queueSlice cleaned up

Author: Attila Cseh

invokeai/frontend/web/src/features/queue/hooks/useClearQueue.ts

@@ -1,6 +1,4 @@
 import { useStore } from '@nanostores/react';
-import { useAppDispatch } from 'app/store/storeHooks';
-import { listCursorChanged, listPriorityChanged } from 'features/queue/store/queueSlice';
 import { toast } from 'features/toast/toast';
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -9,7 +7,6 @@ import { $isConnected } from 'services/events/stores';
 
 export const useClearQueue = () => {
   const { t } = useTranslation();
-  const dispatch = useAppDispatch();
   const { data: queueStatus } = useGetQueueStatusQuery();
   const isConnected = useStore($isConnected);
   const [_trigger, { isLoading }] = useClearQueueMutation({
@@ -28,16 +25,14 @@ export const useClearQueue = () => {
         title: t('queue.clearSucceeded'),
         status: 'success',
       });
-      dispatch(listCursorChanged(undefined));
-      dispatch(listPriorityChanged(undefined));
     } catch {
       toast({
         id: 'QUEUE_CLEAR_FAILED',
         title: t('queue.clearFailed'),
         status: 'error',
       });
     }
-  }, [queueStatus?.queue.total, _trigger, dispatch, t]);
+  }, [queueStatus?.queue.total, _trigger, t]);
 
   return { trigger, isLoading, isDisabled: !isConnected || !queueStatus?.queue.total };
 };

invokeai/frontend/web/src/features/queue/hooks/usePruneQueue.ts

@@ -1,14 +1,11 @@
 import { useStore } from '@nanostores/react';
-import { useAppDispatch } from 'app/store/storeHooks';
-import { listCursorChanged, listPriorityChanged } from 'features/queue/store/queueSlice';
 import { toast } from 'features/toast/toast';
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useGetQueueStatusQuery, usePruneQueueMutation } from 'services/api/endpoints/queue';
 import { $isConnected } from 'services/events/stores';
 
 export const usePruneQueue = () => {
-  const dispatch = useAppDispatch();
   const { t } = useTranslation();
   const isConnected = useStore($isConnected);
   const finishedCount = useFinishedCount();
@@ -24,16 +21,14 @@ export const usePruneQueue = () => {
         title: t('queue.pruneSucceeded', { item_count: data.deleted }),
         status: 'success',
       });
-      dispatch(listCursorChanged(undefined));
-      dispatch(listPriorityChanged(undefined));
     } catch {
       toast({
         id: 'PRUNE_FAILED',
         title: t('queue.pruneFailed'),
         status: 'error',
       });
     }
-  }, [_trigger, dispatch, t]);
+  }, [_trigger, t]);
 
   return { trigger, isLoading, isDisabled: !isConnected || !finishedCount };
 };

invokeai/frontend/web/src/features/queue/store/queueSlice.ts

@@ -10,38 +10,20 @@ const zSortBy = z.enum(['created_at', 'completed_at']);
 export type SortBy = z.infer<typeof zSortBy>;
 
 const zQueueState = z.object({
-  listCursor: z.number().optional(),
-  listPriority: z.number().optional(),
-  selectedQueueItem: z.string().optional(),
   sortBy: zSortBy,
   sortOrder: zSQLiteDirection,
-  resumeProcessorOnEnqueue: z.boolean(),
 });
 type QueueState = z.infer<typeof zQueueState>;
 
 const getInitialState = (): QueueState => ({
-  listCursor: undefined,
-  listPriority: undefined,
-  selectedQueueItem: undefined,
   sortBy: 'created_at',
   sortOrder: 'DESC',
-  resumeProcessorOnEnqueue: true,
 });
 
 const slice = createSlice({
   name: 'queue',
   initialState: getInitialState(),
   reducers: {
-    listCursorChanged: (state, action: PayloadAction<number | undefined>) => {
-      state.listCursor = action.payload;
-    },
-    listPriorityChanged: (state, action: PayloadAction<number | undefined>) => {
-      state.listPriority = action.payload;
-    },
-    listParamsReset: (state) => {
-      state.listCursor = undefined;
-      state.listPriority = undefined;
-    },
     sortByChanged: (state, action: PayloadAction<SortBy>) => {
       state.sortBy = action.payload;
     },
@@ -51,7 +33,7 @@ const slice = createSlice({
   },
 });
 
-export const { listCursorChanged, listPriorityChanged, sortByChanged, sortOrderChanged } = slice.actions;
+export const { sortByChanged, sortOrderChanged } = slice.actions;
 
 export const queueSliceConfig: SliceConfig<typeof slice> = {
   slice,