From d9a75371690fa6884d1baca670871777f3038702 Mon Sep 17 00:00:00 2001
From: Chenlei Hu <chenlei.hu@mail.utoronto.ca>
Date: Sun, 1 Sep 2024 18:55:56 -0400
Subject: [PATCH] Fix top level bookmark migration (#706)

---
 browser_tests/menu.spec.ts      | 6 ++++--
 src/stores/nodeBookmarkStore.ts | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/browser_tests/menu.spec.ts b/browser_tests/menu.spec.ts
index 039c9bd102..0b0fd188c9 100644
--- a/browser_tests/menu.spec.ts
+++ b/browser_tests/menu.spec.ts
@@ -345,7 +345,9 @@ test.describe('Menu', () => {
     test('Can migrate legacy bookmarks', async ({ comfyPage }) => {
       await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks', [
         'foo/',
-        'foo/KSampler (Advanced)'
+        'foo/KSampler (Advanced)',
+        'UNKNOWN',
+        'KSampler'
       ])
       await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [])
       await comfyPage.page.reload()
@@ -355,7 +357,7 @@ test.describe('Menu', () => {
       )
       expect(
         await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
-      ).toEqual(['foo/', 'foo/KSamplerAdvanced'])
+      ).toEqual(['foo/', 'foo/KSamplerAdvanced', 'KSampler'])
     })
   })
 
diff --git a/src/stores/nodeBookmarkStore.ts b/src/stores/nodeBookmarkStore.ts
index 20930fc623..091b5cb57e 100644
--- a/src/stores/nodeBookmarkStore.ts
+++ b/src/stores/nodeBookmarkStore.ts
@@ -28,7 +28,7 @@ export const useNodeBookmarkStore = defineStore('nodeBookmark', () => {
         const nodeDef = nodeDefStore.nodeDefsByDisplayName[displayName]
 
         if (!nodeDef) return
-        addBookmark(`${category}/${nodeDef.name}`)
+        addBookmark(`${category === '' ? '' : category + '/'}${nodeDef.name}`)
       })
     settingStore.set('Comfy.NodeLibrary.Bookmarks', [])
   }