slices merged

Author: Attila Cseh

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelSelected.ts

@@ -4,7 +4,7 @@ import { modelChanged } from 'features/controlLayers/store/actions';
 import { bboxSyncedToOptimalDimension, rgRefImageModelChanged } from 'features/controlLayers/store/canvasSlice';
 import {
   buildSelectIsStagingBySessionId,
-  selectActiveCanvasSessionId,
+  selectActiveCanvasStagingAreaSessionId,
 } from 'features/controlLayers/store/canvasStagingAreaSlice';
 import { loraIsEnabledChanged } from 'features/controlLayers/store/lorasSlice';
 import {
@@ -170,7 +170,7 @@ export const addModelSelectedListener = (startAppListening: AppStartListening) =
       if (modelBase !== params.model?.base) {
         // Sync generate tab settings whenever the model base changes
         paramsDispatch(api, syncedToOptimalDimension);
-        const sessionId = selectActiveCanvasSessionId(state);
+        const sessionId = selectActiveCanvasStagingAreaSessionId(state);
         const selectIsStaging = buildSelectIsStagingBySessionId(sessionId);
         const isStaging = selectIsStaging(state);
         if (!isStaging) {

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/setDefaultSettings.ts

@@ -3,7 +3,7 @@ import { isNil } from 'es-toolkit';
 import { bboxHeightChanged, bboxWidthChanged } from 'features/controlLayers/store/canvasSlice';
 import {
   buildSelectIsStagingBySessionId,
-  selectActiveCanvasSessionId,
+  selectActiveCanvasStagingAreaSessionId,
 } from 'features/controlLayers/store/canvasStagingAreaSlice';
 import {
   heightChanged,
@@ -121,7 +121,7 @@ export const addSetDefaultSettingsListener = (startAppListening: AppStartListeni
         }
         const setSizeOptions = { updateAspectRatio: true, clamp: true };
 
-        const sessionId = selectActiveCanvasSessionId(state);
+        const sessionId = selectActiveCanvasStagingAreaSessionId(state);
         const selectIsStaging = buildSelectIsStagingBySessionId(sessionId);
         const isStaging = selectIsStaging(state);
 

invokeai/frontend/web/src/app/store/store.ts

@@ -21,16 +21,9 @@ import { deepClone } from 'common/util/deepClone';
 import { merge } from 'es-toolkit';
 import { omit, pick } from 'es-toolkit/compat';
 import { changeBoardModalSliceConfig } from 'features/changeBoardModal/store/slice';
-import { canvasSettingsReducer, canvasSettingsSliceConfig } from 'features/controlLayers/store/canvasSettingsSlice';
-import {
-  canvasSliceConfig,
-  initializeCanvasDependencies,
-  migrateCanvas,
-  undoableCanvasesReducer,
-} from 'features/controlLayers/store/canvasSlice';
-import { canvasSessionReducer, canvasSessionSliceConfig } from 'features/controlLayers/store/canvasStagingAreaSlice';
+import { canvasSliceConfig } from 'features/controlLayers/store/canvasSlice';
 import { lorasSliceConfig } from 'features/controlLayers/store/lorasSlice';
-import { paramsSliceConfig, paramsSliceReducer } from 'features/controlLayers/store/paramsSlice';
+import { paramsSliceConfig } from 'features/controlLayers/store/paramsSlice';
 import { refImagesSliceConfig } from 'features/controlLayers/store/refImagesSlice';
 import { dynamicPromptsSliceConfig } from 'features/dynamicPrompts/store/dynamicPromptsSlice';
 import { gallerySliceConfig } from 'features/gallery/store/gallerySlice';
@@ -67,8 +60,6 @@ const log = logger('system');
 
 // When adding a slice, add the config to the SLICE_CONFIGS object below, then add the reducer to ALL_REDUCERS.
 const SLICE_CONFIGS = {
-  [canvasSessionSliceConfig.slice.reducerPath]: canvasSessionSliceConfig,
-  [canvasSettingsSliceConfig.slice.reducerPath]: canvasSettingsSliceConfig,
   [canvasSliceConfig.slice.reducerPath]: canvasSliceConfig,
   [changeBoardModalSliceConfig.slice.reducerPath]: changeBoardModalSliceConfig,
   [configSliceConfig.slice.reducerPath]: configSliceConfig,
@@ -93,17 +84,15 @@ const SLICE_CONFIGS = {
 // Remember to wrap undoable reducers in `undoable()`!
 const ALL_REDUCERS = {
   [api.reducerPath]: api.reducer,
-  [canvasSessionSliceConfig.slice.reducerPath]: canvasSessionReducer,
-  [canvasSettingsSliceConfig.slice.reducerPath]: canvasSettingsReducer,
-  [canvasSliceConfig.slice.reducerPath]: undoableCanvasesReducer,
+  [canvasSliceConfig.slice.reducerPath]: canvasSliceConfig.slice.reducer,
   [changeBoardModalSliceConfig.slice.reducerPath]: changeBoardModalSliceConfig.slice.reducer,
   [configSliceConfig.slice.reducerPath]: configSliceConfig.slice.reducer,
   [dynamicPromptsSliceConfig.slice.reducerPath]: dynamicPromptsSliceConfig.slice.reducer,
   [gallerySliceConfig.slice.reducerPath]: gallerySliceConfig.slice.reducer,
   [lorasSliceConfig.slice.reducerPath]: lorasSliceConfig.slice.reducer,
   [modelManagerSliceConfig.slice.reducerPath]: modelManagerSliceConfig.slice.reducer,
   [nodesSliceConfig.slice.reducerPath]: undoableNodesSliceReducer,
-  [paramsSliceConfig.slice.reducerPath]: paramsSliceReducer,
+  [paramsSliceConfig.slice.reducerPath]: paramsSliceConfig.slice.reducer,
   [queueSliceConfig.slice.reducerPath]: queueSliceConfig.slice.reducer,
   [refImagesSliceConfig.slice.reducerPath]: refImagesSliceConfig.slice.reducer,
   [stylePresetSliceConfig.slice.reducerPath]: stylePresetSliceConfig.slice.reducer,
@@ -224,10 +213,8 @@ export const createStore = (options?: { persist?: boolean; persistDebounce?: num
   // Once-off listener to support waiting for rehydration before rendering the app
   startAppListening({
     actionCreator: createAction(REMEMBER_REHYDRATED),
-    effect: (action, { dispatch, unsubscribe }) => {
+    effect: (action, { unsubscribe }) => {
       unsubscribe();
-      dispatch(migrateCanvas());
-      dispatch(initializeCanvasDependencies());
       options?.onRehydrated?.();
     },
   });

invokeai/frontend/web/src/features/controlLayers/components/Settings/CanvasSettingsClipToBboxCheckbox.tsx

@@ -10,7 +10,7 @@ export const CanvasSettingsClipToBboxCheckbox = memo(() => {
   const dispatch = useAppDispatch();
   const clipToBbox = useAppSelector((state) => selectClipToBbox(state));
   const onChange = useCallback(
-    (e: ChangeEvent<HTMLInputElement>) => dispatch(settingsClipToBboxChanged({ clipToBbox: e.target.checked })),
+    (e: ChangeEvent<HTMLInputElement>) => dispatch(settingsClipToBboxChanged(e.target.checked)),
     [dispatch]
   );
   return (

invokeai/frontend/web/src/features/controlLayers/components/Settings/CanvasSettingsInvertScrollCheckbox.tsx

@@ -14,7 +14,7 @@ export const CanvasSettingsInvertScrollCheckbox = memo(() => {
   const invertScrollForToolWidth = useAppSelector((state) => selectInvertScrollForToolWidth(state));
   const onChange = useCallback(
     (e: ChangeEvent<HTMLInputElement>) => {
-      dispatch(settingsInvertScrollForToolWidthChanged({ invertScrollForToolWidth: e.target.checked }));
+      dispatch(settingsInvertScrollForToolWidthChanged(e.target.checked));
     },
     [dispatch]
   );

invokeai/frontend/web/src/features/controlLayers/components/StagingArea/QueueItemPreviewMini.tsx

@@ -55,7 +55,7 @@ export const QueueItemPreviewMini = memo(({ item, index }: Props) => {
 
   const onDoubleClick = useCallback(() => {
     if (autoSwitch !== 'off') {
-      dispatch(settingsStagingAreaAutoSwitchChanged({ stagingAreaAutoSwitch: 'off' }));
+      dispatch(settingsStagingAreaAutoSwitchChanged('off'));
       toast({
         title: 'Auto-Switch Disabled',
       });

invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaAutoSwitchButtons.tsx

@@ -16,13 +16,13 @@ export const StagingAreaAutoSwitchButtons = memo(() => {
   const dispatch = useAppDispatch();
 
   const onClickOff = useCallback(() => {
-    dispatch(settingsStagingAreaAutoSwitchChanged({ stagingAreaAutoSwitch: 'off' }));
+    dispatch(settingsStagingAreaAutoSwitchChanged('off'));
   }, [dispatch]);
   const onClickSwitchOnStart = useCallback(() => {
-    dispatch(settingsStagingAreaAutoSwitchChanged({ stagingAreaAutoSwitch: 'switch_on_start' }));
+    dispatch(settingsStagingAreaAutoSwitchChanged('switch_on_start'));
   }, [dispatch]);
   const onClickSwitchOnFinished = useCallback(() => {
-    dispatch(settingsStagingAreaAutoSwitchChanged({ stagingAreaAutoSwitch: 'switch_on_finish' }));
+    dispatch(settingsStagingAreaAutoSwitchChanged('switch_on_finish'));
   }, [dispatch]);
 
   return (

invokeai/frontend/web/src/features/controlLayers/components/StagingArea/__mocks__/mockStagingAreaApp.ts

@@ -1,6 +1,6 @@
 import { merge } from 'es-toolkit';
 import type { StagingAreaAppApi } from 'features/controlLayers/components/StagingArea/state';
-import type { AutoSwitchMode } from 'features/controlLayers/store/canvasSettingsSlice';
+import type { AutoSwitchMode } from 'features/controlLayers/store/types';
 import type { ImageDTO, S } from 'services/api/types';
 import type { PartialDeep } from 'type-fest';
 import { vi } from 'vitest';

invokeai/frontend/web/src/features/controlLayers/components/StagingArea/context.tsx

@@ -62,13 +62,13 @@ export const StagingAreaContextProvider = memo(({ canvasId, children }: PropsWit
         });
       },
       onDiscard: ({ item_id, status }) => {
-        store.dispatch(canvasQueueItemDiscarded({ canvasId, itemId: item_id }));
+        store.dispatch(canvasQueueItemDiscarded({ itemId: item_id }));
         if (status === 'in_progress' || status === 'pending') {
           store.dispatch(queueApi.endpoints.cancelQueueItem.initiate({ item_id }, { track: false }));
         }
       },
       onDiscardAll: () => {
-        store.dispatch(canvasSessionReset({ canvasId }));
+        store.dispatch(canvasSessionReset());
         if (sessionId) {
           store.dispatch(
             queueApi.endpoints.cancelQueueItemsByDestination.initiate({ destination: sessionId }, { track: false })
@@ -86,20 +86,20 @@ export const StagingAreaContextProvider = memo(({ canvasId, children }: PropsWit
         };
 
         store.dispatch(rasterLayerAdded({ overrides, isSelected: selectedEntityIdentifier?.type === 'raster_layer' }));
-        store.dispatch(canvasSessionReset({ canvasId }));
+        store.dispatch(canvasSessionReset());
         if (sessionId) {
           store.dispatch(
             queueApi.endpoints.cancelQueueItemsByDestination.initiate({ destination: sessionId }, { track: false })
           );
         }
       },
       onAutoSwitchChange: (mode) => {
-        store.dispatch(settingsStagingAreaAutoSwitchChanged({ stagingAreaAutoSwitch: mode }));
+        store.dispatch(settingsStagingAreaAutoSwitchChanged(mode));
       },
     };
 
     return _stagingAreaAppApi;
-  }, [canvasId, sessionId, selectQueueItems, socket, store]);
+  }, [sessionId, selectQueueItems, socket, store]);
 
   const [stagingAreaApi] = useState(() => new StagingAreaApi());
 

invokeai/frontend/web/src/features/controlLayers/components/StagingArea/state.ts

@@ -1,5 +1,5 @@
 import { clamp } from 'es-toolkit';
-import type { AutoSwitchMode } from 'features/controlLayers/store/canvasSettingsSlice';
+import type { AutoSwitchMode } from 'features/controlLayers/store/types';
 import type { ProgressImage } from 'features/nodes/types/common';
 import type { MapStore } from 'nanostores';
 import { atom, computed, map } from 'nanostores';