fix(marketplace): remove dynamic-plugins-info plugins

Signed-off-by: Yi Cai <[email protected]>

Author: ciiay

dynamic-plugins.default.yaml

@@ -511,6 +511,9 @@ plugins:
             menuItems:
               default.create:
                 title: ''
+              default.admin:
+                title: Administration
+                icon: admin
           red-hat-developer-hub.backstage-plugin-global-header:
             mountPoints:
               - mountPoint: application/header
@@ -1197,17 +1200,20 @@ plugins:
         frontend:
           red-hat-developer-hub.backstage-plugin-marketplace:
             appIcons:
-              - name: marketplace
-                importName: MarketplaceIcon
+              - name: pluginsIcon
+                importName: PluginsIcon
             dynamicRoutes:
-              - path: /extensions/catalog
+              - path: /marketplace
                 importName: DynamicMarketplacePluginRouter
+                menuItem:
+                  icon: pluginsIcon
+                  text: Extensions
             mountPoints:
-              - mountPoint: internal.plugins/tab
-                importName: DynamicMarketplacePluginContent
-                config:
-                  path: marketplace
-                  title: Catalog
+              - mountPoint: application/provider
+                importName: InstallationContextProvider
+            menuItems:
+              marketplace:
+                parent: default.admin
 
   # Group: Orchestrator
   - package: "@redhat/[email protected]"

packages/app/package.json

@@ -41,7 +41,6 @@
     "@backstage/theme": "0.6.6",
     "@emotion/react": "11.14.0",
     "@emotion/styled": "11.14.1",
-    "@internal/plugin-dynamic-plugins-info": "*",
     "@mui/icons-material": "5.18.0",
     "@mui/material": "5.18.0",
     "@mui/styled-engine": "5.18.0",

packages/app/src/App.tsx

@@ -1,14 +1,9 @@
 import GlobalStyles from '@mui/material/GlobalStyles';
 
 import { apis } from './apis';
-import { StaticPlugins } from './components/DynamicRoot/DynamicRoot';
 import ScalprumRoot from './components/DynamicRoot/ScalprumRoot';
 import { DefaultMainMenuItems } from './consts';
 
-// Statically integrated frontend plugins
-const { dynamicPluginsInfoPlugin, ...dynamicPluginsInfoPluginModule } =
-  await import('@internal/plugin-dynamic-plugins-info');
-
 // The base UI configuration, these values can be overridden by values
 // specified in external configuration files
 const baseFrontendConfig = {
@@ -17,62 +12,18 @@ const baseFrontendConfig = {
     dynamicPlugins: {
       frontend: {
         'default.main-menu-items': DefaultMainMenuItems,
-        // please keep this in sync with plugins/dynamic-plugins-info/app-config.janus-idp.yaml
-        'internal.plugin-dynamic-plugins-info': {
-          appIcons: [
-            { name: 'pluginsInfoIcon', importName: 'PluginsInfoIcon' },
-            { name: 'adminIcon', importName: 'AdminIcon' },
-          ],
-          dynamicRoutes: [
-            {
-              path: '/extensions',
-              importName: 'DynamicPluginsInfoPage',
-              menuItem: { text: 'Plugins', icon: 'pluginsInfoIcon' },
-            },
-          ],
-          mountPoints: [
-            {
-              mountPoint: 'internal.plugins/tab',
-              importName: 'DynamicPluginsInfoContent',
-              config: {
-                path: 'installed',
-                title: 'Installed',
-              },
-            },
-          ],
-          menuItems: {
-            admin: {
-              title: 'Administration',
-              icon: 'adminIcon',
-            },
-            extensions: {
-              parent: 'admin',
-              title: 'Extensions',
-              icon: 'pluginsInfoIcon',
-            },
-          },
-        },
       },
     },
   },
 };
 
-// The map of static plugins by package name
-const staticPlugins: StaticPlugins = {
-  'internal.plugin-dynamic-plugins-info': {
-    plugin: dynamicPluginsInfoPlugin,
-    module: dynamicPluginsInfoPluginModule,
-  },
-};
-
 const AppRoot = () => (
   <>
     <GlobalStyles styles={{ html: { overflowY: 'hidden' } }} />
     <ScalprumRoot
       apis={apis}
       afterInit={() => import('./components/AppBase')}
       baseFrontendConfig={baseFrontendConfig}
-      plugins={staticPlugins}
     />
   </>
 );

packages/app/src/components/DynamicRoot/CommonIcons.tsx

@@ -8,6 +8,7 @@ import Extension from '@mui/icons-material/ExtensionOutlined';
 import Favorite from '@mui/icons-material/Favorite';
 import FolderOpen from '@mui/icons-material/FolderOpenOutlined';
 import GppGood from '@mui/icons-material/GppGoodOutlined';
+import AdminIcon from '@mui/icons-material/GppMaybeOutlined';
 import Help from '@mui/icons-material/HelpOutline';
 import Home from '@mui/icons-material/HomeOutlined';
 import InsertChart from '@mui/icons-material/InsertChartOutlined';
@@ -61,6 +62,7 @@ const CommonIcons: {
   logout: Logout,
   developerHub: DeveloperHub,
   account: AccountCircleOutlinedIcon,
+  admin: AdminIcon,
 };
 
 export default CommonIcons;

packages/app/src/components/Root/Root.tsx

@@ -24,7 +24,6 @@ import { SidebarSearchModal } from '@backstage/plugin-search';
 import { Settings as SidebarSettings } from '@backstage/plugin-user-settings';
 
 import { policyEntityCreatePermission } from '@backstage-community/plugin-rbac-common';
-import { AdminIcon } from '@internal/plugin-dynamic-plugins-info';
 import AccountCircleOutlinedIcon from '@mui/icons-material/AccountCircleOutlined';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
 import ExpandMore from '@mui/icons-material/ExpandMore';
@@ -409,8 +408,8 @@ export const Root = ({ children }: PropsWithChildren<{}>) => {
       : menuItems.filter(mi => !mi.name.startsWith('default.'));
 
     menuItemArray = isBottomMenuSection
-      ? menuItemArray.filter(mi => mi.name === 'admin')
-      : menuItemArray.filter(mi => mi.name !== 'admin');
+      ? menuItemArray.filter(mi => mi.name.includes('admin'))
+      : menuItemArray.filter(mi => !mi.name.includes('admin'));
 
     if (isBottomMenuSection && !canDisplayRBACMenuItem && !loadingPermission) {
       menuItemArray[0].children = menuItemArray[0].children?.filter(
@@ -497,8 +496,8 @@ export const Root = ({ children }: PropsWithChildren<{}>) => {
             {showAdministration && (
               <>
                 <SidebarDivider />
-                <SidebarGroup label="Administration" icon={<AdminIcon />}>
-                  {renderMenuItems(false, true)}
+                <SidebarGroup label="Administration">
+                  {renderMenuItems(true, true)}
                 </SidebarGroup>
               </>
             )}

packages/app/src/utils/dynamicUI/initializeRemotePlugins.ts

@@ -4,10 +4,7 @@ import { ScalprumState } from '@scalprum/react-core';
 import { RemotePlugins } from '../../components/DynamicRoot/DynamicRoot';
 
 // See packages/app/src/App.tsx
-const ignoreStaticPlugins = [
-  'default.main-menu-items',
-  'internal.plugin-dynamic-plugins-info',
-];
+const ignoreStaticPlugins = ['default.main-menu-items'];
 
 const initializeRemotePlugins = async (
   pluginStore: ScalprumState['pluginStore'],

packages/backend/package.json

@@ -65,7 +65,6 @@
     "@backstage/plugin-search-backend-module-catalog": "0.3.4",
     "@backstage/plugin-search-backend-module-pg": "0.5.44",
     "@backstage/plugin-user-settings-backend": "^0.3.5",
-    "@internal/plugin-dynamic-plugins-info-backend": "*",
     "@internal/plugin-licensed-users-info-backend": "*",
     "@internal/plugin-scalprum-backend": "*",
     "@janus-idp/backstage-plugin-audit-log-node": "1.7.2",

packages/backend/src/index.ts

@@ -159,7 +159,6 @@ if (process.env.ENABLE_AUTH_PROVIDER_MODULE_OVERRIDE !== 'true') {
   staticLogger.info(`Default authentication provider module disabled`);
 }
 
-backend.add(import('@internal/plugin-dynamic-plugins-info-backend'));
 backend.add(import('@internal/plugin-scalprum-backend'));
 backend.add(import('@internal/plugin-licensed-users-info-backend'));