From 59c03d2de54bb44ef05f800441561fb0506ad4ee Mon Sep 17 00:00:00 2001
From: Chenlei Hu <huchenlei@proton.me>
Date: Wed, 23 Oct 2024 18:04:49 +0200
Subject: [PATCH] [Refactor] Rename ModelStore to ModelFolder (#1244)

* Refactor click

* Rename ModelStore to ModelFolder
---
 .../sidebar/tabs/ModelLibrarySidebarTab.vue        | 14 ++------------
 src/stores/modelStore.ts                           | 11 +++++------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
index 2c0d4069a..9d7231fd4 100644
--- a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
+++ b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
@@ -15,7 +15,6 @@
         class="model-lib-tree-explorer py-0"
         :roots="renderedRoot.children"
         v-model:expandedKeys="expandedKeys"
-        @nodeClick="handleNodeClick"
       >
         <template #node="{ node }">
           <ModelTreeLeaf :node="node" />
@@ -162,6 +161,8 @@ const renderedRoot = computed<TreeExplorerNode<ComfyModelDef>>(() => {
               widget.value = model.file_name
             }
           }
+        } else {
+          toggleNodeOnEvent(e, node)
         }
       }
     }
@@ -169,17 +170,6 @@ const renderedRoot = computed<TreeExplorerNode<ComfyModelDef>>(() => {
   return fillNodeInfo(root.value)
 })
 
-const handleNodeClick = (
-  node: RenderedTreeExplorerNode<ComfyModelDef>,
-  e: MouseEvent
-) => {
-  if (node.leaf) {
-    // TODO
-  } else {
-    toggleNodeOnEvent(e, node)
-  }
-}
-
 watch(
   toRef(expandedKeys, 'value'),
   (newExpandedKeys) => {
diff --git a/src/stores/modelStore.ts b/src/stores/modelStore.ts
index 514e7abe1..d19097c99 100644
--- a/src/stores/modelStore.ts
+++ b/src/stores/modelStore.ts
@@ -139,8 +139,7 @@ export class ComfyModelDef {
   }
 }
 
-/** Model store for a folder */
-export class ModelStore {
+export class ModelFolder {
   models: Record<string, ComfyModelDef> = {}
 
   constructor(directory: string, models: string[]) {
@@ -161,12 +160,12 @@ const folderBlacklist = ['configs', 'custom_nodes']
 /** Model store handler, wraps individual per-folder model stores */
 export const useModelStore = defineStore('modelStore', {
   state: () => ({
-    modelStoreMap: {} as Record<string, ModelStore | null>,
-    isLoading: {} as Record<string, Promise<ModelStore | null> | null>,
+    modelStoreMap: {} as Record<string, ModelFolder | null>,
+    isLoading: {} as Record<string, Promise<ModelFolder | null> | null>,
     modelFolders: [] as string[]
   }),
   actions: {
-    async getModelsInFolderCached(folder: string): Promise<ModelStore | null> {
+    async getModelsInFolderCached(folder: string): Promise<ModelFolder | null> {
       if (folder in this.modelStoreMap) {
         return this.modelStoreMap[folder]
       }
@@ -177,7 +176,7 @@ export const useModelStore = defineStore('modelStore', {
         if (!models) {
           return null
         }
-        const store = new ModelStore(folder, models)
+        const store = new ModelFolder(folder, models)
         this.modelStoreMap[folder] = store
         this.isLoading[folder] = null
         return store