Fix pod logs dock tab (#4738)

- Move all dependencies into a transient LogsViewModel - Remove dependencies on dockStore.selectedTab - Make all bindings as late as possible, as per mobx rules Signed-off-by: Sebastian Malton <[email protected]>
lensapp · Jan 25, 2022 · b3df5b4 · b3df5b4
1 parent b037c3b
commit b3df5b4
Show file tree

Hide file tree

Showing 42 changed files with 648 additions and 642 deletions.
diff --git a/src/common/utils/collection-functions.ts b/src/common/utils/collection-functions.ts
@@ -25,3 +25,14 @@ export function getOrInsert<K, V>(map: Map<K, V>, key: K, value: V): V {
 export function getOrInsertMap<K, MK, MV>(map: Map<K, Map<MK, MV>>, key: K): Map<MK, MV> {
   return getOrInsert(map, key, new Map<MK, MV>());
 }
+
+/**
+ * Like `getOrInsert` but with delayed creation of the item
+ */
+export function getOrInsertWith<K, V>(map: Map<K, V>, key: K, value: () => V): V {
+  if (!map.has(key)) {
+    map.set(key, value());
+  }
+
+  return map.get(key);
+}
diff --git a/src/extensions/renderer-api/components.ts b/src/extensions/renderer-api/components.ts
@@ -6,7 +6,7 @@ import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-
 import createTerminalTabInjectable from "../../renderer/components/dock/create-terminal-tab/create-terminal-tab.injectable";
 import terminalStoreInjectable from "../../renderer/components/dock/terminal-store/terminal-store.injectable";
 import { asLegacyGlobalObjectForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
-import logTabStoreInjectable from "../../renderer/components/dock/log-tab-store/log-tab-store.injectable";
+import logTabStoreInjectable from "../../renderer/components/dock/logs/tab-store.injectable";
 import { asLegacyGlobalSingletonForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-singleton-for-extension-api";
 import { TerminalStore as TerminalStoreClass } from "../../renderer/components/dock/terminal-store/terminal.store";
 

diff --git a/src/renderer/components/dock/__test__/log-resource-selector.test.tsx b/src/renderer/components/dock/__test__/log-resource-selector.test.tsx
diff --git a/src/renderer/components/dock/dock.tsx b/src/renderer/components/dock/dock.tsx
@@ -18,7 +18,7 @@ import { DockTabs } from "./dock-tabs";
 import { DockStore, DockTab, TabKind } from "./dock-store/dock.store";
 import { EditResource } from "./edit-resource";
 import { InstallChart } from "./install-chart";
-import { Logs } from "./logs";
+import { LogsDockTab } from "./logs/dock-tab";
 import { TerminalWindow } from "./terminal-window";
 import { UpgradeChart } from "./upgrade-chart";
 import { withInjectables } from "@ogre-tools/injectable-react";
@@ -85,7 +85,7 @@ class NonInjectedDock extends React.Component<Props & Dependencies> {
       case TabKind.UPGRADE_CHART:
         return <UpgradeChart tab={tab} />;
       case TabKind.POD_LOGS:
-        return <Logs />;
+        return <LogsDockTab tab={tab} />;
       case TabKind.TERMINAL:
         return <TerminalWindow tab={tab} />;
     }

diff --git a/src/renderer/components/dock/log-store/reloaded-log-store.injectable.ts b/src/renderer/components/dock/log-store/reloaded-log-store.injectable.ts
diff --git a/src/renderer/components/dock/logs.tsx b/src/renderer/components/dock/logs.tsx