Skip to content
Draft
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

Large diffs are not rendered by default.

14 changes: 0 additions & 14 deletions packages/app-next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,7 @@
"@backstage/frontend-plugin-api": "0.15.1",
"@backstage/integration-react": "1.2.16",
"@backstage/plugin-app": "0.4.2",
"@backstage/plugin-app-visualizer": "0.2.1",
"@backstage/plugin-auth-react": "0.1.25",
"@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-catalog-unprocessed-entities": "0.2.30",
"@backstage/plugin-permission-react": "0.4.41",
"@backstage/plugin-scaffolder": "1.36.1",
"@backstage/plugin-scaffolder-react": "1.20.0",
"@backstage/plugin-search": "1.7.0",
"@backstage/plugin-search-common": "1.2.22",
"@backstage/plugin-search-react": "1.11.0",
"@backstage/plugin-user-settings": "0.9.1",
"@backstage/theme": "0.7.2",
"@backstage/ui": "0.13.2",
"@material-ui/core": "4.12.4",
Expand Down
10 changes: 0 additions & 10 deletions packages/app-next/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
import { createApp } from '@backstage/frontend-defaults';
import appVisualizerPlugin from '@backstage/plugin-app-visualizer';
import catalogPlugin from '@backstage/plugin-catalog/alpha';
import scaffolderPlugin from '@backstage/plugin-scaffolder/alpha';
import searchPlugin from '@backstage/plugin-search/alpha';
import userSettingsPlugin from '@backstage/plugin-user-settings/alpha';
import { dynamicFrontendFeaturesLoader } from '@backstage/frontend-dynamic-feature-loader';

const app = createApp({
features: [
appVisualizerPlugin,
catalogPlugin,
scaffolderPlugin,
searchPlugin,
userSettingsPlugin,
dynamicFrontendFeaturesLoader()
],
});
Expand Down
12 changes: 1 addition & 11 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@
"dependencies": {
"@backstage-community/plugin-rbac-backend": "7.12.5",
"@backstage-community/plugin-rbac-node": "1.20.1",
"@backstage-community/plugin-scaffolder-backend-module-annotator": "2.16.1",
"@backstage/backend-app-api": "1.6.0",
"@backstage/backend-defaults": "0.16.0",
"@backstage/backend-dynamic-feature-service": "0.8.0",
"@backstage/backend-dynamic-feature-service": "patch:@backstage/backend-dynamic-feature-service@npm%3A0.8.0#~/.yarn/patches/@backstage-backend-dynamic-feature-service-npm-0.8.0-92b2319b05.patch",
"@backstage/backend-plugin-api": "1.8.0",
"@backstage/catalog-client": "1.14.0",
"@backstage/catalog-model": "1.7.7",
Expand All @@ -51,19 +50,10 @@
"@backstage/plugin-auth-backend-module-okta-provider": "0.2.13",
"@backstage/plugin-auth-backend-module-onelogin-provider": "0.3.13",
"@backstage/plugin-auth-node": "0.6.14",
"@backstage/plugin-catalog-backend": "3.5.0",
"@backstage/plugin-catalog-backend-module-logs": "0.1.20",
"@backstage/plugin-catalog-backend-module-openapi": "0.2.20",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "0.2.18",
"@backstage/plugin-events-backend": "0.6.0",
"@backstage/plugin-events-node": "0.4.20",
"@backstage/plugin-permission-backend": "0.7.10",
"@backstage/plugin-proxy-backend": "0.6.11",
"@backstage/plugin-scaffolder-backend": "3.3.0",
"@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-user-settings-backend": "0.4.1",
"@internal/plugin-dynamic-plugins-info-backend": "*",
"@internal/plugin-licensed-users-info-backend": "*",
"@internal/plugin-scalprum-backend": "*",
Expand Down
29 changes: 0 additions & 29 deletions packages/backend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import {
pluginIDProviderService,
rbacDynamicPluginsProvider,
} from './modules';
import { userSettingsBackend } from './modules/userSettings';

// Create a logger to cover logging static initialization tasks
const staticLogger = WinstonLogger.create({
Expand Down Expand Up @@ -115,39 +114,13 @@ if (
backend.add(healthCheckPlugin);

backend.add(import('@backstage/plugin-app-backend'));
backend.add(
import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
);

// See https://backstage.io/docs/features/software-catalog/configuration#subscribing-to-catalog-errors
backend.add(import('@backstage/plugin-catalog-backend-module-logs'));

backend.add(import('@backstage/plugin-catalog-backend'));

// TODO: Probably we should now provide this as a dynamic plugin
backend.add(import('@backstage/plugin-catalog-backend-module-openapi'));

backend.add(import('@backstage/plugin-proxy-backend'));

// TODO: Check in the Scaffolder new backend plugin why the identity is not passed and the default is built instead.
backend.add(import('@backstage/plugin-scaffolder-backend'));

// search engine
// See https://backstage.io/docs/features/search/search-engines
backend.add(import('@backstage/plugin-search-backend-module-pg'));

// search collators
backend.add(import('@backstage/plugin-search-backend'));
backend.add(import('@backstage/plugin-search-backend-module-catalog'));

// TODO: We should test it more deeply. The structure is not exactly the same as the old backend implementation
backend.add(import('@backstage/plugin-events-backend'));

backend.add(import('@backstage/plugin-permission-backend'));
backend.add(import('@backstage-community/plugin-rbac-backend'));
backend.add(
import('@backstage-community/plugin-scaffolder-backend-module-annotator'),
);
backend.add(pluginIDProviderService);
backend.add(rbacDynamicPluginsProvider);

Expand All @@ -166,6 +139,4 @@ backend.add(
);
backend.add(import('@internal/plugin-licensed-users-info-backend'));

backend.add(userSettingsBackend);

backend.start();
3 changes: 3 additions & 0 deletions packages/backend/src/modules/userSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
`Invalid config value for 'userSettings.persistence': "${persistence}". Must be either "database" or "browser".`,
);
}
/*
TODO - this whole file needs to be moved to the user-settings-backend dynamic plugin

Check warning on line 20 in packages/backend/src/modules/userSettings.ts

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Complete the task associated to this "TODO" comment.

See more on https://sonarcloud.io/project/issues?id=redhat-developer_rhdh&issues=AZ6X7Nez_ZacooVmF6cP&open=AZ6X7Nez_ZacooVmF6cP&pullRequest=4922
if (persistence === 'database') {
return [import('@backstage/plugin-user-settings-backend')];
}
*/
// Opt-out: browser -> no backend feature
return [];
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/dynamic-plugins-info-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@backstage/backend-defaults": "0.16.0",
"@backstage/backend-dynamic-feature-service": "0.8.0",
"@backstage/backend-dynamic-feature-service": "patch:@backstage/backend-dynamic-feature-service@npm%3A0.8.0#~/.yarn/patches/@backstage-backend-dynamic-feature-service-npm-0.8.0-92b2319b05.patch",
"@backstage/backend-plugin-api": "1.8.0",
"@backstage/config": "1.3.6",
"express": "4.22.2",
Expand Down
2 changes: 1 addition & 1 deletion plugins/scalprum-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"dependencies": {
"@backstage/backend-defaults": "0.16.0",
"@backstage/backend-dynamic-feature-service": "0.8.0",
"@backstage/backend-dynamic-feature-service": "patch:@backstage/backend-dynamic-feature-service@npm%3A0.8.0#~/.yarn/patches/@backstage-backend-dynamic-feature-service-npm-0.8.0-92b2319b05.patch",
"@backstage/backend-plugin-api": "1.8.0",
"@backstage/config": "1.3.6",
"express": "4.22.2",
Expand Down
Loading
Loading