Rename setting

Comfy-Org · Sep 3, 2024 · f714c3a · f714c3a
1 parent a5e73b6
commit f714c3a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 29 deletions.
diff --git a/browser_tests/interaction.spec.ts b/browser_tests/interaction.spec.ts
@@ -25,10 +25,7 @@ test.describe('Node Interaction', () => {
   })
 
   test('Can disconnect/connect edge', async ({ comfyPage }) => {
-    await comfyPage.setSetting(
-      'Comfy.NodeSearchBoxImpl.LinkReleaseAction',
-      'no action'
-    )
+    await comfyPage.setSetting('Comfy.LinkRelease.Action', 'no action')
     await comfyPage.disconnectEdge()
     await expect(comfyPage.canvas).toHaveScreenshot(
       'disconnected-edge-with-menu.png'

diff --git a/browser_tests/nodeSearchBox.spec.ts b/browser_tests/nodeSearchBox.spec.ts
@@ -3,14 +3,8 @@ import { comfyPageFixture as test } from './ComfyPage'
 
 test.describe('Node search box', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting(
-      'Comfy.NodeSearchBoxImpl.LinkReleaseAction',
-      'search box'
-    )
-    await comfyPage.setSetting(
-      'Comfy.NodeSearchBoxImpl.LinkReleaseActionShift',
-      'search box'
-    )
+    await comfyPage.setSetting('Comfy.LinkRelease.Action', 'search box')
+    await comfyPage.setSetting('Comfy.LinkRelease.ActionShift', 'search box')
     await comfyPage.setSetting('Comfy.NodeSearchBoxImpl', 'default')
   })
 
@@ -79,14 +73,8 @@ test.describe('Node search box', () => {
 
 test.describe('Release context menu', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting(
-      'Comfy.NodeSearchBoxImpl.LinkReleaseAction',
-      'context menu'
-    )
-    await comfyPage.setSetting(
-      'Comfy.NodeSearchBoxImpl.LinkReleaseActionShift',
-      'search box'
-    )
+    await comfyPage.setSetting('Comfy.LinkRelease.Action', 'context menu')
+    await comfyPage.setSetting('Comfy.LinkRelease.ActionShift', 'search box')
     await comfyPage.setSetting('Comfy.NodeSearchBoxImpl', 'default')
   })
 

diff --git a/src/components/searchbox/NodeSearchBoxPopover.vue b/src/components/searchbox/NodeSearchBoxPopover.vue
@@ -168,11 +168,11 @@ const canvasEventHandler = (e: LiteGraphCanvasEvent) => {
 }
 
 const linkReleaseAction = computed(() => {
-  return settingStore.get('Comfy.NodeSearchBoxImpl.LinkReleaseAction')
+  return settingStore.get('Comfy.LinkRelease.Action')
 })
 
 const linkReleaseActionShift = computed(() => {
-  return settingStore.get('Comfy.NodeSearchBoxImpl.LinkReleaseActionShift')
+  return settingStore.get('Comfy.LinkRelease.ActionShift')
 })
 
 const handleCanvasEmptyRelease = (e: LiteGraphCanvasEvent) => {

diff --git a/src/stores/settingStore.ts b/src/stores/settingStore.ts
@@ -93,17 +93,15 @@ export const useSettingStore = defineStore('setting', {
       })
 
       app.ui.settings.addSetting({
-        id: 'Comfy.NodeSearchBoxImpl.LinkReleaseAction',
-        category: ['Comfy', 'Node Search Box', 'LinkReleaseAction'],
+        id: 'Comfy.LinkRelease.Action',
         name: 'Action on link release (No modifier)',
         type: 'combo',
         options: Object.values(LinkReleaseTriggerAction),
         defaultValue: LinkReleaseTriggerAction.CONTEXT_MENU
       })
 
       app.ui.settings.addSetting({
-        id: 'Comfy.NodeSearchBoxImpl.LinkReleaseActionShift',
-        category: ['Comfy', 'Node Search Box', 'LinkReleaseActionShift'],
+        id: 'Comfy.LinkRelease.ActionShift',
         name: 'Action on link release (Shift)',
         type: 'combo',
         options: Object.values(LinkReleaseTriggerAction),

diff --git a/src/types/apiTypes.ts b/src/types/apiTypes.ts
@@ -459,9 +459,8 @@ const zSettings = z.record(z.any()).and(
         'hold shift',
         'NOT hold shift'
       ]),
-      'Comfy.NodeSearchBoxImpl.LinkReleaseAction': zLinkReleaseTriggerAction,
-      'Comfy.NodeSearchBoxImpl.LinkReleaseActionShift':
-        zLinkReleaseTriggerAction,
+      'Comfy.LinkRelease.Action': zLinkReleaseTriggerAction,
+      'Comfy.LinkRelease.ActionShift': zLinkReleaseTriggerAction,
       'Comfy.NodeSearchBoxImpl.NodePreview': z.boolean(),
       'Comfy.NodeSearchBoxImpl': z.enum(['default', 'simple']),
       'Comfy.NodeSearchBoxImpl.ShowCategory': z.boolean(),