fix deletion of assets on delete ref and delete proj

2026-02-26 09:56:50 +09:00
parent b167702bca
commit c77381a59a
2 changed files with 30 additions and 22 deletions
@@ -1,3 +1,5 @@
+'use client'
+
 import {
  type AnyNodeId,
  type GuideNode,
@@ -133,19 +135,25 @@ export function ReferencesDialog({ levelId, open, onOpenChange }: ReferencesDial
  )

  const handleDelete = useCallback(
-    (nodeId: string) => {
+    async (nodeId: string) => {
      const refNode = nodes[nodeId as AnyNodeId] as ScanNode | GuideNode | undefined
-      deleteNode(nodeId as AnyNodeId)
-      // Fire-and-forget storage cleanup for Supabase-hosted assets
      const projectId = activeProject?.id
+
+      // Delete storage asset first (before removing from scene)
      if (
        projectId &&
        !projectId.startsWith('local_') &&
        refNode?.url &&
-        refNode.url.startsWith('https://')
+        (refNode.url.startsWith('http://') || refNode.url.startsWith('https://'))
      ) {
-        deleteProjectAssetByUrl(projectId, refNode.url).catch(console.error)
+        const result = await deleteProjectAssetByUrl(projectId, refNode.url)
+        if (!result.success) {
+          setUploadError(`Failed to delete asset: ${result.error}`)
+          return
+        }
      }
+
+      deleteNode(nodeId as AnyNodeId)
    },
    [deleteNode, nodes, activeProject],
  )
@@ -130,29 +130,29 @@ export async function deleteProjectAssetByUrl(
      return { success: false, error: 'Not authorized' }
    }

-    // Look up the asset row by url + projectId
-    const { data: asset, error: fetchError } = await (supabase.from('project_assets') as any)
-      .select('id, storage_key')
-      .eq('project_id', projectId)
-      .eq('url', url)
-      .maybeSingle()
+    // Derive storage_key from the public URL
+    // URL format: https://<project>.supabase.co/storage/v1/object/public/project-assets/<storageKey>
+    const storageKeyFromUrl = url.split(`/${BUCKET}/`)[1]?.split('?')[0]

-    if (fetchError) {
-      return { success: false, error: fetchError.message }
+    if (!storageKeyFromUrl) {
+      return { success: false, error: 'Could not derive storage key from URL' }
    }

-    if (!asset) {
-      // Nothing to delete — treat as success
-      return { success: true }
+    // Delete from storage directly — remove() is a no-op if the file doesn't exist
+    const { error: storageError } = await supabase.storage.from(BUCKET).remove([storageKeyFromUrl])
+    if (storageError) {
+      return { success: false, error: `Storage delete failed: ${storageError.message}` }
    }

-    // Remove from storage
-    await supabase.storage.from(BUCKET).remove([(asset as any).storage_key])
-
-    // Delete row
-    await (supabase.from('project_assets') as any)
+    // Delete DB row by storage_key scoped to this project
+    const { error: dbError } = await (supabase.from('project_assets') as any)
      .delete()
-      .eq('id', (asset as any).id)
+      .eq('project_id', projectId)
+      .eq('storage_key', storageKeyFromUrl)
+
+    if (dbError) {
+      return { success: false, error: `DB delete failed: ${dbError.message}` }
+    }

    return { success: true }
  } catch (error) {