From d872e073e30cb665e560c636d44eb9074f3f1400 Mon Sep 17 00:00:00 2001 From: Roman Date: Tue, 27 Oct 2020 11:58:34 +0200 Subject: [PATCH] [extensions]: removed passing `registry` in first argument to register hooks Signed-off-by: Roman --- extensions/example-extension/renderer.tsx | 6 +++--- extensions/metrics-cluster-feature/renderer.tsx | 4 ++-- extensions/node-menu/renderer.tsx | 4 ++-- extensions/pod-menu/renderer.tsx | 4 ++-- extensions/support-page/main.ts | 4 ++-- extensions/support-page/renderer.tsx | 6 +++--- extensions/telemetry/renderer.tsx | 4 ++-- src/extensions/extension-loader.ts | 14 +++++++------- src/extensions/lens-main-extension.ts | 6 +++--- src/extensions/lens-renderer-extension.ts | 14 +++++++------- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/extensions/example-extension/renderer.tsx b/extensions/example-extension/renderer.tsx index 2f1db0dd7a..9418e04c8b 100644 --- a/extensions/example-extension/renderer.tsx +++ b/extensions/example-extension/renderer.tsx @@ -1,5 +1,5 @@ -import { LensRendererExtension, Registry } from "@k8slens/extensions"; -import { ExamplePage, ExampleIcon } from "./page" +import { LensRendererExtension } from "@k8slens/extensions"; +import { ExampleIcon, ExamplePage } from "./page" import React from "react" export default class ExampleExtension extends LensRendererExtension { @@ -7,7 +7,7 @@ export default class ExampleExtension extends LensRendererExtension { console.log('EXAMPLE EXTENSION RENDERER: ACTIVATED', this.getMeta()); } - registerClusterPage(registry: Registry.ClusterPageRegistry) { + registerClusterPage() { return [ { path: "/extension-example", diff --git a/extensions/metrics-cluster-feature/renderer.tsx b/extensions/metrics-cluster-feature/renderer.tsx index 9189ddc77e..500228a01e 100644 --- a/extensions/metrics-cluster-feature/renderer.tsx +++ b/extensions/metrics-cluster-feature/renderer.tsx @@ -1,9 +1,9 @@ -import { Registry, LensRendererExtension } from "@k8slens/extensions" +import { LensRendererExtension } from "@k8slens/extensions" import { MetricsFeature } from "./src/metrics-feature" import React from "react" export default class ClusterMetricsFeatureExtension extends LensRendererExtension { - registerClusterFeatures(registry: Registry.ClusterFeatureRegistry) { + registerClusterFeatures() { return [ { title: "Metrics Stack", diff --git a/extensions/node-menu/renderer.tsx b/extensions/node-menu/renderer.tsx index 8cc8d5f2bc..1b721d946c 100644 --- a/extensions/node-menu/renderer.tsx +++ b/extensions/node-menu/renderer.tsx @@ -1,4 +1,4 @@ -import { Registry, LensRendererExtension } from "@k8slens/extensions"; +import { LensRendererExtension } from "@k8slens/extensions"; import React from "react" import { NodeMenu, NodeMenuProps } from "./src/node-menu" @@ -7,7 +7,7 @@ export default class NodeMenuRendererExtension extends LensRendererExtension { console.log("node-menu extension activated") } - registerKubeObjectMenus(registry: Registry.KubeObjectMenuRegistry) { + registerKubeObjectMenus() { return [ { kind: "Node", diff --git a/extensions/pod-menu/renderer.tsx b/extensions/pod-menu/renderer.tsx index 3e5445b22c..aa5534056a 100644 --- a/extensions/pod-menu/renderer.tsx +++ b/extensions/pod-menu/renderer.tsx @@ -1,4 +1,4 @@ -import { Registry, LensRendererExtension } from "@k8slens/extensions"; +import { LensRendererExtension } from "@k8slens/extensions"; import { PodShellMenu, PodShellMenuProps } from "./src/shell-menu" import { PodLogsMenu, PodLogsMenuProps } from "./src/logs-menu" import React from "react" @@ -8,7 +8,7 @@ export default class PodMenuRendererExtension extends LensRendererExtension { console.log("pod-menu extension activated") } - registerKubeObjectMenus(registry: Registry.KubeObjectMenuRegistry) { + registerKubeObjectMenus() { return [ { kind: "Pod", diff --git a/extensions/support-page/main.ts b/extensions/support-page/main.ts index 875e83d17c..ae4dd24c5e 100644 --- a/extensions/support-page/main.ts +++ b/extensions/support-page/main.ts @@ -1,4 +1,4 @@ -import { LensMainExtension, Registry, windowManager } from "@k8slens/extensions"; +import { LensMainExtension, windowManager } from "@k8slens/extensions"; import { supportPageURL } from "./src/support.route"; export default class SupportPageMainExtension extends LensMainExtension { @@ -6,7 +6,7 @@ export default class SupportPageMainExtension extends LensMainExtension { console.log("support page extension activated") } - registerAppMenus(registry: Registry.MenuRegistry) { + registerAppMenus() { return [ { parentId: "help", diff --git a/extensions/support-page/renderer.tsx b/extensions/support-page/renderer.tsx index c607ef6cdb..dcb9581c8e 100644 --- a/extensions/support-page/renderer.tsx +++ b/extensions/support-page/renderer.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Component, LensRendererExtension, Navigation, Registry } from "@k8slens/extensions"; +import { Component, LensRendererExtension, Navigation } from "@k8slens/extensions"; import { supportPageRoute, supportPageURL } from "./src/support.route"; import { Support } from "./src/support"; @@ -8,7 +8,7 @@ export default class SupportPageRendererExtension extends LensRendererExtension console.log("support page extension activated") } - registerGlobalPages(registry: Registry.GlobalPageRegistry) { + registerGlobalPages() { return [ { ...supportPageRoute, @@ -21,7 +21,7 @@ export default class SupportPageRendererExtension extends LensRendererExtension ] } - registerStatusBarItems(registry: Registry.StatusBarRegistry) { + registerStatusBarItems() { return [ { item: ( diff --git a/extensions/telemetry/renderer.tsx b/extensions/telemetry/renderer.tsx index cbd219e245..549d2e541c 100644 --- a/extensions/telemetry/renderer.tsx +++ b/extensions/telemetry/renderer.tsx @@ -1,4 +1,4 @@ -import { LensRendererExtension, Registry } from "@k8slens/extensions"; +import { LensRendererExtension } from "@k8slens/extensions"; import { telemetryPreferencesStore } from "./src/telemetry-preferences-store" import { TelemetryPreferenceHint, TelemetryPreferenceInput } from "./src/telemetry-preference" import { tracker } from "./src/tracker" @@ -11,7 +11,7 @@ export default class TelemetryRendererExtension extends LensRendererExtension { await telemetryPreferencesStore.loadExtension(this) } - registerAppPreferences(registry: Registry.AppPreferenceRegistry) { + registerAppPreferences() { return [ { title: "Telemetry & Usage Tracking", diff --git a/src/extensions/extension-loader.ts b/src/extensions/extension-loader.ts index 4609a3b355..86f65a008b 100644 --- a/src/extensions/extension-loader.ts +++ b/src/extensions/extension-loader.ts @@ -37,25 +37,25 @@ export class ExtensionLoader { loadOnMain() { logger.info('[EXTENSIONS-LOADER]: load on main') this.autoloadExtensions((extension: LensMainExtension) => { - extension.register(menuRegistry, extension.registerAppMenus(menuRegistry)) + extension.register(menuRegistry, extension.registerAppMenus()) }) } loadOnClusterManagerRenderer() { logger.info('[EXTENSIONS-LOADER]: load on main renderer (cluster manager)') this.autoloadExtensions((extension: LensRendererExtension) => { - extension.register(globalPageRegistry, extension.registerGlobalPages(globalPageRegistry)) - extension.register(appPreferenceRegistry, extension.registerAppPreferences(appPreferenceRegistry)) - extension.register(clusterFeatureRegistry, extension.registerClusterFeatures(clusterFeatureRegistry)) - extension.register(statusBarRegistry, extension.registerStatusBarItems(statusBarRegistry)) + extension.register(globalPageRegistry, extension.registerGlobalPages()) + extension.register(appPreferenceRegistry, extension.registerAppPreferences()) + extension.register(clusterFeatureRegistry, extension.registerClusterFeatures()) + extension.register(statusBarRegistry, extension.registerStatusBarItems()) }) } loadOnClusterRenderer() { logger.info('[EXTENSIONS-LOADER]: load on cluster renderer (dashboard)') this.autoloadExtensions((extension: LensRendererExtension) => { - extension.register(clusterPageRegistry, extension.registerClusterPages(clusterPageRegistry)) - extension.register(kubeObjectMenuRegistry, extension.registerKubeObjectMenus(kubeObjectMenuRegistry)) + extension.register(clusterPageRegistry, extension.registerClusterPages()) + extension.register(kubeObjectMenuRegistry, extension.registerKubeObjectMenus()) }) } diff --git a/src/extensions/lens-main-extension.ts b/src/extensions/lens-main-extension.ts index 45a2c0e8e1..9fda0e9c11 100644 --- a/src/extensions/lens-main-extension.ts +++ b/src/extensions/lens-main-extension.ts @@ -1,12 +1,12 @@ import { LensExtension } from "./lens-extension" -import type { MenuRegistration, MenuRegistry } from "./registries/menu-registry"; +import type { MenuRegistration } from "./registries/menu-registry"; export class LensMainExtension extends LensExtension { - registerAppMenus(registry: MenuRegistry): MenuRegistration[] { + registerAppMenus(): MenuRegistration[] { return [] } - registerPrometheusProviders(registry: any): any[] { + registerPrometheusProviders(): any[] { return [] } } diff --git a/src/extensions/lens-renderer-extension.ts b/src/extensions/lens-renderer-extension.ts index 2134dad696..3ed446f392 100644 --- a/src/extensions/lens-renderer-extension.ts +++ b/src/extensions/lens-renderer-extension.ts @@ -1,28 +1,28 @@ import { LensExtension } from "./lens-extension" -import type { GlobalPageRegistry, ClusterPageRegistry, AppPreferenceRegistry, StatusBarRegistry, KubeObjectMenuRegistry, ClusterFeatureRegistry, PageRegistration, AppPreferenceRegistration, ClusterFeatureRegistration, StatusBarRegistration, KubeObjectMenuRegistration } from "./registries" +import type { AppPreferenceRegistration, ClusterFeatureRegistration, KubeObjectMenuRegistration, PageRegistration, StatusBarRegistration } from "./registries" export class LensRendererExtension extends LensExtension { - registerGlobalPages(registry: GlobalPageRegistry): PageRegistration[] { + registerGlobalPages(): PageRegistration[] { return [] } - registerClusterPages(registry: ClusterPageRegistry): PageRegistration[] { + registerClusterPages(): PageRegistration[] { return [] } - registerAppPreferences(registry: AppPreferenceRegistry): AppPreferenceRegistration[] { + registerAppPreferences(): AppPreferenceRegistration[] { return [] } - registerClusterFeatures(registry: ClusterFeatureRegistry): ClusterFeatureRegistration[] { + registerClusterFeatures(): ClusterFeatureRegistration[] { return [] } - registerStatusBarItems(registry: StatusBarRegistry): StatusBarRegistration[] { + registerStatusBarItems(): StatusBarRegistration[] { return [] } - registerKubeObjectMenus(registry: KubeObjectMenuRegistry): KubeObjectMenuRegistration[] { + registerKubeObjectMenus(): KubeObjectMenuRegistration[] { return [] } }