chore(ui): eslint

invokeai/frontend/web/scripts/typegen.js

@@ -38,7 +38,7 @@ async function generateTypes(schema) {
   process.stdout.write(`\nOK!\r\n`);
 }
 
-async function main() {
+function main() {
   const encoding = 'utf-8';
 
   if (process.stdin.isTTY) {

invokeai/frontend/web/src/app/components/App.tsx

@@ -18,8 +18,8 @@ import { StylePresetModal } from 'features/stylePresets/components/StylePresetFo
 import { configChanged } from 'features/system/store/configSlice';
 import { languageSelector } from 'features/system/store/systemSelectors';
 import { AppContent } from 'features/ui/components/AppContent';
-import type { TabName } from "features/ui/store/uiTypes";
 import { setActiveTab } from 'features/ui/store/uiSlice';
+import type { TabName } from "features/ui/store/uiTypes";
 import { useGetAndLoadLibraryWorkflow } from 'features/workflowLibrary/hooks/useGetAndLoadLibraryWorkflow';
 import { AnimatePresence } from 'framer-motion';
 import i18n from 'i18n';

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

@@ -23,7 +23,7 @@ export const addArchivedOrDeletedBoardListener = (startAppListening: AppStartLis
    */
   startAppListening({
     matcher: matchAnyBoardDeleted,
-    effect: async (action, { dispatch, getState }) => {
+    effect: (action, { dispatch, getState }) => {
       const state = getState();
       const deletedBoardId = action.meta.arg.originalArgs;
       const { autoAddBoardId, selectedBoardId } = state.gallery;
@@ -44,7 +44,7 @@ export const addArchivedOrDeletedBoardListener = (startAppListening: AppStartLis
   // If we archived a board, it may end up hidden. If it's selected or the auto-add board, we should reset those.
   startAppListening({
     matcher: boardsApi.endpoints.updateBoard.matchFulfilled,
-    effect: async (action, { dispatch, getState }) => {
+    effect: (action, { dispatch, getState }) => {
       const state = getState();
       const { shouldShowArchivedBoards } = state.gallery;
 
@@ -61,7 +61,7 @@ export const addArchivedOrDeletedBoardListener = (startAppListening: AppStartLis
   // When we hide archived boards, if the selected or the auto-add board is archived, we should reset those.
   startAppListening({
     actionCreator: shouldShowArchivedBoardsChanged,
-    effect: async (action, { dispatch, getState }) => {
+    effect: (action, { dispatch, getState }) => {
       const shouldShowArchivedBoards = action.payload;
 
       // We only need to take action if we have just hidden archived boards.
@@ -100,7 +100,7 @@ export const addArchivedOrDeletedBoardListener = (startAppListening: AppStartLis
    */
   startAppListening({
     matcher: boardsApi.endpoints.listAllBoards.matchFulfilled,
-    effect: async (action, { dispatch, getState }) => {
+    effect: (action, { dispatch, getState }) => {
       const boards = action.payload;
       const state = getState();
       const { selectedBoardId, autoAddBoardId } = state.gallery;

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

@@ -4,7 +4,7 @@ import { queueApi, selectQueueStatus } from 'services/api/endpoints/queue';
 export const addAnyEnqueuedListener = (startAppListening: AppStartListening) => {
   startAppListening({
     matcher: queueApi.endpoints.enqueueBatch.matchFulfilled,
-    effect: async (_, { dispatch, getState }) => {
+    effect: (_, { dispatch, getState }) => {
       const { data } = selectQueueStatus(getState());
 
       if (!data || data.processor.is_started) {

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

@@ -6,7 +6,7 @@ import { appInfoApi } from 'services/api/endpoints/appInfo';
 export const addAppConfigReceivedListener = (startAppListening: AppStartListening) => {
   startAppListening({
     matcher: appInfoApi.endpoints.getAppConfig.matchFulfilled,
-    effect: async (action, { getState, dispatch }) => {
+    effect: (action, { getState, dispatch }) => {
       const { infill_methods = [], nsfw_methods = [], watermarking_methods = [] } = action.payload;
       const infillMethod = getState().canvasV2.compositing.infillMethod;
 

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

@@ -6,7 +6,7 @@ export const appStarted = createAction('app/appStarted');
 export const addAppStartedListener = (startAppListening: AppStartListening) => {
   startAppListening({
     actionCreator: appStarted,
-    effect: async (action, { unsubscribe, cancelActiveListeners }) => {
+    effect: (action, { unsubscribe, cancelActiveListeners }) => {
       // this should only run once
       cancelActiveListeners();
       unsubscribe();

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

@@ -27,7 +27,7 @@ export const galleryImageClicked = createAction<{
 export const addGalleryImageClickedListener = (startAppListening: AppStartListening) => {
   startAppListening({
     actionCreator: galleryImageClicked,
-    effect: async (action, { dispatch, getState }) => {
+    effect: (action, { dispatch, getState }) => {
       const { imageDTO, shiftKey, ctrlKey, metaKey, altKey } = action.payload;
       const state = getState();
       const queryArgs = selectListImagesQueryArgs(state);

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

@@ -6,7 +6,7 @@ import { imagesToDeleteSelected, isModalOpenChanged } from 'features/deleteImage
 export const addImageToDeleteSelectedListener = (startAppListening: AppStartListening) => {
   startAppListening({
     actionCreator: imagesToDeleteSelected,
-    effect: async (action, { dispatch, getState }) => {
+    effect: (action, { dispatch, getState }) => {
       const imageDTOs = action.payload;
       const state = getState();
       const { shouldConfirmOnDelete } = state.system;

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

@@ -6,7 +6,7 @@ import type { ImageDTO } from 'services/api/types';
 export const addImagesStarredListener = (startAppListening: AppStartListening) => {
   startAppListening({
     matcher: imagesApi.endpoints.starImages.matchFulfilled,
-    effect: async (action, { dispatch, getState }) => {
+    effect: (action, { dispatch, getState }) => {
       const { updated_image_names: starredImages } = action.payload;
 
       const state = getState();

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

@@ -6,7 +6,7 @@ import type { ImageDTO } from 'services/api/types';
 export const addImagesUnstarredListener = (startAppListening: AppStartListening) => {
   startAppListening({
     matcher: imagesApi.endpoints.unstarImages.matchFulfilled,
-    effect: async (action, { dispatch, getState }) => {
+    effect: (action, { dispatch, getState }) => {
       const { updated_image_names: unstarredImages } = action.payload;
 
       const state = getState();

invokeai/frontend/web/src/common/hooks/useFullscreenDropzone.ts

@@ -46,7 +46,7 @@ export const useFullscreenDropzone = () => {
   );
 
   const fileAcceptedCallback = useCallback(
-    async (file: File) => {
+    (file: File) => {
       uploadImage({
         file,
         image_category: 'user',
@@ -96,7 +96,7 @@ export const useFullscreenDropzone = () => {
 
   useEffect(() => {
     // This is a hack to allow pasting images into the uploader
-    const handlePaste = async (e: ClipboardEvent) => {
+    const handlePaste = (e: ClipboardEvent) => {
       if (!dropzone.inputRef.current) {
         return;
       }

invokeai/frontend/web/src/common/util/convertImageUrlToBlob.ts

@@ -7,7 +7,7 @@ import { $authToken } from 'app/store/nanostores/authToken';
  * @returns A function that takes a URL and returns a Promise that resolves with a Blob
  */
 
-export const convertImageUrlToBlob = async (url: string) =>
+export const convertImageUrlToBlob = (url: string) =>
   new Promise<Blob | null>((resolve, reject) => {
     const img = new Image();
     img.onload = () => {

invokeai/frontend/web/src/features/controlLayers/components/CanvasResizer.tsx

@@ -1,5 +1,4 @@
 import { Flex, Grid, GridItem, IconButton } from '@invoke-ai/ui-library';
-import { useAppSelector } from 'app/store/storeHooks';
 import { memo, useCallback, useState } from 'react';
 import {
   PiArrowDownBold,
@@ -25,7 +24,6 @@ type ResizeDirection =
   | 'down-right';
 
 export const CanvasResizer = memo(() => {
-  const bbox = useAppSelector((s) => s.canvasV2.bbox);
   const [resizeDirection, setResizeDirection] = useState<ResizeDirection>('center-out');
 
   const setDirUpLeft = useCallback(() => {

invokeai/frontend/web/src/features/controlLayers/components/ControlLayersToolbar.tsx

@@ -10,17 +10,16 @@ import { ToolChooser } from 'features/controlLayers/components/Tool/ToolChooser'
 import { ToolEraserWidth } from 'features/controlLayers/components/Tool/ToolEraserWidth';
 import { ToolFillColorPicker } from 'features/controlLayers/components/Tool/ToolFillColorPicker';
 import { UndoRedoButtonGroup } from 'features/controlLayers/components/UndoRedoButtonGroup';
-import { CanvasManagerProviderGate, useCanvasManager } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
+import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
 import { ToggleProgressButton } from 'features/gallery/components/ImageViewer/ToggleProgressButton';
 import { ViewerToggleMenu } from 'features/gallery/components/ImageViewer/ViewerToggleMenu';
-import { memo, useSyncExternalStore } from 'react';
+import { memo } from 'react';
 
 export const ControlLayersToolbar = memo(() => {
   const tool = useAppSelector((s) => s.canvasV2.tool.selected);
   return (
     <CanvasManagerProviderGate>
       <Flex w="full" gap={2} alignItems="center">
-        <ReactiveTest />
         <ToggleProgressButton />
         <ToolChooser />
         <Spacer />
@@ -41,15 +40,3 @@ export const ControlLayersToolbar = memo(() => {
 });
 
 ControlLayersToolbar.displayName = 'ControlLayersToolbar';
-
-const ReactiveTest = () => {
-  const canvasManager = useCanvasManager();
-  const adapters = useSyncExternalStore(
-    canvasManager.adapters.rasterLayers.subscribe,
-    canvasManager.adapters.rasterLayers.getSnapshot
-  );
-
-  console.log(adapters);
-
-  return null;
-};

invokeai/frontend/web/src/features/controlLayers/components/StageComponent.tsx

@@ -38,7 +38,6 @@ const useStageRenderer = (stage: Konva.Stage, container: HTMLDivElement | null,
     }
 
     const manager = new CanvasManager(stage, container, store, socket);
-    console.log(manager);
     const cleanup = manager.initialize();
     return cleanup;
   }, [asPreview, container, socket, stage, store]);

invokeai/frontend/web/src/features/controlLayers/konva/CanvasManager.ts

@@ -2,6 +2,7 @@ import type { AppSocket } from 'app/hooks/useSocketIO';
 import { logger } from 'app/logging/logger';
 import type { AppStore } from 'app/store/store';
 import type { SerializableObject } from 'common/types';
+import { SyncableMap } from 'common/util/SyncableMap/SyncableMap';
 import { CanvasCacheModule } from 'features/controlLayers/konva/CanvasCacheModule';
 import { CanvasCompositorModule } from 'features/controlLayers/konva/CanvasCompositorModule';
 import { CanvasFilterModule } from 'features/controlLayers/konva/CanvasFilterModule';
@@ -9,7 +10,6 @@ import { CanvasRenderingModule } from 'features/controlLayers/konva/CanvasRender
 import { CanvasStageModule } from 'features/controlLayers/konva/CanvasStageModule';
 import { CanvasWorkerModule } from 'features/controlLayers/konva/CanvasWorkerModule.js';
 import { getPrefixedId } from 'features/controlLayers/konva/util';
-import { SyncableMap } from 'common/util/SyncableMap/SyncableMap';
 import type Konva from 'konva';
 import { atom } from 'nanostores';
 import type { Logger } from 'roarr';

invokeai/frontend/web/src/features/controlLayers/store/types.test.ts

@@ -12,6 +12,8 @@ import type {
   DepthAnythingModelSize,
   DepthAnythingProcessorConfig,
   DWOpenposeProcessorConfig,
+  FilterConfig,
+  FilterType,
   HedProcessorConfig,
   IPMethodV2,
   LineartAnimeProcessorConfig,
@@ -21,8 +23,6 @@ import type {
   MlsdProcessorConfig,
   NormalbaeProcessorConfig,
   PidiProcessorConfig,
-  FilterConfig,
-  FilterType,
   ZoeDepthProcessorConfig,
 } from './types';
 

invokeai/frontend/web/src/features/gallery/hooks/useGalleryHotkeys.ts

@@ -1,7 +1,7 @@
 import { useStore } from '@nanostores/react';
 import { useAppSelector } from 'app/store/storeHooks';
-import { useAssertSingleton } from 'common/hooks/useAssertSingleton';
 import { $activeScopes } from 'common/hooks/interactionScopes';
+import { useAssertSingleton } from 'common/hooks/useAssertSingleton';
 import { useGalleryNavigation } from 'features/gallery/hooks/useGalleryNavigation';
 import { useGalleryPagination } from 'features/gallery/hooks/useGalleryPagination';
 import { selectListImagesQueryArgs } from 'features/gallery/store/gallerySelectors';

invokeai/frontend/web/src/features/metadata/util/handlers.ts

@@ -48,7 +48,7 @@ const renderControlAdapterValue: MetadataRenderValueFunc<AnyControlAdapterConfig
     return `${value.model.key} (${value.model.base.toUpperCase()}) - ${value.weight}`;
   }
 };
-const renderLayerValue: MetadataRenderValueFunc<CanvasRasterLayerState> = async (layer) => {
+const renderLayerValue: MetadataRenderValueFunc<CanvasRasterLayerState> = (layer) => {
   if (layer.type === 'initial_image_layer') {
     let rendered = t('controlLayers.globalInitialImageLayer');
     if (layer.image) {
@@ -88,7 +88,7 @@ const renderLayerValue: MetadataRenderValueFunc<CanvasRasterLayerState> = async
   }
   assert(false, 'Unknown layer type');
 };
-const renderLayersValue: MetadataRenderValueFunc<CanvasRasterLayerState[]> = async (layers) => {
+const renderLayersValue: MetadataRenderValueFunc<CanvasRasterLayerState[]> = (layers) => {
   return `${layers.length} ${t('controlLayers.layers', { count: layers.length })}`;
 };
 
@@ -178,7 +178,10 @@ const buildRecallItem =
     }
   };
 
-const resolveToString = (value: unknown) => new Promise<string>((resolve) => resolve(String(value)));
+const resolveToString = (value: unknown) =>
+  new Promise<string>((resolve) => {
+    resolve(String(value));
+  });
 
 const buildHandlers: BuildMetadataHandlers = ({
   getLabel,
@@ -395,7 +398,7 @@ export const parseAndRecallPrompts = async (metadata: unknown) => {
   }
 };
 
-export const parseAndRecallImageDimensions = async (metadata: unknown) => {
+export const parseAndRecallImageDimensions = (metadata: unknown) => {
   const recalled = recallKeys(['width', 'height'], metadata);
   if (size(recalled) > 0) {
     parameterSetToast(t('metadata.imageDimensions'));

invokeai/frontend/web/src/features/metadata/util/parsers.ts

@@ -1,6 +1,11 @@
 import { getCAId, getImageObjectId, getIPAId, getLayerId } from 'features/controlLayers/konva/naming';
 import { defaultLoRAConfig } from 'features/controlLayers/store/lorasReducers';
-import type { CanvasControlAdapterState, CanvasIPAdapterState, CanvasRasterLayerState, LoRA } from 'features/controlLayers/store/types';
+import type {
+  CanvasControlAdapterState,
+  CanvasIPAdapterState,
+  CanvasRasterLayerState,
+  LoRA,
+} from 'features/controlLayers/store/types';
 import {
   IMAGE_FILTERS,
   imageDTOToImageWithDims,
@@ -424,7 +429,8 @@ const parseAllIPAdapters: MetadataParseFunc<IPAdapterConfigMetadata[]> = async (
 };
 
 //#region Control Layers
-const parseLayer: MetadataParseFunc<CanvasRasterLayerState> = async (metadataItem) => zCanvasRasterLayerState.parseAsync(metadataItem);
+const parseLayer: MetadataParseFunc<CanvasRasterLayerState> = (metadataItem) =>
+  zCanvasRasterLayerState.parseAsync(metadataItem);
 
 const parseLayers: MetadataParseFunc<CanvasRasterLayerState[]> = async (metadata) => {
   // We need to support recalling pre-Control Layers metadata into Control Layers. A separate set of parsers handles
@@ -559,9 +565,7 @@ const parseControlNetToControlAdapterLayer: MetadataParseFunc<CanvasControlAdapt
     .parse(await getProperty(metadataItem, 'control_mode'));
 
   const defaultPreprocessor = controlNetModel.default_settings?.preprocessor;
-  const processorConfig = isFilterType(defaultPreprocessor)
+  const processorConfig = isFilterType(defaultPreprocessor) ? IMAGE_FILTERS[defaultPreprocessor].buildDefaults() : null;
-    ? IMAGE_FILTERS[defaultPreprocessor].buildDefaults()
-    : null;
   const beginEndStepPct: [number, number] = [
     begin_step_percent ?? initialControlNet.beginEndStepPct[0],
     end_step_percent ?? initialControlNet.beginEndStepPct[1],
@@ -620,9 +624,7 @@ const parseT2IAdapterToControlAdapterLayer: MetadataParseFunc<CanvasControlAdapt
     .parse(await getProperty(metadataItem, 'end_step_percent'));
 
   const defaultPreprocessor = t2iAdapterModel.default_settings?.preprocessor;
-  const processorConfig = isFilterType(defaultPreprocessor)
+  const processorConfig = isFilterType(defaultPreprocessor) ? IMAGE_FILTERS[defaultPreprocessor].buildDefaults() : null;
-    ? IMAGE_FILTERS[defaultPreprocessor].buildDefaults()
-    : null;
   const beginEndStepPct: [number, number] = [
     begin_step_percent ?? initialT2IAdapter.beginEndStepPct[0],
     end_step_percent ?? initialT2IAdapter.beginEndStepPct[1],

invokeai/frontend/web/src/features/metadata/util/recallers.ts

@@ -3,18 +3,14 @@ import { getStore } from 'app/store/nanostores/store';
 import { deepClone } from 'common/util/deepClone';
 import {
   getBrushLineId,
-  getCAId,
   getEraserLineId,
   getImageObjectId,
-  getIPAId,
   getRectShapeId,
   getRGId,
 } from 'features/controlLayers/konva/naming';
 import {
   bboxHeightChanged,
   bboxWidthChanged,
-  // caRecalled,
-  ipaRecalled,
   loraAllDeleted,
   loraRecalled,
   negativePrompt2Changed,
@@ -23,7 +19,6 @@ import {
   positivePromptChanged,
   rasterLayerRecalled,
   refinerModelChanged,
-  rgRecalled,
   setCfgRescaleMultiplier,
   setCfgScale,
   setImg2imgStrength,
@@ -39,9 +34,7 @@ import {
   vaeSelected,
 } from 'features/controlLayers/store/canvasV2Slice';
 import type {
-  CanvasIPAdapterState,
   CanvasRasterLayerState,
-  CanvasRegionalGuidanceState,
   LoRA,
 } from 'features/controlLayers/store/types';
 import { setHrfEnabled, setHrfMethod, setHrfStrength } from 'features/hrf/store/hrfSlice';
@@ -51,7 +44,6 @@ import type {
   MetadataRecallFunc,
   T2IAdapterConfigMetadata,
 } from 'features/metadata/types';
-import { fetchModelConfigByIdentifier } from 'features/metadata/util/modelFetchingHelpers';
 import { modelSelected } from 'features/parameters/store/actions';
 import type {
   ParameterCFGRescaleMultiplier,
@@ -246,86 +238,86 @@ const recallIPAdapters: MetadataRecallFunc<IPAdapterConfigMetadata[]> = (ipAdapt
   });
 };
 
-const recallCA: MetadataRecallFunc<CanvasControlAdapterState> = async (ca) => {
+// const recallCA: MetadataRecallFunc<CanvasControlAdapterState> = async (ca) => {
-  const { dispatch } = getStore();
+//   const { dispatch } = getStore();
-  const clone = deepClone(ca);
+//   const clone = deepClone(ca);
-  if (clone.image) {
+//   if (clone.image) {
-    const imageDTO = await getImageDTO(clone.image.name);
+//     const imageDTO = await getImageDTO(clone.image.name);
-    if (!imageDTO) {
+//     if (!imageDTO) {
-      clone.image = null;
+//       clone.image = null;
-    }
+//     }
-  }
+//   }
-  if (clone.processedImage) {
+//   if (clone.processedImage) {
-    const imageDTO = await getImageDTO(clone.processedImage.name);
+//     const imageDTO = await getImageDTO(clone.processedImage.name);
-    if (!imageDTO) {
+//     if (!imageDTO) {
-      clone.processedImage = null;
+//       clone.processedImage = null;
-    }
+//     }
-  }
+//   }
-  if (clone.model) {
+//   if (clone.model) {
-    try {
+//     try {
-      await fetchModelConfigByIdentifier(clone.model);
+//       await fetchModelConfigByIdentifier(clone.model);
-    } catch {
+//     } catch {
-      // MODEL SMITED!
+//       // MODEL SMITED!
-      clone.model = null;
+//       clone.model = null;
-    }
+//     }
-  }
+//   }
-  // No clobber
+//   // No clobber
-  clone.id = getCAId(uuidv4());
+//   clone.id = getCAId(uuidv4());
-  // dispatch(caRecalled({ data: clone }));
+//   // dispatch(caRecalled({ data: clone }));
-  return;
+//   return;
-};
+// };
 
-const recallIPA: MetadataRecallFunc<CanvasIPAdapterState> = async (ipa) => {
+// const recallIPA: MetadataRecallFunc<CanvasIPAdapterState> = async (ipa) => {
-  const { dispatch } = getStore();
+//   const { dispatch } = getStore();
-  const clone = deepClone(ipa);
+//   const clone = deepClone(ipa);
-  if (clone.imageObject) {
+//   if (clone.imageObject) {
-    const imageDTO = await getImageDTO(clone.imageObject.name);
+//     const imageDTO = await getImageDTO(clone.imageObject.name);
-    if (!imageDTO) {
+//     if (!imageDTO) {
-      clone.imageObject = null;
+//       clone.imageObject = null;
-    }
+//     }
-  }
+//   }
-  if (clone.model) {
+//   if (clone.model) {
-    try {
+//     try {
-      await fetchModelConfigByIdentifier(clone.model);
+//       await fetchModelConfigByIdentifier(clone.model);
-    } catch {
+//     } catch {
-      // MODEL SMITED!
+//       // MODEL SMITED!
-      clone.model = null;
+//       clone.model = null;
-    }
+//     }
-  }
+//   }
-  // No clobber
+//   // No clobber
-  clone.id = getIPAId(uuidv4());
+//   clone.id = getIPAId(uuidv4());
-  dispatch(ipaRecalled({ data: clone }));
+//   dispatch(ipaRecalled({ data: clone }));
-  return;
+//   return;
-};
+// };
 
-const recallRG: MetadataRecallFunc<CanvasRegionalGuidanceState> = async (rg) => {
+// const recallRG: MetadataRecallFunc<CanvasRegionalGuidanceState> = async (rg) => {
-  const { dispatch } = getStore();
+//   const { dispatch } = getStore();
-  const clone = deepClone(rg);
+//   const clone = deepClone(rg);
-  // Strip out the uploaded mask image property - this is an intermediate image
+//   // Strip out the uploaded mask image property - this is an intermediate image
-  clone.imageCache = null;
+//   clone.imageCache = null;
 
-  for (const ipAdapter of clone.ipAdapters) {
+//   for (const ipAdapter of clone.ipAdapters) {
-    if (ipAdapter.imageObject) {
+//     if (ipAdapter.imageObject) {
-      const imageDTO = await getImageDTO(ipAdapter.imageObject.name);
+//       const imageDTO = await getImageDTO(ipAdapter.imageObject.name);
-      if (!imageDTO) {
+//       if (!imageDTO) {
-        ipAdapter.imageObject = null;
+//         ipAdapter.imageObject = null;
-      }
+//       }
-    }
+//     }
-    if (ipAdapter.model) {
+//     if (ipAdapter.model) {
-      try {
+//       try {
-        await fetchModelConfigByIdentifier(ipAdapter.model);
+//         await fetchModelConfigByIdentifier(ipAdapter.model);
-      } catch {
+//       } catch {
-        // MODEL SMITED!
+//         // MODEL SMITED!
-        ipAdapter.model = null;
+//         ipAdapter.model = null;
-      }
+//       }
-    }
+//     }
-    // No clobber
+//     // No clobber
-    ipAdapter.id = uuidv4();
+//     ipAdapter.id = uuidv4();
-  }
+//   }
-  clone.id = getRGId(uuidv4());
+//   clone.id = getRGId(uuidv4());
-  dispatch(rgRecalled({ data: clone }));
+//   dispatch(rgRecalled({ data: clone }));
-  return;
+//   return;
-};
+// };
 
 //#region Control Layers
 const recallLayer: MetadataRecallFunc<CanvasRasterLayerState> = async (layer) => {

invokeai/frontend/web/src/features/metadata/util/validators.ts

@@ -29,17 +29,23 @@ const validateBaseCompatibility = (base?: BaseModelType, message?: string) => {
 
 const validateRefinerModel: MetadataValidateFunc<ParameterSDXLRefinerModel> = (refinerModel) => {
   validateBaseCompatibility('sdxl', 'Refiner incompatible with currently-selected model');
-  return new Promise((resolve) => resolve(refinerModel));
+  return new Promise((resolve) => {
+    resolve(refinerModel);
+  });
 };
 
 const validateVAEModel: MetadataValidateFunc<ParameterVAEModel> = (vaeModel) => {
   validateBaseCompatibility(vaeModel.base, 'VAE incompatible with currently-selected model');
-  return new Promise((resolve) => resolve(vaeModel));
+  return new Promise((resolve) => {
+    resolve(vaeModel);
+  });
 };
 
 const validateLoRA: MetadataValidateFunc<LoRA> = (lora) => {
   validateBaseCompatibility(lora.model.base, 'LoRA incompatible with currently-selected model');
-  return new Promise((resolve) => resolve(lora));
+  return new Promise((resolve) => {
+    resolve(lora);
+  });
 };
 
 const validateLoRAs: MetadataValidateFunc<LoRA[]> = (loras) => {
@@ -52,12 +58,16 @@ const validateLoRAs: MetadataValidateFunc<LoRA[]> = (loras) => {
       // This is a no-op - we want to continue validating the rest of the LoRAs, and an empty list is valid.
     }
   });
-  return new Promise((resolve) => resolve(validatedLoRAs));
+  return new Promise((resolve) => {
+    resolve(validatedLoRAs);
+  });
 };
 
 const validateControlNet: MetadataValidateFunc<ControlNetConfigMetadata> = (controlNet) => {
   validateBaseCompatibility(controlNet.model?.base, 'ControlNet incompatible with currently-selected model');
-  return new Promise((resolve) => resolve(controlNet));
+  return new Promise((resolve) => {
+    resolve(controlNet);
+  });
 };
 
 const validateControlNets: MetadataValidateFunc<ControlNetConfigMetadata[]> = (controlNets) => {
@@ -70,12 +80,16 @@ const validateControlNets: MetadataValidateFunc<ControlNetConfigMetadata[]> = (c
       // This is a no-op - we want to continue validating the rest of the ControlNets, and an empty list is valid.
     }
   });
-  return new Promise((resolve) => resolve(validatedControlNets));
+  return new Promise((resolve) => {
+    resolve(validatedControlNets);
+  });
 };
 
 const validateT2IAdapter: MetadataValidateFunc<T2IAdapterConfigMetadata> = (t2iAdapter) => {
   validateBaseCompatibility(t2iAdapter.model?.base, 'T2I Adapter incompatible with currently-selected model');
-  return new Promise((resolve) => resolve(t2iAdapter));
+  return new Promise((resolve) => {
+    resolve(t2iAdapter);
+  });
 };
 
 const validateT2IAdapters: MetadataValidateFunc<T2IAdapterConfigMetadata[]> = (t2iAdapters) => {
@@ -88,12 +102,16 @@ const validateT2IAdapters: MetadataValidateFunc<T2IAdapterConfigMetadata[]> = (t
       // This is a no-op - we want to continue validating the rest of the T2I Adapters, and an empty list is valid.
     }
   });
-  return new Promise((resolve) => resolve(validatedT2IAdapters));
+  return new Promise((resolve) => {
+    resolve(validatedT2IAdapters);
+  });
 };
 
 const validateIPAdapter: MetadataValidateFunc<IPAdapterConfigMetadata> = (ipAdapter) => {
   validateBaseCompatibility(ipAdapter.model?.base, 'IP Adapter incompatible with currently-selected model');
-  return new Promise((resolve) => resolve(ipAdapter));
+  return new Promise((resolve) => {
+    resolve(ipAdapter);
+  });
 };
 
 const validateIPAdapters: MetadataValidateFunc<IPAdapterConfigMetadata[]> = (ipAdapters) => {
@@ -106,10 +124,12 @@ const validateIPAdapters: MetadataValidateFunc<IPAdapterConfigMetadata[]> = (ipA
       // This is a no-op - we want to continue validating the rest of the IP Adapters, and an empty list is valid.
     }
   });
-  return new Promise((resolve) => resolve(validatedIPAdapters));
+  return new Promise((resolve) => {
+    resolve(validatedIPAdapters);
+  });
 };
 
-const validateLayer: MetadataValidateFunc<CanvasRasterLayerState> = async (layer) => {
+const validateLayer: MetadataValidateFunc<CanvasRasterLayerState> = (layer) => {
   if (layer.type === 'control_adapter_layer') {
     const model = layer.controlAdapter.model;
     assert(model, 'Control Adapter layer missing model');
@@ -141,7 +161,9 @@ const validateLayers: MetadataValidateFunc<CanvasRasterLayerState[]> = async (la
       // This is a no-op - we want to continue validating the rest of the layers, and an empty list is valid.
     }
   }
-  return new Promise((resolve) => resolve(validatedLayers));
+  return new Promise((resolve) => {
+    resolve(validatedLayers);
+  });
 };
 
 export const validators = {

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/HuggingFaceFolder/HuggingFaceForm.tsx

@@ -16,7 +16,7 @@ export const HuggingFaceForm = memo(() => {
   const [_getHuggingFaceModels, { isLoading, data }] = useLazyGetHuggingFaceModelsQuery();
   const [installModel] = useInstallModel();
 
-  const getModels = useCallback(async () => {
+  const getModels = useCallback(() => {
     _getHuggingFaceModels(huggingFaceRepo)
       .unwrap()
       .then((response) => {

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanFolder/ScanFolderForm.tsx

@@ -16,7 +16,7 @@ export const ScanModelsForm = memo(() => {
 
   const [_scanFolder, { isLoading, data }] = useLazyScanFolderQuery();
 
-  const scanFolder = useCallback(async () => {
+  const scanFolder = useCallback(() => {
     _scanFolder({ scan_path: scanPath })
       .unwrap()
       .catch((error) => {

invokeai/frontend/web/src/features/nodes/components/flow/nodes/Invocation/fields/EditableFieldTitle.tsx

@@ -38,7 +38,7 @@ const EditableFieldTitle = forwardRef((props: Props, ref) => {
   const [localTitle, setLocalTitle] = useState(label || fieldTemplateTitle || t('nodes.unknownField'));
 
   const handleSubmit = useCallback(
-    async (newTitleRaw: string) => {
+    (newTitleRaw: string) => {
       const newTitle = newTitleRaw.trim();
       const finalTitle = newTitle || fieldTemplateTitle || t('nodes.unknownField');
       setLocalTitle(finalTitle);

invokeai/frontend/web/src/features/nodes/components/flow/nodes/common/NodeTitle.tsx

@@ -22,7 +22,7 @@ const NodeTitle = ({ nodeId, title }: Props) => {
 
   const [localTitle, setLocalTitle] = useState('');
   const handleSubmit = useCallback(
-    async (newTitle: string) => {
+    (newTitle: string) => {
       dispatch(nodeLabelChanged({ nodeId, label: newTitle }));
       setLocalTitle(label || title || templateTitle || t('nodes.problemSettingTitle'));
     },

invokeai/frontend/web/src/features/nodes/components/flow/panels/TopPanel/SaveWorkflowButton.tsx

@@ -13,7 +13,7 @@ const SaveWorkflowButton = () => {
   const { onOpen } = useSaveWorkflowAsDialog();
   const { saveWorkflow } = useSaveLibraryWorkflow();
 
-  const handleClickSave = useCallback(async () => {
+  const handleClickSave = useCallback(() => {
     const builtWorkflow = $builtWorkflow.get();
     if (!builtWorkflow) {
       return;

invokeai/frontend/web/src/features/nodes/components/sidePanel/inspector/details/EditableNodeTitle.tsx

@@ -19,7 +19,7 @@ const EditableNodeTitle = ({ nodeId, title }: Props) => {
 
   const [localTitle, setLocalTitle] = useState('');
   const handleSubmit = useCallback(
-    async (newTitle: string) => {
+    (newTitle: string) => {
       dispatch(nodeLabelChanged({ nodeId, label: newTitle }));
       setLocalTitle(label || title || templateTitle || t('nodes.problemSettingTitle'));
     },

invokeai/frontend/web/src/features/nodes/util/schema/parseFieldType.test.ts

@@ -267,7 +267,7 @@ const specialCases: ParseFieldTypeTestCase[] = [
   },
 ];
 
-describe('refObjectToSchemaName', async () => {
+describe('refObjectToSchemaName', () => {
   it('parses ref object 1', () => {
     expect(
       refObjectToSchemaName({
@@ -284,7 +284,7 @@ describe('refObjectToSchemaName', async () => {
   });
 });
 
-describe.concurrent('parseFieldType', async () => {
+describe.concurrent('parseFieldType', () => {
   it.each(primitiveTypes)('parses primitive types ($name)', ({ schema, expected }: ParseFieldTypeTestCase) => {
     expect(parseFieldType(schema)).toEqual(expected);
   });

invokeai/frontend/web/src/features/nodes/util/workflow/validateWorkflow.test.ts

@@ -78,8 +78,14 @@ describe('validateWorkflow', () => {
     ],
     edges: [],
   };
-  const resolveTrue = async (): Promise<boolean> => new Promise((resolve) => resolve(true));
+  const resolveTrue = (): Promise<boolean> =>
-  const resolveFalse = async (): Promise<boolean> => new Promise((resolve) => resolve(false));
+    new Promise((resolve) => {
+      resolve(true);
+    });
+  const resolveFalse = (): Promise<boolean> =>
+    new Promise((resolve) => {
+      resolve(false);
+    });
   it('should reset images that are inaccessible', async () => {
     const validationResult = await validateWorkflow(
       workflow,

invokeai/frontend/web/src/features/stylePresets/components/StylePresetListItem.tsx

@@ -41,7 +41,7 @@ export const StylePresetListItem = ({ preset }: { preset: StylePresetRecordWithI
     [preset]
   );
 
-  const handleClickApply = useCallback(async () => {
+  const handleClickApply = useCallback(() => {
     dispatch(activeStylePresetIdChanged(preset.id));
     $isMenuOpen.set(false);
   }, [dispatch, preset.id]);

invokeai/frontend/web/src/features/system/components/SettingsModal/useClearIntermediates.ts

@@ -1,4 +1,3 @@
-import { useAppDispatch } from 'app/store/storeHooks';
 import { toast } from 'features/toast/toast';
 import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -15,7 +14,6 @@ type UseClearIntermediatesReturn = {
 
 export const useClearIntermediates = (shouldShowClearIntermediates: boolean): UseClearIntermediatesReturn => {
   const { t } = useTranslation();
-  const dispatch = useAppDispatch();
 
   const { data: intermediatesCount, refetch: refetchIntermediatesCount } = useGetIntermediatesCountQuery(undefined, {
     refetchOnMountOrArgChange: true,
@@ -54,7 +52,7 @@ export const useClearIntermediates = (shouldShowClearIntermediates: boolean): Us
           status: 'error',
         });
       });
-  }, [t, _clearIntermediates, dispatch, hasPendingItems]);
+  }, [t, _clearIntermediates, hasPendingItems]);
 
   return { intermediatesCount, clearIntermediates, isLoading, hasPendingItems, refetchIntermediatesCount };
 };

invokeai/frontend/web/src/features/ui/components/TabButton.tsx

@@ -1,8 +1,8 @@
 import { IconButton, Tooltip } from '@invoke-ai/ui-library';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import type { TabName } from "../store/uiTypes";
 import { selectActiveTab } from 'features/ui/store/uiSelectors';
 import { setActiveTab } from 'features/ui/store/uiSlice';
+import type { TabName } from "features/ui/store/uiTypes";
 import { memo, type ReactElement, useCallback } from 'react';
 
 export const TabButton = memo(({ tab, icon, label }: { tab: TabName; icon: ReactElement; label: string }) => {

invokeai/frontend/web/src/features/ui/components/TabMountGate.tsx

@@ -1,7 +1,7 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppSelector } from 'app/store/storeHooks';
 import { selectConfigSlice } from 'features/system/store/configSlice';
-import type { TabName } from "../store/uiTypes";
+import type { TabName } from "features/ui/store/uiTypes";
 import type { PropsWithChildren } from 'react';
 import { memo, useMemo } from 'react';
 

invokeai/frontend/web/src/features/ui/components/TabVisibilityGate.tsx

@@ -1,6 +1,6 @@
 import { Box } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
-import type { TabName } from "../store/uiTypes";
+import type { TabName } from "features/ui/store/uiTypes";
 import type { PropsWithChildren } from 'react';
 import { memo } from 'react';
 

invokeai/frontend/web/src/features/ui/store/uiSlice.ts

@@ -4,8 +4,7 @@ import type { PersistConfig, RootState } from 'app/store/store';
 import { workflowLoadRequested } from 'features/nodes/store/actions';
 import { atom } from 'nanostores';
 
-import type { TabName } from "./uiTypes";
+import type { TabName , UIState } from "./uiTypes";
-import type { UIState } from './uiTypes';
 
 const initialUIState: UIState = {
   _version: 2,

invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryMenu/SaveWorkflowMenuItem.tsx

@@ -13,7 +13,7 @@ const SaveWorkflowMenuItem = () => {
   const { onOpen } = useSaveWorkflowAsDialog();
   const isTouched = useAppSelector((s) => s.workflow.isTouched);
 
-  const handleClickSave = useCallback(async () => {
+  const handleClickSave = useCallback(() => {
     const builtWorkflow = $builtWorkflow.get();
     if (!builtWorkflow) {
       return;

invokeai/frontend/web/src/features/workflowLibrary/hooks/useLoadWorkflowFromFile.tsx

@@ -16,7 +16,7 @@ type UseLoadWorkflowFromFile = (options: useLoadWorkflowFromFileOptions) => (fil
 
 export const useLoadWorkflowFromFile: UseLoadWorkflowFromFile = ({ resetRef, onSuccess }) => {
   const dispatch = useAppDispatch();
-  const logger = useLogger('nodes');
+  const logger = useLogger('workflows');
   const { t } = useTranslation();
   const loadWorkflowFromFile = useCallback(
     (file: File | null) => {
@@ -24,7 +24,7 @@ export const useLoadWorkflowFromFile: UseLoadWorkflowFromFile = ({ resetRef, onS
         return;
       }
       const reader = new FileReader();
-      reader.onload = async () => {
+      reader.onload = () => {
         const rawJSON = reader.result;
 
         try {

invokeai/frontend/web/src/services/api/endpoints/images.ts

@@ -52,7 +52,7 @@ export const imagesApi = api.injectEndpoints({
           'FetchOnReconnect',
         ];
       },
-      async onQueryStarted(_, { dispatch, queryFulfilled }) {
+      onQueryStarted(_, { dispatch, queryFulfilled }) {
         // Populate the getImageDTO cache with these images. This makes image selection smoother, because it doesn't
         // need to re-fetch image data when the user selects an image. The getImageDTO cache keeps data for the default
         // of 60s, so this data won't stick around too long.

invokeai/frontend/web/src/services/api/endpoints/models.ts

@@ -245,7 +245,7 @@ export const modelsApi = api.injectEndpoints({
       transformResponse: (response: GetModelConfigsResponse) => {
         return modelConfigsAdapter.setAll(modelConfigsAdapter.getInitialState(), response.models);
       },
-      onQueryStarted: async (_, { dispatch, queryFulfilled }) => {
+      onQueryStarted: (_, { dispatch, queryFulfilled }) => {
         queryFulfilled.then(({ data }) => {
           modelConfigsAdapterSelectors.selectAll(data).forEach((modelConfig) => {
             dispatch(modelsApi.util.upsertQueryData('getModelConfig', modelConfig.key, modelConfig));

invokeai/frontend/web/src/services/api/index.ts

@@ -49,11 +49,7 @@ const tagTypes = [
 export type ApiTagDescription = TagDescription<(typeof tagTypes)[number]>;
 export const LIST_TAG = 'LIST';
 
-const dynamicBaseQuery: BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError> = async (
+const dynamicBaseQuery: BaseQueryFn<string | FetchArgs, unknown, FetchBaseQueryError> = (args, api, extraOptions) => {
-  args,
-  api,
-  extraOptions
-) => {
   const baseUrl = $baseUrl.get();
   const authToken = $authToken.get();
   const projectId = $projectId.get();