admin/ota-admin-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge development (#86)

Browse Source
This commit is contained in:
John Wu
2021-09-13 09:15:20 -07:00
committed by GitHub
parent 74eb2707a3
commit 680280dbf2
32 changed files with 465 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/components/Layouts/SideMenu.jsx
View File

@@ -64,27 +64,18 @@ const MenuItem = ({ item, children }) => {
);
};
const ExpandableSideMenuItem = ({ item }) => {
/*
const [expanded, setExpanded] = useState(true);
const clickHandler = (e) => {
setExpanded(!expanded);
};
*/
return (
<>
<span>
<MenuItem item={item}></MenuItem>
</span>
<ul style={{ marginLeft: 50 }}>
{item.submenus.map((subitem, index) => (
<MenuItem key={`submenu-${index}`} item={subitem} />
))}
</ul>
</>
);
};
const ExpandableSideMenuItem = ({ item }) => (
<>
<span>
<MenuItem item={item}></MenuItem>
</span>
<ul style={{ marginLeft: 50 }}>
{item.submenus.map((subitem, index) => (
<MenuItem key={`submenu-${index}`} item={subitem} />
))}
</ul>
</>
);
const SideMenu = () => {
const { groups } = useUserContext();

4
src/components/Layouts/SideMenu.test.jsx
View File

@@ -21,13 +21,13 @@ const renderMenu = async () => {
describe("SideMenu", () => {
it("Unauthenticated", async () => {
setToken(null);
const container = await renderMenu(null);
const container = await renderMenu();
expect(container).toMatchSnapshot();
});
it("Authenticated", async () => {
setToken(TEST_AUTH_OBJECT);
const container = await renderMenu(TEST_AUTH_OBJECT);
const container = await renderMenu();
expect(container).toMatchSnapshot();
});
});

2
src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
View File

@@ -182,7 +182,7 @@ exports[`SideMenu Authenticated 1`] = `
<li>
<a
aria-disabled="false"
class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-53 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-54 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
href="https://grafana.fiskerdps.com"
rel="noopener"
role="button"