Merge branch 'main' of https://github.com/janus-idp/backstage-plugins …

…into scaffolderFrom-processor

Signed-off-by: Frank Kong <[email protected]>

.github/CODEOWNERS

@@ -38,7 +38,6 @@ yarn.lock                    @janus-idp/maintainers-plugins
 /plugins/analytics-module-matomo            @janus-idp/maintainers-plugins @janus-idp/devex-uxe
 /plugins/kiali                              @janus-idp/maintainers-plugins @janus-idp/kiali
 /plugins/kiali-backend                      @janus-idp/maintainers-plugins @janus-idp/kiali
-/plugins/kiali-common                       @janus-idp/maintainers-plugins @janus-idp/kiali
 /plugins/quay                               @janus-idp/rhtap
 /plugins/tekton                             @janus-idp/rhtap
 /plugins/argocd                             @janus-idp/rhtap

package.json

@@ -17,7 +17,7 @@
     "build:storybook": "yarn --cwd packages/storybook build",
     "tsc": "turbo run tsc",
     "clean": "turbo run clean",
-    "test": "turbo run test",
+    "test": "turbo run test --concurrency=1",
     "lint": "turbo run lint",
     "lint:fix": "turbo run lint -- --fix",
     "lint-staged": "lint-staged",

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",

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 = (

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

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",

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',

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",

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',

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",

plugins/argocd/CHANGELOG.md

@@ -1,3 +1,10 @@
+## @janus-idp/backstage-plugin-argocd [1.0.4](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-14)
+
+
+### Bug Fixes
+
+* **argocd:** make refreshInterval configuration as optional ([#1647](https://github.com/janus-idp/backstage-plugins/issues/1647)) ([2c24d35](https://github.com/janus-idp/backstage-plugins/commit/2c24d35f050801801c597967e890b6d2e647fb06))
+
 ## @janus-idp/backstage-plugin-argocd [1.0.3](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-09)
 
 

plugins/argocd/config.d.ts

@@ -20,7 +20,7 @@ export interface Config {
      * Polling interval timeout
      * @visibility frontend
      */
-    refreshInterval: number;
+    refreshInterval?: number;
     /**
      * The base url of the ArgoCD instance.
      * @visibility frontend

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

plugins/argocd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@janus-idp/backstage-plugin-argocd",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -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",

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',

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": {

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]]}>

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",

plugins/feedback-backend/CHANGELOG.md

@@ -1,3 +1,10 @@
+## @janus-idp/backstage-plugin-feedback-backend [1.3.0](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-14)
+
+
+### Features
+
+* **feedback:** use backstage auth service in backend plugin ([#1646](https://github.com/janus-idp/backstage-plugins/issues/1646)) ([7d9ee11](https://github.com/janus-idp/backstage-plugins/commit/7d9ee11d1ed0dbc1ff026de3b1e50f2888c3f542)), closes [#1626](https://github.com/janus-idp/backstage-plugins/issues/1626)
+
 ## @janus-idp/backstage-plugin-feedback-backend [1.2.6](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-05-09)
 
 

plugins/feedback-backend/README.md

@@ -15,7 +15,20 @@ Install the NPM Package
 yarn workspace backend add @janus-idp/backstage-plugin-feedback-backend
 ```
 
-#### Adding the plugin to the legacy backend
+#### Adding the plugin to the new backend
+
+Add the following to your `packages/backend/src/index.ts` file:
+
+```ts title="packages/backend/src/index.ts"
+const backend = createBackend();
+
+// Add the following line
+backend.add(import('@janus-idp/backstage-plugin-feedback-backend'));
+
+backend.start();
+```
+
+#### Adding the plugin to the legacy backend (`@janus-idp/[email protected]` and lower)
 
 1. Create a new file `packages/backend/src/plugins/feedback.ts` and add the following:
 
@@ -50,19 +63,6 @@ yarn workspace backend add @janus-idp/backstage-plugin-feedback-backend
    }
    ```
 
-#### Adding the plugin to the new backend
-
-Add the following to your `packages/backend/src/index.ts` file:
-
-```ts title="packages/backend/src/index.ts"
-const backend = createBackend();
-
-// Add the following line
-backend.add(import('@janus-idp/backstage-plugin-feedback-backend/alpha'));
-
-backend.start();
-```
-
 ### Configurations
 
 Add the following config in your `app-config.yaml` file.

plugins/feedback-backend/dist-dynamic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@janus-idp/backstage-plugin-feedback-backend-dynamic",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
   "license": "Apache-2.0",
@@ -57,6 +57,7 @@
   "peerDependencies": {
     "@backstage/backend-common": "^0.21.7",
     "@backstage/backend-plugin-api": "^0.6.17",
+    "@backstage/backend-test-utils": "^0.3.7",
     "@backstage/catalog-client": "^1.6.4",
     "@backstage/catalog-model": "^1.4.5",
     "@backstage/config": "^1.2.0"

plugins/feedback-backend/dist-dynamic/yarn.lock

@@ -85,9 +85,9 @@
   integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
 
 "@types/node@*":
-  version "20.12.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.11.tgz#c4ef00d3507000d17690643278a60dc55a9dc9be"
-  integrity sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==
+  version "20.12.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050"
+  integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==
   dependencies:
     undici-types "~5.26.4"
 

plugins/feedback-backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@janus-idp/backstage-plugin-feedback-backend",
-  "version": "1.2.6",
+  "version": "1.3.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -41,6 +41,7 @@
   "dependencies": {
     "@backstage/backend-common": "^0.21.7",
     "@backstage/backend-plugin-api": "^0.6.17",
+    "@backstage/backend-test-utils": "^0.3.7",
     "@backstage/catalog-client": "^1.6.4",
     "@backstage/catalog-model": "^1.4.5",
     "@backstage/config": "^1.2.0",