From 929bda55d79666e02e5a79b9bb26c391d2795442 Mon Sep 17 00:00:00 2001
From: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Wed, 18 Sep 2024 10:32:38 +1000
Subject: [PATCH] tidy(ui): remove save & copy functions for mask entities

Not 100% sure that the format these are in is correct just yet. Will restore once we support importing image masks.
---
 .../components/InpaintMask/InpaintMaskMenuItems.tsx |  4 ----
 .../RegionalGuidance/RegionalGuidanceMenuItems.tsx  |  4 ----
 .../web/src/features/controlLayers/store/types.ts   | 13 ++-----------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskMenuItems.tsx b/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskMenuItems.tsx
index a270d6c7543..925ba30e354 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskMenuItems.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskMenuItems.tsx
@@ -1,9 +1,7 @@
 import { MenuDivider } from '@invoke-ai/ui-library';
 import { CanvasEntityMenuItemsArrange } from 'features/controlLayers/components/common/CanvasEntityMenuItemsArrange';
-import { CanvasEntityMenuItemsCopyToClipboard } from 'features/controlLayers/components/common/CanvasEntityMenuItemsCopyToClipboard';
 import { CanvasEntityMenuItemsDelete } from 'features/controlLayers/components/common/CanvasEntityMenuItemsDelete';
 import { CanvasEntityMenuItemsDuplicate } from 'features/controlLayers/components/common/CanvasEntityMenuItemsDuplicate';
-import { CanvasEntityMenuItemsSave } from 'features/controlLayers/components/common/CanvasEntityMenuItemsSave';
 import { CanvasEntityMenuItemsTransform } from 'features/controlLayers/components/common/CanvasEntityMenuItemsTransform';
 import { memo } from 'react';
 
@@ -15,8 +13,6 @@ export const InpaintMaskMenuItems = memo(() => {
       <CanvasEntityMenuItemsArrange />
       <MenuDivider />
       <CanvasEntityMenuItemsDuplicate />
-      <CanvasEntityMenuItemsCopyToClipboard />
-      <CanvasEntityMenuItemsSave />
       <CanvasEntityMenuItemsDelete />
     </>
   );
diff --git a/invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceMenuItems.tsx b/invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceMenuItems.tsx
index e89a41fa80e..ac21fd6357a 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceMenuItems.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceMenuItems.tsx
@@ -1,9 +1,7 @@
 import { MenuDivider } from '@invoke-ai/ui-library';
 import { CanvasEntityMenuItemsArrange } from 'features/controlLayers/components/common/CanvasEntityMenuItemsArrange';
-import { CanvasEntityMenuItemsCopyToClipboard } from 'features/controlLayers/components/common/CanvasEntityMenuItemsCopyToClipboard';
 import { CanvasEntityMenuItemsDelete } from 'features/controlLayers/components/common/CanvasEntityMenuItemsDelete';
 import { CanvasEntityMenuItemsDuplicate } from 'features/controlLayers/components/common/CanvasEntityMenuItemsDuplicate';
-import { CanvasEntityMenuItemsSave } from 'features/controlLayers/components/common/CanvasEntityMenuItemsSave';
 import { CanvasEntityMenuItemsTransform } from 'features/controlLayers/components/common/CanvasEntityMenuItemsTransform';
 import { RegionalGuidanceMenuItemsAddPromptsAndIPAdapter } from 'features/controlLayers/components/RegionalGuidance/RegionalGuidanceMenuItemsAddPromptsAndIPAdapter';
 import { RegionalGuidanceMenuItemsAutoNegative } from 'features/controlLayers/components/RegionalGuidance/RegionalGuidanceMenuItemsAutoNegative';
@@ -20,8 +18,6 @@ export const RegionalGuidanceMenuItems = memo(() => {
       <CanvasEntityMenuItemsArrange />
       <MenuDivider />
       <CanvasEntityMenuItemsDuplicate />
-      <CanvasEntityMenuItemsCopyToClipboard />
-      <CanvasEntityMenuItemsSave />
       <CanvasEntityMenuItemsDelete />
     </>
   );
diff --git a/invokeai/frontend/web/src/features/controlLayers/store/types.ts b/invokeai/frontend/web/src/features/controlLayers/store/types.ts
index b24788f3eae..bdddaeecbb8 100644
--- a/invokeai/frontend/web/src/features/controlLayers/store/types.ts
+++ b/invokeai/frontend/web/src/features/controlLayers/store/types.ts
@@ -386,17 +386,8 @@ export function isTransformableEntityIdentifier(
 
 export function isSaveableEntityIdentifier(
   entityIdentifier: CanvasEntityIdentifier
-): entityIdentifier is
-  | CanvasEntityIdentifier<'raster_layer'>
-  | CanvasEntityIdentifier<'control_layer'>
-  | CanvasEntityIdentifier<'inpaint_mask'>
-  | CanvasEntityIdentifier<'regional_guidance'> {
-  return (
-    isRasterLayerEntityIdentifier(entityIdentifier) ||
-    isControlLayerEntityIdentifier(entityIdentifier) ||
-    isInpaintMaskEntityIdentifier(entityIdentifier) ||
-    isRegionalGuidanceEntityIdentifier(entityIdentifier)
-  );
+): entityIdentifier is CanvasEntityIdentifier<'raster_layer'> | CanvasEntityIdentifier<'control_layer'> {
+  return isRasterLayerEntityIdentifier(entityIdentifier) || isControlLayerEntityIdentifier(entityIdentifier);
 }
 
 export function isRenderableEntity(entity: CanvasEntityState): entity is CanvasRenderableEntityState {