diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts index fc485a4091c..9ef87af8bcb 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts @@ -14,6 +14,9 @@ import { createMockWidget } from './widgetTestUtils' const mockCheckState = vi.hoisted(() => vi.fn()) const mockAssetsData = vi.hoisted(() => ({ items: [] as AssetItem[] })) +const mockAssetDataRefresh = vi.hoisted(() => + vi.fn().mockResolvedValue(undefined) +) vi.mock('@/platform/workflow/management/stores/workflowStore', async () => { const actual = await vi.importActual( @@ -47,7 +50,8 @@ vi.mock( category: computed(() => 'checkpoints'), assets: computed(() => mockAssetsData.items), isLoading: computed(() => false), - error: computed(() => null) + error: computed(() => null), + refresh: mockAssetDataRefresh }) }) ) @@ -77,6 +81,26 @@ vi.mock('@/platform/assets/utils/outputAssetUtil', () => ({ resolveOutputAssetItems: vi.fn().mockResolvedValue([]) })) +vi.mock( + '@/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdown.vue', + () => ({ + default: { + name: 'FormDropdownStub', + props: ['items', 'displayItems', 'selected', 'placeholder'], + emits: ['update:is-open', 'update:selected', 'update:files'], + template: ` +
+ + + + {{ item.name }} + +
+ ` + } + }) +) + const mockUpdateSelectedItems = vi.hoisted(() => vi.fn()) const mockHandleFilesUpdate = vi.hoisted(() => vi.fn()) @@ -144,6 +168,8 @@ describe('WidgetSelectDropdown', () => { mockFilterSelectedRef.value = 'all' mockUpdateSelectedItems.mockClear() mockHandleFilesUpdate.mockClear() + mockMediaAssets.refresh.mockClear() + mockAssetDataRefresh.mockClear() }) function renderComponent( @@ -257,4 +283,72 @@ describe('WidgetSelectDropdown', () => { expect(screen.queryByText('cat.png')).toBeNull() }) }) + + describe('handleIsOpenUpdate', () => { + function renderAssetMode() { + const widget = createMockWidget({ + value: 'model_a.safetensors', + name: 'ckpt_name', + type: 'combo', + options: { values: [], nodeType: 'CheckpointLoaderSimple' } + }) + return renderComponent(widget, 'model_a.safetensors', { + assetKind: 'model', + isAssetMode: true, + nodeType: 'CheckpointLoaderSimple' + }) + } + + function renderNonAssetMode() { + const widget = createMockWidget({ + value: 'cat.png', + name: 'image', + type: 'combo', + options: { values: ['cat.png', 'dog.png'] } + }) + return renderComponent(widget, 'cat.png') + } + + async function fireOpen() { + const { default: userEvent } = await import('@testing-library/user-event') + const user = userEvent.setup() + await user.click(screen.getByTestId('fd-open')) + } + + async function fireClose() { + const { default: userEvent } = await import('@testing-library/user-event') + const user = userEvent.setup() + await user.click(screen.getByTestId('fd-close')) + } + + it('skips outputMediaAssets refresh and triggers assetData refresh when asset-mode dropdown opens', async () => { + renderAssetMode() + await fireOpen() + expect(mockMediaAssets.refresh).not.toHaveBeenCalled() + expect(mockAssetDataRefresh).toHaveBeenCalledTimes(1) + }) + + it('refetches model assets on every asset-mode dropdown reopen (no stale cache)', async () => { + renderAssetMode() + await fireOpen() + await fireClose() + await fireOpen() + expect(mockAssetDataRefresh).toHaveBeenCalledTimes(2) + expect(mockMediaAssets.refresh).not.toHaveBeenCalled() + }) + + it('refreshes outputMediaAssets when non-asset-mode dropdown opens (preserved behavior)', async () => { + renderNonAssetMode() + await fireOpen() + expect(mockMediaAssets.refresh).toHaveBeenCalledTimes(1) + expect(mockAssetDataRefresh).not.toHaveBeenCalled() + }) + + it('does nothing when the dropdown is closed', async () => { + renderNonAssetMode() + await fireClose() + expect(mockMediaAssets.refresh).not.toHaveBeenCalled() + expect(mockAssetDataRefresh).not.toHaveBeenCalled() + }) + }) }) diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue index 541ac04a3ba..c5c023477d8 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue +++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue @@ -146,7 +146,12 @@ const acceptTypes = computed(() => { const layoutMode = ref(props.defaultLayoutMode ?? 'grid') function handleIsOpenUpdate(isOpen: boolean) { - if (isOpen && !outputMediaAssets.loading.value) { + if (!isOpen) return + if (props.isAssetMode) { + void assetData?.refresh() + return + } + if (!outputMediaAssets.loading.value) { void outputMediaAssets.refresh() } } diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.test.ts index ffe0d9e64a5..463febfad57 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.test.ts @@ -242,4 +242,55 @@ describe('useAssetWidgetData', () => { expect(error.value).toBeNull() }) }) + + describe('refresh()', () => { + it('refetches assets for the current node type, bypassing the initial-load cache guard', async () => { + mockGetCategoryForNodeType.mockReturnValue('checkpoints') + mockUpdateModelsForNodeType.mockImplementation( + async (_nodeType: string): Promise => { + mockInitializedKeys.add(_nodeType) + mockLoadingByKey.set(_nodeType, false) + return [] + } + ) + + const { refresh, isLoading } = useAssetWidgetData( + 'CheckpointLoaderSimple' + ) + + await nextTick() + await vi.waitFor(() => !isLoading.value) + expect(mockUpdateModelsForNodeType).toHaveBeenCalledTimes(1) + + await refresh() + expect(mockUpdateModelsForNodeType).toHaveBeenCalledTimes(2) + expect(mockUpdateModelsForNodeType).toHaveBeenLastCalledWith( + 'CheckpointLoaderSimple' + ) + }) + + it('skips refresh when a fetch is already in flight', async () => { + mockGetCategoryForNodeType.mockReturnValue('checkpoints') + mockUpdateModelsForNodeType.mockImplementation( + async (_nodeType: string): Promise => { + mockInitializedKeys.add(_nodeType) + return [] + } + ) + + const { refresh } = useAssetWidgetData('CheckpointLoaderSimple') + await nextTick() + + mockLoadingByKey.set('CheckpointLoaderSimple', true) + mockUpdateModelsForNodeType.mockClear() + await refresh() + expect(mockUpdateModelsForNodeType).not.toHaveBeenCalled() + }) + + it('no-ops when node type is undefined', async () => { + const { refresh } = useAssetWidgetData(undefined) + await refresh() + expect(mockUpdateModelsForNodeType).not.toHaveBeenCalled() + }) + }) }) diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.ts b/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.ts index e517e455ee5..b417875a895 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.ts @@ -59,10 +59,18 @@ export function useAssetWidgetData( { immediate: true } ) + async function refresh(): Promise { + const currentNodeType = toValue(nodeType) + if (!currentNodeType) return + if (assetsStore.isModelLoading(currentNodeType)) return + await assetsStore.updateModelsForNodeType(currentNodeType) + } + return { category, assets, isLoading, - error + error, + refresh } } diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts index 4c688642dd5..28fd07a3ebf 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetSelectItems.test.ts @@ -319,7 +319,8 @@ describe('useWidgetSelectItems', () => { category: computed(() => 'checkpoints'), assets: computed(() => mockAssetsData.items), isLoading: computed(() => false), - error: computed(() => null) + error: computed(() => null), + refresh: async () => {} } const { dropdownItems } = useWidgetSelectItems( @@ -354,7 +355,8 @@ describe('useWidgetSelectItems', () => { category: computed(() => 'checkpoints'), assets: computed(() => mockAssetsData.items), isLoading: computed(() => false), - error: computed(() => null) + error: computed(() => null), + refresh: async () => {} } const { dropdownItems } = useWidgetSelectItems( @@ -379,7 +381,8 @@ describe('useWidgetSelectItems', () => { category: computed(() => 'checkpoints'), assets: computed(() => [] as AssetItem[]), isLoading: computed(() => false), - error: computed(() => null) + error: computed(() => null), + refresh: async () => {} } const { dropdownItems } = useWidgetSelectItems( @@ -408,7 +411,8 @@ describe('useWidgetSelectItems', () => { category: computed(() => 'checkpoints'), assets: computed(() => mockAssetsData.items), isLoading: computed(() => false), - error: computed(() => null) + error: computed(() => null), + refresh: async () => {} } const { displayItems, selectedSet } = useWidgetSelectItems(