Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions workspaces/extensions/.changeset/version-bump-1-49-2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@red-hat-developer-hub/extensions-cli': minor
'@red-hat-developer-hub/backstage-plugin-catalog-backend-module-extensions': minor
'@red-hat-developer-hub/backstage-plugin-extensions': minor
'@red-hat-developer-hub/backstage-plugin-extensions-backend': minor
'@red-hat-developer-hub/backstage-plugin-extensions-common': minor
---

Backstage version bump to v1.49.2
2 changes: 1 addition & 1 deletion workspaces/extensions/backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.45.2"
"version": "1.49.2"
}
26 changes: 20 additions & 6 deletions workspaces/extensions/e2e-tests/extensions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
ja: '日本語',
};

function escapeRegExp(value: string): string {
return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');

Check warning on line 36 in workspaces/extensions/e2e-tests/extensions.test.ts

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Prefer `String#replaceAll()` over `String#replace()`.

See more on https://sonarcloud.io/project/issues?id=redhat-developer_rhdh-plugins&issues=AZ1RicPA1htvfrG2h31g&open=AZ1RicPA1htvfrG2h31g&pullRequest=2672

Check warning on line 36 in workspaces/extensions/e2e-tests/extensions.test.ts

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

`String.raw` should be used to avoid escaping `\`.

See more on https://sonarcloud.io/project/issues?id=redhat-developer_rhdh-plugins&issues=AZ1RicPA1htvfrG2h31h&open=AZ1RicPA1htvfrG2h31h&pullRequest=2672
}

/**
* Get the display name for a locale code
*/
Expand All @@ -44,18 +48,26 @@
let extensions: Extensions;
let extensionHelper: ExtensionHelper;
let translations: ExtensionsMessages;
let sharedPage: Page;
let sharedContext: BrowserContext;
let sharedPage!: Page;
let sharedContext!: BrowserContext;

async function switchToLocale(page: Page, locale: string): Promise<void> {
const baseLocale = locale.split('-')[0];
if (baseLocale === 'en') return;

const displayName = getLocaleDisplayName(locale);
await page.getByRole('link', { name: 'Settings' }).click();
await page.getByRole('button', { name: 'English' }).click();
const localeDisplayPattern = new RegExp(
`^(${Object.values(LOCALE_DISPLAY_NAMES).map(escapeRegExp).join('|')})$`,
);

// Navigating directly avoids flaky duplicate "Settings" links in sidebar.
await page.goto('/settings');
await page
.getByRole('button', { name: localeDisplayPattern })
.first()
.click();
await page.getByRole('option', { name: displayName }).click();
await page.locator('a').filter({ hasText: 'Home' }).click();
await page.goto('/');
}

test.beforeAll(async ({ browser }) => {
Expand All @@ -74,7 +86,9 @@
});

test.afterAll(async () => {
await sharedContext.close();
if (sharedContext) {
await sharedContext.close();
}
});

test.describe('Extensions > Catalog', () => {
Expand Down
10 changes: 5 additions & 5 deletions workspaces/extensions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"tsc": "tsc",
"tsc:full": "tsc --skipLibCheck true --incremental false",
"build:all": "backstage-cli repo build --all",
"build:api-reports": "yarn build:api-reports:only --tsc",
"build:api-reports": "yarn tsc:full && yarn build:api-reports:only",
"build:api-reports:only": "backstage-repo-tools api-reports -o ae-wrong-input-file-type,ae-undocumented --validate-release-tags",
"build-image": "yarn workspace backend build-image",
"build:knip-reports": "backstage-repo-tools knip-reports",
Expand Down Expand Up @@ -44,17 +44,17 @@
"directory": "workspaces/extensions"
},
"devDependencies": {
"@backstage/cli": "^0.34.5",
"@backstage/e2e-test-utils": "^0.1.1",
"@backstage/repo-tools": "^0.16.0",
"@backstage/cli": "^0.36.0",
"@backstage/e2e-test-utils": "^0.1.2",
"@backstage/repo-tools": "^0.17.0",
"@changesets/cli": "^2.27.1",
"@playwright/test": "1.58.2",
"@spotify/prettier-config": "^12.0.0",
"knip": "^5.27.4",
"minimatch": "3",
"node-gyp": "^9.0.0",
"prettier": "^3.4.2",
"typescript": "~5.3.0"
"typescript": "~5.8.0"
},
"resolutions": {
"@types/react": "^18",
Expand Down
52 changes: 26 additions & 26 deletions workspaces/extensions/packages/app-legacy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,32 @@
"lint": "backstage-cli package lint"
},
"dependencies": {
"@backstage-community/plugin-rbac": "^1.45.0",
"@backstage/app-defaults": "^1.7.2",
"@backstage/catalog-model": "^1.7.6",
"@backstage/cli": "^0.34.5",
"@backstage/core-app-api": "^1.19.2",
"@backstage/core-components": "^0.18.3",
"@backstage/core-plugin-api": "^1.12.0",
"@backstage/integration-react": "^1.2.12",
"@backstage/plugin-api-docs": "^0.13.1",
"@backstage/plugin-catalog": "^1.32.0",
"@backstage/plugin-catalog-common": "^1.1.7",
"@backstage/plugin-catalog-graph": "^0.5.3",
"@backstage/plugin-catalog-import": "^0.13.7",
"@backstage/plugin-catalog-react": "^1.21.3",
"@backstage/plugin-kubernetes": "^0.12.13",
"@backstage/plugin-org": "^0.6.46",
"@backstage/plugin-permission-react": "^0.4.38",
"@backstage/plugin-scaffolder": "^1.34.3",
"@backstage/plugin-search": "^1.5.0",
"@backstage/plugin-search-react": "^1.10.0",
"@backstage/plugin-techdocs": "^1.16.0",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.30",
"@backstage/plugin-techdocs-react": "^1.3.5",
"@backstage/plugin-user-settings": "^0.8.29",
"@backstage/theme": "^0.7.0",
"@backstage/ui": "^0.9.1",
"@backstage-community/plugin-rbac": "^1.52.0",
"@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.0",
"@backstage/plugin-kubernetes": "^0.12.17",
"@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-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.1",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@red-hat-developer-hub/backstage-plugin-extensions": "workspace:^",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,17 +144,17 @@ const overviewContent = (
<Grid container spacing={3} alignItems="stretch">
{entityWarningContent}
<Grid item md={6}>
<EntityAboutCard variant="gridItem" />
<EntityAboutCard />
</Grid>
<Grid item md={6} xs={12}>
<EntityCatalogGraphCard variant="gridItem" height={400} />
<EntityCatalogGraphCard height={400} />
</Grid>

<Grid item md={4} xs={12}>
<EntityLinksCard />
</Grid>
<Grid item md={8} xs={12}>
<EntityHasSubcomponentsCard variant="gridItem" />
<EntityHasSubcomponentsCard />
</Grid>
</Grid>
);
Expand Down Expand Up @@ -191,10 +191,10 @@ const serviceEntityPage = (
<EntityLayout.Route path="/dependencies" title="Dependencies">
<Grid container spacing={3} alignItems="stretch">
<Grid item md={6}>
<EntityDependsOnComponentsCard variant="gridItem" />
<EntityDependsOnComponentsCard />
</Grid>
<Grid item md={6}>
<EntityDependsOnResourcesCard variant="gridItem" />
<EntityDependsOnResourcesCard />
</Grid>
</Grid>
</EntityLayout.Route>
Expand Down Expand Up @@ -226,10 +226,10 @@ const websiteEntityPage = (
<EntityLayout.Route path="/dependencies" title="Dependencies">
<Grid container spacing={3} alignItems="stretch">
<Grid item md={6}>
<EntityDependsOnComponentsCard variant="gridItem" />
<EntityDependsOnComponentsCard />
</Grid>
<Grid item md={6}>
<EntityDependsOnResourcesCard variant="gridItem" />
<EntityDependsOnResourcesCard />
</Grid>
</Grid>
</EntityLayout.Route>
Expand Down Expand Up @@ -282,7 +282,7 @@ const apiPage = (
<EntityAboutCard />
</Grid>
<Grid item md={6} xs={12}>
<EntityCatalogGraphCard variant="gridItem" height={400} />
<EntityCatalogGraphCard height={400} />
</Grid>
<Grid item md={4} xs={12}>
<EntityLinksCard />
Expand Down Expand Up @@ -314,10 +314,10 @@ const userPage = (
<Grid container spacing={3}>
{entityWarningContent}
<Grid item xs={12} md={6}>
<EntityUserProfileCard variant="gridItem" />
<EntityUserProfileCard />
</Grid>
<Grid item xs={12} md={6}>
<EntityOwnershipCard variant="gridItem" />
<EntityOwnershipCard />
</Grid>
</Grid>
</EntityLayout.Route>
Expand All @@ -330,10 +330,10 @@ const groupPage = (
<Grid container spacing={3}>
{entityWarningContent}
<Grid item xs={12} md={6}>
<EntityGroupProfileCard variant="gridItem" />
<EntityGroupProfileCard />
</Grid>
<Grid item xs={12} md={6}>
<EntityOwnershipCard variant="gridItem" />
<EntityOwnershipCard />
</Grid>
<Grid item xs={12} md={6}>
<EntityMembersListCard />
Expand All @@ -352,28 +352,27 @@ const systemPage = (
<Grid container spacing={3} alignItems="stretch">
{entityWarningContent}
<Grid item md={6}>
<EntityAboutCard variant="gridItem" />
<EntityAboutCard />
</Grid>
<Grid item md={6} xs={12}>
<EntityCatalogGraphCard variant="gridItem" height={400} />
<EntityCatalogGraphCard height={400} />
</Grid>
<Grid item md={4} xs={12}>
<EntityLinksCard />
</Grid>
<Grid item md={8}>
<EntityHasComponentsCard variant="gridItem" />
<EntityHasComponentsCard />
</Grid>
<Grid item md={6}>
<EntityHasApisCard variant="gridItem" />
<EntityHasApisCard />
</Grid>
<Grid item md={6}>
<EntityHasResourcesCard variant="gridItem" />
<EntityHasResourcesCard />
</Grid>
</Grid>
</EntityLayout.Route>
<EntityLayout.Route path="/diagram" title="Diagram">
<EntityCatalogGraphCard
variant="gridItem"
direction={Direction.TOP_BOTTOM}
title="System Diagram"
height={700}
Expand All @@ -399,13 +398,13 @@ const domainPage = (
<Grid container spacing={3} alignItems="stretch">
{entityWarningContent}
<Grid item md={6}>
<EntityAboutCard variant="gridItem" />
<EntityAboutCard />
</Grid>
<Grid item md={6} xs={12}>
<EntityCatalogGraphCard variant="gridItem" height={400} />
<EntityCatalogGraphCard height={400} />
</Grid>
<Grid item md={6}>
<EntityHasSystemsCard variant="gridItem" />
<EntityHasSystemsCard />
</Grid>
</Grid>
</EntityLayout.Route>
Expand Down
1 change: 1 addition & 0 deletions workspaces/extensions/packages/app/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
48 changes: 24 additions & 24 deletions workspaces/extensions/packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,30 @@
"lint": "backstage-cli package lint"
},
"dependencies": {
"@backstage/cli": "^0.35.4",
"@backstage/core-compat-api": "^0.5.8",
"@backstage/core-components": "^0.18.7",
"@backstage/core-plugin-api": "^1.12.3",
"@backstage/frontend-defaults": "^0.4.0",
"@backstage/frontend-plugin-api": "^0.14.0",
"@backstage/integration-react": "^1.2.15",
"@backstage/plugin-api-docs": "^0.13.4",
"@backstage/plugin-app-react": "^0.2.0",
"@backstage/plugin-app-visualizer": "^0.2.0",
"@backstage/plugin-catalog": "^1.33.0",
"@backstage/plugin-catalog-graph": "^0.5.7",
"@backstage/plugin-catalog-import": "^0.13.10",
"@backstage/plugin-home": "^0.9.2",
"@backstage/plugin-kubernetes": "^0.12.16",
"@backstage/plugin-notifications": "^0.5.14",
"@backstage/plugin-org": "^0.6.49",
"@backstage/plugin-scaffolder": "^1.35.3",
"@backstage/plugin-search": "^1.6.0",
"@backstage/plugin-signals": "^0.0.28",
"@backstage/plugin-techdocs": "^1.17.0",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.33",
"@backstage/plugin-user-settings": "^0.9.0",
"@backstage/ui": "^0.12.0",
"@backstage/cli": "^0.36.0",
"@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-app-visualizer": "^0.2.1",
"@backstage/plugin-catalog": "^2.0.1",
"@backstage/plugin-catalog-graph": "^0.6.0",
"@backstage/plugin-catalog-import": "^0.13.11",
"@backstage/plugin-home": "^0.9.3",
"@backstage/plugin-kubernetes": "^0.12.17",
"@backstage/plugin-notifications": "^0.5.15",
"@backstage/plugin-org": "^0.7.0",
"@backstage/plugin-scaffolder": "^1.36.1",
"@backstage/plugin-search": "^1.7.0",
"@backstage/plugin-signals": "^0.0.29",
"@backstage/plugin-techdocs": "^1.17.2",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.34",
"@backstage/plugin-user-settings": "^0.9.1",
"@backstage/ui": "^0.13.1",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@red-hat-developer-hub/backstage-plugin-extensions": "workspace:^",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import { createFrontendModule } from '@backstage/frontend-plugin-api';
import { SignInPageBlueprint } from '@backstage/plugin-app-react';

export const signInModule = createFrontendModule({
pluginId: 'app',
extensions: [
Expand Down
Loading
Loading