Addressed review comments and cleaned code

Signed-off-by: Yi Cai <yicai@redhat.com>
backstage · Oct 24, 2024 · 2143582 · 2143582
1 parent d805202
commit 2143582
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 54 deletions.
diff --git a/workspaces/topology/packages/app/package.json b/workspaces/topology/packages/app/package.json
@@ -44,8 +44,6 @@
     "@backstage/plugin-techdocs-react": "^1.2.9",
     "@backstage/plugin-user-settings": "^0.8.14",
     "@backstage/theme": "^0.6.0",
-    "@emotion/react": "^11.5.0",
-    "@emotion/styled": "^11.3.0",
     "@mui/icons-material": "5.15.17",
     "@mui/lab": "5.0.0-alpha.173",
     "@mui/material": "5.15.17",

diff --git a/workspaces/topology/packages/app/src/components/Root/Root.tsx b/workspaces/topology/packages/app/src/components/Root/Root.tsx
@@ -43,8 +43,6 @@ import SearchIcon from '@mui/icons-material/Search';
 import { MyGroupsSidebarItem } from '@backstage/plugin-org';
 import GroupIcon from '@mui/icons-material/People';
 
-import { ThemeProvider, useTheme } from '@mui/material/styles';
-
 const useSidebarLogoStyles = makeStyles({
   root: {
     width: sidebarConfig.drawerWidthClosed,
@@ -74,49 +72,46 @@ const SidebarLogo = () => {
 };
 
 export const Root = ({ children }: PropsWithChildren<{}>) => {
-  const theme = useTheme();
   return (
-    <ThemeProvider theme={theme}>
-      <SidebarPage>
-        <Sidebar>
-          <SidebarLogo />
-          <SidebarGroup label="Search" icon={<SearchIcon />} to="/search">
-            <SidebarSearchModal />
-          </SidebarGroup>
-          <SidebarDivider />
-          <SidebarGroup label="Menu" icon={<MenuIcon />}>
-            {/* Global nav, not org-specific */}
-            <SidebarItem icon={HomeIcon} to="catalog" text="Home" />
-            <MyGroupsSidebarItem
-              singularTitle="My Group"
-              pluralTitle="My Groups"
-              icon={GroupIcon}
-            />
-            <SidebarItem icon={ExtensionIcon} to="api-docs" text="APIs" />
-            <SidebarItem icon={LibraryBooks} to="docs" text="Docs" />
-            <SidebarItem
-              icon={CreateComponentIcon}
-              to="create"
-              text="Create..."
-            />
-            {/* End global nav */}
-            <SidebarDivider />
-            <SidebarScrollWrapper>
-              {/* Items in this group will be scrollable if they run out of space */}
-            </SidebarScrollWrapper>
-          </SidebarGroup>
-          <SidebarSpace />
+    <SidebarPage>
+      <Sidebar>
+        <SidebarLogo />
+        <SidebarGroup label="Search" icon={<SearchIcon />} to="/search">
+          <SidebarSearchModal />
+        </SidebarGroup>
+        <SidebarDivider />
+        <SidebarGroup label="Menu" icon={<MenuIcon />}>
+          {/* Global nav, not org-specific */}
+          <SidebarItem icon={HomeIcon} to="catalog" text="Home" />
+          <MyGroupsSidebarItem
+            singularTitle="My Group"
+            pluralTitle="My Groups"
+            icon={GroupIcon}
+          />
+          <SidebarItem icon={ExtensionIcon} to="api-docs" text="APIs" />
+          <SidebarItem icon={LibraryBooks} to="docs" text="Docs" />
+          <SidebarItem
+            icon={CreateComponentIcon}
+            to="create"
+            text="Create..."
+          />
+          {/* End global nav */}
           <SidebarDivider />
-          <SidebarGroup
-            label="Settings"
-            icon={<UserSettingsSignInAvatar />}
-            to="/settings"
-          >
-            <SidebarSettings />
-          </SidebarGroup>
-        </Sidebar>
-        {children}
-      </SidebarPage>
-    </ThemeProvider>
+          <SidebarScrollWrapper>
+            {/* Items in this group will be scrollable if they run out of space */}
+          </SidebarScrollWrapper>
+        </SidebarGroup>
+        <SidebarSpace />
+        <SidebarDivider />
+        <SidebarGroup
+          label="Settings"
+          icon={<UserSettingsSignInAvatar />}
+          to="/settings"
+        >
+          <SidebarSettings />
+        </SidebarGroup>
+      </Sidebar>
+      {children}
+    </SidebarPage>
   );
 };
diff --git a/workspaces/topology/packages/app/src/components/catalog/EntityPage.tsx b/workspaces/topology/packages/app/src/components/catalog/EntityPage.tsx
@@ -147,7 +147,7 @@ const entityWarningContent = (
 const overviewContent = (
   <Grid container spacing={3} alignItems="stretch">
     {entityWarningContent}
-    <Grid item xs={6}>
+    <Grid item md={6}>
       <EntityAboutCard variant="gridItem" />
     </Grid>
     <Grid item md={6} xs={12}>

diff --git a/workspaces/topology/packages/app/src/components/search/SearchPage.tsx b/workspaces/topology/packages/app/src/components/search/SearchPage.tsx
@@ -68,12 +68,12 @@ const SearchPage = () => {
       <Header title="Search" />
       <Content>
         <Grid container direction="row">
-          <Grid xs={12}>
+          <Grid item xs={12}>
             <Paper className={classes.bar}>
               <SearchBar />
             </Paper>
           </Grid>
-          <Grid xs={3}>
+          <Grid item xs={3}>
             <SearchType.Accordion
               name="Result Type"
               defaultValue="software-catalog"
@@ -126,7 +126,7 @@ const SearchPage = () => {
               />
             </Paper>
           </Grid>
-          <Grid xs={9}>
+          <Grid item xs={9}>
             <SearchPagination />
             <SearchResult>
               <CatalogSearchResultListItem icon={<CatalogIcon />} />

diff --git a/workspaces/topology/yarn.lock b/workspaces/topology/yarn.lock
@@ -6267,7 +6267,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/react@npm:^11.10.5, @emotion/react@npm:^11.5.0":
+"@emotion/react@npm:^11.10.5":
   version: 11.13.3
   resolution: "@emotion/react@npm:11.13.3"
   dependencies:
@@ -6308,7 +6308,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/styled@npm:^11.10.5, @emotion/styled@npm:^11.3.0":
+"@emotion/styled@npm:^11.10.5":
   version: 11.13.0
   resolution: "@emotion/styled@npm:11.13.0"
   dependencies:
@@ -15680,8 +15680,6 @@ __metadata:
     "@backstage/plugin-user-settings": ^0.8.14
     "@backstage/test-utils": ^1.7.0
     "@backstage/theme": ^0.6.0
-    "@emotion/react": ^11.5.0
-    "@emotion/styled": ^11.3.0
     "@mui/icons-material": 5.15.17
     "@mui/lab": 5.0.0-alpha.173
     "@mui/material": 5.15.17