Fix crash on clean startup (#6276)

* Convert ReleaseChannel into an InitializableState

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix init timing for DefaultUpdateChannel

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Make UserStore loading seperate from creation to fix initialization timing errors

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix overrides of UserStore

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix UserStore tests

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Move userStoreFileMigration call to the init runnable

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Add global override for userStoreFileMigratiom

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/renderer/bootstrap.tsx

@@ -28,7 +28,6 @@ import extensionLoaderInjectable from "../extensions/extension-loader/extension-
 import extensionDiscoveryInjectable from "../extensions/extension-discovery/extension-discovery.injectable";
 import extensionInstallationStateStoreInjectable from "../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 import clusterStoreInjectable from "../common/cluster-store/cluster-store.injectable";
-import userStoreInjectable from "../common/user-store/user-store.injectable";
 import initRootFrameInjectable from "./frames/root-frame/init-root-frame/init-root-frame.injectable";
 import initClusterFrameInjectable from "./frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable";
 import commandOverlayInjectable from "./components/command-palette/command-overlay.injectable";
@@ -92,9 +91,6 @@ export async function bootstrap(di: DiContainer) {
    */
   di.inject(autoRegistrationInjectable);
 
-  // TODO: Remove temporal dependencies to make timing of initialization not important
-  di.inject(userStoreInjectable);
-
   await attachChromeDebugger();
   rootElem.classList.toggle("is-mac", isMac);
 

src/renderer/getDiForUnitTesting.tsx

@@ -66,6 +66,7 @@ import legacyOnChannelListenInjectable from "./ipc/legacy-channel-listen.injecta
 import getEntitySettingCommandsInjectable from "./components/command-palette/registered-commands/get-entity-setting-commands.injectable";
 import storageSaveDelayInjectable from "./utils/create-storage/storage-save-delay.injectable";
 import type { GlobalOverride } from "../common/test-utils/get-global-override";
+import type { PartialDeep } from "type-fest";
 
 export const getDiForUnitTesting = (
   opts: { doGeneralOverrides?: boolean } = {},
@@ -184,17 +185,14 @@ export const getDiForUnitTesting = (
 
     di.override(defaultShellInjectable, () => "some-default-shell");
 
-    di.override(
-      userStoreInjectable,
-      () =>
-        ({
-          isTableColumnHidden: () => false,
-          extensionRegistryUrl: { customUrl: "some-custom-url" },
-          syncKubeconfigEntries: observable.map(),
-          terminalConfig: { fontSize: 42 },
-          editorConfiguration: { minimap: {}, tabSize: 42, fontSize: 42 },
-        } as unknown as UserStore),
-    );
+    di.override(userStoreInjectable, () => ({
+      isTableColumnHidden: () => false,
+      extensionRegistryUrl: { customUrl: "some-custom-url" },
+      syncKubeconfigEntries: observable.map(),
+      terminalConfig: { fontSize: 42 },
+      editorConfiguration: { minimap: {}, tabSize: 42, fontSize: 42 },
+      load: () => {},
+    } as PartialDeep<UserStore> as UserStore));
 
     di.override(apiManagerInjectable, () => new ApiManager());
 

src/renderer/stores/init-user-store.injectable.ts

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import userStoreInjectable from "../../common/user-store/user-store.injectable";
+import { beforeFrameStartsInjectionToken } from "../before-frame-starts/before-frame-starts-injection-token";
+import initDefaultUpdateChannelInjectableInjectable from "../vars/default-update-channel/init.injectable";
+
+const initUserStoreInjectable = getInjectable({
+  id: "init-user-store",
+  instantiate: (di) => {
+    const userStore = di.inject(userStoreInjectable);
+
+    return {
+      run: () => userStore.load(),
+      runAfter: di.inject(initDefaultUpdateChannelInjectableInjectable),
+    };
+  },
+  injectionToken: beforeFrameStartsInjectionToken,
+});
+
+export default initUserStoreInjectable;

src/renderer/vars/default-update-channel/init.injectable.ts

@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import defaultUpdateChannelInjectable from "../../../common/application-update/selected-update-channel/default-update-channel.injectable";
-import initSemanticBuildVersionInjectable from "../../../renderer/vars/semantic-build-version/init.injectable";
 import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token";
+import initReleaseChannelInjectable from "../release-channel/init.injectable";
 
 const initDefaultUpdateChannelInjectableInjectable = getInjectable({
   id: "init-default-update-channel-injectable",
@@ -14,7 +14,7 @@ const initDefaultUpdateChannelInjectableInjectable = getInjectable({
 
     return {
       run: () => defaultUpdateChannel.init(),
-      runAfter: di.inject(initSemanticBuildVersionInjectable),
+      runAfter: di.inject(initReleaseChannelInjectable),
     };
   },
   injectionToken: beforeFrameStartsInjectionToken,

src/renderer/vars/release-channel/init.injectable.ts

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import releaseChannelInjectable from "../../../common/vars/release-channel.injectable";
+import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token";
+import initSemanticBuildVersionInjectable from "../semantic-build-version/init.injectable";
+
+const initReleaseChannelInjectable = getInjectable({
+  id: "init-release-channel",
+  instantiate: (di) => {
+    const releaseChannel = di.inject(releaseChannelInjectable);
+
+    return {
+      run: () => releaseChannel.init(),
+      runAfter: di.inject(initSemanticBuildVersionInjectable),
+    };
+  },
+  injectionToken: beforeFrameStartsInjectionToken,
+});
+
+export default initReleaseChannelInjectable;