From 4a182014e193e6badb1b75f5b146d1fbb477ce93 Mon Sep 17 00:00:00 2001
From: Chenlei Hu <huchenlei@proton.me>
Date: Tue, 26 Nov 2024 10:08:19 -0800
Subject: [PATCH] Revert "Fix queue sidebar tab task filter (#1682)" (#1700)

This reverts commit c1c5573e7f538a76d817d2c83854377079ffcd80.
---
 .../sidebar/tabs/QueueSidebarTab.vue          | 44 ++++++++++---------
 src/stores/queueStore.ts                      |  6 ---
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/components/sidebar/tabs/QueueSidebarTab.vue b/src/components/sidebar/tabs/QueueSidebarTab.vue
index 4717cbad0..23b4ba094 100644
--- a/src/components/sidebar/tabs/QueueSidebarTab.vue
+++ b/src/components/sidebar/tabs/QueueSidebarTab.vue
@@ -118,11 +118,7 @@ import OutputFilters from './queue/OutputFilters.vue'
 import ResultGallery from './queue/ResultGallery.vue'
 import SidebarTabTemplate from './SidebarTabTemplate.vue'
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
-import {
-  TaskItemDisplayStatus,
-  TaskItemImpl,
-  useQueueStore
-} from '@/stores/queueStore'
+import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
 import { api } from '@/scripts/api'
 import { ComfyNode } from '@/types/comfyWorkflow'
 import { useSettingStore } from '@/stores/settingStore'
@@ -174,7 +170,9 @@ const allTasks = computed(() =>
     ? folderTask.value
       ? folderTask.value.flatten()
       : []
-    : filterTasks(isExpanded.value ? queueStore.flatTasks : queueStore.tasks)
+    : isExpanded.value
+      ? queueStore.flatTasks
+      : queueStore.tasks
 )
 const allGalleryItems = computed(() =>
   allTasks.value.flatMap((task: TaskItemImpl) => {
@@ -184,24 +182,30 @@ const allGalleryItems = computed(() =>
 )
 
 const filterTasks = (tasks: TaskItemImpl[]) =>
-  tasks.filter((task: TaskItemImpl) => {
-    if (
-      hideCanceled.value &&
-      task.displayStatus === TaskItemDisplayStatus.Cancelled
-    ) {
-      return false
-    }
+  tasks
+    .filter((t) => {
+      if (
+        hideCanceled.value &&
+        t.status?.messages?.at(-1)?.[0] === 'execution_interrupted'
+      ) {
+        return false
+      }
 
-    if (hideCached.value && task.isCached) {
-      return false
-    }
+      if (
+        hideCached.value &&
+        t.flatOutputs?.length &&
+        t.flatOutputs.every((o) => o.cached)
+      ) {
+        return false
+      }
 
-    return true
-  })
+      return true
+    })
+    .slice(0, ITEMS_PER_PAGE)
 
 const loadMoreItems = () => {
   const currentLength = visibleTasks.value.length
-  const newTasks = allTasks.value.slice(
+  const newTasks = filterTasks(allTasks.value).slice(
     currentLength,
     currentLength + ITEMS_PER_PAGE
   )
@@ -236,7 +240,7 @@ useResizeObserver(scrollContainer, () => {
 })
 
 const updateVisibleTasks = () => {
-  visibleTasks.value = allTasks.value
+  visibleTasks.value = filterTasks(allTasks.value)
 }
 
 const toggleExpanded = () => {
diff --git a/src/stores/queueStore.ts b/src/stores/queueStore.ts
index c37c9aa6a..2c7f9240f 100644
--- a/src/stores/queueStore.ts
+++ b/src/stores/queueStore.ts
@@ -265,12 +265,6 @@ export class TaskItemImpl {
     }
   }
 
-  get isCached() {
-    return (
-      this.flatOutputs && _.every(this.flatOutputs, (output) => output.cached)
-    )
-  }
-
   get executionStartTimestamp() {
     const message = this.messages.find(
       (message) => message[0] === 'execution_start'