tidy(ui): update image usage names to match canvas v2

- "isControlAdapterImage" -> "isControlLayerImage" - "isIPAdapterImage" -> "isReferenceImage"
invoke-ai · Sep 18, 2024 · c57c6a6 · c57c6a6
1 parent db9d109
commit c57c6a6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/...ontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageToDeleteSelected.ts b/...ontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageToDeleteSelected.ts
@@ -14,8 +14,8 @@ export const addImageToDeleteSelectedListener = (startAppListening: AppStartList
 
       const isImageInUse =
         imagesUsage.some((i) => i.isRasterLayerImage) ||
-        imagesUsage.some((i) => i.isControlAdapterImage) ||
-        imagesUsage.some((i) => i.isIPAdapterImage) ||
+        imagesUsage.some((i) => i.isControlLayerImage) ||
+        imagesUsage.some((i) => i.isReferenceImage) ||
         imagesUsage.some((i) => i.isInpaintMaskImage) ||
         imagesUsage.some((i) => i.isUpscaleImage) ||
         imagesUsage.some((i) => i.isNodesImage) ||

diff --git a/invokeai/frontend/web/src/features/deleteImageModal/components/DeleteImageModal.tsx b/invokeai/frontend/web/src/features/deleteImageModal/components/DeleteImageModal.tsx
@@ -36,8 +36,8 @@ const selectImageUsages = createMemoizedSelector(
       isInpaintMaskImage: some(allImageUsage, (i) => i.isInpaintMaskImage),
       isRegionalGuidanceImage: some(allImageUsage, (i) => i.isRegionalGuidanceImage),
       isNodesImage: some(allImageUsage, (i) => i.isNodesImage),
-      isControlAdapterImage: some(allImageUsage, (i) => i.isControlAdapterImage),
-      isIPAdapterImage: some(allImageUsage, (i) => i.isIPAdapterImage),
+      isControlLayerImage: some(allImageUsage, (i) => i.isControlLayerImage),
+      isReferenceImage: some(allImageUsage, (i) => i.isReferenceImage),
     };
 
     return {

diff --git a/invokeai/frontend/web/src/features/deleteImageModal/components/ImageUsageMessage.tsx b/invokeai/frontend/web/src/features/deleteImageModal/components/ImageUsageMessage.tsx
@@ -29,8 +29,8 @@ const ImageUsageMessage = (props: Props) => {
     <>
       <Text>{topMessage}</Text>
       <UnorderedList paddingInlineStart={6} fontSize="sm">
-        {imageUsage.isControlAdapterImage && <ListItem>{t('controlLayers.controlLayer')}</ListItem>}
-        {imageUsage.isIPAdapterImage && <ListItem>{t('controlLayers.referenceImage')}</ListItem>}
+        {imageUsage.isControlLayerImage && <ListItem>{t('controlLayers.controlLayer')}</ListItem>}
+        {imageUsage.isReferenceImage && <ListItem>{t('controlLayers.referenceImage')}</ListItem>}
         {imageUsage.isInpaintMaskImage && <ListItem>{t('controlLayers.inpaintMask')}</ListItem>}
         {imageUsage.isRasterLayerImage && <ListItem>{t('controlLayers.rasterLayer')}</ListItem>}
         {imageUsage.isRegionalGuidanceImage && <ListItem>{t('controlLayers.regionalGuidance')}</ListItem>}

diff --git a/invokeai/frontend/web/src/features/deleteImageModal/store/selectors.ts b/invokeai/frontend/web/src/features/deleteImageModal/store/selectors.ts
@@ -21,15 +21,15 @@ export const getImageUsage = (nodes: NodesState, canvas: CanvasState, upscale: U
 
   const isUpscaleImage = upscale.upscaleInitialImage?.image_name === image_name;
 
-  const isIPAdapterImage = canvas.referenceImages.entities.some(
+  const isReferenceImage = canvas.referenceImages.entities.some(
     ({ ipAdapter }) => ipAdapter.image?.image_name === image_name
   );
 
   const isRasterLayerImage = canvas.rasterLayers.entities.some(({ objects }) =>
     objects.some((obj) => isCanvasImageState(obj) && obj.image.image_name === image_name)
   );
 
-  const isControlAdapterImage = canvas.controlLayers.entities.some(({ objects }) =>
+  const isControlLayerImage = canvas.controlLayers.entities.some(({ objects }) =>
     objects.some((obj) => isCanvasImageState(obj) && obj.image.image_name === image_name)
   );
 
@@ -47,8 +47,8 @@ export const getImageUsage = (nodes: NodesState, canvas: CanvasState, upscale: U
     isInpaintMaskImage,
     isRegionalGuidanceImage,
     isNodesImage,
-    isControlAdapterImage,
-    isIPAdapterImage,
+    isControlLayerImage,
+    isReferenceImage,
   };
 
   return imageUsage;

diff --git a/invokeai/frontend/web/src/features/deleteImageModal/store/types.ts b/invokeai/frontend/web/src/features/deleteImageModal/store/types.ts
@@ -11,6 +11,6 @@ export type ImageUsage = {
   isInpaintMaskImage: boolean;
   isRegionalGuidanceImage: boolean;
   isNodesImage: boolean;
-  isControlAdapterImage: boolean;
-  isIPAdapterImage: boolean;
+  isControlLayerImage: boolean;
+  isReferenceImage: boolean;
 };
diff --git a/invokeai/frontend/web/src/features/gallery/components/Boards/DeleteBoardModal.tsx b/invokeai/frontend/web/src/features/gallery/components/Boards/DeleteBoardModal.tsx
@@ -50,8 +50,8 @@ const DeleteBoardModal = () => {
           isInpaintMaskImage: some(allImageUsage, (i) => i.isInpaintMaskImage),
           isRegionalGuidanceImage: some(allImageUsage, (i) => i.isRegionalGuidanceImage),
           isNodesImage: some(allImageUsage, (i) => i.isNodesImage),
-          isControlAdapterImage: some(allImageUsage, (i) => i.isControlAdapterImage),
-          isIPAdapterImage: some(allImageUsage, (i) => i.isIPAdapterImage),
+          isControlLayerImage: some(allImageUsage, (i) => i.isControlLayerImage),
+          isReferenceImage: some(allImageUsage, (i) => i.isReferenceImage),
         };
 
         return imageUsageSummary;