From 72f7c3101d15400a92904c6c4b6d955a7220a747 Mon Sep 17 00:00:00 2001
From: Chenlei Hu <huchenlei@proton.me>
Date: Fri, 20 Dec 2024 16:30:11 -0800
Subject: [PATCH] Always show extension panel in settings dialog (#2002)

Co-authored-by: github-actions <github-actions@github.com>
---
 .../dialog/content/SettingDialogContent.vue   |  8 +-------
 .../dialog/content/setting/ExtensionPanel.vue |  3 +++
 src/constants/coreSettings.ts                 |  8 --------
 src/locales/en/settings.json                  |  3 ---
 src/locales/ja/settings.json                  |  3 ---
 src/locales/ko/settings.json                  |  3 ---
 src/locales/ru/settings.json                  |  3 ---
 src/locales/zh/settings.json                  |  3 ---
 src/stores/extensionStore.ts                  | 19 +++++++++++++++++++
 9 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/components/dialog/content/SettingDialogContent.vue b/src/components/dialog/content/SettingDialogContent.vue
index a2fbb7ec1..e99cb4fe0 100644
--- a/src/components/dialog/content/SettingDialogContent.vue
+++ b/src/components/dialog/content/SettingDialogContent.vue
@@ -116,12 +116,6 @@ const serverConfigPanelNode: SettingTreeNode = {
   children: []
 }
 
-const extensionPanelNodeList = computed<SettingTreeNode[]>(() => {
-  const settingStore = useSettingStore()
-  const showExtensionPanel = settingStore.get('Comfy.Settings.ExtensionPanel')
-  return showExtensionPanel ? [extensionPanelNode] : []
-})
-
 /**
  * Server config panel is only available in Electron. We might want to support
  * it in the web version in the future.
@@ -140,7 +134,7 @@ const categories = computed<SettingTreeNode[]>(() =>
   [
     ...settingCategories.value,
     keybindingPanelNode,
-    ...extensionPanelNodeList.value,
+    extensionPanelNode,
     ...serverConfigPanelNodeList.value,
     aboutPanelNode
   ].map((node) => ({
diff --git a/src/components/dialog/content/setting/ExtensionPanel.vue b/src/components/dialog/content/setting/ExtensionPanel.vue
index fedf068b7..f0cb4b7d6 100644
--- a/src/components/dialog/content/setting/ExtensionPanel.vue
+++ b/src/components/dialog/content/setting/ExtensionPanel.vue
@@ -38,6 +38,9 @@
       >
         <template #body="slotProps">
           <ToggleSwitch
+            :disabled="
+              extensionStore.isExtensionAlwaysEnabled(slotProps.data.name)
+            "
             v-model="editingEnabledExtensions[slotProps.data.name]"
             @change="updateExtensionStatus"
           />
diff --git a/src/constants/coreSettings.ts b/src/constants/coreSettings.ts
index 460f534e3..b370ed270 100644
--- a/src/constants/coreSettings.ts
+++ b/src/constants/coreSettings.ts
@@ -436,14 +436,6 @@ export const CORE_SETTINGS: SettingParams[] = [
     defaultValue: [] as string[],
     versionAdded: '1.3.11'
   },
-  {
-    id: 'Comfy.Settings.ExtensionPanel',
-    name: 'Show extension panel in settings dialog',
-    type: 'boolean',
-    defaultValue: false,
-    experimental: true,
-    versionAdded: '1.3.11'
-  },
   {
     id: 'Comfy.Validation.NodeDefs',
     name: 'Validate node definitions (slow)',
diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json
index 59b4a91fd..e194b5124 100644
--- a/src/locales/en/settings.json
+++ b/src/locales/en/settings.json
@@ -262,9 +262,6 @@
     "name": "Server config values for frontend display",
     "tooltip": "Server config values used for frontend display only"
   },
-  "Comfy_Settings_ExtensionPanel": {
-    "name": "Show extension panel in settings dialog"
-  },
   "Comfy_Sidebar_Location": {
     "name": "Sidebar location",
     "options": {
diff --git a/src/locales/ja/settings.json b/src/locales/ja/settings.json
index b5c2ec36d..80df92931 100644
--- a/src/locales/ja/settings.json
+++ b/src/locales/ja/settings.json
@@ -262,9 +262,6 @@
     "name": "フロントエンド表示用のサーバー設定値",
     "tooltip": "フロントエンド表示のみに使用されるサーバー設定値"
   },
-  "Comfy_Settings_ExtensionPanel": {
-    "name": "設定ダイアログに拡張パネルを表示"
-  },
   "Comfy_Sidebar_Location": {
     "name": "サイドバーの位置",
     "options": {
diff --git a/src/locales/ko/settings.json b/src/locales/ko/settings.json
index 1238e8330..a3435a02a 100644
--- a/src/locales/ko/settings.json
+++ b/src/locales/ko/settings.json
@@ -262,9 +262,6 @@
     "name": "프론트엔드 표시를 위한 서버 구성 값",
     "tooltip": "프론트엔드 표시를 위해 사용되는 서버 구성 값만 해당됩니다."
   },
-  "Comfy_Settings_ExtensionPanel": {
-    "name": "설정 대화 상자에서 확장 패널 표시"
-  },
   "Comfy_Sidebar_Location": {
     "name": "사이드바 위치",
     "options": {
diff --git a/src/locales/ru/settings.json b/src/locales/ru/settings.json
index c2738e002..8a97f407e 100644
--- a/src/locales/ru/settings.json
+++ b/src/locales/ru/settings.json
@@ -262,9 +262,6 @@
     "name": "Значения конфигурации сервера для отображения на фронтенде",
     "tooltip": "Значения конфигурации сервера, используемые только для отображения на фронтенде"
   },
-  "Comfy_Settings_ExtensionPanel": {
-    "name": "Показать панель расширений в диалоговом окне настроек"
-  },
   "Comfy_Sidebar_Location": {
     "name": "Расположение боковой панели",
     "options": {
diff --git a/src/locales/zh/settings.json b/src/locales/zh/settings.json
index c89d590e8..394b3754f 100644
--- a/src/locales/zh/settings.json
+++ b/src/locales/zh/settings.json
@@ -262,9 +262,6 @@
     "name": "前端显示的服务器配置值",
     "tooltip": "仅用于前端显示的服务器配置值"
   },
-  "Comfy_Settings_ExtensionPanel": {
-    "name": "在设置对话框中显示扩展面板"
-  },
   "Comfy_Sidebar_Location": {
     "name": "侧边栏位置",
     "options": {
diff --git a/src/stores/extensionStore.ts b/src/stores/extensionStore.ts
index 9269dff4e..b9b3420ee 100644
--- a/src/stores/extensionStore.ts
+++ b/src/stores/extensionStore.ts
@@ -9,6 +9,16 @@ import { useMenuItemStore } from './menuItemStore'
 import { useBottomPanelStore } from './workspace/bottomPanelStore'
 import { useWidgetStore } from './widgetStore'
 
+/**
+ * These extensions are always active, even if they are disabled in the setting.
+ * TODO(https://github.com/Comfy-Org/ComfyUI_frontend/issues/1996):
+ * Migrate logic to out of extensions/core, as features provided
+ * by these extensions are now essential to core.
+ */
+export const ALWAYS_ENABLED_EXTENSIONS: readonly string[] = [
+  'Comfy.ColorPalette'
+]
+
 export const useExtensionStore = defineStore('extension', () => {
   // For legacy reasons, the name uniquely identifies an extension
   const extensionByName = ref<Record<string, ComfyExtension>>({})
@@ -32,6 +42,10 @@ export const useExtensionStore = defineStore('extension', () => {
     return extensions.value.filter((ext) => isExtensionEnabled(ext.name))
   })
 
+  function isExtensionAlwaysEnabled(name: string) {
+    return ALWAYS_ENABLED_EXTENSIONS.includes(name)
+  }
+
   function registerExtension(extension: ComfyExtension) {
     if (!extension.name) {
       throw new Error("Extensions must have a 'name' property.")
@@ -80,6 +94,10 @@ export const useExtensionStore = defineStore('extension', () => {
     // allowed since v1.3.12.
     // https://github.com/Comfy-Org/ComfyUI_frontend/issues/1176
     disabledExtensionNames.value.add('pysssss.SnapToGrid')
+
+    for (const name of ALWAYS_ENABLED_EXTENSIONS) {
+      disabledExtensionNames.value.delete(name)
+    }
   }
 
   // Some core extensions are registered before the store is initialized, e.g.
@@ -95,6 +113,7 @@ export const useExtensionStore = defineStore('extension', () => {
     enabledExtensions,
     inactiveDisabledExtensionNames,
     isExtensionEnabled,
+    isExtensionAlwaysEnabled,
     registerExtension,
     loadDisabledExtensionNames
   }