From acbc38ced4c68305b9a9440862fc1ede931d680c Mon Sep 17 00:00:00 2001
From: Chenlei Hu <huchenlei@proton.me>
Date: Fri, 8 Nov 2024 16:35:52 -0500
Subject: [PATCH] Revert "Enable New UI by default (#1460)" (#1476)

This reverts commit f0b735f3dd0b8cc06d45ca613b210eacc26387fb.
---
 browser_tests/fixtures/ComfyPage.ts           |  1 -
 .../dialog/content/SettingDialogContent.vue   |  2 --
 .../content/setting/FirstTimeUIMessage.vue    | 25 -------------------
 src/i18n.ts                                   |  4 ---
 src/stores/coreSettings.ts                    |  5 ++--
 src/stores/settingStore.ts                    |  7 +-----
 6 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 src/components/dialog/content/setting/FirstTimeUIMessage.vue

diff --git a/browser_tests/fixtures/ComfyPage.ts b/browser_tests/fixtures/ComfyPage.ts
index c7110ebaf..222865f92 100644
--- a/browser_tests/fixtures/ComfyPage.ts
+++ b/browser_tests/fixtures/ComfyPage.ts
@@ -778,7 +778,6 @@ export const comfyPageFixture = base.extend<{ comfyPage: ComfyPage }>({
     comfyPage.userIds[parallelIndex] = userId
 
     await comfyPage.setupSettings({
-      'Comfy.UseNewMenu': 'Disabled',
       // Hide canvas menu/info by default.
       'Comfy.Graph.CanvasInfo': false,
       'Comfy.Graph.CanvasMenu': false,
diff --git a/src/components/dialog/content/SettingDialogContent.vue b/src/components/dialog/content/SettingDialogContent.vue
index 10989087e..c056f3bad 100644
--- a/src/components/dialog/content/SettingDialogContent.vue
+++ b/src/components/dialog/content/SettingDialogContent.vue
@@ -19,7 +19,6 @@
     <Divider layout="vertical" class="mx-1 2xl:mx-4" />
     <ScrollPanel class="settings-content flex-grow">
       <Tabs :value="tabValue">
-        <FirstTimeUIMessage v-if="tabValue === 'Comfy'" />
         <TabPanels class="settings-tab-panels">
           <TabPanel key="search-results" value="Search Results">
             <div v-if="searchResults.length > 0">
@@ -92,7 +91,6 @@ import SearchBox from '@/components/common/SearchBox.vue'
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 import { flattenTree } from '@/utils/treeUtil'
 import AboutPanel from './setting/AboutPanel.vue'
-import FirstTimeUIMessage from './setting/FirstTimeUIMessage.vue'
 
 const KeybindingPanel = defineAsyncComponent(
   () => import('./setting/KeybindingPanel.vue')
diff --git a/src/components/dialog/content/setting/FirstTimeUIMessage.vue b/src/components/dialog/content/setting/FirstTimeUIMessage.vue
deleted file mode 100644
index 7a4014a7e..000000000
--- a/src/components/dialog/content/setting/FirstTimeUIMessage.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <Message
-    v-if="show"
-    class="first-time-ui-message m-2"
-    severity="info"
-    :closable="true"
-    @close="handleClose"
-  >
-    {{ $t('firstTimeUIMessage') }}
-  </Message>
-</template>
-
-<script setup lang="ts">
-import { useSettingStore } from '@/stores/settingStore'
-import Message from 'primevue/message'
-import { computed } from 'vue'
-
-const settingStore = useSettingStore()
-const show = computed(() => !settingStore.exists('Comfy.UseNewMenu'))
-const handleClose = () => {
-  // Explicitly write the current value to the store.
-  const currentValue = settingStore.get('Comfy.UseNewMenu')
-  settingStore.set('Comfy.UseNewMenu', currentValue)
-}
-</script>
diff --git a/src/i18n.ts b/src/i18n.ts
index 55fe90840..6f281bb7c 100644
--- a/src/i18n.ts
+++ b/src/i18n.ts
@@ -2,8 +2,6 @@ import { createI18n } from 'vue-i18n'
 
 const messages = {
   en: {
-    firstTimeUIMessage:
-      'This is the first time you use the new UI. Choose "Menu > Use New Menu > Disabled" to restore the old UI.',
     download: 'Download',
     loadAllFolders: 'Load All Folders',
     refresh: 'Refresh',
@@ -127,8 +125,6 @@ const messages = {
     }
   },
   zh: {
-    firstTimeUIMessage:
-      '这是您第一次使用新界面。选择“Menu > Use New Menu > Disabled”以恢复旧界面。',
     download: '下载',
     loadAllFolders: '加载所有文件夹',
     refresh: '刷新',
diff --git a/src/stores/coreSettings.ts b/src/stores/coreSettings.ts
index 0fb22c0db..7158b2503 100644
--- a/src/stores/coreSettings.ts
+++ b/src/stores/coreSettings.ts
@@ -373,8 +373,9 @@ export const CORE_SETTINGS: SettingParams[] = [
   {
     id: 'Comfy.UseNewMenu',
     category: ['Comfy', 'Menu', 'UseNewMenu'],
-    defaultValue: 'Top',
-    name: 'Use new menu',
+    defaultValue: 'Disabled',
+    name: 'Use new menu and workflow management.',
+    experimental: true,
     type: 'combo',
     options: ['Disabled', 'Top', 'Bottom'],
     migrateDeprecatedValue: (value: string) => {
diff --git a/src/stores/settingStore.ts b/src/stores/settingStore.ts
index a68a45fba..496fba11c 100644
--- a/src/stores/settingStore.ts
+++ b/src/stores/settingStore.ts
@@ -66,10 +66,6 @@ export const useSettingStore = defineStore('setting', () => {
     })
   }
 
-  function exists(key: string) {
-    return settingValues.value[key] !== undefined
-  }
-
   async function set<K extends keyof Settings>(key: K, value: Settings[K]) {
     settingValues.value[key] = value
     await app.ui.settings.setSettingValueAsync(key, value)
@@ -88,7 +84,6 @@ export const useSettingStore = defineStore('setting', () => {
     addSettings,
     loadExtensionSettings,
     set,
-    get,
-    exists
+    get
   }
 })