From 6a5b2b442a5eba550ede224ee2bd41ab9228a1bd Mon Sep 17 00:00:00 2001 From: Varun Date: Wed, 8 Apr 2026 09:22:55 +0530 Subject: [PATCH] feat: asset delete in preview, workflow api key auto-generate, UI polish Add delete with confirm dialog to asset lightbox (always visible, handles deletion internally with local state update). Force dark theme on asset info panel and fix text color inheritance. Add edge-to-edge image display in lightbox by removing slide padding. Show open-in-immich link on hover only. Add workflow page title breadcrumb. Add one-click workflow API key generation that creates the key in Immich and saves it automatically. --- src/components/asset-info/AssetInfoPanel.tsx | 8 +- src/components/shared/AssetGrid.tsx | 107 +++++++++++++----- .../api/settings/generate-workflow-api-key.ts | 53 +++++++++ src/pages/workflows/[id].tsx | 35 +++++- src/styles/globals.scss | 8 ++ 5 files changed, 175 insertions(+), 36 deletions(-) create mode 100644 src/pages/api/settings/generate-workflow-api-key.ts diff --git a/src/components/asset-info/AssetInfoPanel.tsx b/src/components/asset-info/AssetInfoPanel.tsx index c395082..1b935f2 100644 --- a/src/components/asset-info/AssetInfoPanel.tsx +++ b/src/components/asset-info/AssetInfoPanel.tsx @@ -142,7 +142,7 @@ function PersonChip({ person: p, exImmichUrl, isHidden: hidden, onUpdate }: Pers )} - {p.personName || 'Unknown'} + {p.personName || 'Unknown'} @@ -262,7 +262,7 @@ export default function AssetInfoPanel({ assetId }: AssetInfoPanelProps) { if (loading) { return ( -
+

Info

@@ -275,7 +275,7 @@ export default function AssetInfoPanel({ assetId }: AssetInfoPanelProps) { if (!detail) { return ( -
+

Info

Unable to load asset details.

@@ -296,7 +296,7 @@ export default function AssetInfoPanel({ assetId }: AssetInfoPanelProps) { : null return ( -
+
{/* Header */}

Info

diff --git a/src/components/shared/AssetGrid.tsx b/src/components/shared/AssetGrid.tsx index ddcc6fd..f8bb084 100644 --- a/src/components/shared/AssetGrid.tsx +++ b/src/components/shared/AssetGrid.tsx @@ -13,8 +13,19 @@ import { usePhotoSelectionContext } from '@/contexts/PhotoSelectionContext'; import { useConfig } from '@/contexts/ConfigContext'; import dynamic from 'next/dynamic'; import { Heart, Info, Trash2, ExternalLink } from 'lucide-react'; -import { updateAssets } from '@/handlers/api/asset.handler'; +import { updateAssets, deleteAssets } from '@/handlers/api/asset.handler'; import { toast } from '@/components/ui/use-toast'; +import { + AlertDialogHeader, + AlertDialogTitle, + AlertDialogDescription, + AlertDialogFooter, + AlertDialogCancel, + AlertDialogAction, + AlertDialogPortal, + AlertDialogOverlay, +} from '@/components/ui/alert-dialog'; +import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'; const AssetInfoPanel = dynamic(() => import('@/components/asset-info/AssetInfoPanel'), { ssr: false }); @@ -50,6 +61,8 @@ const AssetGrid = forwardRef(({ assets, isInternal return false }); const [favoriteIds, setFavoriteIds] = useState>(() => new Set(assets.filter(a => a.isFavorite).map(a => a.id))); + const [deletedIds, setDeletedIds] = useState>(new Set()); + const [deleteConfirmOpen, setDeleteConfirmOpen] = useState(false); const { exImmichUrl } = useConfig(); // Use context for selection state const { selectedIds, updateContext } = usePhotoSelectionContext(); @@ -145,7 +158,7 @@ const AssetGrid = forwardRef(({ assets, isInternal }; const slides = useMemo(() => { - return assets.map((asset) => ({ + return assets.filter((asset) => !deletedIds.has(asset.id)).map((asset) => ({ ...asset, orientation: 1, src: asset.previewUrl as string, @@ -166,18 +179,20 @@ const AssetGrid = forwardRef(({ assets, isInternal }, [assets]); const images: AssetPhoto[] = useMemo(() => { - return assets.map((p) => ({ - ...p, - src: p.url as string, - original: p.previewUrl as string, - width: p.exifImageWidth as number, - height: p.exifImageHeight as number, - orientation: 1, - isSelected: selectedIds.includes(p.id), - isVideo: p.type === "VIDEO", - duration: p.duration != null ? String(p.duration) : undefined, - })); - }, [assets, selectedIds, exImmichUrl]); + return assets + .filter((p) => !deletedIds.has(p.id)) + .map((p) => ({ + ...p, + src: p.url as string, + original: p.previewUrl as string, + width: p.exifImageWidth as number, + height: p.exifImageHeight as number, + orientation: 1, + isSelected: selectedIds.includes(p.id), + isVideo: p.type === "VIDEO", + duration: p.duration != null ? String(p.duration) : undefined, + })); + }, [assets, selectedIds, deletedIds]); const handleEsc = (event: KeyboardEvent) => { if (event.key === "Escape") { @@ -242,20 +257,15 @@ const AssetGrid = forwardRef(({ assets, isInternal > , - ...(onDeleteAsset ? [ - , - ] : []), + , ]; }, [currentAsset, showInfoPanel, onDeleteAsset, onFavoriteAsset, handleOpenInImmich, favoriteIds, handleToggleFavorite]); @@ -280,7 +290,7 @@ const AssetGrid = forwardRef(({ assets, isInternal render={{ slideContainer: ({ children }) => (
-
+
{children}
{showInfoPanel && currentAsset && ( @@ -295,8 +305,47 @@ const AssetGrid = forwardRef(({ assets, isInternal container: { backgroundColor: "rgba(0, 0, 0, 0.95)", }, + slide: { + padding: 0, + }, }} /> + + + + + + Delete asset? + + This will permanently delete{currentAsset ? ` "${currentAsset.originalFileName}"` : " this asset"}. This action cannot be undone. + + + + setDeleteConfirmOpen(false)}>Cancel + { + if (currentAsset) { + try { + await deleteAssets([currentAsset.id]); + setDeletedIds((prev) => new Set(prev).add(currentAsset.id)); + onDeleteAsset?.(currentAsset.id); + toast({ title: "Deleted", description: `"${currentAsset.originalFileName}" deleted.` }); + setIndex(-1); + } catch { + toast({ title: "Error", description: "Failed to delete asset.", variant: "destructive" }); + } + } + setDeleteConfirmOpen(false); + }} + > + Delete + + + + + + ({})); + return res.status(immichRes.status).json({ message: err.message ?? "Failed to create API key in Immich" }); + } + + const { secret } = await immichRes.json(); + + // Save the secret to the KV settings store as workflow_api_key + const [existing] = await appDb + .select() + .from(settings) + .where(and(eq(settings.key, WORKFLOW_API_KEY_SETTING), eq(settings.ownerId, currentUser.id))); + + if (existing) { + await appDb.update(settings).set({ value: secret }).where(eq(settings.id, existing.id)); + } else { + await appDb.insert(settings).values({ key: WORKFLOW_API_KEY_SETTING, value: secret, ownerId: currentUser.id }); + } + + return res.status(200).json({ success: true }); +} diff --git a/src/pages/workflows/[id].tsx b/src/pages/workflows/[id].tsx index 1a1a956..ba09b1e 100644 --- a/src/pages/workflows/[id].tsx +++ b/src/pages/workflows/[id].tsx @@ -30,7 +30,8 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@ import { Badge } from "@/components/ui/badge"; import { ASSET_THUMBNAIL_PATH } from "@/config/routes"; import { IWorkflowRun } from "@/types/workflow"; -import { ArrowLeft, Play, Save, Clock, Webhook, History, ChevronUp, ChevronDown, Bug, TriangleAlert } from "lucide-react"; +import { ArrowLeft, Play, Save, Clock, Webhook, History, ChevronUp, ChevronDown, Bug, TriangleAlert, Wand2 } from "lucide-react"; +import Head from "next/head"; import { format } from "date-fns"; import Link from "next/link"; import Loader from "@/components/ui/loader"; @@ -231,6 +232,7 @@ function WorkflowEditorInner() { const [showRuns, setShowRuns] = useState(false); const [expandedRunId, setExpandedRunId] = useState(null); const [hasApiKey, setHasApiKey] = useState(null); + const [generatingKey, setGeneratingKey] = useState(false); const [nodes, setNodes, onNodesChange] = useNodesState([] as Node[]); const [edges, setEdges, onEdgesChange] = useEdgesState([] as Edge[]); @@ -259,6 +261,19 @@ function WorkflowEditorInner() { .catch(() => setHasApiKey(false)); }, [id]); + const handleGenerateApiKey = async () => { + setGeneratingKey(true); + try { + await API.post("/api/settings/generate-workflow-api-key", {}); + setHasApiKey(true); + hotToast.success("Workflow API key created and saved"); + } catch (err: any) { + hotToast.error(err?.message ?? "Failed to create API key"); + } finally { + setGeneratingKey(false); + } + }; + const onConnect = useCallback((connection: Connection) => { setEdges((eds) => addEdge({ ...connection, animated: true }, eds)); }, [setEdges]); @@ -421,11 +436,16 @@ function WorkflowEditorInner() { return (
+ + {workflowName ? `${workflowName} — Workflow` : "Workflow"} + {/* Top bar */}
+ Workflow + / - tag.create — Create and assign tags
+ -
diff --git a/src/styles/globals.scss b/src/styles/globals.scss index f14c264..6c4161f 100644 --- a/src/styles/globals.scss +++ b/src/styles/globals.scss @@ -101,6 +101,14 @@ } +.react-photo-album--photo a[href] { + opacity: 0; + transition: opacity 0.15s ease; +} +.react-photo-album--photo:hover a[href] { + opacity: 1; +} + .leaflet-tile-pane { z-index: 1 !important; }