Merge branch 'main' into improvements

Ericsson · Jun 27, 2024 · a8d893d · a8d893d
2 parents 81d71ac + 4f1aed7
commit a8d893d
Show file tree

Hide file tree

Showing 27 changed files with 1,165 additions and 1,048 deletions.
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.26.0"
+  "version": "1.27.7"
 }
diff --git a/package.json b/package.json
@@ -39,9 +39,9 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.3",
+    "@backstage/cli": "^0.26.6",
     "@backstage/e2e-test-utils": "^0.1.1",
-    "@backstage/repo-tools": "^0.8.0",
+    "@backstage/repo-tools": "^0.9.0",
     "@changesets/cli": "^2.26.2",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^12.0.0",

diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
@@ -1,5 +1,20 @@
 # app
 
+## 0.5.0
+
+### Minor Changes
+
+- 916589b: Bumped Backstage to v.27.7 and removed the TechRadar plugin since it was not used and caused problems with the new version.
+
+### Patch Changes
+
+- Updated dependencies [916589b]
+  - @axis-backstage/plugin-analytics-module-umami@0.3.0
+  - @axis-backstage/plugin-jira-dashboard-common@1.2.0
+  - @axis-backstage/plugin-jira-dashboard@1.2.0
+  - @axis-backstage/plugin-statuspage@0.4.0
+  - @axis-backstage/plugin-readme@0.8.0
+
 ## 0.4.15
 
 ### Patch Changes

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "0.4.15",
+  "version": "0.5.0",
   "private": true,
   "bundled": true,
   "backstage": {
@@ -19,31 +19,30 @@
     "@axis-backstage/plugin-jira-dashboard-common": "workspace:^",
     "@axis-backstage/plugin-readme": "workspace:^",
     "@axis-backstage/plugin-statuspage": "workspace:^",
-    "@backstage/app-defaults": "^1.5.4",
-    "@backstage/catalog-model": "^1.4.5",
-    "@backstage/cli": "^0.26.3",
-    "@backstage/core-app-api": "^1.12.4",
-    "@backstage/core-components": "^0.14.4",
+    "@backstage-community/plugin-github-actions": "^0.6.16",
+    "@backstage/app-defaults": "^1.5.5",
+    "@backstage/catalog-model": "^1.5.0",
+    "@backstage/cli": "^0.26.6",
+    "@backstage/core-app-api": "^1.12.5",
+    "@backstage/core-components": "^0.14.7",
     "@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-github-actions": "^0.6.15",
-    "@backstage/plugin-org": "^0.6.24",
+    "@backstage/integration-react": "^1.1.27",
+    "@backstage/plugin-api-docs": "^0.11.5",
+    "@backstage/plugin-catalog": "^1.20.0",
+    "@backstage/plugin-catalog-common": "^1.0.23",
+    "@backstage/plugin-catalog-graph": "^0.4.5",
+    "@backstage/plugin-catalog-import": "^0.11.0",
+    "@backstage/plugin-catalog-react": "^1.12.0",
+    "@backstage/plugin-org": "^0.6.25",
     "@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-tech-radar": "^0.7.3",
-    "@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",
+    "@backstage/plugin-scaffolder": "^1.20.1",
+    "@backstage/plugin-search": "^1.4.11",
+    "@backstage/plugin-search-react": "^1.7.11",
+    "@backstage/plugin-techdocs": "^1.10.5",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.10",
+    "@backstage/plugin-techdocs-react": "^1.2.4",
+    "@backstage/plugin-user-settings": "^0.8.6",
+    "@backstage/theme": "^0.5.5",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
     "@mui/material": "^5.15.7",
@@ -56,7 +55,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.5.4",
+    "@backstage/test-utils": "^1.5.5",
     "@playwright/test": "^1.32.3",
     "@testing-library/dom": "^9.0.0",
     "@testing-library/jest-dom": "6.0.0",

diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
@@ -13,7 +13,6 @@ import {
 import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
 import { orgPlugin } from '@backstage/plugin-org';
 import { SearchPage } from '@backstage/plugin-search';
-import { TechRadarPage } from '@backstage/plugin-tech-radar';
 import {
   TechDocsIndexPage,
   techdocsPlugin,
@@ -77,10 +76,6 @@ const routes = (
     </Route>
     <Route path="/create" element={<ScaffolderPage />} />
     <Route path="/api-docs" element={<ApiExplorerPage />} />
-    <Route
-      path="/tech-radar"
-      element={<TechRadarPage width={1500} height={800} />}
-    />
     <Route
       path="/catalog-import"
       element={

diff --git a/packages/app/src/components/Root/Root.tsx b/packages/app/src/components/Root/Root.tsx
@@ -2,7 +2,6 @@ import React, { PropsWithChildren } from 'react';
 import { makeStyles } from '@material-ui/core';
 import HomeIcon from '@material-ui/icons/Home';
 import ExtensionIcon from '@material-ui/icons/Extension';
-import MapIcon from '@material-ui/icons/MyLocation';
 import LibraryBooks from '@material-ui/icons/LibraryBooks';
 import CreateComponentIcon from '@material-ui/icons/AddCircleOutline';
 import LogoFull from './LogoFull';
@@ -19,7 +18,6 @@ import {
   SidebarGroup,
   SidebarItem,
   SidebarPage,
-  SidebarScrollWrapper,
   SidebarSpace,
   useSidebarOpenState,
   Link,
@@ -71,9 +69,6 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
         <SidebarItem icon={CreateComponentIcon} to="create" text="Create..." />
         {/* End global nav */}
         <SidebarDivider />
-        <SidebarScrollWrapper>
-          <SidebarItem icon={MapIcon} to="tech-radar" text="Tech Radar" />
-        </SidebarScrollWrapper>
       </SidebarGroup>
       <SidebarSpace />
       <SidebarDivider />

diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
@@ -1,5 +1,19 @@
 # backend
 
+## 0.4.0
+
+### Minor Changes
+
+- 916589b: Bumped Backstage to v.27.7 and removed the TechRadar plugin since it was not used and caused problems with the new version.
+
+### Patch Changes
+
+- Updated dependencies [916589b]
+  - @axis-backstage/plugin-jira-dashboard-backend@2.3.0
+  - @axis-backstage/plugin-statuspage-backend@0.3.0
+  - @axis-backstage/plugin-readme-backend@0.7.0
+  - [email protected]
+
 ## 0.3.13
 
 ### Patch Changes

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend",
-  "version": "0.3.13",
+  "version": "0.4.0",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "private": true,
@@ -19,25 +19,25 @@
     "@axis-backstage/plugin-jira-dashboard-backend": "workspace:^",
     "@axis-backstage/plugin-readme-backend": "workspace:^",
     "@axis-backstage/plugin-statuspage-backend": "workspace:^",
-    "@backstage/backend-common": "^0.21.7",
-    "@backstage/backend-defaults": "^0.2.17",
-    "@backstage/backend-plugin-api": "^0.6.17",
-    "@backstage/backend-tasks": "^0.5.22",
-    "@backstage/catalog-client": "^1.6.4",
-    "@backstage/catalog-model": "^1.4.5",
+    "@backstage/backend-common": "^0.22.0",
+    "@backstage/backend-defaults": "^0.2.18",
+    "@backstage/backend-plugin-api": "^0.6.18",
+    "@backstage/backend-tasks": "^0.5.23",
+    "@backstage/catalog-client": "^1.6.5",
+    "@backstage/catalog-model": "^1.5.0",
     "@backstage/config": "^1.2.0",
-    "@backstage/plugin-app-backend": "^0.3.65",
-    "@backstage/plugin-auth-backend": "^0.22.4",
-    "@backstage/plugin-auth-node": "^0.4.12",
-    "@backstage/plugin-catalog-backend": "^1.21.1",
+    "@backstage/plugin-app-backend": "^0.3.67",
+    "@backstage/plugin-auth-backend": "^0.22.5",
+    "@backstage/plugin-auth-node": "^0.4.13",
+    "@backstage/plugin-catalog-backend": "^1.22.0",
     "@backstage/plugin-permission-common": "^0.7.13",
-    "@backstage/plugin-permission-node": "^0.7.28",
-    "@backstage/plugin-proxy-backend": "^0.4.15",
-    "@backstage/plugin-scaffolder-backend": "^1.22.4",
-    "@backstage/plugin-search-backend": "^1.5.7",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.26",
-    "@backstage/plugin-search-backend-node": "^1.2.21",
-    "@backstage/plugin-techdocs-backend": "^1.10.4",
+    "@backstage/plugin-permission-node": "^0.7.29",
+    "@backstage/plugin-proxy-backend": "^0.4.16",
+    "@backstage/plugin-scaffolder-backend": "^1.22.8",
+    "@backstage/plugin-search-backend": "^1.5.9",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.27",
+    "@backstage/plugin-search-backend-node": "^1.2.23",
+    "@backstage/plugin-techdocs-backend": "^1.10.5",
     "app": "link:../app",
     "better-sqlite3": "^8.0.0",
     "dockerode": "^3.3.1",
@@ -47,7 +47,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.3",
+    "@backstage/cli": "^0.26.6",
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",

diff --git a/plugins/analytics-module-umami/CHANGELOG.md b/plugins/analytics-module-umami/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @axis-backstage/plugin-analytics-module-umami
 
+## 0.3.0
+
+### Minor Changes
+
+- 916589b: Bumped Backstage to v.27.7 and removed the TechRadar plugin since it was not used and caused problems with the new version.
+
 ## 0.2.2
 
 ### Patch Changes

diff --git a/plugins/analytics-module-umami/package.json b/plugins/analytics-module-umami/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axis-backstage/plugin-analytics-module-umami",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -25,16 +25,16 @@
   },
   "dependencies": {
     "@backstage/config": "^1.2.0",
-    "@backstage/core-components": "^0.14.4",
+    "@backstage/core-components": "^0.14.7",
     "@backstage/core-plugin-api": "^1.9.2"
   },
   "peerDependencies": {
     "react": "^17.0.0 || ^18.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.3",
-    "@backstage/dev-utils": "^1.0.31",
-    "@backstage/test-utils": "^1.5.4",
+    "@backstage/cli": "^0.26.6",
+    "@backstage/dev-utils": "^1.0.32",
+    "@backstage/test-utils": "^1.5.5",
     "@testing-library/jest-dom": "6.0.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.5.2"

diff --git a/plugins/jira-dashboard-backend/CHANGELOG.md b/plugins/jira-dashboard-backend/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @axis-backstage/plugin-jira-dashboard-backend
 
+## 2.3.0
+
+### Minor Changes
+
+- 916589b: Bumped Backstage to v.27.7 and removed the TechRadar plugin since it was not used and caused problems with the new version.
+
+### Patch Changes
+
+- Updated dependencies [916589b]
+  - @axis-backstage/plugin-jira-dashboard-common@1.2.0
+
 ## 2.2.0
 
 ### Minor Changes

diff --git a/plugins/jira-dashboard-backend/package.json b/plugins/jira-dashboard-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axis-backstage/plugin-jira-dashboard-backend",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -24,12 +24,12 @@
   },
   "dependencies": {
     "@axis-backstage/plugin-jira-dashboard-common": "workspace:^",
-    "@backstage/backend-common": "^0.21.7",
-    "@backstage/backend-plugin-api": "^0.6.17",
-    "@backstage/catalog-client": "^1.6.4",
-    "@backstage/catalog-model": "^1.4.5",
+    "@backstage/backend-common": "^0.22.0",
+    "@backstage/backend-plugin-api": "^0.6.18",
+    "@backstage/catalog-client": "^1.6.5",
+    "@backstage/catalog-model": "^1.5.0",
     "@backstage/config": "^1.2.0",
-    "@backstage/plugin-auth-node": "^0.4.12",
+    "@backstage/plugin-auth-node": "^0.4.13",
     "@backstage/plugin-permission-common": "^0.7.13",
     "@types/express": "*",
     "express": "^4.17.1",
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "^0.3.8",
-    "@backstage/cli": "^0.26.3",
+    "@backstage/cli": "^0.26.6",
     "@types/supertest": "^2.0.12",
     "msw": "^1.0.0",
     "supertest": "^6.2.4"

diff --git a/plugins/jira-dashboard-common/CHANGELOG.md b/plugins/jira-dashboard-common/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @axis-backstage/plugin-jira-dashboard-common
 
+## 1.2.0
+
+### Minor Changes
+
+- 916589b: Bumped Backstage to v.27.7 and removed the TechRadar plugin since it was not used and caused problems with the new version.
+
 ## 1.1.0
 
 ### Minor Changes

diff --git a/plugins/jira-dashboard-common/package.json b/plugins/jira-dashboard-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@axis-backstage/plugin-jira-dashboard-common",
   "description": "Common functionalities for the jira-dashboard plugin",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -25,7 +25,7 @@
     "postpack": "backstage-cli package postpack"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.3"
+    "@backstage/cli": "^0.26.6"
   },
   "files": [
     "dist"

diff --git a/plugins/jira-dashboard/CHANGELOG.md b/plugins/jira-dashboard/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @axis-backstage/plugin-jira-dashboard
 
+## 1.2.0
+
+### Minor Changes
+
+- 916589b: Bumped Backstage to v.27.7 and removed the TechRadar plugin since it was not used and caused problems with the new version.
+
+### Patch Changes
+
+- Updated dependencies [916589b]
+  - @axis-backstage/plugin-jira-dashboard-common@1.2.0
+
 ## 1.1.0
 
 ### Minor Changes