From dddcedbf2e3a9f143dabe1bc59ee91ae780ef862 Mon Sep 17 00:00:00 2001 From: bnechyporenko Date: Thu, 7 Jul 2022 12:47:47 +0200 Subject: [PATCH] Incorporated the feedback. Signed-off-by: bnechyporenko --- .changeset/fast-walls-carry.md | 4 +- packages/app/package.json | 3 +- .../core-plugin-api/src/plugin/Plugin.tsx | 2 +- plugins/catalog-customized/package.json | 6 +- yarn.lock | 75 +------------------ 5 files changed, 8 insertions(+), 82 deletions(-) diff --git a/.changeset/fast-walls-carry.md b/.changeset/fast-walls-carry.md index edf03a9c60..4126bf3d2d 100644 --- a/.changeset/fast-walls-carry.md +++ b/.changeset/fast-walls-carry.md @@ -1,7 +1,7 @@ --- -'@backstage/core-plugin-api': patch +'@internal/plugin-catalog-customized': patch --- -Introduced an optional metadata for the components, which can contain a configurable data. +Introduced plugin options for the components, to be able to customise existing components. The author of the component might define the configurable places of the component, and the user of this component can reconfigure it if necessary. diff --git a/packages/app/package.json b/packages/app/package.json index 35f3925d54..7a308cc129 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -20,7 +20,6 @@ "@backstage/plugin-azure-devops": "^0.1.23-next.2", "@backstage/plugin-apache-airflow": "^0.2.0-next.2", "@backstage/plugin-badges": "^0.2.31-next.2", - "@backstage/plugin-catalog": "^1.4.0-next.2", "@backstage/plugin-catalog-common": "^1.0.4-next.0", "@backstage/plugin-catalog-graph": "^0.2.19-next.2", "@backstage/plugin-catalog-import": "^0.8.10-next.2", @@ -70,7 +69,7 @@ "@roadiehq/backstage-plugin-github-insights": "^2.0.0", "@roadiehq/backstage-plugin-github-pull-requests": "^2.0.0", "@roadiehq/backstage-plugin-travis-ci": "^2.0.0", - "@internal/plugin-catalog-customized": "1.2.1-next.1", + "@internal/plugin-catalog-customized": "0.0.0", "history": "^5.0.0", "prop-types": "^15.7.2", "react": "^17.0.2", diff --git a/packages/core-plugin-api/src/plugin/Plugin.tsx b/packages/core-plugin-api/src/plugin/Plugin.tsx index 4e042ab0ba..da26cd4db0 100644 --- a/packages/core-plugin-api/src/plugin/Plugin.tsx +++ b/packages/core-plugin-api/src/plugin/Plugin.tsx @@ -41,7 +41,7 @@ export class PluginImpl< >, ) {} - options: {} | undefined = undefined; + private options: {} | undefined = undefined; getId(): string { return this.config.id; diff --git a/plugins/catalog-customized/package.json b/plugins/catalog-customized/package.json index 1e1c2c14b5..b6cc66b3b1 100644 --- a/plugins/catalog-customized/package.json +++ b/plugins/catalog-customized/package.json @@ -1,11 +1,11 @@ { "name": "@internal/plugin-catalog-customized", "description": "The internal Backstage Customizable plugin for browsing the Backstage catalog", - "version": "1.2.1-next.1", + "version": "0.0.0", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", - "private": false, + "private": true, "publishConfig": { "access": "public", "main": "dist/index.esm.js", @@ -35,7 +35,7 @@ }, "dependencies": { "@backstage/plugin-catalog": "1.4.0-next.2", - "@backstage/plugin-catalog-react": "^1.1.2-next.0" + "@backstage/plugin-catalog-react": "^1.1.2-next.2" }, "peerDependencies": { "@types/react": "^16.13.1 || ^17.0.0", diff --git a/yarn.lock b/yarn.lock index 68e9a56a40..fa5d2c0620 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1602,51 +1602,6 @@ zen-observable "^0.8.15" zod "^3.11.6" -"@backstage/core-components@^0.9.6-next.1": - version "0.9.6-next.1" - resolved "https://registry.npmjs.org/@backstage/core-components/-/core-components-0.9.6-next.1.tgz#52fc93339ee9f9adf11833fb6f54a6a2c7f6526e" - integrity sha512-TTNGzypjcDI7xAqSz+d3SLN7W2duHiOAebCiyoi38MHzHeQGjga7feBu0HuxEcXxfn8i6E0j3cdmZIlCIlcUXA== - dependencies: - "@backstage/config" "^1.0.1" - "@backstage/core-plugin-api" "^1.0.3" - "@backstage/errors" "^1.1.0-next.0" - "@backstage/theme" "^0.2.16-next.0" - "@backstage/version-bridge" "^1.0.1" - "@material-table/core" "^3.1.0" - "@material-ui/core" "^4.12.2" - "@material-ui/icons" "^4.9.1" - "@material-ui/lab" "4.0.0-alpha.57" - "@react-hookz/web" "^14.0.0" - "@types/react-sparklines" "^1.7.0" - "@types/react-text-truncate" "^0.14.0" - ansi-regex "^6.0.1" - classnames "^2.2.6" - d3-selection "^3.0.0" - d3-shape "^3.0.0" - d3-zoom "^3.0.0" - dagre "^0.8.5" - history "^5.0.0" - immer "^9.0.1" - lodash "^4.17.21" - pluralize "^8.0.0" - prop-types "^15.7.2" - qs "^6.9.4" - rc-progress "3.3.3" - react-helmet "6.1.0" - react-hook-form "^7.12.2" - react-markdown "^8.0.0" - react-router "6.0.0-beta.0" - react-router-dom "6.0.0-beta.0" - react-sparklines "^1.7.0" - react-syntax-highlighter "^15.4.5" - react-text-truncate "^0.19.0" - react-use "^17.3.2" - react-virtualized-auto-sizer "^1.0.6" - react-window "^1.8.6" - remark-gfm "^3.0.1" - zen-observable "^0.8.15" - zod "^3.11.6" - "@backstage/errors@^1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@backstage/errors/-/errors-1.0.0.tgz#08ebf53afdeaca32362955ea8551e8ffa0bb3cd7" @@ -1722,33 +1677,6 @@ yaml "^1.10.0" zen-observable "^0.8.15" -"@backstage/plugin-catalog@^1.3.1-next.0": - version "1.3.1-next.1" - resolved "https://registry.npmjs.org/@backstage/plugin-catalog/-/plugin-catalog-1.3.1-next.1.tgz#c191a6bc8bbef485a40dffe0a1d0ab9114497be2" - integrity sha512-aPSpX33ZHdok0ruJg5k7BPQd28k4ARjPHwEQCNvAVXLRJHIeU63ZOgsQPQ/iWSutRJE/6seELnZ1a4tWSGYe6Q== - dependencies: - "@backstage/catalog-client" "^1.0.4-next.1" - "@backstage/catalog-model" "^1.1.0-next.1" - "@backstage/core-components" "^0.9.6-next.1" - "@backstage/core-plugin-api" "^1.0.3" - "@backstage/errors" "^1.1.0-next.0" - "@backstage/integration-react" "^1.1.2-next.1" - "@backstage/plugin-catalog-common" "^1.0.4-next.0" - "@backstage/plugin-catalog-react" "^1.1.2-next.1" - "@backstage/plugin-search-common" "^0.3.6-next.0" - "@backstage/plugin-search-react" "^0.2.2-next.1" - "@backstage/theme" "^0.2.16-next.0" - "@backstage/types" "^1.0.0" - "@material-ui/core" "^4.12.2" - "@material-ui/icons" "^4.9.1" - "@material-ui/lab" "4.0.0-alpha.57" - history "^5.0.0" - lodash "^4.17.21" - react-helmet "6.1.0" - react-router "6.0.0-beta.0" - react-use "^17.2.4" - zen-observable "^0.8.15" - "@backstage/plugin-home@^0.4.19", "@backstage/plugin-home@^0.4.22": version "0.4.22" resolved "https://registry.npmjs.org/@backstage/plugin-home/-/plugin-home-0.4.22.tgz#efc54ebffb83a2a36dcd43e65142c30be5d8559d" @@ -12720,7 +12648,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: "@backstage/plugin-api-docs" "^0.8.7-next.2" "@backstage/plugin-azure-devops" "^0.1.23-next.2" "@backstage/plugin-badges" "^0.2.31-next.2" - "@backstage/plugin-catalog" "^1.4.0-next.2" "@backstage/plugin-catalog-common" "^1.0.4-next.0" "@backstage/plugin-catalog-graph" "^0.2.19-next.2" "@backstage/plugin-catalog-import" "^0.8.10-next.2" @@ -12762,7 +12689,7 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: "@backstage/plugin-todo" "^0.2.9-next.2" "@backstage/plugin-user-settings" "^0.4.6-next.2" "@backstage/theme" "^0.2.16-next.1" - "@internal/plugin-catalog-customized" "1.2.1-next.1" + "@internal/plugin-catalog-customized" "0.0.0" "@material-ui/core" "^4.12.2" "@material-ui/icons" "^4.9.1" "@material-ui/lab" "4.0.0-alpha.57"