From cecb2113e3ccadd60d95f179db9966e9eab19b60 Mon Sep 17 00:00:00 2001 From: Ben Lambert Date: Wed, 15 Oct 2025 14:14:07 +0200 Subject: [PATCH 1/2] Revert "feat(user-settings): add storage api blueprint for nfs" Signed-off-by: benjdlambert --- plugins/user-settings/report-alpha.api.md | 18 ----------- plugins/user-settings/src/alpha.tsx | 37 ++--------------------- 2 files changed, 3 insertions(+), 52 deletions(-) diff --git a/plugins/user-settings/report-alpha.api.md b/plugins/user-settings/report-alpha.api.md index 04169de4ac..1c8e844d05 100644 --- a/plugins/user-settings/report-alpha.api.md +++ b/plugins/user-settings/report-alpha.api.md @@ -3,11 +3,8 @@ > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). ```ts -import { AnyApiFactory } from '@backstage/frontend-plugin-api'; import { AnyRouteRefParams } from '@backstage/frontend-plugin-api'; -import { ApiFactory } from '@backstage/frontend-plugin-api'; import { ConfigurableExtensionDataRef } from '@backstage/frontend-plugin-api'; -import { ExtensionBlueprintParams } from '@backstage/frontend-plugin-api'; import { ExtensionDataRef } from '@backstage/frontend-plugin-api'; import { ExtensionDefinition } from '@backstage/frontend-plugin-api'; import { ExtensionInput } from '@backstage/frontend-plugin-api'; @@ -24,21 +21,6 @@ const _default: OverridableFrontendPlugin< }, {}, { - 'api:user-settings/storage': ExtensionDefinition<{ - kind: 'api'; - name: 'storage'; - config: {}; - configInput: {}; - output: ExtensionDataRef; - inputs: {}; - params: < - TApi, - TImpl extends TApi, - TDeps extends { [name in string]: unknown }, - >( - params: ApiFactory, - ) => ExtensionBlueprintParams; - }>; 'nav-item:user-settings': ExtensionDefinition<{ kind: 'nav-item'; name: undefined; diff --git a/plugins/user-settings/src/alpha.tsx b/plugins/user-settings/src/alpha.tsx index 060bf4a2b8..e71c61febc 100644 --- a/plugins/user-settings/src/alpha.tsx +++ b/plugins/user-settings/src/alpha.tsx @@ -14,53 +14,22 @@ * limitations under the License. */ import { - ApiBlueprint, coreExtensionData, createExtensionInput, createFrontendPlugin, - discoveryApiRef, - errorApiRef, - fetchApiRef, - identityApiRef, - NavItemBlueprint, PageBlueprint, - storageApiRef, + NavItemBlueprint, } from '@backstage/frontend-plugin-api'; import { - compatWrapper, convertLegacyRouteRef, convertLegacyRouteRefs, + compatWrapper, } from '@backstage/core-compat-api'; import SettingsIcon from '@material-ui/icons/Settings'; import { settingsRouteRef } from './plugin'; -import { UserSettingsStorage } from './apis'; -import { signalApiRef } from '@backstage/plugin-signals-react'; export * from './translation'; -const userSettingsStorageApi = ApiBlueprint.make({ - name: 'storage', - params: defineParams => - defineParams({ - api: storageApiRef, - deps: { - fetchApi: fetchApiRef, - discoveryApi: discoveryApiRef, - errorApi: errorApiRef, - identityApi: identityApiRef, - signalApi: signalApiRef, - }, - factory: ({ fetchApi, discoveryApi, errorApi, identityApi, signalApi }) => - UserSettingsStorage.create({ - fetchApi, - discoveryApi, - errorApi, - identityApi, - signalApi, - }), - }), -}); - const userSettingsPage = PageBlueprint.makeWithOverrides({ inputs: { providerSettings: createExtensionInput([coreExtensionData.reactElement], { @@ -101,7 +70,7 @@ export const settingsNavItem = NavItemBlueprint.make({ export default createFrontendPlugin({ pluginId: 'user-settings', info: { packageJson: () => import('../package.json') }, - extensions: [userSettingsStorageApi, userSettingsPage, settingsNavItem], + extensions: [userSettingsPage, settingsNavItem], routes: convertLegacyRouteRefs({ root: settingsRouteRef, }), From 2b6fda34e309cffcfcbc84b38a2118c2cc812a45 Mon Sep 17 00:00:00 2001 From: benjdlambert Date: Wed, 15 Oct 2025 14:41:18 +0200 Subject: [PATCH 2/2] chore: chagneset Signed-off-by: benjdlambert --- .changeset/solid-dancers-march.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/solid-dancers-march.md diff --git a/.changeset/solid-dancers-march.md b/.changeset/solid-dancers-march.md new file mode 100644 index 0000000000..5633bb3e2e --- /dev/null +++ b/.changeset/solid-dancers-march.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-user-settings': patch +--- + +Revert `storageApiRef` implementation