From cba15f601576a2bb58fe2366f7f3adeb240ae24c Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Thu, 13 Oct 2022 10:12:42 +0300
Subject: [PATCH] Rename id -> origin because it is not unique

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 .../status-bar/status-bar-item-injection-token.ts           | 2 +-
 .../status-bar/status-bar-item-registrator.injectable.tsx   | 2 +-
 .../components/status-bar/status-bar-items.injectable.tsx   | 6 +++---
 src/renderer/components/status-bar/status-bar.test.tsx      | 2 +-
 src/renderer/components/status-bar/status-bar.tsx           | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/renderer/components/status-bar/status-bar-item-injection-token.ts b/src/renderer/components/status-bar/status-bar-item-injection-token.ts
index 78b3861a06..c2c4ecb289 100644
--- a/src/renderer/components/status-bar/status-bar-item-injection-token.ts
+++ b/src/renderer/components/status-bar/status-bar-item-injection-token.ts
@@ -7,7 +7,7 @@ import type { IComputedValue } from "mobx";
 import type React from "react";
 
 export interface StatusBarItem {
-  id?: string;
+  origin?: string;
   component: React.ComponentType<any>;
   position: "left" | "right";
   visible: IComputedValue<boolean>;
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 373e8df30e..ed909a8284 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
@@ -74,7 +74,7 @@ const toItemInjectableFor = (extension: LensRendererExtension, getRandomId: () =
       id,
 
       instantiate: () => ({
-        id: extension.sanitizedExtensionId,
+        origin: extension.sanitizedExtensionId,
         component,
         position,
         visible: visible ?? computed(() => true),
diff --git a/src/renderer/components/status-bar/status-bar-items.injectable.tsx b/src/renderer/components/status-bar/status-bar-items.injectable.tsx
index 2f80baad86..2b5be6fdb3 100644
--- a/src/renderer/components/status-bar/status-bar-items.injectable.tsx
+++ b/src/renderer/components/status-bar/status-bar-items.injectable.tsx
@@ -11,7 +11,7 @@ import { statusBarItemInjectionToken } from "./status-bar-item-injection-token";
 import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
 
 interface StatusItem {
-  id?: string;
+  origin?: string;
   component: React.ComponentType<StatusBarItemProps>;
 }
 
@@ -32,14 +32,14 @@ function getStatusBarItems({ registrations }: Dependencies): IComputedValue<Stat
     };
 
     for (const registration of registrations.get()) {
-      const { position = "right", component, visible, id } = registration;
+      const { position = "right", component, visible, origin } = registration;
 
       if (!visible.get()) {
         continue;
       }
 
       res[position].push({
-        id,
+        origin,
         component,
       });
     }
diff --git a/src/renderer/components/status-bar/status-bar.test.tsx b/src/renderer/components/status-bar/status-bar.test.tsx
index 0a3eca2ef5..82ce2e2852 100644
--- a/src/renderer/components/status-bar/status-bar.test.tsx
+++ b/src/renderer/components/status-bar/status-bar.test.tsx
@@ -65,7 +65,7 @@ describe("<StatusBar />", () => {
 
     builder.beforeWindowStart((windowDi) => {
       windowDi.override(statusBarItemsInjectable, () => computed(() => ({
-        right: [ { id: testId, component: () => <span data-testid={testId} >{text}</span> }],
+        right: [ { origin: testId, component: () => <span data-testid={testId} >{text}</span> }],
         left: [],
       }) as StatusBarItems));
     });
diff --git a/src/renderer/components/status-bar/status-bar.tsx b/src/renderer/components/status-bar/status-bar.tsx
index 5abe444a4e..dabad3bf17 100644
--- a/src/renderer/components/status-bar/status-bar.tsx
+++ b/src/renderer/components/status-bar/status-bar.tsx
@@ -28,7 +28,7 @@ const NonInjectedStatusBar = observer(({ items }: Dependencies & StatusBarProps)
           <div
             className={styles.item}
             key={index}
-            data-origin={Item.id}>
+            data-origin={Item.origin}>
             {<Item.component/>}
           </div>
         ))}
@@ -38,7 +38,7 @@ const NonInjectedStatusBar = observer(({ items }: Dependencies & StatusBarProps)
           <div
             className={styles.item}
             key={index}
-            data-origin={Item.id}>
+            data-origin={Item.origin}>
             {<Item.component/>}
           </div>
         ))}