update to 1.29.2

opentelekomcloud-infra · Aug 19, 2024 · dedddc2 · dedddc2
1 parent e4687fc
commit dedddc2
Show file tree

Hide file tree

Showing 16 changed files with 8,312 additions and 13,527 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -52,7 +52,7 @@ FROM node:18-bookworm-slim
 
 # Install isolate-vm dependencies, these are needed by the @backstage/plugin-scaffolder-backend.
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends python3 g++ build-essential && \
+    apt-get install -y --no-install-recommends python3 g++ build-essential git && \
     yarn config set python /usr/bin/python3
 
 # Install sqlite3 dependencies. You can skip this if you don't use sqlite3 in the image,

diff --git a/app-config.production.yaml b/app-config.production.yaml
@@ -19,7 +19,7 @@ backend:
   cors:
     origin: https://backstage.eco.tsi-dev.otc-service.com
 
-  # config options: https://node-postgres.com/api/client
+  # config options: https://node-postgres.com/apis/client
   #  database:
   #    client: pg
   #    connection:

diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.26.3"
+  "version": "1.29.2"
 }
diff --git a/package.json b/package.json
@@ -31,9 +31,10 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.4",
-    "@janus-idp/cli": "^1.8.0",
+    "@backstage/cli": "^0.26.11",
+    "@janus-idp/cli": "^1.13.1",
     "@spotify/prettier-config": "^12.0.0",
+    "@types/node-fetch": "^2.6.11",
     "concurrently": "^8.1.0",
     "node-gyp": "^9.0.0",
     "prettier": "3.2.5",
@@ -54,9 +55,24 @@
     ]
   },
   "dependencies": {
-    "@backstage/backend-dynamic-feature-service": "^0.2.9",
-    "@backstage/test-utils": "^1.5.4",
+    "@backstage-community/plugin-adr-backend": "^0.4.21",
+    "@backstage-community/plugin-explore-backend": "^0.1.2",
+    "@backstage-community/plugin-explore-common": "^0.0.4",
+    "@backstage-community/plugin-gcalendar": "^0.3.29",
+    "@backstage-community/plugin-tech-insights-backend": "^0.6.0",
+    "@backstage-community/plugin-tech-insights-backend-module-jsonfc": "^0.1.53",
+    "@backstage-community/plugin-tech-radar": "^0.7.6",
+    "@backstage/backend-defaults": "^0.4.1",
+    "@backstage/backend-dynamic-feature-service": "^0.2.15",
+    "@backstage/plugin-home": "^0.7.8",
+    "@backstage/plugin-kubernetes-backend": "^0.18.3",
+    "@backstage/test-utils": "^1.5.9",
+    "@k-phoen/backstage-plugin-grafana": "^0.1.22",
     "@types/passport-oauth2": "^1.4.12",
+    "@types/react": "^17",
+    "app": "^0.1.0",
+    "backend": "^0.0.0",
+    "backstage": "^0.0.2",
     "passport-oauth2": "^1.7.0"
   },
   "files": [

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -11,72 +11,51 @@
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
     "test": "backstage-cli package test",
-    "lint": "backstage-cli package lint",
-    "test:e2e": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:dev",
-    "test:e2e:ci": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:run",
-    "cy:dev": "cypress open",
-    "cy:run": "cypress run --browser chrome"
+    "lint": "backstage-cli package lint"
   },
   "dependencies": {
-    "@backstage/app-defaults": "^1.5.4",
-    "@backstage/catalog-model": "^1.4.5",
-    "@backstage/cli": "^0.26.4",
-    "@backstage/core-app-api": "^1.12.4",
-    "@backstage/core-components": "^0.14.4",
-    "@backstage/core-plugin-api": "^1.9.2",
-    "@backstage/integration-react": "^1.1.26",
-    "@backstage/plugin-api-docs": "^0.11.4",
-    "@backstage/plugin-catalog": "^1.19.0",
-    "@backstage/plugin-catalog-common": "^1.0.22",
-    "@backstage/plugin-catalog-graph": "^0.4.4",
-    "@backstage/plugin-catalog-import": "^0.10.10",
-    "@backstage/plugin-catalog-react": "^1.11.3",
-    "@backstage/plugin-home": "^0.7.3",
-    "@backstage/plugin-kubernetes": "^0.11.9",
-    "@backstage/plugin-org": "^0.6.24",
-    "@backstage/plugin-permission-react": "^0.4.22",
-    "@backstage/plugin-scaffolder": "^1.19.3",
-    "@backstage/plugin-search": "^1.4.10",
-    "@backstage/plugin-search-react": "^1.7.10",
-    "@backstage/plugin-techdocs": "^1.10.4",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.9",
-    "@backstage/plugin-techdocs-react": "^1.2.3",
-    "@backstage/plugin-user-settings": "^0.8.5",
-    "@backstage/theme": "^0.5.3",
-    "@internal/backstage-plugin-cicd-statistics-module-zuul": "^0.1.0",
-    "@janus-idp/backstage-plugin-quay": "^1.6.0",
-    "@janus-idp/backstage-plugin-topology": "^1.19.0",
-    "@k-phoen/backstage-plugin-grafana": "^0.1.22",
+    "@backstage/app-defaults": "^1.5.9",
+    "@backstage/catalog-model": "^1.5.0",
+    "@backstage/cli": "^0.26.11",
+    "@backstage/core-app-api": "^1.14.1",
+    "@backstage/core-components": "^0.14.9",
+    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/integration-react": "^1.1.29",
+    "@backstage/plugin-api-docs": "^0.11.7",
+    "@backstage/plugin-catalog": "^1.21.1",
+    "@backstage/plugin-catalog-common": "^1.0.25",
+    "@backstage/plugin-catalog-graph": "^0.4.7",
+    "@backstage/plugin-catalog-import": "^0.12.1",
+    "@backstage/plugin-catalog-react": "^1.12.2",
+    "@backstage/plugin-home": "^0.7.8",
+    "@backstage/plugin-org": "^0.6.27",
+    "@backstage/plugin-permission-react": "^0.4.24",
+    "@backstage/plugin-scaffolder": "^1.23.0",
+    "@backstage/plugin-search": "^1.4.14",
+    "@backstage/plugin-search-react": "^1.7.13",
+    "@backstage/plugin-techdocs": "^1.10.7",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.12",
+    "@backstage/plugin-techdocs-react": "^1.2.6",
+    "@backstage/plugin-user-settings": "^0.8.10",
+    "@backstage/theme": "^0.5.6",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
-    "@roadiehq/backstage-plugin-github-insights": "^2.3.28",
-    "@roadiehq/backstage-plugin-github-pull-requests": "^2.5.25",
-    "@trimm/plugin-dependencytrack": "^0.2.2",
     "history": "^5.0.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.0.2",
+    "react-dom": "^18.0.2",
+    "react-router": "^6.3.0",
     "react-router-dom": "^6.3.0",
-    "react-use": "^17.2.4",
-    "@backstage-community/plugin-adr": "^0.6.18",
-    "@backstage-community/plugin-cicd-statistics": "^0.1.37",
-    "@backstage-community/plugin-explore": "^0.4.21",
-    "@backstage-community/plugin-gcalendar": "^0.3.28",
-    "@backstage-community/plugin-github-actions": "^0.6.16",
-    "@backstage-community/plugin-github-pull-requests-board": "^0.2.1",
-    "@backstage-community/plugin-tech-insights": "^0.3.27",
-    "@backstage-community/plugin-tech-radar": "^0.7.4"
+    "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.5.4",
-    "@testing-library/jest-dom": "^5.10.1",
-    "@testing-library/react": "^12.1.3",
+    "@backstage/test-utils": "^1.5.9",
+    "@playwright/test": "^1.32.3",
+    "@testing-library/dom": "^9.0.0",
+    "@testing-library/jest-dom": "^6.0.0",
+    "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.0.0",
-    "@types/node": "^16.11.26",
     "@types/react-dom": "*",
-    "cross-env": "^7.0.0",
-    "cypress": "^9.7.0",
-    "eslint-plugin-cypress": "^2.10.3",
-    "start-server-and-test": "^1.10.11"
+    "cross-env": "^7.0.0"
   },
   "browserslist": {
     "production": [

diff --git a/packages/app/src/App.test.tsx b/packages/app/src/App.test.tsx
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { /* Navigate, */ Route } from 'react-router-dom';
+import { Navigate, Route } from 'react-router-dom';
 import { apiDocsPlugin, ApiExplorerPage } from '@backstage/plugin-api-docs';
 import {
   CatalogEntityPage,
@@ -13,116 +13,75 @@ import {
 import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
 import { orgPlugin } from '@backstage/plugin-org';
 import { SearchPage } from '@backstage/plugin-search';
-import { TechRadarPage } from '@backstage-community/plugin-tech-radar';
 import {
-  DefaultTechDocsHome,
   TechDocsIndexPage,
-  /*  techdocsPlugin,*/
+  techdocsPlugin,
   TechDocsReaderPage,
 } from '@backstage/plugin-techdocs';
-/* import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
-import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib'; */
+import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
+import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
 import { UserSettingsPage } from '@backstage/plugin-user-settings';
-// import { UserSettingsPage } from '@internal/plugin-user-settings';
-import { giteaOauth2AuthApiRef, apis } from './apis';
+import { apis } from './apis';
 import { entityPage } from './components/catalog/EntityPage';
 import { searchPage } from './components/search/SearchPage';
 import { Root } from './components/Root';
 
-import { AlertDisplay, OAuthRequestDialog } from '@backstage/core-components';
+import {
+  AlertDisplay,
+  OAuthRequestDialog,
+  SignInPage,
+} from '@backstage/core-components';
 import { createApp } from '@backstage/app-defaults';
 import { AppRouter, FlatRoutes } from '@backstage/core-app-api';
 import { CatalogGraphPage } from '@backstage/plugin-catalog-graph';
 import { RequirePermission } from '@backstage/plugin-permission-react';
 import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common/alpha';
 
-import {
-  configApiRef,
-  githubAuthApiRef,
-  useApi,
-} from '@backstage/core-plugin-api';
-import { SignInPage, ProxiedSignInPage } from '@backstage/core-components';
-import { ExplorePage /* , explorePlugin */ } from '@backstage-community/plugin-explore';
-
-import { HomepageCompositionRoot } from '@backstage/plugin-home';
-import { homePage } from './components/home/HomePage';
-
-import * as plugins from './plugins';
-
 const app = createApp({
   apis,
-  plugins: Object.values(plugins),
-  components: {
-    SignInPage: props => {
-      const configApi = useApi(configApiRef);
-      if (configApi.getString('auth.environment') === 'development') {
-        return (
-          <SignInPage
-            {...props}
-            auto
-            providers={[
-              {
-                id: 'github-auth-provider',
-                title: 'GitHub',
-                message: 'Sign in using GitHub',
-                apiRef: githubAuthApiRef,
-              },
-              {
-                id: 'gitea-auth-provider',
-                title: 'Gitea',
-                message: 'Sign in using Gitea',
-                apiRef: giteaOauth2AuthApiRef,
-              },
-            ]}
-          />
-        );
-      }
-      return <ProxiedSignInPage {...props} provider="oauth2Proxy" />;
-    },
-  },
   bindRoutes({ bind }) {
     bind(catalogPlugin.externalRoutes, {
       createComponent: scaffolderPlugin.routes.root,
-      /* viewTechDoc: techdocsPlugin.routes.docRoot, */
+      viewTechDoc: techdocsPlugin.routes.docRoot,
+      createFromTemplate: scaffolderPlugin.routes.selectedTemplate,
     });
     bind(apiDocsPlugin.externalRoutes, {
       registerApi: catalogImportPlugin.routes.importPage,
     });
     bind(scaffolderPlugin.externalRoutes, {
       registerComponent: catalogImportPlugin.routes.importPage,
+      viewTechDoc: techdocsPlugin.routes.docRoot,
     });
     bind(orgPlugin.externalRoutes, {
       catalogIndex: catalogPlugin.routes.catalogIndex,
     });
   },
+  components: {
+    SignInPage: props => <SignInPage {...props} auto providers={['guest']} />,
+  },
 });
 
 const routes = (
   <FlatRoutes>
-    <Route path="/" element={<HomepageCompositionRoot />}>
-      {homePage}
-    </Route>
-    ;
+    <Route path="/" element={<Navigate to="catalog" />} />
     <Route path="/catalog" element={<CatalogIndexPage />} />
     <Route
       path="/catalog/:namespace/:kind/:name"
       element={<CatalogEntityPage />}
     >
       {entityPage}
     </Route>
-    <Route path="/create" element={<ScaffolderPage />} />
-    <Route path="/api-docs" element={<ApiExplorerPage />} />
-    <Route path="/docs" element={<TechDocsIndexPage />}>
-      <DefaultTechDocsHome />
-    </Route>
+    <Route path="/docs" element={<TechDocsIndexPage />} />
     <Route
       path="/docs/:namespace/:kind/:name/*"
       element={<TechDocsReaderPage />}
-    />
-    <Route
-      path="/tech-radar"
-      element={<TechRadarPage width={1500} height={800} />}
-    />
+    >
+      <TechDocsAddons>
+        <ReportIssue />
+      </TechDocsAddons>
+    </Route>
+    <Route path="/create" element={<ScaffolderPage />} />
+    <Route path="/api-docs" element={<ApiExplorerPage />} />
     <Route
       path="/catalog-import"
       element={
@@ -136,7 +95,6 @@ const routes = (
     </Route>
     <Route path="/settings" element={<UserSettingsPage />} />
     <Route path="/catalog-graph" element={<CatalogGraphPage />} />
-    <Route path="/explore" element={<ExplorePage />} />
   </FlatRoutes>
 );
 
@@ -148,4 +106,4 @@ export default app.createRoot(
       <Root>{routes}</Root>
     </AppRouter>
   </>,
-);
+);