Skip to content

Commit 9deb41e

Browse files
backstage-servicegithub-actions[bot]christoph-jerolimov
authored
topology - version:bump to v1.49.2 (#8214)
* v1.49.2 version bump * chore(topology): update typescript and add backstage cli defaults Signed-off-by: Christoph Jerolimov <jerolimov+git@redhat.com> * chore(topology): remove the removed variant from entity cards from the test app Signed-off-by: Christoph Jerolimov <jerolimov+git@redhat.com> * chore(topology): fix ts error Signed-off-by: Christoph Jerolimov <jerolimov+git@redhat.com> --------- Signed-off-by: Christoph Jerolimov <jerolimov+git@redhat.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Christoph Jerolimov <jerolimov+git@redhat.com>
1 parent dd0586f commit 9deb41e

9 files changed

Lines changed: 2326 additions & 2394 deletions

File tree

‎workspaces/topology/.changeset/version-bump-1-49-2.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@backstage-community/plugin-topology': minor
3+
---
4+
5+
Backstage version bump to v1.49.2

‎workspaces/topology/backstage.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "1.48.5"
2+
"version": "1.49.2"
33
}

‎workspaces/topology/package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,16 @@
3636
"directory": "workspaces/topology"
3737
},
3838
"devDependencies": {
39-
"@backstage/cli": "^0.35.4",
39+
"@backstage/cli": "^0.36.0",
40+
"@backstage/cli-defaults": "^0.1.0",
4041
"@backstage/e2e-test-utils": "^0.1.2",
41-
"@backstage/repo-tools": "^0.16.5",
42+
"@backstage/repo-tools": "^0.17.0",
4243
"@changesets/cli": "^2.27.1",
4344
"@playwright/test": "^1.56.1",
4445
"knip": "^5.27.4",
4546
"node-gyp": "^9.0.0",
4647
"prettier": "^2.3.2",
47-
"typescript": "~5.3.0"
48+
"typescript": "~5.8.0"
4849
},
4950
"resolutions": {
5051
"@types/react": "^18",

‎workspaces/topology/packages/app/package.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,31 @@
2020
},
2121
"dependencies": {
2222
"@backstage-community/plugin-topology": "workspace:^",
23-
"@backstage/app-defaults": "^1.7.5",
24-
"@backstage/catalog-model": "^1.7.6",
25-
"@backstage/cli": "^0.35.4",
26-
"@backstage/core-app-api": "^1.19.5",
27-
"@backstage/core-components": "^0.18.7",
28-
"@backstage/core-plugin-api": "^1.12.3",
29-
"@backstage/integration-react": "^1.2.15",
30-
"@backstage/plugin-api-docs": "^0.13.4",
31-
"@backstage/plugin-catalog": "^1.33.1",
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",
3232
"@backstage/plugin-catalog-common": "^1.1.8",
33-
"@backstage/plugin-catalog-graph": "^0.5.7",
34-
"@backstage/plugin-catalog-import": "^0.13.10",
35-
"@backstage/plugin-catalog-react": "^2.0.0",
36-
"@backstage/plugin-kubernetes": "^0.12.16",
37-
"@backstage/plugin-org": "^0.6.49",
38-
"@backstage/plugin-permission-react": "^0.4.40",
39-
"@backstage/plugin-scaffolder": "^1.35.4",
40-
"@backstage/plugin-search": "^1.6.1",
41-
"@backstage/plugin-search-react": "^1.10.4",
42-
"@backstage/plugin-techdocs": "^1.17.0",
43-
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.33",
44-
"@backstage/plugin-techdocs-react": "^1.3.8",
45-
"@backstage/plugin-user-settings": "^0.9.0",
33+
"@backstage/plugin-catalog-graph": "^0.6.0",
34+
"@backstage/plugin-catalog-import": "^0.13.11",
35+
"@backstage/plugin-catalog-react": "^2.1.0",
36+
"@backstage/plugin-kubernetes": "^0.12.17",
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-techdocs": "^1.17.2",
43+
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.34",
44+
"@backstage/plugin-techdocs-react": "^1.3.9",
45+
"@backstage/plugin-user-settings": "^0.9.1",
4646
"@backstage/theme": "^0.7.2",
47-
"@backstage/ui": "^0.12.0",
47+
"@backstage/ui": "^0.13.1",
4848
"@material-ui/core": "^4.12.2",
4949
"@material-ui/icons": "^4.9.1",
5050
"react": "^18.0.2",

‎workspaces/topology/packages/app/src/components/catalog/EntityPage.tsx‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,17 @@ const overviewContent = (
144144
<Grid container spacing={3} alignItems="stretch">
145145
{entityWarningContent}
146146
<Grid item md={6}>
147-
<EntityAboutCard variant="gridItem" />
147+
<EntityAboutCard />
148148
</Grid>
149149
<Grid item md={6} xs={12}>
150-
<EntityCatalogGraphCard variant="gridItem" height={400} />
150+
<EntityCatalogGraphCard height={400} />
151151
</Grid>
152152

153153
<Grid item md={4} xs={12}>
154154
<EntityLinksCard />
155155
</Grid>
156156
<Grid item md={8} xs={12}>
157-
<EntityHasSubcomponentsCard variant="gridItem" />
157+
<EntityHasSubcomponentsCard />
158158
</Grid>
159159
</Grid>
160160
);
@@ -195,10 +195,10 @@ const serviceEntityPage = (
195195
<EntityLayout.Route path="/dependencies" title="Dependencies">
196196
<Grid container spacing={3} alignItems="stretch">
197197
<Grid item md={6}>
198-
<EntityDependsOnComponentsCard variant="gridItem" />
198+
<EntityDependsOnComponentsCard />
199199
</Grid>
200200
<Grid item md={6}>
201-
<EntityDependsOnResourcesCard variant="gridItem" />
201+
<EntityDependsOnResourcesCard />
202202
</Grid>
203203
</Grid>
204204
</EntityLayout.Route>
@@ -230,10 +230,10 @@ const websiteEntityPage = (
230230
<EntityLayout.Route path="/dependencies" title="Dependencies">
231231
<Grid container spacing={3} alignItems="stretch">
232232
<Grid item md={6}>
233-
<EntityDependsOnComponentsCard variant="gridItem" />
233+
<EntityDependsOnComponentsCard />
234234
</Grid>
235235
<Grid item md={6}>
236-
<EntityDependsOnResourcesCard variant="gridItem" />
236+
<EntityDependsOnResourcesCard />
237237
</Grid>
238238
</Grid>
239239
</EntityLayout.Route>
@@ -286,7 +286,7 @@ const apiPage = (
286286
<EntityAboutCard />
287287
</Grid>
288288
<Grid item md={6} xs={12}>
289-
<EntityCatalogGraphCard variant="gridItem" height={400} />
289+
<EntityCatalogGraphCard height={400} />
290290
</Grid>
291291
<Grid item md={4} xs={12}>
292292
<EntityLinksCard />
@@ -318,10 +318,10 @@ const userPage = (
318318
<Grid container spacing={3}>
319319
{entityWarningContent}
320320
<Grid item xs={12} md={6}>
321-
<EntityUserProfileCard variant="gridItem" />
321+
<EntityUserProfileCard />
322322
</Grid>
323323
<Grid item xs={12} md={6}>
324-
<EntityOwnershipCard variant="gridItem" />
324+
<EntityOwnershipCard />
325325
</Grid>
326326
</Grid>
327327
</EntityLayout.Route>
@@ -334,10 +334,10 @@ const groupPage = (
334334
<Grid container spacing={3}>
335335
{entityWarningContent}
336336
<Grid item xs={12} md={6}>
337-
<EntityGroupProfileCard variant="gridItem" />
337+
<EntityGroupProfileCard />
338338
</Grid>
339339
<Grid item xs={12} md={6}>
340-
<EntityOwnershipCard variant="gridItem" />
340+
<EntityOwnershipCard />
341341
</Grid>
342342
<Grid item xs={12} md={6}>
343343
<EntityMembersListCard />
@@ -356,28 +356,27 @@ const systemPage = (
356356
<Grid container spacing={3} alignItems="stretch">
357357
{entityWarningContent}
358358
<Grid item md={6}>
359-
<EntityAboutCard variant="gridItem" />
359+
<EntityAboutCard />
360360
</Grid>
361361
<Grid item md={6} xs={12}>
362-
<EntityCatalogGraphCard variant="gridItem" height={400} />
362+
<EntityCatalogGraphCard height={400} />
363363
</Grid>
364364
<Grid item md={4} xs={12}>
365365
<EntityLinksCard />
366366
</Grid>
367367
<Grid item md={8}>
368-
<EntityHasComponentsCard variant="gridItem" />
368+
<EntityHasComponentsCard />
369369
</Grid>
370370
<Grid item md={6}>
371-
<EntityHasApisCard variant="gridItem" />
371+
<EntityHasApisCard />
372372
</Grid>
373373
<Grid item md={6}>
374-
<EntityHasResourcesCard variant="gridItem" />
374+
<EntityHasResourcesCard />
375375
</Grid>
376376
</Grid>
377377
</EntityLayout.Route>
378378
<EntityLayout.Route path="/diagram" title="Diagram">
379379
<EntityCatalogGraphCard
380-
variant="gridItem"
381380
direction={Direction.TOP_BOTTOM}
382381
title="System Diagram"
383382
height={700}
@@ -403,13 +402,13 @@ const domainPage = (
403402
<Grid container spacing={3} alignItems="stretch">
404403
{entityWarningContent}
405404
<Grid item md={6}>
406-
<EntityAboutCard variant="gridItem" />
405+
<EntityAboutCard />
407406
</Grid>
408407
<Grid item md={6} xs={12}>
409-
<EntityCatalogGraphCard variant="gridItem" height={400} />
408+
<EntityCatalogGraphCard height={400} />
410409
</Grid>
411410
<Grid item md={6}>
412-
<EntityHasSystemsCard variant="gridItem" />
411+
<EntityHasSystemsCard />
413412
</Grid>
414413
</Grid>
415414
</EntityLayout.Route>

‎workspaces/topology/packages/backend/package.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,36 @@
2121
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
2222
},
2323
"dependencies": {
24-
"@backstage/backend-defaults": "^0.15.2",
24+
"@backstage/backend-defaults": "^0.16.0",
2525
"@backstage/config": "^1.3.6",
26-
"@backstage/plugin-app-backend": "^0.5.11",
27-
"@backstage/plugin-auth-backend": "^0.27.1",
28-
"@backstage/plugin-auth-backend-module-github-provider": "^0.5.0",
29-
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.16",
30-
"@backstage/plugin-auth-node": "^0.6.13",
31-
"@backstage/plugin-catalog-backend": "^3.4.0",
32-
"@backstage/plugin-catalog-backend-module-logs": "^0.1.19",
33-
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.17",
34-
"@backstage/plugin-kubernetes-backend": "^0.21.1",
35-
"@backstage/plugin-permission-backend": "^0.7.9",
36-
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.16",
37-
"@backstage/plugin-permission-common": "^0.9.6",
38-
"@backstage/plugin-permission-node": "^0.10.10",
39-
"@backstage/plugin-proxy-backend": "^0.6.10",
40-
"@backstage/plugin-scaffolder-backend": "^3.1.5",
41-
"@backstage/plugin-search-backend": "^2.0.12",
42-
"@backstage/plugin-search-backend-module-catalog": "^0.3.12",
43-
"@backstage/plugin-search-backend-module-pg": "^0.5.52",
44-
"@backstage/plugin-search-backend-module-techdocs": "^0.4.11",
45-
"@backstage/plugin-search-backend-node": "^1.4.1",
46-
"@backstage/plugin-techdocs-backend": "^2.1.5",
26+
"@backstage/plugin-app-backend": "^0.5.12",
27+
"@backstage/plugin-auth-backend": "^0.27.3",
28+
"@backstage/plugin-auth-backend-module-github-provider": "^0.5.1",
29+
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.17",
30+
"@backstage/plugin-auth-node": "^0.6.14",
31+
"@backstage/plugin-catalog-backend": "^3.5.0",
32+
"@backstage/plugin-catalog-backend-module-logs": "^0.1.20",
33+
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.18",
34+
"@backstage/plugin-kubernetes-backend": "^0.21.2",
35+
"@backstage/plugin-permission-backend": "^0.7.10",
36+
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.17",
37+
"@backstage/plugin-permission-common": "^0.9.7",
38+
"@backstage/plugin-permission-node": "^0.10.11",
39+
"@backstage/plugin-proxy-backend": "^0.6.11",
40+
"@backstage/plugin-scaffolder-backend": "^3.2.0",
41+
"@backstage/plugin-search-backend": "^2.1.0",
42+
"@backstage/plugin-search-backend-module-catalog": "^0.3.13",
43+
"@backstage/plugin-search-backend-module-pg": "^0.5.53",
44+
"@backstage/plugin-search-backend-module-techdocs": "^0.4.12",
45+
"@backstage/plugin-search-backend-node": "^1.4.2",
46+
"@backstage/plugin-techdocs-backend": "^2.1.6",
4747
"app": "link:../app",
4848
"better-sqlite3": "^12.0.0",
4949
"node-gyp": "^10.0.0",
5050
"pg": "^8.11.3"
5151
},
5252
"devDependencies": {
53-
"@backstage/cli": "^0.35.4"
53+
"@backstage/cli": "^0.36.0"
5454
},
5555
"files": [
5656
"dist"

‎workspaces/topology/plugins/topology/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@
4646
},
4747
"dependencies": {
4848
"@backstage-community/plugin-tekton-react": "^0.4.0",
49-
"@backstage/catalog-model": "^1.7.6",
50-
"@backstage/core-components": "^0.18.7",
51-
"@backstage/core-plugin-api": "^1.12.3",
52-
"@backstage/plugin-catalog-react": "^2.0.0",
49+
"@backstage/catalog-model": "^1.7.7",
50+
"@backstage/core-components": "^0.18.8",
51+
"@backstage/core-plugin-api": "^1.12.4",
52+
"@backstage/plugin-catalog-react": "^2.1.0",
5353
"@backstage/plugin-kubernetes-common": "^0.9.10",
54-
"@backstage/plugin-kubernetes-react": "^0.5.16",
55-
"@backstage/plugin-permission-common": "^0.9.6",
56-
"@backstage/plugin-permission-react": "^0.4.40",
54+
"@backstage/plugin-kubernetes-react": "^0.5.17",
55+
"@backstage/plugin-permission-common": "^0.9.7",
56+
"@backstage/plugin-permission-react": "^0.4.41",
5757
"@backstage/theme": "^0.7.2",
5858
"@kubernetes/client-node": "1.4.0",
5959
"@mui/icons-material": "5.18.0",
@@ -80,9 +80,9 @@
8080
},
8181
"devDependencies": {
8282
"@axe-core/playwright": "^4.11.0",
83-
"@backstage/cli": "^0.35.4",
84-
"@backstage/dev-utils": "^1.1.20",
85-
"@backstage/test-utils": "^1.7.15",
83+
"@backstage/cli": "^0.36.0",
84+
"@backstage/dev-utils": "^1.1.21",
85+
"@backstage/test-utils": "^1.7.16",
8686
"@playwright/test": "^1.56.1",
8787
"@testing-library/dom": "^10.0.0",
8888
"@testing-library/jest-dom": "^6.0.0",

‎workspaces/topology/plugins/topology/src/utils/vm-utils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ export const getLabel = (
186186
value: any,
187187
label: string,
188188
defaultValue?: string,
189-
): string =>
189+
): string | undefined =>
190190
_.has(value, 'metadata.labels') ? value.metadata.labels[label] : defaultValue;
191191

192192
// Node

0 commit comments

Comments
 (0)