From b469ab54252b8a153170022b46d378c36a662274 Mon Sep 17 00:00:00 2001
From: Panu Horsmalahti <phorsmalahti@mirantis.com>
Date: Wed, 7 Sep 2022 13:09:14 +0300
Subject: [PATCH] Move visible to StatusBarRegistration

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>
---
 ...atus-bar-items-originating-from-extensions.test.tsx |  2 +-
 .../status-bar-item-registrator.injectable.tsx         |  5 ++---
 .../components/status-bar/status-bar-registration.ts   | 10 +++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/features/status-bar/status-bar-items-originating-from-extensions.test.tsx b/src/features/status-bar/status-bar-items-originating-from-extensions.test.tsx
index 79ac4ab1b9..a23ffa2dd1 100644
--- a/src/features/status-bar/status-bar-items-originating-from-extensions.test.tsx
+++ b/src/features/status-bar/status-bar-items-originating-from-extensions.test.tsx
@@ -100,8 +100,8 @@ describe("status-bar-items-originating-from-extensions", () => {
                 components: {
                   Item: () => <div data-testid="some-testId">right4</div>,
                   position: "right" as const,
-                  visible: computed(() => false),
                 },
+                visible: computed(() => false),
               },
               {
                 components: {
diff --git a/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx b/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx
index 1e3d0cc5f5..71293126f7 100644
--- a/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx
+++ b/src/renderer/components/status-bar/status-bar-item-registrator.injectable.tsx
@@ -39,7 +39,7 @@ const toItemInjectableFor = (extension: LensRendererExtension, getRandomId: () =
     const id = `${getRandomId()}-status-bar-item-for-extension-${extension.sanitizedExtensionId}`;
     let component: React.ComponentType;
     let position: "left" | "right";
-    let visible: IComputedValue<boolean> | undefined;
+    const visible: IComputedValue<boolean> | undefined = registration?.visible;
 
     if (registration?.item) {
       const { item } = registration;
@@ -56,7 +56,7 @@ const toItemInjectableFor = (extension: LensRendererExtension, getRandomId: () =
           </>
         );
     } else if (registration?.components) {
-      const { position: pos = "right", Item, visible: componentVisible } = registration.components;
+      const { position: pos = "right", Item } = registration.components;
 
       if (pos !== "left" && pos !== "right") {
         throw new TypeError("StatusBarRegistration.components.position must be either 'right' or 'left'");
@@ -64,7 +64,6 @@ const toItemInjectableFor = (extension: LensRendererExtension, getRandomId: () =
 
       position = pos;
       component = Item;
-      visible = componentVisible;
     } else {
       logger.warn("StatusBarRegistration must have valid item or components field");
 
diff --git a/src/renderer/components/status-bar/status-bar-registration.ts b/src/renderer/components/status-bar/status-bar-registration.ts
index 879d53a972..32e7c9c88e 100644
--- a/src/renderer/components/status-bar/status-bar-registration.ts
+++ b/src/renderer/components/status-bar/status-bar-registration.ts
@@ -25,11 +25,6 @@ export interface StatusBarComponents {
    * @default "right"
    */
   position?: "left" | "right";
-
-  /**
-   * If specified, controls item visibility
-   */
-  visible?: IComputedValue<boolean>;
 }
 
 /**
@@ -45,4 +40,9 @@ export interface StatusBarRegistration {
    * The newer API, allows for registering a component instead of a ReactNode
    */
   components?: StatusBarComponents;
+
+  /**
+   * If specified, controls item visibility
+   */
+  visible?: IComputedValue<boolean>;
 }