diff --git a/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-settings-dialog-mobile-chrome-linux.png b/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-settings-dialog-mobile-chrome-linux.png index 7f6fdec8bbe..9cf9d64bc5d 100644 Binary files a/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-settings-dialog-mobile-chrome-linux.png and b/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-settings-dialog-mobile-chrome-linux.png differ diff --git a/packages/settings-core/src/types.ts b/packages/settings-core/src/types.ts index dc7cee26997..a3c3c0d2a4f 100644 --- a/packages/settings-core/src/types.ts +++ b/packages/settings-core/src/types.ts @@ -139,6 +139,7 @@ export type Settings = { 'Comfy.Canvas.LeftMouseClickBehavior': string 'Comfy.Canvas.MouseWheelScroll': string 'Comfy.VueNodes.Enabled': boolean + 'Comfy.VueNodes.HideSafeModelExtensions': boolean 'Comfy.AppBuilder.VueNodeSwitchDismissed': boolean 'Comfy.PartnerNodesEducation.Dismissed': boolean 'Comfy.ModelLibrary.UseAssetBrowser': boolean diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json index 5491b4cc9a1..4db24e27f59 100644 --- a/src/locales/en/settings.json +++ b/src/locales/en/settings.json @@ -434,6 +434,10 @@ "name": "Modern Node Design (Nodes 2.0)", "tooltip": "Modern: DOM-based rendering with enhanced interactivity, native browser features, and updated visual design. Classic: Traditional canvas rendering." }, + "Comfy_VueNodes_HideSafeModelExtensions": { + "name": "Hide .safetensors and .sft extensions", + "tooltip": "Hide these extensions in closed model widgets. Other extensions remain visible; dropdown options and saved values keep full filenames." + }, "Comfy_WidgetControlMode": { "name": "Widget control mode", "tooltip": "Controls when widget values are updated (randomize/increment/decrement), either before the prompt is queued or after.", diff --git a/src/platform/settings/constants/coreSettings.ts b/src/platform/settings/constants/coreSettings.ts index 71846dde66a..99564c6d9a7 100644 --- a/src/platform/settings/constants/coreSettings.ts +++ b/src/platform/settings/constants/coreSettings.ts @@ -1231,6 +1231,15 @@ export const CORE_SETTINGS: SettingParams[] = [ experimental: true, versionAdded: '1.27.1' }, + { + id: 'Comfy.VueNodes.HideSafeModelExtensions', + category: ['Comfy', 'Nodes 2.0', 'HideSafeModelExtensions'], + name: 'Hide .safetensors and .sft extensions', + type: 'boolean', + defaultValue: false, + tooltip: + 'Hide these extensions in closed model widgets. Other extensions remain visible; dropdown options and saved values keep full filenames.' + }, { id: 'Comfy.AppBuilder.VueNodeSwitchDismissed', name: 'App Builder Vue Node switch dismissed', diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.test.ts index d3cce447003..3ac9da0447e 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.test.ts @@ -4,6 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick } from 'vue' import { createI18n } from 'vue-i18n' +import { useSettingStore } from '@/platform/settings/settingStore' import type { SimplifiedWidget, WidgetValue } from '@/types/simplifiedWidget' import { toNodeId } from '@comfyorg/graph-model/nodeId' import { widgetId } from '@comfyorg/graph-model/widgetId' @@ -128,6 +129,80 @@ describe('WidgetSelectDefault', () => { expect(screen.getByRole('combobox')).not.toHaveAttribute('title') }) + it.for([ + { filename: 'portrait.safetensors', summary: 'portrait' }, + { filename: 'portrait.SFT', summary: 'portrait' }, + { filename: 'portrait.SAFETENSORS', summary: 'portrait' }, + { filename: 'portrait.ckpt', summary: 'portrait.ckpt' }, + { filename: 'portrait.pt', summary: 'portrait.pt' }, + { filename: 'portrait.pth', summary: 'portrait.pth' }, + { filename: 'portrait.bin', summary: 'portrait.bin' }, + { + filename: 'portrait.safetensors.ckpt', + summary: 'portrait.safetensors.ckpt' + }, + { filename: '.sft', summary: '.sft' } + ])('optionally summarizes $filename as $summary', ({ filename, summary }) => { + useSettingStore().settingValues['Comfy.VueNodes.HideSafeModelExtensions'] = + true + const raw = `studio/models/${filename}` + renderComponent(createWidget([raw]), raw, undefined, true) + + expect(screen.getByRole('combobox').textContent.trim()).toBe(summary) + }) + + it.for([ + { filenameSummary: false, options: {}, expected: 'studio/model.sft' }, + { + filenameSummary: true, + options: { getOptionLabel: () => 'Custom.sft' }, + expected: 'Custom.sft' + } + ])( + 'preserves $expected with extension hiding enabled', + ({ filenameSummary, options, expected }) => { + useSettingStore().settingValues[ + 'Comfy.VueNodes.HideSafeModelExtensions' + ] = true + const raw = 'studio/model.sft' + renderComponent( + createWidget([raw], options), + raw, + undefined, + filenameSummary + ) + + expect(screen.getByRole('combobox').textContent.trim()).toBe(expected) + } + ) + + it('updates summaries live without hiding option extensions or changing raw selections', async () => { + const settings = useSettingStore() + const first = 'studio/model.safetensors' + const second = 'studio/model.sft' + const { user, onUpdate, rerender } = renderComponent( + createWidget([first, second]), + first, + undefined, + true + ) + settings.settingValues['Comfy.VueNodes.HideSafeModelExtensions'] = true + await nextTick() + expect(screen.getByRole('combobox').textContent.trim()).toBe('model') + + await openDropdown(user) + expect( + screen.getByRole('option', { name: 'model.safetensors' }) + ).toBeVisible() + await user.click(screen.getByRole('option', { name: 'model.sft' })) + expect(onUpdate).toHaveBeenCalledWith(second) + await rerender({ modelValue: second }) + + settings.settingValues['Comfy.VueNodes.HideSafeModelExtensions'] = false + await nextTick() + expect(screen.getByRole('combobox').textContent.trim()).toBe('model.sft') + }) + it.for([ { current: 42, action: 'Next', expected: -7 }, { current: 42, action: 'Previous', expected: 11 }, diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useComboOptions.ts b/src/renderer/extensions/vueNodes/widgets/composables/useComboOptions.ts index 315d07d85a3..e4d1daf3c19 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useComboOptions.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useComboOptions.ts @@ -2,6 +2,7 @@ import { countBy } from 'es-toolkit' import { computed, ref, toRef } from 'vue' import type { Ref } from 'vue' +import { useSettingStore } from '@/platform/settings/settingStore' import { useComboStepping } from '@/renderer/extensions/vueNodes/widgets/composables/useComboStepping' import type { WidgetValue } from '@comfyorg/graph-model/widgetValue' import type { IWidgetOptions } from '@comfyorg/graph-model/widgets' @@ -32,6 +33,7 @@ export function useComboOptions( onSelect: (option: ComboOption) => void } ) { + const settings = useSettingStore() const options = toRef(getOptions) const searchQuery = ref('') const directory = ref([]) @@ -60,6 +62,9 @@ export function useComboOptions( const selectedOption = computed(() => normalized.value.find((option) => option.value === selectedValue.value) ) + const summarizeFilename = computed( + () => config.filenameSummary() && !options.value?.getOptionLabel + ) const selection = computed(() => { const option = selectedOption.value const invalid = @@ -67,13 +72,17 @@ export function useComboOptions( Boolean(selectedValue.value) && !option const label = option ? option.label : invalid ? String(value.value) : '' + const summary = summarizeFilename.value + ? label.split(/[/\\]/).at(-1) + : label return { option, invalid, summary: - config.filenameSummary() && !options.value?.getOptionLabel - ? label.split(/[/\\]/).at(-1) - : label + summarizeFilename.value && + settings.get('Comfy.VueNodes.HideSafeModelExtensions') + ? summary?.replace(/^(.+)\.(?:safetensors|sft)$/i, '$1') + : summary } }) const longestLabel = computed(() =>