feat(marketplace): integrate plugins-info plugin (#1395)

* feat(marketplace): integrate plugins-info plugin

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

* update package and yarn.lock

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

* added changeset

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

* yarn dedupe

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

* fix tsc issue

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

* addressed review comments

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

* addressed feedback

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

* code improvement

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

* updated report.api.md

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

* added link to name column

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

* addressed review comments

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

* fixed saving issue

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

* fixed saving config error

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

* changeset updated to minor

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

---------

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

Author: ciiay

workspaces/marketplace/.changeset/unlucky-hornets-cross.md

@@ -0,0 +1,15 @@
+---
+'@red-hat-developer-hub/backstage-plugin-marketplace-backend': minor
+'@red-hat-developer-hub/backstage-plugin-marketplace': minor
+---
+
+Integrate plugins-info plugin and add `Installed packages` tab with enhanced UI.
+
+BREAKING: The deprecated `InstallationContextProvider` export behavior changed.
+
+- We now export a null component `InstallationContextProvider` from `plugin.ts` solely for backward compatibility. It no longer provides context and will be removed in a future release.
+- Migration: There is no replacement API; this was internal-only. Please upgrade to the latest RHDH where features no longer rely on this provider.
+
+Also:
+
+- New `Installed packages` tab with dual-source mapping and client-side filtering/pagination.

workspaces/marketplace/package.json

@@ -50,7 +50,8 @@
     "minimatch": "3",
     "node-gyp": "^9.0.0",
     "prettier": "^3.4.2",
-    "typescript": "~5.3.0"
+    "typescript": "~5.3.0",
+    "yaml": "^2.8.1"
   },
   "resolutions": {
     "@types/react": "^18",

workspaces/marketplace/packages/app/src/App.tsx

@@ -52,10 +52,7 @@ import { githubAuthApiRef } from '@backstage/core-plugin-api';
 
 import { getAllThemes } from '@red-hat-developer-hub/backstage-plugin-theme';
 
-import {
-  InstallationContextProvider,
-  DynamicMarketplacePluginRouter as Marketplace,
-} from '@red-hat-developer-hub/backstage-plugin-marketplace';
+import { DynamicMarketplacePluginRouter as Marketplace } from '@red-hat-developer-hub/backstage-plugin-marketplace';
 
 import { apis } from './apis';
 import { entityPage } from './components/catalog/EntityPage';
@@ -136,14 +133,7 @@ const routes = (
     </Route>
     <Route path="/settings" element={<UserSettingsPage />} />
     <Route path="/catalog-graph" element={<CatalogGraphPage />} />
-    <Route
-      path="/extensions"
-      element={
-        <InstallationContextProvider>
-          <Marketplace />
-        </InstallationContextProvider>
-      }
-    />
+    <Route path="/extensions" element={<Marketplace />} />
   </FlatRoutes>
 );
 

workspaces/marketplace/plugins/marketplace-backend/package.json

@@ -34,6 +34,7 @@
   },
   "dependencies": {
     "@backstage/backend-defaults": "^0.11.1",
+    "@backstage/backend-dynamic-feature-service": "^0.7.3",
     "@backstage/backend-plugin-api": "^1.4.1",
     "@backstage/catalog-client": "^1.10.2",
     "@backstage/catalog-model": "^1.7.5",
@@ -44,7 +45,6 @@
     "@red-hat-developer-hub/backstage-plugin-marketplace-common": "workspace:^",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
-    "yaml": "^2.7.1",
     "zod": "^3.22.4"
   },
   "devDependencies": {
@@ -56,7 +56,8 @@
     "@types/express": "*",
     "@types/supertest": "^2.0.12",
     "msw": "^1.0.0",
-    "supertest": "^6.2.4"
+    "supertest": "^6.2.4",
+    "yaml": "^2.7.1"
   },
   "files": [
     "dist"

workspaces/marketplace/plugins/marketplace-backend/src/plugin.ts

@@ -19,6 +19,7 @@ import {
   createBackendPlugin,
 } from '@backstage/backend-plugin-api';
 import { CatalogClient } from '@backstage/catalog-client';
+import { dynamicPluginsServiceRef } from '@backstage/backend-dynamic-feature-service';
 
 import {
   MarketplaceApi,
@@ -45,8 +46,10 @@ export const marketplacePlugin = createBackendPlugin({
         discovery: coreServices.discovery,
         logger: coreServices.logger,
         permissions: coreServices.permissions,
+        pluginProvider: dynamicPluginsServiceRef,
       },
       async init({
+        pluginProvider,
         auth,
         config,
         httpAuth,
@@ -75,6 +78,8 @@ export const marketplacePlugin = createBackendPlugin({
             installationDataService,
             marketplaceApi,
             permissions,
+            pluginProvider,
+            logger,
             config,
           }),
         );

workspaces/marketplace/plugins/marketplace-backend/src/router.test.ts

@@ -20,8 +20,16 @@ import request from 'supertest';
 import { stringify } from 'yaml';
 
 import { ExtendedHttpServer } from '@backstage/backend-defaults/rootHttpRouter';
-import { BackendFeature } from '@backstage/backend-plugin-api';
+import {
+  BackendFeature,
+  createServiceFactory,
+} from '@backstage/backend-plugin-api';
 import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
+import {
+  DynamicPluginProvider,
+  BaseDynamicPlugin,
+  dynamicPluginsServiceRef,
+} from '@backstage/backend-dynamic-feature-service';
 import type { JsonObject } from '@backstage/types';
 import {
   AuthorizeResult,
@@ -67,6 +75,43 @@ const BASE_CONFIG = {
   },
 };
 
+// Mock dynamic plugins data for testing
+const mockDynamicPluginsData: BaseDynamicPlugin[] = [
+  {
+    name: '@backstage/plugin-catalog-backend',
+    version: '1.0.0',
+    role: 'backend',
+    platform: 'node',
+  },
+  {
+    name: '@backstage/plugin-catalog',
+    version: '1.0.0',
+    role: 'frontend',
+    platform: 'web',
+  },
+  {
+    name: '@red-hat-developer-hub/backstage-plugin-marketplace',
+    version: '1.0.0',
+    role: 'frontend',
+    platform: 'web',
+  },
+];
+
+// Mock DynamicPluginProvider
+const mockDynamicPluginProvider: DynamicPluginProvider = {
+  plugins: () => mockDynamicPluginsData as any,
+  getScannedPackage: () => ({}) as any,
+  frontendPlugins: () => [],
+  backendPlugins: () => [],
+};
+
+// Create mock service factory for dynamicPluginsServiceRef
+const mockDynamicPluginsServiceFactory = createServiceFactory({
+  service: dynamicPluginsServiceRef,
+  deps: {},
+  factory: () => mockDynamicPluginProvider,
+});
+
 const FILE_INSTALL_CONFIG = {
   extensions: {
     installation: {
@@ -141,6 +186,7 @@ async function startBackendServer(
     mockServices.rootConfig.factory({
       data: { ...BASE_CONFIG, ...(config ?? {}) },
     }),
+    mockDynamicPluginsServiceFactory,
   ];
 
   if (authorizeResult) {
@@ -881,4 +927,31 @@ describe('createRouter', () => {
       },
     );
   });
+
+  describe('GET /loaded-plugins', () => {
+    it('should return the list of loaded dynamic plugins', async () => {
+      const { backendServer } = await setupTestWithMockCatalog({
+        mockData: {},
+      });
+
+      const response = await request(backendServer).get(
+        '/api/extensions/loaded-plugins',
+      );
+
+      expect(response.status).toBe(200);
+      expect(Array.isArray(response.body)).toBe(true);
+      // The response should be an array of dynamic plugin info objects
+      // Each plugin should have the expected structure
+      response.body.forEach((plugin: any) => {
+        expect(plugin).toEqual(
+          expect.objectContaining({
+            name: expect.any(String),
+            version: expect.any(String),
+            role: expect.any(String),
+            platform: expect.any(String),
+          }),
+        );
+      });
+    });
+  });
 });

workspaces/marketplace/plugins/marketplace-backend/src/router.ts

@@ -22,6 +22,7 @@ import type { Config } from '@backstage/config';
 import {
   HttpAuthService,
   PermissionsService,
+  LoggerService,
 } from '@backstage/backend-plugin-api';
 import {
   AuthorizeResult,
@@ -48,11 +49,19 @@ import { matches } from './utils/permissionUtils';
 import { InstallationDataService } from './installation/InstallationDataService';
 import { ConfigFormatError } from './errors/ConfigFormatError';
 
+import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
+import {
+  BaseDynamicPlugin,
+  DynamicPluginProvider,
+} from '@backstage/backend-dynamic-feature-service';
+
 export type MarketplaceRouterOptions = {
   httpAuth: HttpAuthService;
   marketplaceApi: MarketplaceApi;
   permissions: PermissionsService;
   installationDataService: InstallationDataService;
+  pluginProvider: DynamicPluginProvider;
+  logger: LoggerService;
   config: Config;
 };
 
@@ -64,6 +73,8 @@ export async function createRouter(
     marketplaceApi,
     permissions,
     installationDataService,
+    pluginProvider,
+    logger,
     config,
   } = options;
 
@@ -457,5 +468,22 @@ export async function createRouter(
     res.json(packages);
   });
 
+  const plugins = pluginProvider.plugins();
+  const dynamicPlugins = plugins.map(p => {
+    // Remove the installer details for the dynamic backend plugins
+    if (p.platform === 'node') {
+      const { installer, ...rest } = p;
+      return rest as BaseDynamicPlugin;
+    }
+    return p as BaseDynamicPlugin;
+  });
+  router.get('/loaded-plugins', async (req, response) => {
+    await httpAuth.credentials(req, { allow: ['user', 'service'] });
+    response.send(dynamicPlugins);
+  });
+  const middleware = MiddlewareFactory.create({ logger, config });
+
+  router.use(middleware.error());
+
   return router;
 }

workspaces/marketplace/plugins/marketplace/knip-report.md

@@ -6,4 +6,3 @@
 | :-------------------------- | :---------------- | :------- |
 | @testing-library/user-event | package.json:64:6 | error    |
 | msw                         | package.json:65:6 | error    |
-

workspaces/marketplace/plugins/marketplace/package.json

@@ -41,6 +41,7 @@
     "@backstage/plugin-permission-react": "^0.4.36",
     "@backstage/theme": "^0.6.7",
     "@backstage/types": "^1.2.1",
+    "@material-table/core": "^6.4.4",
     "@material-ui/core": "^4.12.2",
     "@monaco-editor/react": "^4.7.0",
     "@mui/icons-material": "^5.16.7",

workspaces/marketplace/plugins/marketplace/report.api.md

@@ -4,27 +4,21 @@
 
 ```ts
 
-/// <reference types="react" />
-
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { IconComponent } from '@backstage/core-plugin-api';
 import { JSX as JSX_2 } from 'react/jsx-runtime';
-import { JSXElementConstructor } from 'react';
 import { PathParams } from '@backstage/core-plugin-api';
-import { ReactElement } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { SubRouteRef } from '@backstage/core-plugin-api';
 
 // @public (undocumented)
 export const DynamicMarketplacePluginContent: () => JSX_2.Element;
 
-// @public (undocumented)
+// @public
 export const DynamicMarketplacePluginRouter: () => JSX_2.Element;
 
-// @public (undocumented)
-export const InstallationContextProvider: ({ children, }: {
-    children: ReactElement<any, string | JSXElementConstructor<any>>;
-}) => JSX_2.Element;
+// @public @deprecated (undocumented)
+export const InstallationContextProvider: () => null;
 
 // @public
 export const MarketplaceFullPageRouter: () => JSX_2.Element;
@@ -43,11 +37,16 @@ packageRouteRef: SubRouteRef<PathParams<"/packages/:namespace/:name">>;
 packageInstallRouteRef: SubRouteRef<PathParams<"/packages/:namespace/:name/install">>;
 collectionsRouteRef: SubRouteRef<undefined>;
 collectionRouteRef: SubRouteRef<PathParams<"/collections/:namespace/:name">>;
+catalogTabRouteRef: SubRouteRef<undefined>;
+installedTabRouteRef: SubRouteRef<undefined>;
 }, {}, {}>;
 
 // @public
 export const MarketplaceTabbedPageRouter: () => JSX_2.Element;
 
+// @public (undocumented)
+export const PluginsIcon: IconComponent;
+
 // (No @packageDocumentation comment for this package)
 
 ```