chore(bulk-import): bump Backstage dependencies to 1.52.0

workspaces/bulk-import/.changeset/version-bump-1-52-0.md

@@ -0,0 +1,7 @@
+---
+'@red-hat-developer-hub/backstage-plugin-bulk-import': minor
+'@red-hat-developer-hub/backstage-plugin-bulk-import-backend': minor
+'@red-hat-developer-hub/backstage-plugin-bulk-import-common': minor
+---
+
+Backstage version bump to v1.52.0

workspaces/bulk-import/app-config.yaml

@@ -141,6 +141,11 @@ catalog:
 permission:
   # setting this to `false` will disable permissions
   enabled: false
+  rbac:
+    pluginsWithPermission:
+      - catalog
+      - scaffolder
+      - bulk-import
 # scaffolder template execution configuration. Disabled by default.
 # bulkImport:
 #   importTemplate: template:default/create-pr-with-catalog-info

workspaces/bulk-import/backstage.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.49.3"
+  "version": "1.52.0"
 }

workspaces/bulk-import/e2e-tests/utils/helpers.ts

@@ -47,10 +47,11 @@ export async function switchToLocale(
   const baseLocale = locale.split('-')[0];
   if (baseLocale !== 'en') {
     const displayName = getLocaleDisplayName(locale);
-    await page.getByRole('link', { name: 'Settings' }).click();
+    // Navigating directly avoids duplicate "Settings" links in sidebar.
+    await page.goto('/settings');
     await page.getByRole('button', { name: 'English' }).click();
     await page.getByRole('option', { name: displayName }).click();
-    await page.locator('a').filter({ hasText: 'Home' }).click();
+    await page.goto('/');
     // Wait for page to settle after locale switch and reload
     await page.waitForLoadState('networkidle');
   }

workspaces/bulk-import/package.json

@@ -42,9 +42,9 @@
   },
   "devDependencies": {
     "@axe-core/playwright": "^4.11.0",
-    "@backstage/cli": "^0.36.0",
+    "@backstage/cli": "^0.36.3",
     "@backstage/e2e-test-utils": "^0.1.2",
-    "@backstage/repo-tools": "^0.17.0",
+    "@backstage/repo-tools": "^0.17.3",
     "@changesets/cli": "^2.27.1",
     "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
     "@jest/environment-jsdom-abstract": "^30.3.0",
@@ -63,29 +63,29 @@
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "refractor@npm:3.6.0/prismjs": "^1.30.0",
-    "@backstage/frontend-plugin-api": "0.15.1",
-    "@backstage/plugin-catalog": "2.0.1",
-    "@backstage/plugin-scaffolder": "1.36.1",
-    "@backstage/ui": "0.14.3",
-    "@backstage/plugin-catalog-backend": "3.5.0",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "0.2.18",
-    "@backstage/backend-plugin-api": "1.8.0",
-    "@backstage/backend-openapi-utils": "0.6.7",
-    "@backstage/plugin-catalog-node": "2.1.0",
-    "@backstage/plugin-events-node": "0.4.20",
-    "@backstage/plugin-permission-node": "0.10.11",
-    "@backstage/core-compat-api": "0.5.9",
-    "@backstage/core-plugin-api": "1.12.4",
-    "@backstage/plugin-app-react": "0.2.1",
-    "@backstage/plugin-catalog-react": "2.1.0",
-    "@backstage/plugin-scaffolder-react": "1.20.0",
-    "@backstage/plugin-catalog-graph": "0.6.0",
-    "@backstage/plugin-catalog-import": "0.13.11",
-    "@backstage/plugin-org": "0.7.0",
-    "@backstage/plugin-search-react": "1.11.0",
-    "@backstage/plugin-search": "1.7.0",
-    "@backstage/plugin-techdocs-react": "1.3.9",
-    "@backstage/plugin-techdocs": "1.17.2"
+    "@backstage/frontend-plugin-api": "0.17.3",
+    "@backstage/plugin-catalog": "2.0.7",
+    "@backstage/plugin-scaffolder": "1.38.1",
+    "@backstage/ui": "0.16.0",
+    "@backstage/plugin-catalog-backend": "3.8.1",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "0.2.22",
+    "@backstage/backend-plugin-api": "1.9.3",
+    "@backstage/backend-openapi-utils": "0.7.0",
+    "@backstage/plugin-catalog-node": "2.2.3",
+    "@backstage/plugin-events-node": "0.4.24",
+    "@backstage/plugin-permission-node": "0.11.2",
+    "@backstage/core-compat-api": "0.5.13",
+    "@backstage/core-plugin-api": "1.12.8",
+    "@backstage/plugin-app-react": "0.2.5",
+    "@backstage/plugin-catalog-react": "3.2.0",
+    "@backstage/plugin-scaffolder-react": "2.0.2",
+    "@backstage/plugin-catalog-graph": "0.6.6",
+    "@backstage/plugin-catalog-import": "0.13.15",
+    "@backstage/plugin-org": "0.7.6",
+    "@backstage/plugin-search-react": "1.11.6",
+    "@backstage/plugin-search": "1.7.6",
+    "@backstage/plugin-techdocs-react": "1.3.13",
+    "@backstage/plugin-techdocs": "1.17.8"
   },
   "prettier": "@spotify/prettier-config",
   "lint-staged": {

workspaces/bulk-import/packages/app-legacy/package.json

@@ -20,32 +20,32 @@
   },
   "dependencies": {
     "@backstage-community/plugin-rbac": "^1.33.2",
-    "@backstage/app-defaults": "^1.7.6",
-    "@backstage/catalog-model": "^1.7.7",
-    "@backstage/cli": "^0.36.0",
-    "@backstage/core-app-api": "^1.19.6",
-    "@backstage/core-components": "^0.18.8",
-    "@backstage/core-plugin-api": "^1.12.4",
-    "@backstage/integration-react": "^1.2.16",
-    "@backstage/plugin-api-docs": "^0.13.5",
-    "@backstage/plugin-catalog": "^2.0.1",
-    "@backstage/plugin-catalog-common": "^1.1.8",
-    "@backstage/plugin-catalog-graph": "^0.6.0",
-    "@backstage/plugin-catalog-import": "^0.13.11",
-    "@backstage/plugin-catalog-react": "^2.1.1",
-    "@backstage/plugin-notifications": "^0.5.15",
-    "@backstage/plugin-org": "^0.7.0",
-    "@backstage/plugin-permission-react": "^0.4.41",
-    "@backstage/plugin-scaffolder": "^1.36.1",
-    "@backstage/plugin-search": "^1.7.0",
-    "@backstage/plugin-search-react": "^1.11.0",
-    "@backstage/plugin-signals": "^0.0.29",
-    "@backstage/plugin-techdocs": "^1.17.2",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.34",
-    "@backstage/plugin-techdocs-react": "^1.3.9",
-    "@backstage/plugin-user-settings": "^0.9.1",
-    "@backstage/theme": "^0.7.2",
-    "@backstage/ui": "^0.13.2",
+    "@backstage/app-defaults": "^1.7.9",
+    "@backstage/catalog-model": "^1.9.0",
+    "@backstage/cli": "^0.36.3",
+    "@backstage/core-app-api": "^1.20.2",
+    "@backstage/core-components": "^0.18.11",
+    "@backstage/core-plugin-api": "^1.12.7",
+    "@backstage/integration-react": "^1.2.19",
+    "@backstage/plugin-api-docs": "^0.14.2",
+    "@backstage/plugin-catalog": "^2.0.6",
+    "@backstage/plugin-catalog-common": "^1.1.10",
+    "@backstage/plugin-catalog-graph": "^0.6.5",
+    "@backstage/plugin-catalog-import": "^0.13.14",
+    "@backstage/plugin-catalog-react": "^3.1.0",
+    "@backstage/plugin-notifications": "^0.5.18",
+    "@backstage/plugin-org": "^0.7.5",
+    "@backstage/plugin-permission-react": "^0.5.2",
+    "@backstage/plugin-scaffolder": "^1.38.0",
+    "@backstage/plugin-search": "^1.7.5",
+    "@backstage/plugin-search-react": "^1.11.5",
+    "@backstage/plugin-signals": "^0.0.32",
+    "@backstage/plugin-techdocs": "^1.17.7",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.37",
+    "@backstage/plugin-techdocs-react": "^1.3.12",
+    "@backstage/plugin-user-settings": "^0.9.4",
+    "@backstage/theme": "^0.7.3",
+    "@backstage/ui": "^0.16.0",
     "@mui/icons-material": "5.18.0",
     "@mui/lab": "5.0.0-alpha.177",
     "@mui/material": "5.18.0",
@@ -74,10 +74,10 @@
   },
   "devDependencies": {
     "@axe-core/playwright": "^4.11.0",
-    "@backstage/cli": "^0.36.0",
-    "@backstage/core-app-api": "^1.19.6",
-    "@backstage/dev-utils": "^1.1.21",
-    "@backstage/test-utils": "^1.7.16",
+    "@backstage/cli": "^0.36.3",
+    "@backstage/core-app-api": "^1.20.2",
+    "@backstage/dev-utils": "^1.1.24",
+    "@backstage/test-utils": "^1.7.19",
     "@playwright/test": "1.61.1",
     "@red-hat-developer-hub/backstage-plugin-theme": "^0.14.11",
     "@spotify/prettier-config": "^15.0.0",

workspaces/bulk-import/packages/app-legacy/src/components/Root/Root.tsx

@@ -32,6 +32,7 @@ import {
   Settings as SidebarSettings,
   UserSettingsSignInAvatar,
 } from '@backstage/plugin-user-settings';
+import { Administration } from '@backstage-community/plugin-rbac';
 import CreateComponentIcon from '@mui/icons-material/AddCircleOutline';
 import ExtensionIcon from '@mui/icons-material/Extension';
 import HomeIcon from '@mui/icons-material/Home';
@@ -106,6 +107,7 @@ export const Root = ({ children }: PropsWithChildren<{}>) => {
             text="Orchestrator"
           />
           <BulkImportSidebarItem />
+          <Administration />
 
           {/* End global nav */}
           <SidebarDivider />

workspaces/bulk-import/packages/app/package.json

@@ -20,36 +20,36 @@
   },
   "dependencies": {
     "@backstage-community/plugin-rbac": "^1.33.2",
-    "@backstage/app-defaults": "^1.7.6",
-    "@backstage/catalog-model": "^1.7.7",
-    "@backstage/cli": "^0.36.0",
-    "@backstage/core-app-api": "^1.19.6",
-    "@backstage/core-compat-api": "^0.5.9",
-    "@backstage/core-components": "^0.18.8",
-    "@backstage/core-plugin-api": "^1.12.4",
-    "@backstage/frontend-defaults": "^0.5.0",
-    "@backstage/frontend-plugin-api": "^0.15.1",
-    "@backstage/integration-react": "^1.2.16",
-    "@backstage/plugin-api-docs": "^0.13.5",
-    "@backstage/plugin-app-react": "^0.2.1",
-    "@backstage/plugin-catalog": "^2.0.1",
-    "@backstage/plugin-catalog-common": "^1.1.8",
-    "@backstage/plugin-catalog-graph": "^0.6.0",
-    "@backstage/plugin-catalog-import": "^0.13.11",
-    "@backstage/plugin-catalog-react": "^2.1.1",
-    "@backstage/plugin-notifications": "^0.5.15",
-    "@backstage/plugin-org": "^0.7.0",
-    "@backstage/plugin-permission-react": "^0.4.41",
-    "@backstage/plugin-scaffolder": "^1.36.1",
-    "@backstage/plugin-search": "^1.7.0",
-    "@backstage/plugin-search-react": "^1.11.0",
-    "@backstage/plugin-signals": "^0.0.29",
-    "@backstage/plugin-techdocs": "^1.17.2",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.34",
-    "@backstage/plugin-techdocs-react": "^1.3.9",
-    "@backstage/plugin-user-settings": "^0.9.1",
-    "@backstage/theme": "^0.7.2",
-    "@backstage/ui": "^0.13.2",
+    "@backstage/app-defaults": "^1.7.9",
+    "@backstage/catalog-model": "^1.9.0",
+    "@backstage/cli": "^0.36.3",
+    "@backstage/core-app-api": "^1.20.2",
+    "@backstage/core-compat-api": "^0.5.12",
+    "@backstage/core-components": "^0.18.11",
+    "@backstage/core-plugin-api": "^1.12.7",
+    "@backstage/frontend-defaults": "^0.5.3",
+    "@backstage/frontend-plugin-api": "^0.17.2",
+    "@backstage/integration-react": "^1.2.19",
+    "@backstage/plugin-api-docs": "^0.14.2",
+    "@backstage/plugin-app-react": "^0.2.4",
+    "@backstage/plugin-catalog": "^2.0.6",
+    "@backstage/plugin-catalog-common": "^1.1.10",
+    "@backstage/plugin-catalog-graph": "^0.6.5",
+    "@backstage/plugin-catalog-import": "^0.13.14",
+    "@backstage/plugin-catalog-react": "^3.1.0",
+    "@backstage/plugin-notifications": "^0.5.18",
+    "@backstage/plugin-org": "^0.7.5",
+    "@backstage/plugin-permission-react": "^0.5.2",
+    "@backstage/plugin-scaffolder": "^1.38.0",
+    "@backstage/plugin-search": "^1.7.5",
+    "@backstage/plugin-search-react": "^1.11.5",
+    "@backstage/plugin-signals": "^0.0.32",
+    "@backstage/plugin-techdocs": "^1.17.7",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.37",
+    "@backstage/plugin-techdocs-react": "^1.3.12",
+    "@backstage/plugin-user-settings": "^0.9.4",
+    "@backstage/theme": "^0.7.3",
+    "@backstage/ui": "^0.16.0",
     "@mui/icons-material": "5.18.0",
     "@mui/lab": "5.0.0-alpha.177",
     "@mui/material": "5.18.0",
@@ -74,10 +74,10 @@
   },
   "devDependencies": {
     "@axe-core/playwright": "^4.11.0",
-    "@backstage/cli": "^0.36.0",
-    "@backstage/core-app-api": "^1.19.6",
-    "@backstage/dev-utils": "^1.1.21",
-    "@backstage/test-utils": "^1.7.16",
+    "@backstage/cli": "^0.36.3",
+    "@backstage/core-app-api": "^1.20.2",
+    "@backstage/dev-utils": "^1.1.24",
+    "@backstage/test-utils": "^1.7.19",
     "@playwright/test": "1.61.1",
     "@red-hat-developer-hub/backstage-plugin-theme": "^0.14.11",
     "@spotify/prettier-config": "^15.0.0",

workspaces/bulk-import/packages/backend/package.json

@@ -22,45 +22,46 @@
   },
   "dependencies": {
     "@backstage-community/plugin-rbac-backend": "^7.5.0",
-    "@backstage/backend-defaults": "^0.16.0",
-    "@backstage/backend-plugin-api": "^1.8.0",
-    "@backstage/catalog-model": "^1.7.7",
-    "@backstage/config": "^1.3.6",
-    "@backstage/errors": "^1.2.7",
-    "@backstage/integration": "^2.0.0",
-    "@backstage/plugin-app-backend": "^0.5.12",
-    "@backstage/plugin-auth-backend": "^0.27.3",
-    "@backstage/plugin-auth-backend-module-github-provider": "^0.5.1",
-    "@backstage/plugin-auth-backend-module-gitlab-provider": "^0.4.1",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.17",
-    "@backstage/plugin-auth-node": "^0.6.14",
-    "@backstage/plugin-catalog-backend": "^3.5.0",
-    "@backstage/plugin-catalog-backend-module-gitlab": "^0.8.1",
-    "@backstage/plugin-catalog-backend-module-logs": "^0.1.20",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.18",
-    "@backstage/plugin-catalog-node": "^2.1.0",
-    "@backstage/plugin-notifications-backend": "^0.6.3",
-    "@backstage/plugin-permission-backend": "^0.7.10",
-    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.17",
-    "@backstage/plugin-permission-common": "^0.9.7",
-    "@backstage/plugin-permission-node": "^0.10.11",
-    "@backstage/plugin-proxy-backend": "^0.6.11",
-    "@backstage/plugin-scaffolder-backend": "^3.2.0",
-    "@backstage/plugin-scaffolder-backend-module-github": "^0.9.7",
-    "@backstage/plugin-scaffolder-backend-module-gitlab": "^0.11.4",
-    "@backstage/plugin-search-backend": "^2.1.0",
-    "@backstage/plugin-search-backend-module-catalog": "^0.3.13",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.53",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.4.12",
-    "@backstage/plugin-search-backend-node": "^1.4.2",
-    "@backstage/plugin-signals-backend": "^0.3.13",
-    "@backstage/plugin-techdocs-backend": "^2.1.6",
+    "@backstage/backend-defaults": "0.17.3",
+    "@backstage/backend-plugin-api": "^1.9.2",
+    "@backstage/catalog-client": "^1.16.0",
+    "@backstage/catalog-model": "^1.9.0",
+    "@backstage/config": "^1.3.8",
+    "@backstage/errors": "^1.3.1",
+    "@backstage/integration": "^2.0.3",
+    "@backstage/plugin-app-backend": "^0.5.15",
+    "@backstage/plugin-auth-backend": "^0.29.1",
+    "@backstage/plugin-auth-backend-module-github-provider": "^0.5.4",
+    "@backstage/plugin-auth-backend-module-gitlab-provider": "^0.4.4",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.20",
+    "@backstage/plugin-auth-node": "^0.7.2",
+    "@backstage/plugin-catalog-backend": "^3.8.0",
+    "@backstage/plugin-catalog-backend-module-gitlab": "^0.8.4",
+    "@backstage/plugin-catalog-backend-module-logs": "^0.1.23",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.21",
+    "@backstage/plugin-catalog-node": "^2.2.2",
+    "@backstage/plugin-notifications-backend": "^0.6.6",
+    "@backstage/plugin-permission-backend": "^0.7.13",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.20",
+    "@backstage/plugin-permission-common": "^0.9.9",
+    "@backstage/plugin-permission-node": "^0.11.1",
+    "@backstage/plugin-proxy-backend": "^0.6.14",
+    "@backstage/plugin-scaffolder-backend": "^4.0.1",
+    "@backstage/plugin-scaffolder-backend-module-github": "^0.9.10",
+    "@backstage/plugin-scaffolder-backend-module-gitlab": "^0.11.7",
+    "@backstage/plugin-search-backend": "^2.1.3",
+    "@backstage/plugin-search-backend-module-catalog": "^0.3.16",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.56",
+    "@backstage/plugin-search-backend-module-techdocs": "^0.4.15",
+    "@backstage/plugin-search-backend-node": "^1.4.5",
+    "@backstage/plugin-signals-backend": "^0.3.16",
+    "@backstage/plugin-techdocs-backend": "^2.2.1",
     "@gitbeaker/rest": "^43.4.0",
     "@octokit/auth-app": "^6.0.3",
     "@octokit/rest": "^20.0.2",
     "@red-hat-developer-hub/backstage-plugin-bulk-import-backend": "workspace:^",
     "@red-hat-developer-hub/backstage-plugin-bulk-import-common": "workspace:^",
-    "@red-hat-developer-hub/backstage-plugin-orchestrator-backend": "^8.5.0",
+    "@red-hat-developer-hub/backstage-plugin-orchestrator-backend": "^8.10.3",
     "@red-hat-developer-hub/backstage-plugin-orchestrator-common": "^3.3.0",
     "@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator": "^1.3.0",
     "ajv-formats": "^3.0.1",
@@ -73,18 +74,17 @@
     "just-kebab-case": "4.2.0",
     "knex": "^3.0.0",
     "luxon": "^3.4.4",
-    "node-fetch": "^2.6.7",
     "node-gyp": "^10.0.0",
     "openapi-backend": "^5.10.6",
     "pg": "^8.11.3",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^1.11.1",
-    "@backstage/catalog-client": "^1.14.0",
-    "@backstage/cli": "^0.36.0",
-    "@backstage/config": "^1.3.6",
-    "@backstage/plugin-catalog-backend": "^3.5.0",
+    "@backstage/backend-test-utils": "^1.11.4",
+    "@backstage/catalog-client": "^1.16.0",
+    "@backstage/cli": "^0.36.3",
+    "@backstage/config": "^1.3.8",
+    "@backstage/plugin-catalog-backend": "^3.8.0",
     "@backstage/types": "^1.2.2",
     "@openapitools/openapi-generator-cli": "2.39.0",
     "@spotify/prettier-config": "^15.0.0",
@@ -93,7 +93,6 @@
     "@types/git-url-parse": "^9.0.0",
     "@types/knex": "^0.16.1",
     "@types/luxon": "^2.0.4",
-    "@types/node-fetch": "^2.5.12",
     "@types/supertest": "2.0.16",
     "js-yaml-cli": "0.6.0",
     "msw": "1.3.5",