diff --git a/extensions/support-page/renderer.tsx b/extensions/support-page/renderer.tsx index 2aa318505a..84e7f87f65 100644 --- a/extensions/support-page/renderer.tsx +++ b/extensions/support-page/renderer.tsx @@ -21,15 +21,17 @@ export default class SupportPageRendererExtension extends LensRendererExtension ) } - registerStatusBarIcon(registry: Registry.StatusBarRegistry) { + registerStatusBarItem(registry: Registry.StatusBarRegistry) { this.disposers.push( registry.add({ - icon: ( - Navigation.navigate(supportPageURL())} - /> + > + + Support + ) }) ) diff --git a/src/extensions/extension-loader.ts b/src/extensions/extension-loader.ts index e48dbd4767..0e831af9f8 100644 --- a/src/extensions/extension-loader.ts +++ b/src/extensions/extension-loader.ts @@ -47,7 +47,7 @@ export class ExtensionLoader { instance.registerGlobalPage(globalPageRegistry) instance.registerAppPreferences(appPreferenceRegistry) instance.registerClusterFeatures(clusterFeatureRegistry) - instance.registerStatusBarIcon(statusBarRegistry) + instance.registerStatusBarItem(statusBarRegistry) }) } diff --git a/src/extensions/lens-main-extension.ts b/src/extensions/lens-main-extension.ts index c19184bb84..9ad858d0c6 100644 --- a/src/extensions/lens-main-extension.ts +++ b/src/extensions/lens-main-extension.ts @@ -1,16 +1,11 @@ import { LensExtension } from "./lens-extension" import type { MenuRegistry } from "./registries/menu-registry"; -import type { StatusBarRegistry } from "./registries/status-bar-registry"; export class LensMainExtension extends LensExtension { registerAppMenus(registry: MenuRegistry) { // } - registerStatusBarIcon(registry: StatusBarRegistry) { - // - } - registerPrometheusProviders(registry: any) { // } diff --git a/src/extensions/lens-renderer-extension.ts b/src/extensions/lens-renderer-extension.ts index e7f28ba0aa..4c2e25ebdf 100644 --- a/src/extensions/lens-renderer-extension.ts +++ b/src/extensions/lens-renderer-extension.ts @@ -18,7 +18,7 @@ export class LensRendererExtension extends LensExtension { return } - registerStatusBarIcon(registry: StatusBarRegistry) { + registerStatusBarItem(registry: StatusBarRegistry) { return } diff --git a/src/extensions/registries/status-bar-registry.ts b/src/extensions/registries/status-bar-registry.ts index df1599cd28..88c4132d30 100644 --- a/src/extensions/registries/status-bar-registry.ts +++ b/src/extensions/registries/status-bar-registry.ts @@ -4,7 +4,7 @@ import React from "react"; import { BaseRegistry } from "./base-registry"; export interface StatusBarRegistration { - icon?: React.ReactNode; + item?: React.ReactNode; } export class StatusBarRegistry extends BaseRegistry { diff --git a/src/renderer/components/cluster-manager/bottom-bar.scss b/src/renderer/components/cluster-manager/bottom-bar.scss index 359c123836..021ac7e8d7 100644 --- a/src/renderer/components/cluster-manager/bottom-bar.scss +++ b/src/renderer/components/cluster-manager/bottom-bar.scss @@ -1,13 +1,27 @@ .BottomBar { $spacing: $padding / 2; + --flex-gap: #{$spacing}; font-size: $font-size-small; background-color: #3d90ce; - padding: $padding / 4 $padding; + padding: 0 $padding; color: white; #current-workspace { - --flex-gap: #{$spacing}; + padding: $padding / 4 $padding / 2; cursor: pointer; } + + .hover-highlight { + &:hover { + background-color: #ffffff33; + cursor: pointer; + } + } + + .extensions { + > * { + padding: $padding / 4 $padding / 2; + } + } } diff --git a/src/renderer/components/cluster-manager/bottom-bar.tsx b/src/renderer/components/cluster-manager/bottom-bar.tsx index 1847615c7f..e29ea3bc56 100644 --- a/src/renderer/components/cluster-manager/bottom-bar.tsx +++ b/src/renderer/components/cluster-manager/bottom-bar.tsx @@ -13,7 +13,7 @@ export class BottomBar extends React.Component { const { currentWorkspace } = workspaceStore; return (
-
+
{currentWorkspace.name}
@@ -21,9 +21,9 @@ export class BottomBar extends React.Component { htmlFor="current-workspace" />
- {statusBarRegistry.getItems().map(({ icon }, index) => { - if (!icon) return; - return {icon} + {statusBarRegistry.getItems().map(({ item }, index) => { + if (!item) return; + return {item} })}