Skip to content

Commit bd80b86

Browse files
lokanandaprabhugithub-actions[bot]cursoragent
authored
orchestrator - version:bump to v1.51.1 (#3281)
* v1.51.1 version bump * fix(orchestrator): adapt to Backstage v1.51.1 NFS and catalog APIs Migrate PageBlueprint nav (title/icon), update app sidebar to navItems API, and remove unused alpha catalogServiceRef from the backend plugin. Co-authored-by: Cursor <cursoragent@cursor.com> * chore(orchestrator): update alpha API report after NFS nav migration Co-authored-by: Cursor <cursoragent@cursor.com> * chore(orchestrator): refresh alpha API report Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 1a93ef9 commit bd80b86

24 files changed

Lines changed: 2258 additions & 3984 deletions

File tree

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
'@red-hat-developer-hub/backstage-plugin-orchestrator': minor
3+
'@red-hat-developer-hub/backstage-plugin-orchestrator-backend': minor
4+
'@red-hat-developer-hub/backstage-plugin-orchestrator-backend-module-loki': minor
5+
'@red-hat-developer-hub/backstage-plugin-orchestrator-common': minor
6+
'@red-hat-developer-hub/backstage-plugin-orchestrator-form-api': minor
7+
'@red-hat-developer-hub/backstage-plugin-orchestrator-form-react': minor
8+
'@red-hat-developer-hub/backstage-plugin-orchestrator-form-widgets': minor
9+
'@red-hat-developer-hub/backstage-plugin-orchestrator-node': minor
10+
'@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator': minor
11+
---
12+
13+
Backstage version bump to v1.51.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "1.49.3"
2+
"version": "1.51.1"
33
}

workspaces/orchestrator/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
"directory": "workspaces/orchestrator"
4141
},
4242
"devDependencies": {
43-
"@backstage/cli": "^0.36.0",
43+
"@backstage/cli": "^0.36.2",
4444
"@backstage/e2e-test-utils": "^0.1.2",
45-
"@backstage/repo-tools": "^0.17.0",
45+
"@backstage/repo-tools": "^0.17.2",
4646
"@changesets/cli": "^2.27.1",
4747
"@ianvs/prettier-plugin-sort-imports": "^4.4.0",
4848
"@jest/environment-jsdom-abstract": "^30.3.0",

workspaces/orchestrator/packages/app-legacy/package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,32 @@
2020
},
2121
"dependencies": {
2222
"@backstage-community/plugin-rbac": "^1.33.2",
23-
"@backstage/app-defaults": "^1.7.6",
24-
"@backstage/catalog-model": "^1.7.7",
25-
"@backstage/cli": "^0.36.0",
26-
"@backstage/core-app-api": "^1.19.6",
27-
"@backstage/core-components": "^0.18.8",
28-
"@backstage/core-plugin-api": "^1.12.4",
29-
"@backstage/integration-react": "^1.2.16",
30-
"@backstage/plugin-api-docs": "^0.13.5",
31-
"@backstage/plugin-catalog": "^2.0.1",
32-
"@backstage/plugin-catalog-common": "^1.1.8",
33-
"@backstage/plugin-catalog-graph": "^0.6.0",
34-
"@backstage/plugin-catalog-import": "^0.13.11",
35-
"@backstage/plugin-catalog-react": "^2.1.1",
36-
"@backstage/plugin-notifications": "^0.5.15",
37-
"@backstage/plugin-org": "^0.7.0",
38-
"@backstage/plugin-permission-react": "^0.4.41",
39-
"@backstage/plugin-scaffolder": "^1.36.1",
40-
"@backstage/plugin-search": "^1.7.0",
41-
"@backstage/plugin-search-react": "^1.11.0",
42-
"@backstage/plugin-signals": "^0.0.29",
43-
"@backstage/plugin-techdocs": "^1.17.2",
44-
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.34",
45-
"@backstage/plugin-techdocs-react": "^1.3.9",
46-
"@backstage/plugin-user-settings": "^0.9.1",
47-
"@backstage/theme": "^0.7.2",
48-
"@backstage/ui": "^0.13.2",
23+
"@backstage/app-defaults": "^1.7.8",
24+
"@backstage/catalog-model": "^1.9.0",
25+
"@backstage/cli": "^0.36.2",
26+
"@backstage/core-app-api": "^1.20.1",
27+
"@backstage/core-components": "^0.18.10",
28+
"@backstage/core-plugin-api": "^1.12.6",
29+
"@backstage/integration-react": "^1.2.18",
30+
"@backstage/plugin-api-docs": "^0.14.1",
31+
"@backstage/plugin-catalog": "^2.0.5",
32+
"@backstage/plugin-catalog-common": "^1.1.10",
33+
"@backstage/plugin-catalog-graph": "^0.6.4",
34+
"@backstage/plugin-catalog-import": "^0.13.13",
35+
"@backstage/plugin-catalog-react": "^3.0.0",
36+
"@backstage/plugin-notifications": "^0.5.17",
37+
"@backstage/plugin-org": "^0.7.4",
38+
"@backstage/plugin-permission-react": "^0.5.1",
39+
"@backstage/plugin-scaffolder": "^1.37.0",
40+
"@backstage/plugin-search": "^1.7.4",
41+
"@backstage/plugin-search-react": "^1.11.4",
42+
"@backstage/plugin-signals": "^0.0.31",
43+
"@backstage/plugin-techdocs": "^1.17.6",
44+
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.36",
45+
"@backstage/plugin-techdocs-react": "^1.3.11",
46+
"@backstage/plugin-user-settings": "^0.9.3",
47+
"@backstage/theme": "^0.7.3",
48+
"@backstage/ui": "^0.15.0",
4949
"@mui/icons-material": "5.18.0",
5050
"@mui/lab": "5.0.0-alpha.177",
5151
"@mui/material": "5.18.0",
@@ -62,7 +62,7 @@
6262
"react-use": "^17.4.0"
6363
},
6464
"devDependencies": {
65-
"@backstage/test-utils": "^1.7.16",
65+
"@backstage/test-utils": "^1.7.18",
6666
"@playwright/test": "1.58.2",
6767
"@testing-library/dom": "^9.0.0",
6868
"@testing-library/jest-dom": "^6.0.0",

workspaces/orchestrator/packages/app/package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
"lint": "backstage-cli package lint"
2020
},
2121
"dependencies": {
22-
"@backstage/cli": "^0.36.0",
23-
"@backstage/core-compat-api": "^0.5.9",
24-
"@backstage/core-components": "^0.18.8",
25-
"@backstage/core-plugin-api": "^1.12.4",
26-
"@backstage/frontend-defaults": "^0.5.0",
27-
"@backstage/frontend-plugin-api": "^0.15.1",
28-
"@backstage/integration-react": "^1.2.16",
29-
"@backstage/plugin-app-react": "^0.2.1",
30-
"@backstage/plugin-catalog": "^2.0.1",
31-
"@backstage/plugin-user-settings": "^0.9.1",
32-
"@backstage/ui": "^0.13.2",
22+
"@backstage/cli": "^0.36.2",
23+
"@backstage/core-compat-api": "^0.5.11",
24+
"@backstage/core-components": "^0.18.10",
25+
"@backstage/core-plugin-api": "^1.12.6",
26+
"@backstage/frontend-defaults": "^0.5.2",
27+
"@backstage/frontend-plugin-api": "^0.17.1",
28+
"@backstage/integration-react": "^1.2.18",
29+
"@backstage/plugin-app-react": "^0.2.3",
30+
"@backstage/plugin-catalog": "^2.0.5",
31+
"@backstage/plugin-user-settings": "^0.9.3",
32+
"@backstage/ui": "^0.15.0",
3333
"@mui/icons-material": "^5.17.1",
3434
"@mui/material": "^5.17.1",
3535
"@red-hat-developer-hub/backstage-plugin-orchestrator": "workspace:^",
@@ -41,7 +41,7 @@
4141
"react-router-dom": "^6.3.0"
4242
},
4343
"devDependencies": {
44-
"@backstage/test-utils": "^1.7.16",
44+
"@backstage/test-utils": "^1.7.18",
4545
"@testing-library/dom": "^9.0.0",
4646
"@testing-library/jest-dom": "^6.0.0",
4747
"@testing-library/react": "^14.0.0",

workspaces/orchestrator/packages/app/src/modules/nav/Sidebar.tsx

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,48 @@
1414
* limitations under the License.
1515
*/
1616
import {
17+
Sidebar,
1718
SidebarDivider,
1819
SidebarGroup,
1920
SidebarItem,
2021
SidebarScrollWrapper,
2122
SidebarSpace,
2223
} from '@backstage/core-components';
23-
import { compatWrapper } from '@backstage/core-compat-api';
24-
import { Sidebar } from '@backstage/core-components';
2524
import { NavContentBlueprint } from '@backstage/plugin-app-react';
26-
import { SidebarLogo } from './SidebarLogo';
25+
import { UserSettingsSignInAvatar } from '@backstage/plugin-user-settings';
2726
import MenuIcon from '@mui/icons-material/Menu';
2827

28+
import { SidebarLogo } from './SidebarLogo';
29+
2930
export const SidebarContent = NavContentBlueprint.make({
3031
params: {
31-
component: ({ items }) =>
32-
compatWrapper(
32+
component: ({ navItems }) => {
33+
const nav = navItems.withComponent(item => (
34+
<SidebarItem icon={() => item.icon} to={item.href} text={item.title} />
35+
));
36+
37+
return (
3338
<Sidebar>
3439
<SidebarLogo />
3540
<SidebarDivider />
3641
<SidebarGroup label="Menu" icon={<MenuIcon />}>
42+
{nav.take('page:catalog')}
43+
{nav.take('page:orchestrator')}
3744
<SidebarScrollWrapper>
38-
{items.map((item, index) => (
39-
<SidebarItem {...item} key={index} />
40-
))}
45+
{nav.rest({ sortBy: 'title' })}
4146
</SidebarScrollWrapper>
4247
</SidebarGroup>
4348
<SidebarSpace />
44-
</Sidebar>,
45-
),
49+
<SidebarDivider />
50+
<SidebarGroup
51+
label="Settings"
52+
icon={<UserSettingsSignInAvatar />}
53+
to="/settings"
54+
>
55+
{nav.take('page:user-settings')}
56+
</SidebarGroup>
57+
</Sidebar>
58+
);
59+
},
4660
},
4761
});

workspaces/orchestrator/packages/backend/package.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,34 +22,34 @@
2222
},
2323
"dependencies": {
2424
"@backstage-community/plugin-rbac-backend": "^7.4.0",
25-
"@backstage/backend-defaults": "^0.16.0",
26-
"@backstage/config": "^1.3.6",
27-
"@backstage/plugin-app-backend": "^0.5.12",
28-
"@backstage/plugin-auth-backend": "^0.27.3",
29-
"@backstage/plugin-auth-backend-module-github-provider": "^0.5.1",
30-
"@backstage/plugin-auth-backend-module-gitlab-provider": "^0.4.1",
31-
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.17",
32-
"@backstage/plugin-auth-node": "^0.6.14",
33-
"@backstage/plugin-catalog-backend": "^3.5.0",
34-
"@backstage/plugin-catalog-backend-module-gitlab": "^0.8.1",
35-
"@backstage/plugin-catalog-backend-module-logs": "^0.1.20",
36-
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.18",
37-
"@backstage/plugin-notifications-backend": "^0.6.3",
38-
"@backstage/plugin-permission-backend": "^0.7.10",
39-
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.17",
40-
"@backstage/plugin-permission-common": "^0.9.7",
41-
"@backstage/plugin-permission-node": "^0.10.11",
42-
"@backstage/plugin-proxy-backend": "^0.6.11",
43-
"@backstage/plugin-scaffolder-backend": "^3.2.0",
44-
"@backstage/plugin-scaffolder-backend-module-github": "^0.9.7",
45-
"@backstage/plugin-scaffolder-backend-module-gitlab": "^0.11.4",
46-
"@backstage/plugin-search-backend": "^2.1.0",
47-
"@backstage/plugin-search-backend-module-catalog": "^0.3.13",
48-
"@backstage/plugin-search-backend-module-pg": "^0.5.53",
49-
"@backstage/plugin-search-backend-module-techdocs": "^0.4.12",
50-
"@backstage/plugin-search-backend-node": "^1.4.2",
51-
"@backstage/plugin-signals-backend": "^0.3.13",
52-
"@backstage/plugin-techdocs-backend": "^2.1.6",
25+
"@backstage/backend-defaults": "^0.17.2",
26+
"@backstage/config": "^1.3.8",
27+
"@backstage/plugin-app-backend": "^0.5.14",
28+
"@backstage/plugin-auth-backend": "^0.29.0",
29+
"@backstage/plugin-auth-backend-module-github-provider": "^0.5.3",
30+
"@backstage/plugin-auth-backend-module-gitlab-provider": "^0.4.3",
31+
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.19",
32+
"@backstage/plugin-auth-node": "^0.7.1",
33+
"@backstage/plugin-catalog-backend": "^3.7.1",
34+
"@backstage/plugin-catalog-backend-module-gitlab": "^0.8.3",
35+
"@backstage/plugin-catalog-backend-module-logs": "^0.1.22",
36+
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.20",
37+
"@backstage/plugin-notifications-backend": "^0.6.5",
38+
"@backstage/plugin-permission-backend": "^0.7.12",
39+
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.19",
40+
"@backstage/plugin-permission-common": "^0.9.9",
41+
"@backstage/plugin-permission-node": "^0.11.0",
42+
"@backstage/plugin-proxy-backend": "^0.6.13",
43+
"@backstage/plugin-scaffolder-backend": "^4.0.0",
44+
"@backstage/plugin-scaffolder-backend-module-github": "^0.9.9",
45+
"@backstage/plugin-scaffolder-backend-module-gitlab": "^0.11.6",
46+
"@backstage/plugin-search-backend": "^2.1.2",
47+
"@backstage/plugin-search-backend-module-catalog": "^0.3.15",
48+
"@backstage/plugin-search-backend-module-pg": "^0.5.55",
49+
"@backstage/plugin-search-backend-module-techdocs": "^0.4.14",
50+
"@backstage/plugin-search-backend-node": "^1.4.4",
51+
"@backstage/plugin-signals-backend": "^0.3.15",
52+
"@backstage/plugin-techdocs-backend": "^2.2.0",
5353
"@red-hat-developer-hub/backstage-plugin-orchestrator-backend": "workspace:^",
5454
"@red-hat-developer-hub/backstage-plugin-orchestrator-backend-module-loki": "workspace:^",
5555
"@red-hat-developer-hub/backstage-plugin-scaffolder-backend-module-orchestrator": "workspace:^",
@@ -61,7 +61,7 @@
6161
"winston": "^3.2.1"
6262
},
6363
"devDependencies": {
64-
"@backstage/cli": "^0.36.0",
64+
"@backstage/cli": "^0.36.2",
6565
"@types/express": "^4.17.6",
6666
"@types/express-serve-static-core": "^4.17.5",
6767
"@types/luxon": "^2.0.4"

workspaces/orchestrator/plugins/custom-authentication-provider-module-backend/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
"export-dynamic:clean": "run export-dynamic --clean"
4444
},
4545
"dependencies": {
46-
"@backstage/backend-defaults": "^0.16.0",
47-
"@backstage/backend-plugin-api": "^1.8.0",
48-
"@backstage/plugin-auth-backend": "^0.27.3",
49-
"@backstage/plugin-auth-backend-module-github-provider": "^0.5.1",
50-
"@backstage/plugin-auth-node": "^0.6.14",
46+
"@backstage/backend-defaults": "^0.17.2",
47+
"@backstage/backend-plugin-api": "^1.9.1",
48+
"@backstage/plugin-auth-backend": "^0.29.0",
49+
"@backstage/plugin-auth-backend-module-github-provider": "^0.5.3",
50+
"@backstage/plugin-auth-node": "^0.7.1",
5151
"express": "^4.17.1"
5252
},
5353
"devDependencies": {
54-
"@backstage/cli": "^0.36.0",
54+
"@backstage/cli": "^0.36.2",
5555
"@backstage/types": "^1.2.2",
5656
"@janus-idp/cli": "3.7.0",
5757
"prettier": "3.8.3",

workspaces/orchestrator/plugins/custom-authentication-provider-module/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@
4444
"export-dynamic:clean": "run export-dynamic --clean"
4545
},
4646
"dependencies": {
47-
"@backstage/core-app-api": "^1.19.6",
48-
"@backstage/core-components": "^0.18.8",
49-
"@backstage/core-plugin-api": "^1.12.4",
50-
"@backstage/integration-react": "^1.2.16",
47+
"@backstage/core-app-api": "^1.20.1",
48+
"@backstage/core-components": "^0.18.10",
49+
"@backstage/core-plugin-api": "^1.12.6",
50+
"@backstage/integration-react": "^1.2.18",
5151
"@mui/material": "^5.17.1",
5252
"react": "^18.2.0",
5353
"react-dom": "^18.2.0"
5454
},
5555
"devDependencies": {
56-
"@backstage/cli": "^0.36.0",
56+
"@backstage/cli": "^0.36.2",
5757
"@janus-idp/cli": "3.7.0",
5858
"@types/react": "^18.0.0",
5959
"prettier": "3.8.3",

workspaces/orchestrator/plugins/orchestrator-backend-module-loki/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@
3737
"prettier:fix": "prettier --ignore-unknown --write ."
3838
},
3939
"dependencies": {
40-
"@backstage/backend-plugin-api": "^1.8.0",
41-
"@backstage/errors": "^1.2.7",
40+
"@backstage/backend-plugin-api": "^1.9.1",
41+
"@backstage/errors": "^1.3.1",
4242
"@red-hat-developer-hub/backstage-plugin-orchestrator-common": "workspace:^",
4343
"@red-hat-developer-hub/backstage-plugin-orchestrator-node": "workspace:^",
4444
"luxon": "^3.7.2",
4545
"undici": "^7.24.0"
4646
},
4747
"devDependencies": {
48-
"@backstage/backend-test-utils": "^1.11.1",
49-
"@backstage/cli": "^0.36.0",
50-
"@backstage/config": "^1.3.6"
48+
"@backstage/backend-test-utils": "^1.11.3",
49+
"@backstage/cli": "^0.36.2",
50+
"@backstage/config": "^1.3.8"
5151
},
5252
"files": [
5353
"dist",

0 commit comments

Comments
 (0)