From b362e9ab441f1ca1198e50001de405651520e58c Mon Sep 17 00:00:00 2001
From: Jim Ehrismann <jehrismann@mirantis.com>
Date: Wed, 5 Apr 2023 17:14:02 -0400
Subject: [PATCH] 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>
---
 .../create-resource-templates.injectable.ts           |  2 +-
 ...stop-watching-user-templates-on-quit.injectable.ts | 10 +++++++---
 .../dock/create-resource/user-templates.injectable.ts | 11 +++--------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/renderer/components/dock/create-resource/create-resource-templates.injectable.ts b/packages/core/src/renderer/components/dock/create-resource/create-resource-templates.injectable.ts
index 31bd27685b..03f6e5dd60 100644
--- a/packages/core/src/renderer/components/dock/create-resource/create-resource-templates.injectable.ts
+++ b/packages/core/src/renderer/components/dock/create-resource/create-resource-templates.injectable.ts
@@ -15,7 +15,7 @@ const createResourceTemplatesInjectable = getInjectable({
 
   instantiate: async (di) => {
     const lensResourceTemplates = await di.inject(lensCreateResourceTemplatesInjectable);
-    const [ userResourceTemplates, ] = di.inject(userCreateResourceTemplatesInjectable);
+    const [ userResourceTemplates ] = di.inject(userCreateResourceTemplatesInjectable);
 
     return computed((): GroupBase<{ label: string; value: string }>[] => {
       const res = [
diff --git a/packages/core/src/renderer/components/dock/create-resource/stop-watching-user-templates-on-quit.injectable.ts b/packages/core/src/renderer/components/dock/create-resource/stop-watching-user-templates-on-quit.injectable.ts
index ce87e4c5fe..d2f0d93799 100644
--- a/packages/core/src/renderer/components/dock/create-resource/stop-watching-user-templates-on-quit.injectable.ts
+++ b/packages/core/src/renderer/components/dock/create-resource/stop-watching-user-templates-on-quit.injectable.ts
@@ -5,6 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { beforeQuitOfBackEndInjectionToken } from "../../../../main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
 import userTemplatesInjectable from "./user-templates.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";
 
 const stopWatchingUserTemplatesOnQuitInjectable = getInjectable({
   id: "stop-watching-user-templates-on-quit",
@@ -14,10 +15,13 @@ const stopWatchingUserTemplatesOnQuitInjectable = getInjectable({
     return {
       id: "stop-watching-user-templates-on-quit",
 
-      run: () => {
-        const [, disposer] = di.inject(userTemplatesInjectable);
+      run: async () => {
+        const [, watcher] = di.inject(userTemplatesInjectable);
+        const logger = di.inject(loggerInjectable);
 
-        disposer();
+        logger.info("[USER-CREATE-RESOURCE-TEMPLATES]: stopping watch");
+  
+        await watcher?.close();
       },
     };
   },
diff --git a/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts b/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts
index 21b6671fe5..9aa57c96be 100644
--- a/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts
+++ b/packages/core/src/renderer/components/dock/create-resource/user-templates.injectable.ts
@@ -17,9 +17,8 @@ import homeDirectoryPathInjectable from "../../../../common/os/home-directory-pa
 import getDirnameOfPathInjectable from "../../../../common/path/get-dirname.injectable";
 import loggerInjectable from "../../../../common/logger.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({
   id: "user-create-resource-templates",
@@ -101,7 +100,7 @@ const userCreateResourceTemplatesInjectable = getInjectable({
         },
         ignoreInitial: false,
         atomic: 150, // for "atomic writes"
-      })
+      });
 
       watcher
         .on("add", onAddOrChange)
@@ -112,11 +111,7 @@ const userCreateResourceTemplatesInjectable = getInjectable({
         });
     })();
 
-    return [computed(() => groupTemplates(templates)), () => {
-      logger.info("[USER-CREATE-RESOURCE-TEMPLATES]: stopping watch");
-
-      watcher?.close()
-   }];
+    return [computed(() => groupTemplates(templates)), watcher];
   },
 });