Merge pull request 'update backstage version' (#4) from IPCEICIS-3461_upgrade_backstage into development

Reviewed-on: #4

backstage.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.36.1"
+  "version": "1.38.1"
 }

package.json

@@ -31,7 +31,7 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.30.0",
+    "@backstage/cli": "^0.32.0",
     "@backstage/e2e-test-utils": "^0.1.1",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^12.0.0",

packages/app/package.json

@@ -16,31 +16,31 @@
   "dependencies": {
     "@backstage-community/plugin-github-actions": "^0.6.16",
     "@backstage-community/plugin-tech-radar": "^0.7.4",
-    "@backstage/app-defaults": "^1.5.17",
+    "@backstage/app-defaults": "^1.6.1",
     "@backstage/catalog-model": "^1.7.3",
-    "@backstage/cli": "^0.30.0",
-    "@backstage/core-app-api": "^1.15.5",
-    "@backstage/core-components": "^0.16.4",
-    "@backstage/core-plugin-api": "^1.10.4",
-    "@backstage/integration-react": "^1.2.4",
-    "@backstage/plugin-api-docs": "^0.12.4",
-    "@backstage/plugin-catalog": "^1.27.0",
+    "@backstage/cli": "^0.32.0",
+    "@backstage/core-app-api": "^1.16.1",
+    "@backstage/core-components": "^0.17.1",
+    "@backstage/core-plugin-api": "^1.10.6",
+    "@backstage/integration-react": "^1.2.6",
+    "@backstage/plugin-api-docs": "^0.12.6",
+    "@backstage/plugin-catalog": "^1.29.0",
     "@backstage/plugin-catalog-common": "^1.1.3",
-    "@backstage/plugin-catalog-graph": "^0.4.16",
-    "@backstage/plugin-catalog-import": "^0.12.10",
-    "@backstage/plugin-catalog-react": "^1.15.2",
-    "@backstage/plugin-home": "^0.8.5",
-    "@backstage/plugin-kubernetes": "^0.12.4",
-    "@backstage/plugin-org": "^0.6.36",
-    "@backstage/plugin-permission-react": "^0.4.31",
-    "@backstage/plugin-scaffolder": "^1.28.0",
-    "@backstage/plugin-search": "^1.4.23",
-    "@backstage/plugin-search-react": "^1.8.6",
-    "@backstage/plugin-techdocs": "^1.12.3",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.21",
-    "@backstage/plugin-techdocs-react": "^1.2.14",
-    "@backstage/plugin-user-settings": "^0.8.19",
-    "@backstage/theme": "^0.6.4",
+    "@backstage/plugin-catalog-graph": "^0.4.18",
+    "@backstage/plugin-catalog-import": "^0.12.13",
+    "@backstage/plugin-catalog-react": "^1.17.0",
+    "@backstage/plugin-home": "^0.8.7",
+    "@backstage/plugin-kubernetes": "^0.12.6",
+    "@backstage/plugin-org": "^0.6.38",
+    "@backstage/plugin-permission-react": "^0.4.33",
+    "@backstage/plugin-scaffolder": "^1.30.1",
+    "@backstage/plugin-search": "^1.4.25",
+    "@backstage/plugin-search-react": "^1.8.8",
+    "@backstage/plugin-techdocs": "^1.12.5",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.23",
+    "@backstage/plugin-techdocs-react": "^1.2.16",
+    "@backstage/plugin-user-settings": "^0.8.21",
+    "@backstage/theme": "^0.6.5",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@roadiehq/backstage-plugin-argo-cd": "^2.5.1",
@@ -52,7 +52,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.7.5",
+    "@backstage/test-utils": "^1.7.7",
     "@playwright/test": "^1.32.3",
     "@testing-library/dom": "^9.0.0",
     "@testing-library/jest-dom": "^6.0.0",

packages/app/src/App.tsx

@@ -34,8 +34,6 @@ import { CatalogGraphPage } from '@backstage/plugin-catalog-graph';
 import { RequirePermission } from '@backstage/plugin-permission-react';
 import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common/alpha';
 import {configApiRef, useApi} from "@backstage/core-plugin-api";
-import { myTheme } from './theme';
-import { UnifiedThemeProvider } from '@backstage/theme';
 
 const app = createApp({
   apis,
@@ -58,18 +56,6 @@ const app = createApp({
       );
     },
   },
-  themes: [
-    {
-      id: 'my-theme',
-      title: 'My Custom Theme',
-      variant: 'light',
-      Provider: ({ children }) => (
-        <UnifiedThemeProvider theme={myTheme}>
-          {children}
-        </UnifiedThemeProvider>
-      ),
-    },
-  ],
   bindRoutes({ bind }) {
     bind(catalogPlugin.externalRoutes, {
       createComponent: scaffolderPlugin.routes.root,

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import { makeStyles } from '@material-ui/core';
-import edpLogo from './edp_logo_prototype.png';
 
 const useStyles = makeStyles({
   svg: {
@@ -12,8 +11,21 @@ const useStyles = makeStyles({
   },
 });
 
-export const LogoIcon = () => {
-  <img src={'edp_logo_prototype.png'} alt="EDP Logo Icon" style={{ height: 32 }} />;
+const LogoIcon = () => {
+  const classes = useStyles();
+
+  return (
+    <svg
+      className={classes.svg}
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 337.46 428.5"
+    >
+      <path
+        className={classes.path}
+        d="M303,166.05a80.69,80.69,0,0,0,13.45-10.37c.79-.77,1.55-1.53,2.3-2.3a83.12,83.12,0,0,0,7.93-9.38A63.69,63.69,0,0,0,333,133.23a48.58,48.58,0,0,0,4.35-16.4c1.49-19.39-10-38.67-35.62-54.22L198.56,0,78.3,115.23,0,190.25l108.6,65.91a111.59,111.59,0,0,0,57.76,16.41c24.92,0,48.8-8.8,66.42-25.69,19.16-18.36,25.52-42.12,13.7-61.87a49.22,49.22,0,0,0-6.8-8.87A89.17,89.17,0,0,0,259,178.29h.15a85.08,85.08,0,0,0,31-5.79A80.88,80.88,0,0,0,303,166.05ZM202.45,225.86c-19.32,18.51-50.4,21.23-75.7,5.9L51.61,186.15l67.45-64.64,76.41,46.38C223,184.58,221.49,207.61,202.45,225.86Zm8.93-82.22-70.65-42.89L205.14,39,274.51,81.1c25.94,15.72,29.31,37,10.55,55A60.69,60.69,0,0,1,211.38,143.64Zm29.86,190c-19.57,18.75-46.17,29.09-74.88,29.09a123.73,123.73,0,0,1-64.1-18.2L0,282.52v24.67L108.6,373.1a111.6,111.6,0,0,0,57.76,16.42c24.92,0,48.8-8.81,66.42-25.69,12.88-12.34,20-27.13,19.68-41.49v-1.79A87.27,87.27,0,0,1,241.24,333.68Zm0-39c-19.57,18.75-46.17,29.08-74.88,29.08a123.81,123.81,0,0,1-64.1-18.19L0,243.53v24.68l108.6,65.91a111.6,111.6,0,0,0,57.76,16.42c24.92,0,48.8-8.81,66.42-25.69,12.88-12.34,20-27.13,19.68-41.5v-1.78A87.27,87.27,0,0,1,241.24,294.7Zm0-39c-19.57,18.76-46.17,29.09-74.88,29.09a123.81,123.81,0,0,1-64.1-18.19L0,204.55v24.68l108.6,65.91a111.59,111.59,0,0,0,57.76,16.41c24.92,0,48.8-8.8,66.42-25.68,12.88-12.35,20-27.13,19.68-41.5v-1.82A86.09,86.09,0,0,1,241.24,255.71Zm83.7,25.74a94.15,94.15,0,0,1-60.2,25.86h0V334a81.6,81.6,0,0,0,51.74-22.37c14-13.38,21.14-28.11,21-42.64v-2.19A94.92,94.92,0,0,1,324.94,281.45Zm-83.7,91.21c-19.57,18.76-46.17,29.09-74.88,29.09a123.73,123.73,0,0,1-64.1-18.2L0,321.5v24.68l108.6,65.9a111.6,111.6,0,0,0,57.76,16.42c24.92,0,48.8-8.8,66.42-25.69,12.88-12.34,20-27.13,19.68-41.49v-1.79A86.29,86.29,0,0,1,241.24,372.66ZM327,162.45c-.68.69-1.35,1.38-2.05,2.06a94.37,94.37,0,0,1-10.64,8.65,91.35,91.35,0,0,1-11.6,7,94.53,94.53,0,0,1-26.24,8.71,97.69,97.69,0,0,1-14.16,1.57c.5,1.61.9,3.25,1.25,4.9a53.27,53.27,0,0,1,1.14,12V217h.05a84.41,84.41,0,0,0,25.35-5.55,81,81,0,0,0,26.39-16.82c.8-.77,1.5-1.56,2.26-2.34a82.08,82.08,0,0,0,7.93-9.38A63.76,63.76,0,0,0,333,172.17a48.55,48.55,0,0,0,4.32-16.45c.09-1.23.2-2.47.19-3.7V150q-1.08,1.54-2.25,3.09A96.73,96.73,0,0,1,327,162.45Zm0,77.92c-.69.7-1.31,1.41-2,2.1a94.2,94.2,0,0,1-60.2,25.86h0l0,26.67h0a81.6,81.6,0,0,0,51.74-22.37A73.51,73.51,0,0,0,333,250.13a48.56,48.56,0,0,0,4.32-16.44c.09-1.24.2-2.47.19-3.71v-2.19c-.74,1.07-1.46,2.15-2.27,3.21A95.68,95.68,0,0,1,327,240.37Zm0-39c-.69.7-1.31,1.41-2,2.1a93.18,93.18,0,0,1-10.63,8.65,91.63,91.63,0,0,1-11.63,7,95.47,95.47,0,0,1-37.94,10.18h0V256h0a81.65,81.65,0,0,0,51.74-22.37c.8-.77,1.5-1.56,2.26-2.34a82.08,82.08,0,0,0,7.93-9.38A63.76,63.76,0,0,0,333,211.15a48.56,48.56,0,0,0,4.32-16.44c.09-1.24.2-2.48.19-3.71v-2.2c-.74,1.08-1.46,2.16-2.27,3.22A95.68,95.68,0,0,1,327,201.39Z"
+      />
+    </svg>
+  );
 };
 
 export default LogoIcon;

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

@@ -23,9 +23,6 @@ import {
 } from '@backstage/core-components';
 import MenuIcon from '@material-ui/icons/Menu';
 import SearchIcon from '@material-ui/icons/Search';
-import { LogoFull } from './LogoFull.tsx';
-import { LogoIcon } from './LogoIcon.tsx';
-import { useSidebarOpenState } from '@backstage/core-components';
 
 const useSidebarLogoStyles = makeStyles({
   root: {
@@ -44,16 +41,15 @@ const useSidebarLogoStyles = makeStyles({
 
 const SidebarLogo = () => {
   const classes = useSidebarLogoStyles();
-  const { isOpen } = useSidebarOpenState();
 
   return (
     <div className={classes.root}>
       <Link to="/" underline="none" className={classes.link} aria-label="Home">
-        {isOpen ? <LogoFull /> : <LogoIcon />}
       </Link>
     </div>
   );
 };
+
 export const Root = ({ children }: PropsWithChildren<{}>) => (
   <SidebarPage>
     <Sidebar>

packages/app/src/components/search/SearchPage.tsx

@@ -47,7 +47,7 @@ const SearchPage = () => {
 
   return (
     <Page themeId="home">
-      <Header title="Search" style={{ backgroundColor: '#EC008C' }} />
+      <Header title="Search" />
       <Content>
         <Grid container direction="row">
           <Grid item xs={12}>

packages/app/src/theme.tsx

@@ -1,25 +0,0 @@
-import {
-  createBaseThemeOptions,
-  createUnifiedTheme,
-  genPageTheme,
-  palettes,
-  shapes,
-} from '@backstage/theme';
-
-export const myTheme = createUnifiedTheme({
-  ...createBaseThemeOptions({
-    palette: palettes.light,
-  }),
-  defaultPageTheme: 'home',
-  pageTheme: {
-    home: genPageTheme({ colors: ['#EC008C'], shape: shapes.wave }),
-    documentation: genPageTheme({ colors: ['#EC008C'], shape: shapes.wave2 }),
-    tool: genPageTheme({ colors: ['#EC008C'], shape: shapes.round }),
-    service: genPageTheme({ colors: ['#EC008C'], shape: shapes.wave }),
-    website: genPageTheme({ colors: ['#EC008C'], shape: shapes.wave }),
-    library: genPageTheme({ colors: ['#EC008C'], shape: shapes.wave }),
-    other: genPageTheme({ colors: ['#EC008C'], shape: shapes.wave }),
-    app: genPageTheme({ colors: ['#EC008C'], shape: shapes.wave }),
-    apis: genPageTheme({ colors: ['#EC008C'], shape: shapes.wave }),
-  },
-});

packages/backend/package.json

@@ -17,35 +17,35 @@
   },
   "dependencies": {
     "@backstage/backend-common": "^0.25.0",
-    "@backstage/backend-defaults": "^0.8.1",
-    "@backstage/backend-plugin-api": "^1.2.0",
+    "@backstage/backend-defaults": "^0.9.0",
+    "@backstage/backend-plugin-api": "^1.3.0",
     "@backstage/backend-tasks": "^0.6.1",
     "@backstage/catalog-client": "^1.9.1",
     "@backstage/catalog-model": "^1.7.3",
     "@backstage/config": "^1.3.2",
     "@backstage/errors": "^1.2.7",
-    "@backstage/integration": "^1.16.1",
-    "@backstage/plugin-app-backend": "^0.4.5",
-    "@backstage/plugin-auth-backend": "^0.24.3",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.5",
-    "@backstage/plugin-auth-backend-module-oidc-provider": "^0.4.0",
-    "@backstage/plugin-auth-node": "^0.6.0",
-    "@backstage/plugin-catalog-backend": "^1.31.0",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.5",
-    "@backstage/plugin-kubernetes-backend": "^0.19.3",
+    "@backstage/integration": "^1.16.3",
+    "@backstage/plugin-app-backend": "^0.5.1",
+    "@backstage/plugin-auth-backend": "^0.24.5",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.7",
+    "@backstage/plugin-auth-backend-module-oidc-provider": "^0.4.2",
+    "@backstage/plugin-auth-node": "^0.6.2",
+    "@backstage/plugin-catalog-backend": "^1.32.1",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.7",
+    "@backstage/plugin-kubernetes-backend": "^0.19.5",
     "@backstage/plugin-permission-common": "^0.8.4",
-    "@backstage/plugin-permission-node": "^0.8.8",
-    "@backstage/plugin-proxy-backend": "^0.5.11",
-    "@backstage/plugin-scaffolder-backend": "^1.30.0",
-    "@backstage/plugin-scaffolder-backend-module-gitea": "^0.2.6",
-    "@backstage/plugin-scaffolder-backend-module-github": "^0.6.0",
-    "@backstage/plugin-scaffolder-node": "^0.7.0",
-    "@backstage/plugin-search-backend": "^1.8.2",
-    "@backstage/plugin-search-backend-module-catalog": "^0.3.1",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.41",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.3.6",
-    "@backstage/plugin-search-backend-node": "^1.3.8",
-    "@backstage/plugin-techdocs-backend": "^1.11.6",
+    "@backstage/plugin-permission-node": "^0.9.1",
+    "@backstage/plugin-proxy-backend": "^0.6.1",
+    "@backstage/plugin-scaffolder-backend": "^1.32.1",
+    "@backstage/plugin-scaffolder-backend-module-gitea": "^0.2.8",
+    "@backstage/plugin-scaffolder-backend-module-github": "^0.7.0",
+    "@backstage/plugin-scaffolder-node": "^0.8.1",
+    "@backstage/plugin-search-backend": "^2.0.1",
+    "@backstage/plugin-search-backend-module-catalog": "^0.3.3",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.43",
+    "@backstage/plugin-search-backend-module-techdocs": "^0.4.1",
+    "@backstage/plugin-search-backend-node": "^1.3.10",
+    "@backstage/plugin-techdocs-backend": "^2.0.1",
     "@backstage/types": "^1.2.1",
     "@kubernetes/client-node": "~0.20.0",
     "@roadiehq/backstage-plugin-argo-cd-backend": "3.1.0",
@@ -62,7 +62,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.30.0",
+    "@backstage/cli": "^0.32.0",
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",

packages/backend/src/plugins/argocd.ts

@@ -4,16 +4,6 @@ import { examples } from './gitea-actions';
 import { Logger } from 'winston';
 import { ArgoService } from '@roadiehq/backstage-plugin-argo-cd-backend';
 import { createRouter } from '@roadiehq/backstage-plugin-argo-cd-backend';
-//import { PluginEnvironment } from '../types';
-
-
-/*export default async function createPlugin({
-  logger,
-  config,
-}: PluginEnvironment) {
-  return await createRouter({ logger, config });
-}*/
-
 import { loggerToWinstonLogger } from '@backstage/backend-common';
 
 import {
@@ -31,7 +21,6 @@ export const argocdPlugin = createBackendPlugin({
         reader: coreServices.urlReader,
         discovery: coreServices.discovery,
         auth: coreServices.auth,
-        //tokenManager: coreServices.tokenManager,
         httpRouter: coreServices.httpRouter,
       },
       async init({
@@ -50,8 +39,6 @@ export const argocdPlugin = createBackendPlugin({
   },
 });
 
-
-
 export function createArgoCDApp(options: { config: Config; logger: Logger }) {
   const { config, logger } = options;
 

packages/backend/src/plugins/proxy.ts

@@ -1,4 +1,4 @@
-import { createRouter } from '@backstage/plugin-proxy-backend';
+import { createRouter } from '@roadiehq/backstage-plugin-argo-cd-backend';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';
 
@@ -7,7 +7,6 @@ export default async function createPlugin(
 ): Promise<Router> {
   return await createRouter({
     logger: env.logger,
-    config: env.config,
-    discovery: env.discovery,
+    config: env.config
   });
 }