From c849ab432b42b984e905b10dccae72e6a8997454 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Tue, 12 Apr 2022 14:38:33 -0400
Subject: [PATCH] fix upgrade-chart/store.ts and dock-tab.store.ts

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../dock/dock-tab-store/dock-tab.store.ts     | 25 ++++++-------------
 .../components/dock/upgrade-chart/store.ts    |  8 +++---
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/renderer/components/dock/dock-tab-store/dock-tab.store.ts b/src/renderer/components/dock/dock-tab-store/dock-tab.store.ts
index f4ac99c6cb..eec8c5a27f 100644
--- a/src/renderer/components/dock/dock-tab-store/dock-tab.store.ts
+++ b/src/renderer/components/dock/dock-tab-store/dock-tab.store.ts
@@ -16,32 +16,21 @@ export interface DockTabStoreOptions {
 
 export type DockTabStorageState<T> = Record<TabId, T>;
 
-interface DockTabStoreDependencies {
+export interface DockTabStoreDependencies {
   createStorage: CreateStorage;
 }
 
 export class DockTabStore<T> {
-  protected storage?: StorageLayer<DockTabStorageState<T>>;
-  private data = observable.map<TabId, T>();
+  protected readonly storage?: StorageLayer<DockTabStorageState<T>>;
+  private readonly data = observable.map<TabId, T>();
 
-  constructor(protected dependencies: DockTabStoreDependencies, protected options: DockTabStoreOptions) {
+  constructor(protected readonly dependencies: DockTabStoreDependencies, protected readonly options: DockTabStoreOptions) {
     autoBind(this);
+    this.options.autoInit ??= true;
 
-    this.options = {
-      autoInit: true,
-      ...this.options,
-    };
+    const { storageKey, autoInit } = this.options;
 
-    if (this.options.autoInit) {
-      this.init();
-    }
-  }
-
-  protected init() {
-    const { storageKey } = this.options;
-
-    // auto-save to local-storage
-    if (storageKey) {
+    if (autoInit && storageKey) {
       const storage = this.storage = this.dependencies.createStorage(storageKey, {});
 
       storage.whenReady.then(() => {
diff --git a/src/renderer/components/dock/upgrade-chart/store.ts b/src/renderer/components/dock/upgrade-chart/store.ts
index 57359a946d..3e699c01b1 100644
--- a/src/renderer/components/dock/upgrade-chart/store.ts
+++ b/src/renderer/components/dock/upgrade-chart/store.ts
@@ -5,10 +5,9 @@
 
 import { action, computed, makeObservable } from "mobx";
 import type { TabId } from "../dock/store";
-import type { DockTabStorageState } from "../dock-tab-store/dock-tab.store";
+import type { DockTabStoreDependencies } from "../dock-tab-store/dock-tab.store";
 import { DockTabStore } from "../dock-tab-store/dock-tab.store";
 import { getReleaseValues } from "../../../../common/k8s-api/endpoints/helm-releases.api";
-import type { StorageHelper } from "../../../utils";
 import assert from "assert";
 
 export interface IChartUpgradeData {
@@ -16,9 +15,8 @@ export interface IChartUpgradeData {
   releaseNamespace: string;
 }
 
-interface Dependencies {
+export interface UpgradeChartTabStoreDependencies extends DockTabStoreDependencies {
   valuesStore: DockTabStore<string>;
-  createStorage: <T>(storageKey: string, options: DockTabStorageState<T>) => StorageHelper<DockTabStorageState<T>>;
 }
 
 export class UpgradeChartTabStore extends DockTabStore<IChartUpgradeData> {
@@ -30,7 +28,7 @@ export class UpgradeChartTabStore extends DockTabStore<IChartUpgradeData> {
     return this.dependencies.valuesStore;
   }
 
-  constructor(protected dependencies : Dependencies) {
+  constructor(protected readonly dependencies: UpgradeChartTabStoreDependencies) {
     super(dependencies, {
       storageKey: "chart_releases",
     });