diff --git a/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.test.ts b/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.test.ts index bdd0e49a8ba..473aedc4821 100644 --- a/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.test.ts +++ b/public/app/features/plugins/extensions/registry/AddedComponentsRegistry.test.ts @@ -452,8 +452,8 @@ describe('AddedComponentsRegistry', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, addedComponents: [] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, addedComponents: [] } }; + setAppPluginMetas({ [pluginId]: app }); registry.register({ pluginId, @@ -505,8 +505,8 @@ describe('AddedComponentsRegistry', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, addedComponents: [] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, addedComponents: [] } }; + setAppPluginMetas({ [pluginId]: app }); registry.register({ pluginId, @@ -535,8 +535,8 @@ describe('AddedComponentsRegistry', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, addedComponents: [componentConfig] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, addedComponents: [componentConfig] } }; + setAppPluginMetas({ [pluginId]: app }); registry.register({ pluginId, diff --git a/public/app/features/plugins/extensions/registry/AddedFunctionsRegistry.test.ts b/public/app/features/plugins/extensions/registry/AddedFunctionsRegistry.test.ts index 2f05570f1b0..19a47c57781 100644 --- a/public/app/features/plugins/extensions/registry/AddedFunctionsRegistry.test.ts +++ b/public/app/features/plugins/extensions/registry/AddedFunctionsRegistry.test.ts @@ -644,8 +644,8 @@ describe('addedFunctionsRegistry', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, addedFunctions: [] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, addedFunctions: [] } }; + setAppPluginMetas({ [pluginId]: app }); registry.register({ pluginId, @@ -697,8 +697,8 @@ describe('addedFunctionsRegistry', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, addedFunctions: [] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, addedFunctions: [] } }; + setAppPluginMetas({ [pluginId]: app }); registry.register({ pluginId, @@ -727,8 +727,8 @@ describe('addedFunctionsRegistry', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, addedFunctions: [fnConfig] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, addedFunctions: [fnConfig] } }; + setAppPluginMetas({ [pluginId]: app }); registry.register({ pluginId, diff --git a/public/app/features/plugins/extensions/registry/AddedLinksRegistry.test.ts b/public/app/features/plugins/extensions/registry/AddedLinksRegistry.test.ts index 62558be0070..ccbe9b56f6c 100644 --- a/public/app/features/plugins/extensions/registry/AddedLinksRegistry.test.ts +++ b/public/app/features/plugins/extensions/registry/AddedLinksRegistry.test.ts @@ -626,8 +626,8 @@ describe('AddedLinksRegistry', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, addedLinks: [] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, addedLinks: [] } }; + setAppPluginMetas({ [pluginId]: app }); registry.register({ pluginId, @@ -681,8 +681,8 @@ describe('AddedLinksRegistry', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, addedLinks: [] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, addedLinks: [] } }; + setAppPluginMetas({ [pluginId]: app }); registry.register({ pluginId, @@ -712,8 +712,8 @@ describe('AddedLinksRegistry', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, addedLinks: [linkConfig] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, addedLinks: [linkConfig] } }; + setAppPluginMetas({ [pluginId]: app }); registry.register({ pluginId, diff --git a/public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.test.ts b/public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.test.ts index 1834fc34de0..ae5d5814bd6 100644 --- a/public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.test.ts +++ b/public/app/features/plugins/extensions/registry/ExposedComponentsRegistry.test.ts @@ -425,8 +425,8 @@ describe('ExposedComponentsRegistry', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, exposedComponents: [] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, exposedComponents: [] } }; + setAppPluginMetas({ [pluginId]: app }); registry.register({ pluginId, @@ -478,8 +478,8 @@ describe('ExposedComponentsRegistry', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, exposedComponents: [] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, exposedComponents: [] } }; + setAppPluginMetas({ [pluginId]: app }); registry.register({ pluginId, @@ -507,8 +507,8 @@ describe('ExposedComponentsRegistry', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, exposedComponents: [componentConfig] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, exposedComponents: [componentConfig] } }; + setAppPluginMetas({ [pluginId]: app }); registry.register({ pluginId, diff --git a/public/app/features/plugins/extensions/usePluginComponents.test.tsx b/public/app/features/plugins/extensions/usePluginComponents.test.tsx index fc0aead9640..44359a5f6a8 100644 --- a/public/app/features/plugins/extensions/usePluginComponents.test.tsx +++ b/public/app/features/plugins/extensions/usePluginComponents.test.tsx @@ -513,8 +513,8 @@ describe('usePluginComponents()', () => { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, addedComponents: [componentConfig] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, addedComponents: [componentConfig] } }; + setAppPluginMetas({ [pluginId]: app }); wrapper = ({ children }: { children: React.ReactNode }) => ( { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, addedFunctions: [functionConfig] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, addedFunctions: [functionConfig] } }; + setAppPluginMetas({ [pluginId]: app }); wrapper = ({ children }: { children: React.ReactNode }) => ( { const meta = getAppPluginMeta(pluginId); expect(meta).toBeDefined(); - const config = { ...meta!, extensions: { ...meta!.extensions, addedLinks: [linkConfig] } }; - setAppPluginMetas({ [pluginId]: config }); + const app = { ...meta!, extensions: { ...meta!.extensions, addedLinks: [linkConfig] } }; + setAppPluginMetas({ [pluginId]: app }); wrapper = ({ children }: { children: React.ReactNode }) => ( { it('should return FALSE if the meta-info in the plugin.json is correct', () => { const log = createLogMock(); - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, addedLinks: [extensionConfig] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isAddedLinkMetaInfoMissing(pluginId, extensionConfig, log); @@ -292,11 +292,11 @@ describe('Plugin Extension Validators', () => { it('should return TRUE and log an error if the link has no meta-info in the plugin.json', () => { const log = createLogMock(); - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, addedLinks: [] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isAddedLinkMetaInfoMissing(pluginId, extensionConfig, log); @@ -309,11 +309,11 @@ describe('Plugin Extension Validators', () => { it('should return TRUE and log an error if the "targets" do not match', () => { const log = createLogMock(); - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, addedLinks: [extensionConfig] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isAddedLinkMetaInfoMissing( pluginId, @@ -333,11 +333,11 @@ describe('Plugin Extension Validators', () => { it('should return FALSE and log a warning if the "description" does not match', () => { const log = createLogMock(); - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, addedLinks: [extensionConfig] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isAddedLinkMetaInfoMissing( pluginId, @@ -359,11 +359,11 @@ describe('Plugin Extension Validators', () => { ...extensionConfig, targets: [PluginExtensionPoints.ExploreToolbarAction], }; - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, addedLinks: [extensionConfig, extensionConfig2] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isAddedLinkMetaInfoMissing(pluginId, extensionConfig2, log); @@ -417,11 +417,11 @@ describe('Plugin Extension Validators', () => { it('should return FALSE if the meta-info in the plugin.json is correct', () => { const log = createLogMock(); - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, addedComponents: [extensionConfig] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isAddedComponentMetaInfoMissing(pluginId, extensionConfig, log); @@ -442,11 +442,11 @@ describe('Plugin Extension Validators', () => { it('should return TRUE and log an error if the Component has no meta-info in the plugin.json', () => { const log = createLogMock(); - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, addedComponents: [] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isAddedComponentMetaInfoMissing(pluginId, extensionConfig, log); @@ -459,11 +459,11 @@ describe('Plugin Extension Validators', () => { it('should return TRUE and log an error if the "targets" do not match', () => { const log = createLogMock(); - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, addedComponents: [extensionConfig] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isAddedComponentMetaInfoMissing( pluginId, @@ -482,11 +482,11 @@ describe('Plugin Extension Validators', () => { it('should return FALSE and log a warning if the "description" does not match', () => { const log = createLogMock(); - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, addedComponents: [extensionConfig] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isAddedComponentMetaInfoMissing( pluginId, @@ -508,11 +508,11 @@ describe('Plugin Extension Validators', () => { ...extensionConfig, targets: [PluginExtensionPoints.ExploreToolbarAction], }; - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, addedComponents: [extensionConfig, extensionConfig2] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isAddedComponentMetaInfoMissing(pluginId, extensionConfig2, log); @@ -566,11 +566,11 @@ describe('Plugin Extension Validators', () => { it('should return FALSE if the meta-info in the plugin.json is correct', () => { const log = createLogMock(); - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, exposedComponents: [exposedComponentConfig] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isExposedComponentMetaInfoMissing(pluginId, exposedComponentConfig, log); @@ -591,11 +591,11 @@ describe('Plugin Extension Validators', () => { it('should return TRUE and log an error if the exposed component has no meta-info in the plugin.json', () => { const log = createLogMock(); - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, exposedComponents: [] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isExposedComponentMetaInfoMissing(pluginId, exposedComponentConfig, log); @@ -608,11 +608,11 @@ describe('Plugin Extension Validators', () => { it('should return TRUE and log an error if the title does not match', () => { const log = createLogMock(); - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, exposedComponents: [exposedComponentConfig] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isExposedComponentMetaInfoMissing( pluginId, @@ -632,11 +632,11 @@ describe('Plugin Extension Validators', () => { it('should return FALSE and log a warning if the "description" does not match', () => { const log = createLogMock(); - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, exposedComponents: [exposedComponentConfig] }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isExposedComponentMetaInfoMissing( pluginId, @@ -658,14 +658,14 @@ describe('Plugin Extension Validators', () => { ...exposedComponentConfig, targets: [PluginExtensionPoints.ExploreToolbarAction], }; - const config = { + const app = { ...appPluginConfig, extensions: { ...appPluginConfig.extensions, exposedComponents: [exposedComponentConfig, exposedComponentConfig2], }, }; - setAppPluginMetas({ [pluginId]: config }); + setAppPluginMetas({ [pluginId]: app }); const returnValue = isExposedComponentMetaInfoMissing(pluginId, exposedComponentConfig2, log);