From d503873980d894420106e8af14bde1f951ea8646 Mon Sep 17 00:00:00 2001
From: Chenlei Hu <huchenlei@proton.me>
Date: Fri, 17 Jan 2025 17:14:22 -0500
Subject: [PATCH] Move queueStore update from QueueSidebarTab to GraphView
 (#2278)

---
 src/components/sidebar/tabs/QueueSidebarTab.vue | 15 +--------------
 src/views/GraphView.vue                         |  8 ++++----
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/components/sidebar/tabs/QueueSidebarTab.vue b/src/components/sidebar/tabs/QueueSidebarTab.vue
index c1eebe9ca..8e59c06cc 100644
--- a/src/components/sidebar/tabs/QueueSidebarTab.vue
+++ b/src/components/sidebar/tabs/QueueSidebarTab.vue
@@ -99,7 +99,7 @@ import type { MenuItem } from 'primevue/menuitem'
 import ProgressSpinner from 'primevue/progressspinner'
 import { useConfirm } from 'primevue/useconfirm'
 import { useToast } from 'primevue/usetoast'
-import { computed, onMounted, onUnmounted, ref, shallowRef, watch } from 'vue'
+import { computed, ref, shallowRef, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
@@ -194,10 +194,6 @@ const confirmRemoveAll = (event: Event) => {
   })
 }
 
-const onStatus = async () => {
-  await queueStore.update()
-}
-
 const menu = ref(null)
 const menuTargetTask = ref<TaskItemImpl | null>(null)
 const menuTargetNode = ref<ComfyNode | null>(null)
@@ -267,13 +263,4 @@ watch(allTasks, () => {
   const newIndex = galleryActiveIndex.value + lengthChange
   galleryActiveIndex.value = Math.max(0, newIndex)
 })
-
-onMounted(() => {
-  api.addEventListener('status', onStatus)
-  queueStore.update()
-})
-
-onUnmounted(() => {
-  api.removeEventListener('status', onStatus)
-})
 </script>
diff --git a/src/views/GraphView.vue b/src/views/GraphView.vue
index 304977bc3..fadee3662 100644
--- a/src/views/GraphView.vue
+++ b/src/views/GraphView.vue
@@ -55,6 +55,7 @@ const toast = useToast()
 const settingStore = useSettingStore()
 const executionStore = useExecutionStore()
 const colorPaletteStore = useColorPaletteStore()
+const queueStore = useQueueStore()
 
 watch(
   () => colorPaletteStore.completedActivePalette,
@@ -110,9 +111,7 @@ watchEffect(() => {
 })
 
 watchEffect(() => {
-  useQueueStore().maxHistoryItems = settingStore.get(
-    'Comfy.Queue.MaxHistoryItems'
-  )
+  queueStore.maxHistoryItems = settingStore.get('Comfy.Queue.MaxHistoryItems')
 })
 
 const init = () => {
@@ -126,8 +125,9 @@ const init = () => {
 }
 
 const queuePendingTaskCountStore = useQueuePendingTaskCountStore()
-const onStatus = (e: CustomEvent<StatusWsMessageStatus>) => {
+const onStatus = async (e: CustomEvent<StatusWsMessageStatus>) => {
   queuePendingTaskCountStore.update(e)
+  await queueStore.update()
 }
 
 const reconnectingMessage: ToastMessageOptions = {