feat(deps): use RHDH themes in the backstage app and dev pages (janus…

…-idp#1480)
ciiay · May 14, 2024 · 8263bf0 · 8263bf0
1 parent 5e27a8c
commit 8263bf0
Show file tree

Hide file tree

Showing 43 changed files with 102 additions and 29 deletions.
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -23,6 +23,8 @@
     "lint": "backstage-cli package lint"
   },
   "dependencies": {
+    "@backstage-community/plugin-github-actions": "^0.6.16",
+    "@backstage-community/plugin-tech-radar": "^0.7.4",
     "@backstage/app-defaults": "^1.5.4",
     "@backstage/catalog-model": "^1.4.5",
     "@backstage/core-app-api": "^1.12.4",
@@ -48,13 +50,12 @@
     "@mui/icons-material": "^5.15.16",
     "@mui/material": "^5.15.16",
     "@mui/styles": "^5.15.16",
+    "@redhat-developer/red-hat-developer-hub-theme": "^0.0.40",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-router": "^6.23.0",
     "react-router-dom": "^6.23.0",
-    "tss-react": "^4.9.10",
-    "@backstage-community/plugin-github-actions": "^0.6.16",
-    "@backstage-community/plugin-tech-radar": "^0.7.4"
+    "tss-react": "^4.9.10"
   },
   "devDependencies": {
     "@backstage/cli": "0.26.4",

diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
@@ -33,6 +33,7 @@ import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
 import { UserSettingsPage } from '@backstage/plugin-user-settings';
 
 import { TechRadarPage } from '@backstage-community/plugin-tech-radar';
+import { getThemes } from '@redhat-developer/red-hat-developer-hub-theme';
 
 import { apis } from './apis';
 import { entityPage } from './components/catalog/EntityPage';
@@ -61,6 +62,7 @@ const app = createApp({
   components: {
     SignInPage: props => <SignInPage {...props} auto providers={['guest']} />,
   },
+  themes: getThemes(),
 });
 
 const routes = (

diff --git a/plugins/acr/dev/index.tsx b/plugins/acr/dev/index.tsx
@@ -4,6 +4,8 @@ import { createDevApp } from '@backstage/dev-utils';
 import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { TestApiProvider } from '@backstage/test-utils';
 
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
+
 import { mockAcrTagsData } from '../src/__fixtures__/acrTagsObject';
 import { mockEntity } from '../src/__fixtures__/mockEntity';
 import {
@@ -29,6 +31,7 @@ class MockAzureContainerRegistryApiClient
 
 createDevApp()
   .registerPlugin(acrPlugin)
+  .addThemes(createDevAppThemes())
   .addPage({
     element: (
       <TestApiProvider

diff --git a/plugins/acr/package.json b/plugins/acr/package.json
@@ -30,10 +30,10 @@
     "@backstage/core-plugin-api": "^1.9.2",
     "@backstage/plugin-catalog-react": "^1.11.3",
     "@backstage/theme": "^0.5.3",
+    "@janus-idp/shared-react": "2.6.1",
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.45",
-    "@janus-idp/shared-react": "2.6.1",
     "react-use": "^17.4.0"
   },
   "peerDependencies": {
@@ -45,6 +45,7 @@
     "@backstage/dev-utils": "1.0.31",
     "@backstage/test-utils": "1.5.4",
     "@janus-idp/cli": "1.8.6",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/react": "14.2.1",
     "@testing-library/react-hooks": "8.0.1",

diff --git a/plugins/analytics-module-matomo/dev/index.tsx b/plugins/analytics-module-matomo/dev/index.tsx
@@ -2,11 +2,14 @@ import React from 'react';
 
 import { createDevApp } from '@backstage/dev-utils';
 
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
+
 import { analyticsModuleMatomoPlugin } from '../src';
 import { Playground } from './Playground';
 
 createDevApp()
   .registerPlugin(analyticsModuleMatomoPlugin)
+  .addThemes(createDevAppThemes())
   .addPage({
     title: 'Matomo Analytics Playground',
     path: '/analytics-module-matomo',

diff --git a/plugins/analytics-module-matomo/package.json b/plugins/analytics-module-matomo/package.json
@@ -35,6 +35,7 @@
     "@backstage/dev-utils": "1.0.31",
     "@backstage/test-utils": "1.5.4",
     "@janus-idp/cli": "1.8.6",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/react": "14.2.1",
     "@testing-library/user-event": "14.5.1",

diff --git a/plugins/analytics-provider-segment/dev/index.tsx b/plugins/analytics-provider-segment/dev/index.tsx
@@ -18,11 +18,14 @@ import React from 'react';
 
 import { createDevApp } from '@backstage/dev-utils';
 
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
+
 import { analyticsModuleSegment } from '../src';
 import { Playground } from './Playground';
 
 createDevApp()
   .registerPlugin(analyticsModuleSegment)
+  .addThemes(createDevAppThemes())
   .addPage({
     path: '/segment',
     title: 'Segment Playground',

diff --git a/plugins/analytics-provider-segment/package.json b/plugins/analytics-provider-segment/package.json
@@ -46,6 +46,7 @@
     "@backstage/dev-utils": "1.0.31",
     "@backstage/test-utils": "1.5.4",
     "@janus-idp/cli": "1.8.6",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/dom": "9.3.3",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/react": "14.2.1",

diff --git a/plugins/argocd/dev/index.tsx b/plugins/argocd/dev/index.tsx
@@ -8,6 +8,7 @@ import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { TestApiProvider } from '@backstage/test-utils';
 
 import { Box } from '@material-ui/core';
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
 
 import {
   ArgoCDApi,
@@ -64,6 +65,7 @@ export class MockArgoCDApiClient implements ArgoCDApi {
 
 createDevApp()
   .registerPlugin(argocdPlugin)
+  .addThemes(createDevAppThemes())
   .addPage({
     element: (
       <TestApiProvider

diff --git a/plugins/argocd/package.json b/plugins/argocd/package.json
@@ -56,6 +56,7 @@
     "@backstage/test-utils": "1.5.4",
     "@janus-idp/cli": "1.8.6",
     "@playwright/test": "1.41.2",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/jest-dom": "6.0.0",
     "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.0.0",

diff --git a/plugins/bulk-import/dev/index.tsx b/plugins/bulk-import/dev/index.tsx
@@ -2,10 +2,13 @@ import React from 'react';
 
 import { createDevApp } from '@backstage/dev-utils';
 
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
+
 import { BulkImportPage, bulkImportPlugin } from '../src/plugin';
 
 createDevApp()
   .registerPlugin(bulkImportPlugin)
+  .addThemes(createDevAppThemes())
   .addPage({
     element: <BulkImportPage />,
     title: 'Bulk import',

diff --git a/plugins/bulk-import/package.json b/plugins/bulk-import/package.json
@@ -35,8 +35,8 @@
     "@material-ui/lab": "^4.0.0-alpha.61",
     "@mui/icons-material": "5.14.11",
     "@mui/material": "^5.12.2",
-    "lodash": "^4.17.21",
     "formik": "^2.4.5",
+    "lodash": "^4.17.21",
     "react-use": "^17.2.4"
   },
   "peerDependencies": {
@@ -49,10 +49,11 @@
     "@backstage/dev-utils": "1.0.31",
     "@backstage/test-utils": "1.5.4",
     "@janus-idp/cli": "1.7.10",
+    "@playwright/test": "1.41.2",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/jest-dom": "6.0.0",
     "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.0.0",
-    "@playwright/test": "1.41.2",
     "msw": "1.0.0"
   },
   "scalprum": {

diff --git a/plugins/dynamic-plugins-info/dev/index.tsx b/plugins/dynamic-plugins-info/dev/index.tsx
@@ -4,6 +4,8 @@ import { Content, Header, HeaderTabs, Page } from '@backstage/core-components';
 import { createDevApp } from '@backstage/dev-utils';
 import { TestApiProvider } from '@backstage/test-utils';
 
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
+
 import { listLoadedPluginsResult } from '../src/__fixtures__/listLoadedPluginsResult';
 import { dynamicPluginsInfoApiRef } from '../src/api/types';
 import { DynamicPluginsInfoContent } from '../src/components/DynamicPluginsInfoContent/DynamicPluginsInfoContent';
@@ -17,6 +19,7 @@ const mockedApi = {
 
 createDevApp()
   .registerPlugin(dynamicPluginsInfoPlugin)
+  .addThemes(createDevAppThemes())
   .addPage({
     element: (
       <TestApiProvider apis={[[dynamicPluginsInfoApiRef, mockedApi]]}>

diff --git a/plugins/dynamic-plugins-info/package.json b/plugins/dynamic-plugins-info/package.json
@@ -40,6 +40,7 @@
     "@backstage/core-app-api": "1.12.4",
     "@backstage/dev-utils": "1.0.31",
     "@backstage/test-utils": "1.5.4",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/react": "14.2.1",
     "@testing-library/user-event": "14.5.1",

diff --git a/plugins/feedback/dev/index.tsx b/plugins/feedback/dev/index.tsx
@@ -3,6 +3,8 @@ import React from 'react';
 import { createDevApp } from '@backstage/dev-utils';
 import { EntityProvider } from '@backstage/plugin-catalog-react';
 
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
+
 import { mockEntity } from '../src/mocks';
 import {
   EntityFeedbackPage,
@@ -13,6 +15,7 @@ import {
 
 createDevApp()
   .registerPlugin(feedbackPlugin)
+  .addThemes(createDevAppThemes())
   .addPage({
     element: (
       <>

diff --git a/plugins/feedback/package.json b/plugins/feedback/package.json
@@ -47,6 +47,7 @@
     "@backstage/dev-utils": "1.0.31",
     "@backstage/test-utils": "1.5.4",
     "@janus-idp/cli": "1.8.6",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/react": "14.2.1",
     "@testing-library/user-event": "14.0.0",

diff --git a/plugins/jfrog-artifactory/dev/index.tsx b/plugins/jfrog-artifactory/dev/index.tsx
@@ -4,6 +4,8 @@ import { Entity } from '@backstage/catalog-model';
 import { createDevApp } from '@backstage/dev-utils';
 import { EntityProvider } from '@backstage/plugin-catalog-react';
 
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
+
 import { JfrogArtifactoryPage, jfrogArtifactoryPlugin } from '../src/plugin';
 
 const mockEntity: Entity = {
@@ -25,6 +27,7 @@ const mockEntity: Entity = {
 
 createDevApp()
   .registerPlugin(jfrogArtifactoryPlugin)
+  .addThemes(createDevAppThemes())
   .addPage({
     element: (
       <EntityProvider entity={mockEntity}>

diff --git a/plugins/jfrog-artifactory/package.json b/plugins/jfrog-artifactory/package.json
@@ -46,6 +46,7 @@
     "@backstage/dev-utils": "1.0.31",
     "@backstage/test-utils": "1.5.4",
     "@janus-idp/cli": "1.8.6",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/react": "14.2.1",
     "@testing-library/user-event": "14.5.1",

diff --git a/plugins/kiali/dev/index.tsx b/plugins/kiali/dev/index.tsx
@@ -13,6 +13,7 @@ import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { TestApiProvider } from '@backstage/test-utils';
 
 import { Grid } from '@material-ui/core';
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
 
 import { EntityKialiResourcesCard, kialiPlugin } from '../src';
 import { getEntityRoutes, getRoutes } from '../src/components/Router';
@@ -619,6 +620,7 @@ const MockKialiError = () => {
 
 createDevApp()
   .registerPlugin(kialiPlugin)
+  .addThemes(createDevAppThemes())
   .addPage({
     element: <MockProvider />,
     title: 'KialiPage',

diff --git a/plugins/kiali/package.json b/plugins/kiali/package.json
@@ -77,6 +77,7 @@
     "@backstage/test-utils": "1.5.4",
     "@janus-idp/cli": "1.8.6",
     "@playwright/test": "1.41.2",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/react": "14.2.1",
     "@testing-library/user-event": "14.5.1",

diff --git a/plugins/matomo/dev/index.tsx b/plugins/matomo/dev/index.tsx
@@ -2,10 +2,13 @@ import React from 'react';
 
 import { createDevApp } from '@backstage/dev-utils';
 
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
+
 import { MatomoPage, matomoPlugin } from '../src/plugin';
 
 createDevApp()
   .registerPlugin(matomoPlugin)
+  .addThemes(createDevAppThemes())
   .addPage({
     element: <MatomoPage />,
     title: 'Root Page',

diff --git a/plugins/matomo/package.json b/plugins/matomo/package.json
@@ -48,6 +48,7 @@
     "@backstage/dev-utils": "1.0.31",
     "@backstage/test-utils": "1.5.4",
     "@janus-idp/cli": "1.8.6",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/react": "14.2.1",
     "@testing-library/user-event": "14.5.1",

diff --git a/plugins/nexus-repository-manager/dev/index.tsx b/plugins/nexus-repository-manager/dev/index.tsx
@@ -4,6 +4,8 @@ import { createDevApp } from '@backstage/dev-utils';
 import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { TestApiProvider } from '@backstage/test-utils';
 
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
+
 import {
   entityMock,
   NexusRepositoryManagerApiClientMock,
@@ -16,6 +18,7 @@ import {
 
 createDevApp()
   .registerPlugin(nexusRepositoryManagerPlugin)
+  .addThemes(createDevAppThemes())
   .addPage({
     element: (
       <TestApiProvider

diff --git a/plugins/nexus-repository-manager/package.json b/plugins/nexus-repository-manager/package.json
@@ -30,8 +30,8 @@
     "@backstage/core-components": "^0.14.6",
     "@backstage/core-plugin-api": "^1.9.2",
     "@backstage/plugin-catalog-react": "^1.11.3",
-    "@janus-idp/shared-react": "2.6.1",
     "@backstage/theme": "^0.5.3",
+    "@janus-idp/shared-react": "2.6.1",
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.45",
@@ -47,15 +47,16 @@
     "@backstage/core-app-api": "1.12.4",
     "@backstage/dev-utils": "1.0.31",
     "@backstage/test-utils": "1.5.4",
+    "@hey-api/openapi-ts": "0.34.5",
     "@janus-idp/cli": "1.8.6",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/react": "14.2.1",
     "@testing-library/react-hooks": "8.0.1",
     "@testing-library/user-event": "14.5.1",
     "@types/node": "18.18.5",
     "cross-fetch": "4.0.0",
-    "msw": "1.3.2",
-    "@hey-api/openapi-ts": "0.34.5"
+    "msw": "1.3.2"
   },
   "files": [
     "dist",

diff --git a/plugins/notifications/dev/index.tsx b/plugins/notifications/dev/index.tsx
@@ -2,10 +2,13 @@ import React from 'react';
 
 import { createDevApp } from '@backstage/dev-utils';
 
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
+
 import { NotificationsPage, notificationsPlugin } from '../src/plugin';
 
 createDevApp()
   .registerPlugin(notificationsPlugin)
+  .addThemes(createDevAppThemes())
   .addPage({
     element: <NotificationsPage />,
     title: 'Root Page',

diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json
@@ -49,6 +49,7 @@
     "@backstage/test-utils": "1.5.4",
     "@janus-idp/cli": "1.8.6",
     "@openapitools/openapi-generator-cli": "2.7.0",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/react": "14.2.1",
     "@testing-library/user-event": "14.5.1",

diff --git a/plugins/ocm/dev/index.tsx b/plugins/ocm/dev/index.tsx
@@ -12,6 +12,7 @@ import {
 import { SearchApi, searchApiRef } from '@backstage/plugin-search-react';
 
 import { Grid } from '@material-ui/core';
+import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
 
 import {
   ClusterAvailableResourceCard,
@@ -83,6 +84,7 @@ createDevApp()
     }),
   )
   .registerPlugin(ocmPlugin)
+  .addThemes(createDevAppThemes())
   .addPage({
     element: <OcmPage />,
     title: 'Root Page',

diff --git a/plugins/ocm/package.json b/plugins/ocm/package.json
@@ -54,6 +54,7 @@
     "@backstage/plugin-catalog": "1.19.0",
     "@backstage/test-utils": "1.5.4",
     "@janus-idp/cli": "1.8.6",
+    "@redhat-developer/red-hat-developer-hub-theme": "*",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/react": "14.2.1",
     "@testing-library/user-event": "14.5.1",