From 2217b681e9fe8b297ce4172bb32cbb54c1f7466c Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 6 Dec 2022 17:52:52 -0500 Subject: [PATCH] Fix type error Signed-off-by: Sebastian Malton --- src/common/user-store/kubeconfig-syncs.injectable.ts | 6 +----- src/common/user-store/preference-descriptors.injectable.ts | 6 ++++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/common/user-store/kubeconfig-syncs.injectable.ts b/src/common/user-store/kubeconfig-syncs.injectable.ts index bbe02fffad..7327b9d8e4 100644 --- a/src/common/user-store/kubeconfig-syncs.injectable.ts +++ b/src/common/user-store/kubeconfig-syncs.injectable.ts @@ -7,11 +7,7 @@ import userStoreInjectable from "./user-store.injectable"; const kubeconfigSyncsInjectable = getInjectable({ id: "kubeconfig-syncs", - instantiate: (di) => { - const store = di.inject(userStoreInjectable); - - return store.syncKubeconfigEntries; - }, + instantiate: (di) => di.inject(userStoreInjectable).syncKubeconfigEntries, }); export default kubeconfigSyncsInjectable; diff --git a/src/common/user-store/preference-descriptors.injectable.ts b/src/common/user-store/preference-descriptors.injectable.ts index 865728e675..35815dbbea 100644 --- a/src/common/user-store/preference-descriptors.injectable.ts +++ b/src/common/user-store/preference-descriptors.injectable.ts @@ -4,6 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { merge } from "lodash"; +import type { ObservableMap } from "mobx"; +import { observable } from "mobx"; import homeDirectoryPathInjectable from "../os/home-directory-path.injectable"; import joinPathsInjectable from "../path/join-paths.injectable"; import { defaultThemeId } from "../vars"; @@ -109,8 +111,8 @@ const userStorePreferenceDescriptorsInjectable = getInjectable({ return res.length ? res : undefined; }, }), - syncKubeconfigEntries: getPreferenceDescriptor>({ - fromStore: val => new Map( + syncKubeconfigEntries: getPreferenceDescriptor>({ + fromStore: val => observable.map( val?.map(({ filePath, ...rest }) => [filePath, rest]) ?? [[mainKubeFolderPath, {}]], ),