mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
fix lint, refactor a bit, not sure why it close() doesn't log (close not getting called?)
Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>
This commit is contained in:
parent
30796eccff
commit
b362e9ab44
@ -15,7 +15,7 @@ const createResourceTemplatesInjectable = getInjectable({
|
|||||||
|
|
||||||
instantiate: async (di) => {
|
instantiate: async (di) => {
|
||||||
const lensResourceTemplates = await di.inject(lensCreateResourceTemplatesInjectable);
|
const lensResourceTemplates = await di.inject(lensCreateResourceTemplatesInjectable);
|
||||||
const [ userResourceTemplates, ] = di.inject(userCreateResourceTemplatesInjectable);
|
const [ userResourceTemplates ] = di.inject(userCreateResourceTemplatesInjectable);
|
||||||
|
|
||||||
return computed((): GroupBase<{ label: string; value: string }>[] => {
|
return computed((): GroupBase<{ label: string; value: string }>[] => {
|
||||||
const res = [
|
const res = [
|
||||||
|
|||||||
@ -5,6 +5,7 @@
|
|||||||
import { getInjectable } from "@ogre-tools/injectable";
|
import { getInjectable } from "@ogre-tools/injectable";
|
||||||
import { beforeQuitOfBackEndInjectionToken } from "../../../../main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
|
import { beforeQuitOfBackEndInjectionToken } from "../../../../main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
|
||||||
import userTemplatesInjectable from "./user-templates.injectable";
|
import userTemplatesInjectable from "./user-templates.injectable";
|
||||||
|
import loggerInjectable from "../../../../common/logger.injectable";
|
||||||
|
|
||||||
const stopWatchingUserTemplatesOnQuitInjectable = getInjectable({
|
const stopWatchingUserTemplatesOnQuitInjectable = getInjectable({
|
||||||
id: "stop-watching-user-templates-on-quit",
|
id: "stop-watching-user-templates-on-quit",
|
||||||
@ -14,10 +15,13 @@ const stopWatchingUserTemplatesOnQuitInjectable = getInjectable({
|
|||||||
return {
|
return {
|
||||||
id: "stop-watching-user-templates-on-quit",
|
id: "stop-watching-user-templates-on-quit",
|
||||||
|
|
||||||
run: () => {
|
run: async () => {
|
||||||
const [, disposer] = di.inject(userTemplatesInjectable);
|
const [, watcher] = di.inject(userTemplatesInjectable);
|
||||||
|
const logger = di.inject(loggerInjectable);
|
||||||
|
|
||||||
disposer();
|
logger.info("[USER-CREATE-RESOURCE-TEMPLATES]: stopping watch");
|
||||||
|
|
||||||
|
await watcher?.close();
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|||||||
@ -17,9 +17,8 @@ import homeDirectoryPathInjectable from "../../../../common/os/home-directory-pa
|
|||||||
import getDirnameOfPathInjectable from "../../../../common/path/get-dirname.injectable";
|
import getDirnameOfPathInjectable from "../../../../common/path/get-dirname.injectable";
|
||||||
import loggerInjectable from "../../../../common/logger.injectable";
|
import loggerInjectable from "../../../../common/logger.injectable";
|
||||||
import parsePathInjectable from "../../../../common/path/parse.injectable";
|
import parsePathInjectable from "../../../../common/path/parse.injectable";
|
||||||
import type { Disposer } from "../../../../common/utils";
|
|
||||||
|
|
||||||
export type ResourceTemplates = [IComputedValue<RawTemplates[]>, Disposer];
|
export type ResourceTemplates = [IComputedValue<RawTemplates[]>, Watcher<false>|undefined];
|
||||||
|
|
||||||
const userCreateResourceTemplatesInjectable = getInjectable({
|
const userCreateResourceTemplatesInjectable = getInjectable({
|
||||||
id: "user-create-resource-templates",
|
id: "user-create-resource-templates",
|
||||||
@ -101,7 +100,7 @@ const userCreateResourceTemplatesInjectable = getInjectable({
|
|||||||
},
|
},
|
||||||
ignoreInitial: false,
|
ignoreInitial: false,
|
||||||
atomic: 150, // for "atomic writes"
|
atomic: 150, // for "atomic writes"
|
||||||
})
|
});
|
||||||
|
|
||||||
watcher
|
watcher
|
||||||
.on("add", onAddOrChange)
|
.on("add", onAddOrChange)
|
||||||
@ -112,11 +111,7 @@ const userCreateResourceTemplatesInjectable = getInjectable({
|
|||||||
});
|
});
|
||||||
})();
|
})();
|
||||||
|
|
||||||
return [computed(() => groupTemplates(templates)), () => {
|
return [computed(() => groupTemplates(templates)), watcher];
|
||||||
logger.info("[USER-CREATE-RESOURCE-TEMPLATES]: stopping watch");
|
|
||||||
|
|
||||||
watcher?.close()
|
|
||||||
}];
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user