From db9af5083f13460d60ad65861cfa86c95d294751 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Fri, 18 Jul 2025 16:06:55 +1000 Subject: [PATCH] tidy(ui): move launchpad components to ui dir --- .../nodes/components/sidePanel/viewMode/EmptyState.tsx | 2 +- .../SimpleSession => ui/layouts}/CanvasLaunchpadPanel.tsx | 0 .../SimpleSession => ui/layouts}/GenerateLaunchpadPanel.tsx | 4 ++-- .../layouts}/InitialStateMainModelPicker.tsx | 0 .../layouts}/LaunchpadAddStyleReference.tsx | 2 +- .../SimpleSession => ui/layouts}/LaunchpadButton.tsx | 0 .../SimpleSession => ui/layouts}/LaunchpadContainer.tsx | 0 .../SimpleSession => ui/layouts}/LaunchpadEditImageButton.tsx | 2 +- .../layouts}/LaunchpadGenerateFromTextButton.tsx | 2 +- .../layouts}/LaunchpadUseALayoutImageButton.tsx | 0 .../SimpleSession => ui/layouts}/UpscalingLaunchpadPanel.tsx | 0 .../SimpleSession => ui/layouts}/WorkflowsLaunchpadPanel.tsx | 0 .../web/src/features/ui/layouts/canvas-tab-auto-layout.tsx | 2 +- .../web/src/features/ui/layouts/generate-tab-auto-layout.tsx | 2 +- .../web/src/features/ui/layouts/upscaling-tab-auto-layout.tsx | 2 +- .../web/src/features/ui/layouts/workflows-tab-auto-layout.tsx | 2 +- 16 files changed, 10 insertions(+), 10 deletions(-) rename invokeai/frontend/web/src/features/{controlLayers/components/SimpleSession => ui/layouts}/CanvasLaunchpadPanel.tsx (100%) rename invokeai/frontend/web/src/features/{controlLayers/components/SimpleSession => ui/layouts}/GenerateLaunchpadPanel.tsx (87%) rename invokeai/frontend/web/src/features/{controlLayers/components/SimpleSession => ui/layouts}/InitialStateMainModelPicker.tsx (100%) rename invokeai/frontend/web/src/features/{controlLayers/components/SimpleSession => ui/layouts}/LaunchpadAddStyleReference.tsx (95%) rename invokeai/frontend/web/src/features/{controlLayers/components/SimpleSession => ui/layouts}/LaunchpadButton.tsx (100%) rename invokeai/frontend/web/src/features/{controlLayers/components/SimpleSession => ui/layouts}/LaunchpadContainer.tsx (100%) rename invokeai/frontend/web/src/features/{controlLayers/components/SimpleSession => ui/layouts}/LaunchpadEditImageButton.tsx (94%) rename invokeai/frontend/web/src/features/{controlLayers/components/SimpleSession => ui/layouts}/LaunchpadGenerateFromTextButton.tsx (92%) rename invokeai/frontend/web/src/features/{controlLayers/components/SimpleSession => ui/layouts}/LaunchpadUseALayoutImageButton.tsx (100%) rename invokeai/frontend/web/src/features/{controlLayers/components/SimpleSession => ui/layouts}/UpscalingLaunchpadPanel.tsx (100%) rename invokeai/frontend/web/src/features/{controlLayers/components/SimpleSession => ui/layouts}/WorkflowsLaunchpadPanel.tsx (100%) diff --git a/invokeai/frontend/web/src/features/nodes/components/sidePanel/viewMode/EmptyState.tsx b/invokeai/frontend/web/src/features/nodes/components/sidePanel/viewMode/EmptyState.tsx index 5fb3a37d15..410633acf8 100644 --- a/invokeai/frontend/web/src/features/nodes/components/sidePanel/viewMode/EmptyState.tsx +++ b/invokeai/frontend/web/src/features/nodes/components/sidePanel/viewMode/EmptyState.tsx @@ -1,9 +1,9 @@ import { Flex, Heading, Icon, Link, Text } from '@invoke-ai/ui-library'; import { useAppDispatch } from 'app/store/storeHooks'; -import { LaunchpadButton } from 'features/controlLayers/components/SimpleSession/LaunchpadButton'; import { useIsWorkflowUntouched } from 'features/nodes/components/sidePanel/workflow/IsolatedWorkflowBuilderWatcher'; import { useWorkflowLibraryModal } from 'features/nodes/store/workflowLibraryModal'; import { workflowModeChanged } from 'features/nodes/store/workflowLibrarySlice'; +import { LaunchpadButton } from 'features/ui/layouts/LaunchpadButton'; import { useCallback } from 'react'; import { Trans, useTranslation } from 'react-i18next'; import { PiFolderOpenBold, PiPlusBold } from 'react-icons/pi'; diff --git a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/CanvasLaunchpadPanel.tsx b/invokeai/frontend/web/src/features/ui/layouts/CanvasLaunchpadPanel.tsx similarity index 100% rename from invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/CanvasLaunchpadPanel.tsx rename to invokeai/frontend/web/src/features/ui/layouts/CanvasLaunchpadPanel.tsx diff --git a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/GenerateLaunchpadPanel.tsx b/invokeai/frontend/web/src/features/ui/layouts/GenerateLaunchpadPanel.tsx similarity index 87% rename from invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/GenerateLaunchpadPanel.tsx rename to invokeai/frontend/web/src/features/ui/layouts/GenerateLaunchpadPanel.tsx index dd7160cb43..2db7cdef4e 100644 --- a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/GenerateLaunchpadPanel.tsx +++ b/invokeai/frontend/web/src/features/ui/layouts/GenerateLaunchpadPanel.tsx @@ -1,9 +1,9 @@ import { Alert, Button, Flex, Grid, Text } from '@invoke-ai/ui-library'; -import { InitialStateMainModelPicker } from 'features/controlLayers/components/SimpleSession/InitialStateMainModelPicker'; -import { LaunchpadAddStyleReference } from 'features/controlLayers/components/SimpleSession/LaunchpadAddStyleReference'; import { navigationApi } from 'features/ui/layouts/navigation-api'; import { memo, useCallback } from 'react'; +import { InitialStateMainModelPicker } from './InitialStateMainModelPicker'; +import { LaunchpadAddStyleReference } from './LaunchpadAddStyleReference'; import { LaunchpadContainer } from './LaunchpadContainer'; import { LaunchpadGenerateFromTextButton } from './LaunchpadGenerateFromTextButton'; diff --git a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/InitialStateMainModelPicker.tsx b/invokeai/frontend/web/src/features/ui/layouts/InitialStateMainModelPicker.tsx similarity index 100% rename from invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/InitialStateMainModelPicker.tsx rename to invokeai/frontend/web/src/features/ui/layouts/InitialStateMainModelPicker.tsx diff --git a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadAddStyleReference.tsx b/invokeai/frontend/web/src/features/ui/layouts/LaunchpadAddStyleReference.tsx similarity index 95% rename from invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadAddStyleReference.tsx rename to invokeai/frontend/web/src/features/ui/layouts/LaunchpadAddStyleReference.tsx index 4f68f9eaf6..e95bdee250 100644 --- a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadAddStyleReference.tsx +++ b/invokeai/frontend/web/src/features/ui/layouts/LaunchpadAddStyleReference.tsx @@ -1,12 +1,12 @@ import { Flex, Heading, Icon, Text } from '@invoke-ai/ui-library'; import { useAppStore } from 'app/store/storeHooks'; import { useImageUploadButton } from 'common/hooks/useImageUploadButton'; -import { LaunchpadButton } from 'features/controlLayers/components/SimpleSession/LaunchpadButton'; import { getDefaultRefImageConfig } from 'features/controlLayers/hooks/addLayerHooks'; import { refImageAdded } from 'features/controlLayers/store/refImagesSlice'; import { imageDTOToImageWithDims } from 'features/controlLayers/store/util'; import { addGlobalReferenceImageDndTarget, newCanvasFromImageDndTarget } from 'features/dnd/dnd'; import { DndDropTarget } from 'features/dnd/DndDropTarget'; +import { LaunchpadButton } from 'features/ui/layouts/LaunchpadButton'; import { memo, useMemo } from 'react'; import { PiUploadBold, PiUserCircleGearBold } from 'react-icons/pi'; import type { ImageDTO } from 'services/api/types'; diff --git a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadButton.tsx b/invokeai/frontend/web/src/features/ui/layouts/LaunchpadButton.tsx similarity index 100% rename from invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadButton.tsx rename to invokeai/frontend/web/src/features/ui/layouts/LaunchpadButton.tsx diff --git a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadContainer.tsx b/invokeai/frontend/web/src/features/ui/layouts/LaunchpadContainer.tsx similarity index 100% rename from invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadContainer.tsx rename to invokeai/frontend/web/src/features/ui/layouts/LaunchpadContainer.tsx diff --git a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadEditImageButton.tsx b/invokeai/frontend/web/src/features/ui/layouts/LaunchpadEditImageButton.tsx similarity index 94% rename from invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadEditImageButton.tsx rename to invokeai/frontend/web/src/features/ui/layouts/LaunchpadEditImageButton.tsx index 7899b5f646..c9919e652f 100644 --- a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadEditImageButton.tsx +++ b/invokeai/frontend/web/src/features/ui/layouts/LaunchpadEditImageButton.tsx @@ -1,10 +1,10 @@ import { Flex, Heading, Icon, Text } from '@invoke-ai/ui-library'; import { useAppStore } from 'app/store/storeHooks'; import { useImageUploadButton } from 'common/hooks/useImageUploadButton'; -import { LaunchpadButton } from 'features/controlLayers/components/SimpleSession/LaunchpadButton'; import { newCanvasFromImageDndTarget } from 'features/dnd/dnd'; import { DndDropTarget } from 'features/dnd/DndDropTarget'; import { newCanvasFromImage } from 'features/imageActions/actions'; +import { LaunchpadButton } from 'features/ui/layouts/LaunchpadButton'; import { memo, useCallback } from 'react'; import { PiPencilBold, PiUploadBold } from 'react-icons/pi'; import type { ImageDTO } from 'services/api/types'; diff --git a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadGenerateFromTextButton.tsx b/invokeai/frontend/web/src/features/ui/layouts/LaunchpadGenerateFromTextButton.tsx similarity index 92% rename from invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadGenerateFromTextButton.tsx rename to invokeai/frontend/web/src/features/ui/layouts/LaunchpadGenerateFromTextButton.tsx index e0bb929a87..a5d4c0c269 100644 --- a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadGenerateFromTextButton.tsx +++ b/invokeai/frontend/web/src/features/ui/layouts/LaunchpadGenerateFromTextButton.tsx @@ -1,5 +1,5 @@ import { Flex, Heading, Icon, Text } from '@invoke-ai/ui-library'; -import { LaunchpadButton } from 'features/controlLayers/components/SimpleSession/LaunchpadButton'; +import { LaunchpadButton } from 'features/ui/layouts/LaunchpadButton'; import { memo, useCallback } from 'react'; import { PiCursorTextBold, PiTextAaBold } from 'react-icons/pi'; diff --git a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadUseALayoutImageButton.tsx b/invokeai/frontend/web/src/features/ui/layouts/LaunchpadUseALayoutImageButton.tsx similarity index 100% rename from invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/LaunchpadUseALayoutImageButton.tsx rename to invokeai/frontend/web/src/features/ui/layouts/LaunchpadUseALayoutImageButton.tsx diff --git a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/UpscalingLaunchpadPanel.tsx b/invokeai/frontend/web/src/features/ui/layouts/UpscalingLaunchpadPanel.tsx similarity index 100% rename from invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/UpscalingLaunchpadPanel.tsx rename to invokeai/frontend/web/src/features/ui/layouts/UpscalingLaunchpadPanel.tsx diff --git a/invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/WorkflowsLaunchpadPanel.tsx b/invokeai/frontend/web/src/features/ui/layouts/WorkflowsLaunchpadPanel.tsx similarity index 100% rename from invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/WorkflowsLaunchpadPanel.tsx rename to invokeai/frontend/web/src/features/ui/layouts/WorkflowsLaunchpadPanel.tsx diff --git a/invokeai/frontend/web/src/features/ui/layouts/canvas-tab-auto-layout.tsx b/invokeai/frontend/web/src/features/ui/layouts/canvas-tab-auto-layout.tsx index ff76901061..cc4b8c4b7b 100644 --- a/invokeai/frontend/web/src/features/ui/layouts/canvas-tab-auto-layout.tsx +++ b/invokeai/frontend/web/src/features/ui/layouts/canvas-tab-auto-layout.tsx @@ -1,7 +1,6 @@ import type { DockviewApi, GridviewApi, IDockviewReactProps, IGridviewReactProps } from 'dockview'; import { DockviewReact, GridviewReact, LayoutPriority, Orientation } from 'dockview'; import { CanvasLayersPanel } from 'features/controlLayers/components/CanvasLayersPanelContent'; -import { CanvasLaunchpadPanel } from 'features/controlLayers/components/SimpleSession/CanvasLaunchpadPanel'; import { BoardsPanel } from 'features/gallery/components/BoardsListPanelContent'; import { GalleryPanel } from 'features/gallery/components/Gallery'; import { GenerationProgressPanel } from 'features/gallery/components/ImageViewer/GenerationProgressPanel'; @@ -15,6 +14,7 @@ import type { RootLayoutGridviewComponents, } from 'features/ui/layouts/auto-layout-context'; import { AutoLayoutProvider, useAutoLayoutContext, withPanelContainer } from 'features/ui/layouts/auto-layout-context'; +import { CanvasLaunchpadPanel } from 'features/ui/layouts/CanvasLaunchpadPanel'; import type { TabName } from 'features/ui/store/uiTypes'; import { dockviewTheme } from 'features/ui/styles/theme'; import { memo, useCallback, useEffect } from 'react'; diff --git a/invokeai/frontend/web/src/features/ui/layouts/generate-tab-auto-layout.tsx b/invokeai/frontend/web/src/features/ui/layouts/generate-tab-auto-layout.tsx index 3c63ea6494..5e433038a6 100644 --- a/invokeai/frontend/web/src/features/ui/layouts/generate-tab-auto-layout.tsx +++ b/invokeai/frontend/web/src/features/ui/layouts/generate-tab-auto-layout.tsx @@ -1,6 +1,5 @@ import type { DockviewApi, GridviewApi, IDockviewReactProps, IGridviewReactProps } from 'dockview'; import { DockviewReact, GridviewReact, LayoutPriority, Orientation } from 'dockview'; -import { GenerateLaunchpadPanel } from 'features/controlLayers/components/SimpleSession/GenerateLaunchpadPanel'; import { BoardsPanel } from 'features/gallery/components/BoardsListPanelContent'; import { GalleryPanel } from 'features/gallery/components/Gallery'; import { GenerationProgressPanel } from 'features/gallery/components/ImageViewer/GenerationProgressPanel'; @@ -21,6 +20,7 @@ import { memo, useCallback, useEffect } from 'react'; import { DockviewTab } from './DockviewTab'; import { DockviewTabLaunchpad } from './DockviewTabLaunchpad'; import { DockviewTabProgress } from './DockviewTabProgress'; +import { GenerateLaunchpadPanel } from './GenerateLaunchpadPanel'; import { GenerateTabLeftPanel } from './GenerateTabLeftPanel'; import { navigationApi } from './navigation-api'; import { PanelHotkeysLogical } from './PanelHotkeysLogical'; diff --git a/invokeai/frontend/web/src/features/ui/layouts/upscaling-tab-auto-layout.tsx b/invokeai/frontend/web/src/features/ui/layouts/upscaling-tab-auto-layout.tsx index 5dffd5172d..005abdea30 100644 --- a/invokeai/frontend/web/src/features/ui/layouts/upscaling-tab-auto-layout.tsx +++ b/invokeai/frontend/web/src/features/ui/layouts/upscaling-tab-auto-layout.tsx @@ -1,6 +1,5 @@ import type { DockviewApi, GridviewApi, IDockviewReactProps, IGridviewReactProps } from 'dockview'; import { DockviewReact, GridviewReact, LayoutPriority, Orientation } from 'dockview'; -import { UpscalingLaunchpadPanel } from 'features/controlLayers/components/SimpleSession/UpscalingLaunchpadPanel'; import { BoardsPanel } from 'features/gallery/components/BoardsListPanelContent'; import { GalleryPanel } from 'features/gallery/components/Gallery'; import { GenerationProgressPanel } from 'features/gallery/components/ImageViewer/GenerationProgressPanel'; @@ -43,6 +42,7 @@ import { SETTINGS_PANEL_ID, VIEWER_PANEL_ID, } from './shared'; +import { UpscalingLaunchpadPanel } from './UpscalingLaunchpadPanel'; import { UpscalingTabLeftPanel } from './UpscalingTabLeftPanel'; const tabComponents = { diff --git a/invokeai/frontend/web/src/features/ui/layouts/workflows-tab-auto-layout.tsx b/invokeai/frontend/web/src/features/ui/layouts/workflows-tab-auto-layout.tsx index 7785ae836f..808b01fee2 100644 --- a/invokeai/frontend/web/src/features/ui/layouts/workflows-tab-auto-layout.tsx +++ b/invokeai/frontend/web/src/features/ui/layouts/workflows-tab-auto-layout.tsx @@ -1,6 +1,5 @@ import type { DockviewApi, GridviewApi, IDockviewReactProps, IGridviewReactProps } from 'dockview'; import { DockviewReact, GridviewReact, LayoutPriority, Orientation } from 'dockview'; -import { WorkflowsLaunchpadPanel } from 'features/controlLayers/components/SimpleSession/WorkflowsLaunchpadPanel'; import { BoardsPanel } from 'features/gallery/components/BoardsListPanelContent'; import { GalleryPanel } from 'features/gallery/components/Gallery'; import { GenerationProgressPanel } from 'features/gallery/components/ImageViewer/GenerationProgressPanel'; @@ -46,6 +45,7 @@ import { VIEWER_PANEL_ID, WORKSPACE_PANEL_ID, } from './shared'; +import { WorkflowsLaunchpadPanel } from './WorkflowsLaunchpadPanel'; const tabComponents = { [DOCKVIEW_TAB_ID]: DockviewTab,