Complete local transition to InitializableState

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

src/renderer/utils/prevDefault.ts

@@ -17,7 +17,7 @@ import type React from "react";
 //  <Icon onClick={prevDefault(() => console.log('stay on the page and open dialog'))}/>
 // </a>
 
-export function prevDefault<E extends React.SyntheticEvent | Event>(callback: (evt: E) => any) {
+export function prevDefault<E extends React.SyntheticEvent | Event, R>(callback: (evt: E) => R): (event: E) => R {
   return function (evt: E) {
     evt.preventDefault();
     evt.stopPropagation();

src/renderer/vars/build-version/build-version.injectable.ts

@@ -2,16 +2,16 @@
  * 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 { buildVersionInjectionToken } from "../../../common/vars/build-semantic-version.injectable";
-import buildVersionAsyncSyncBoxInjectable from "./state.injectable";
+import { createInitializableState } from "../../../common/initializable-state/create";
+import { requestFromChannelInjectionToken } from "../../../common/utils/channel/request-from-channel-injection-token";
+import { buildVersionChannel, buildVersionInjectionToken } from "../../../common/vars/build-semantic-version.injectable";
 
-const buildVersionInjectable = getInjectable({
+const buildVersionInjectable = createInitializableState({
   id: "build-version",
-  instantiate: (di) => {
-    const buildVersionAsyncSyncBox = di.inject(buildVersionAsyncSyncBoxInjectable);
+  init: (di) => {
+    const requestFromChannel = di.inject(requestFromChannelInjectionToken);
 
-    return buildVersionAsyncSyncBox.get();
+    return requestFromChannel(buildVersionChannel);
   },
   injectionToken: buildVersionInjectionToken,
 });

src/renderer/vars/build-version/init.injectable.ts

@@ -4,18 +4,18 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token";
-import buildVersionAsyncSyncBoxInjectable from "./state.injectable";
+import buildVersionInjectable from "./build-version.injectable";
 
-const initializeBuildVersionAsyncSyncBoxInjectable = getInjectable({
-  id: "initialize-build-version-async-sync-box",
+const initializeBuildVersionInjectable = getInjectable({
+  id: "initialize-build-version",
   instantiate: (di) => {
-    const buildVersionAsyncSyncBox = di.inject(buildVersionAsyncSyncBoxInjectable);
+    const buildVersion = di.inject(buildVersionInjectable);
 
     return {
-      run: () => buildVersionAsyncSyncBox.init(),
+      run: () => buildVersion.init(),
     };
   },
   injectionToken: beforeFrameStartsInjectionToken,
 });
 
-export default initializeBuildVersionAsyncSyncBoxInjectable;
+export default initializeBuildVersionInjectable;

src/renderer/vars/build-version/state.injectable.ts

@@ -1,19 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { createInitializableState } from "../../../common/initializable-state/create";
-import { requestFromChannelInjectionToken } from "../../../common/utils/channel/request-from-channel-injection-token";
-import { buildVersionChannel } from "../../../common/vars/build-semantic-version.injectable";
-
-const buildVersionAsyncSyncBoxInjectable = createInitializableState({
-  id: "build-version",
-  init: (di) => {
-    const requestFromChannel = di.inject(requestFromChannelInjectionToken);
-
-    return requestFromChannel(buildVersionChannel);
-  },
-});
-
-export default buildVersionAsyncSyncBoxInjectable;

src/renderer/vars/default-update-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 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";
+
+const initDefaultUpdateChannelInjectableInjectable = getInjectable({
+  id: "init-default-update-channel-injectable",
+  instantiate: (di) => {
+    const defaultUpdateChannel = di.inject(defaultUpdateChannelInjectable);
+
+    return {
+      run: () => defaultUpdateChannel.init(),
+      runAfter: di.inject(initSemanticBuildVersionInjectable),
+    };
+  },
+  injectionToken: beforeFrameStartsInjectionToken,
+});
+
+export default initDefaultUpdateChannelInjectableInjectable;

src/renderer/vars/semantic-build-version/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 buildSemanticVersionInjectable from "../../../common/vars/build-semantic-version.injectable";
+import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token";
+import initializeBuildVersionInjectable from "../build-version/init.injectable";
+
+const initSemanticBuildVersionInjectable = getInjectable({
+  id: "init-semantic-build-version",
+  instantiate: (di) => {
+    const buildSemanticVersion = di.inject(buildSemanticVersionInjectable);
+
+    return {
+      run: () => buildSemanticVersion.init(),
+      runAfter: di.inject(initializeBuildVersionInjectable),
+    };
+  },
+  injectionToken: beforeFrameStartsInjectionToken,
+});
+
+export default initSemanticBuildVersionInjectable;