mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-19 22:09:37 +00:00
## Summary Add integration contract tests (unit) and expanded Playwright coverage for subgraph promotion, hydration, navigation, and lifecycle edge behaviors. ## Changes - **What**: 22 unit/integration tests across 9 files covering promotion store sync, widget view lifecycle, input link resolution, pseudo-widget cache, navigation viewport restore, and subgraph operations. 13 Playwright E2E tests covering proxyWidgets hydration stability, promoted source removal cleanup, pseudo-preview unpack/remove, multi-link representative round-trip, nested promotion retarget, and navigation state on workflow switch. - **Helpers**: Added `isPseudoPreviewEntry`, `getPseudoPreviewWidgets`, `getNonPreviewPromotedWidgets` to promotedWidgets helper. Added `SubgraphHelper.getNodeCount()`. ## Review Focus - Test-only PR — no production code changes - Validates existing subgraph behaviors are covered by regression tests before further feature work - Phase 4 (unit/integration contracts) and Phase 5 (Playwright expansion) of the subgraph test coverage plan ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-10123-test-subgraph-integration-contracts-and-expanded-Playwright-coverage-3256d73d365081258023e3a763859e00) by [Unito](https://www.unito.io) --------- Co-authored-by: Amp <amp@ampcode.com> Co-authored-by: GitHub Action <action@github.com>
271 lines
7.6 KiB
Vue
271 lines
7.6 KiB
Vue
<script setup lang="ts">
|
|
import { useMounted, watchDebounced } from '@vueuse/core'
|
|
import { storeToRefs } from 'pinia'
|
|
import {
|
|
computed,
|
|
nextTick,
|
|
onBeforeUnmount,
|
|
onMounted,
|
|
ref,
|
|
shallowRef,
|
|
useTemplateRef,
|
|
watch
|
|
} from 'vue'
|
|
import { useI18n } from 'vue-i18n'
|
|
|
|
import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
|
|
import {
|
|
getSourceNodeId,
|
|
getWidgetName
|
|
} from '@/core/graph/subgraph/promotionUtils'
|
|
import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
|
|
import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
|
|
import FormSearchInput from '@/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue'
|
|
import CollapseToggleButton from '@/components/rightSidePanel/layout/CollapseToggleButton.vue'
|
|
import { DraggableList } from '@/scripts/ui/draggableList'
|
|
import { usePromotionStore } from '@/stores/promotionStore'
|
|
import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
|
|
|
|
import { searchWidgets } from '../shared'
|
|
import type { NodeWidgetsList } from '../shared'
|
|
import SectionWidgets from './SectionWidgets.vue'
|
|
|
|
const { node } = defineProps<{
|
|
node: SubgraphNode
|
|
}>()
|
|
|
|
const { t } = useI18n()
|
|
const canvasStore = useCanvasStore()
|
|
const promotionStore = usePromotionStore()
|
|
const rightSidePanelStore = useRightSidePanelStore()
|
|
const { focusedSection, searchQuery } = storeToRefs(rightSidePanelStore)
|
|
|
|
const advancedInputsCollapsed = ref(true)
|
|
const firstSectionCollapsed = ref(false)
|
|
const isAllCollapsed = computed({
|
|
get() {
|
|
const hasAdvanced = advancedInputsWidgets.value.length > 0
|
|
return hasAdvanced
|
|
? firstSectionCollapsed.value && advancedInputsCollapsed.value
|
|
: firstSectionCollapsed.value
|
|
},
|
|
set(collapse: boolean) {
|
|
firstSectionCollapsed.value = collapse
|
|
advancedInputsCollapsed.value = collapse
|
|
}
|
|
})
|
|
const draggableList = ref<DraggableList | undefined>(undefined)
|
|
const sectionWidgetsRef = useTemplateRef('sectionWidgetsRef')
|
|
const advancedInputsSectionRef = useTemplateRef('advancedInputsSectionRef')
|
|
|
|
const promotionEntries = computed(() =>
|
|
promotionStore.getPromotions(node.rootGraph.id, node.id)
|
|
)
|
|
|
|
watch(
|
|
focusedSection,
|
|
async (section) => {
|
|
if (section === 'advanced-inputs') {
|
|
advancedInputsCollapsed.value = false
|
|
rightSidePanelStore.clearFocusedSection()
|
|
|
|
await nextTick()
|
|
|
|
await new Promise((resolve) => setTimeout(resolve, 300))
|
|
|
|
const sectionComponent = advancedInputsSectionRef.value
|
|
const sectionElement = sectionComponent?.rootElement
|
|
if (sectionElement) {
|
|
sectionElement.scrollIntoView({ behavior: 'smooth', block: 'start' })
|
|
}
|
|
}
|
|
},
|
|
{ immediate: true }
|
|
)
|
|
|
|
const widgetsList = computed((): NodeWidgetsList => {
|
|
const entries = promotionEntries.value
|
|
const { widgets = [] } = node
|
|
|
|
const result: NodeWidgetsList = []
|
|
for (const {
|
|
sourceNodeId: entryNodeId,
|
|
sourceWidgetName,
|
|
disambiguatingSourceNodeId
|
|
} of entries) {
|
|
const widget = widgets.find((w) => {
|
|
if (isPromotedWidgetView(w)) {
|
|
if (
|
|
String(w.sourceNodeId) !== entryNodeId ||
|
|
w.sourceWidgetName !== sourceWidgetName
|
|
)
|
|
return false
|
|
|
|
if (!disambiguatingSourceNodeId) return true
|
|
|
|
return (
|
|
(w.disambiguatingSourceNodeId ?? w.sourceNodeId) ===
|
|
disambiguatingSourceNodeId
|
|
)
|
|
}
|
|
return w.name === sourceWidgetName
|
|
})
|
|
if (widget) {
|
|
result.push({ node, widget })
|
|
}
|
|
}
|
|
return result
|
|
})
|
|
|
|
const advancedInputsWidgets = computed((): NodeWidgetsList => {
|
|
const interiorNodes = node.subgraph.nodes
|
|
|
|
const allInteriorWidgets = interiorNodes.flatMap((interiorNode) => {
|
|
const { widgets = [] } = interiorNode
|
|
return widgets
|
|
.filter((w) => !w.computedDisabled)
|
|
.map((widget) => ({ node: interiorNode, widget }))
|
|
})
|
|
|
|
return allInteriorWidgets.filter(
|
|
({ node: interiorNode, widget }) =>
|
|
!promotionStore.isPromoted(node.rootGraph.id, node.id, {
|
|
sourceNodeId: String(interiorNode.id),
|
|
sourceWidgetName: getWidgetName(widget),
|
|
disambiguatingSourceNodeId: getSourceNodeId(widget)
|
|
})
|
|
)
|
|
})
|
|
|
|
const parents = computed<SubgraphNode[]>(() => [node])
|
|
|
|
const searchedWidgetsList = shallowRef<NodeWidgetsList>(widgetsList.value)
|
|
const isSearching = ref(false)
|
|
|
|
async function searcher(query: string) {
|
|
isSearching.value = query.trim() !== ''
|
|
searchedWidgetsList.value = searchWidgets(widgetsList.value, query)
|
|
}
|
|
|
|
const isMounted = useMounted()
|
|
|
|
function setDraggableState() {
|
|
if (!isMounted.value) return
|
|
|
|
draggableList.value?.dispose()
|
|
const container = sectionWidgetsRef.value?.widgetsContainer
|
|
if (isSearching.value || !container?.children?.length) return
|
|
|
|
draggableList.value = new DraggableList(container, '.draggable-item')
|
|
|
|
draggableList.value.applyNewItemsOrder = function () {
|
|
const reorderedItems: HTMLElement[] = []
|
|
|
|
let oldPosition = -1
|
|
this.getAllItems().forEach((item, index) => {
|
|
if (item === this.draggableItem) {
|
|
oldPosition = index
|
|
return
|
|
}
|
|
if (!this.isItemToggled(item)) {
|
|
reorderedItems[index] = item
|
|
return
|
|
}
|
|
const newIndex = this.isItemAbove(item) ? index + 1 : index - 1
|
|
reorderedItems[newIndex] = item
|
|
})
|
|
|
|
if (oldPosition === -1) {
|
|
console.error('[TabSubgraphInputs] draggableItem not found in items')
|
|
return
|
|
}
|
|
|
|
for (let index = 0; index < this.getAllItems().length; index++) {
|
|
const item = reorderedItems[index]
|
|
if (typeof item === 'undefined') {
|
|
reorderedItems[index] = this.draggableItem as HTMLElement
|
|
}
|
|
}
|
|
|
|
const newPosition = reorderedItems.indexOf(
|
|
this.draggableItem as HTMLElement
|
|
)
|
|
|
|
promotionStore.movePromotion(
|
|
node.rootGraph.id,
|
|
node.id,
|
|
oldPosition,
|
|
newPosition
|
|
)
|
|
canvasStore.canvas?.setDirty(true, true)
|
|
}
|
|
}
|
|
|
|
watchDebounced(searchedWidgetsList, () => setDraggableState(), {
|
|
debounce: 100
|
|
})
|
|
onMounted(() => setDraggableState())
|
|
onBeforeUnmount(() => draggableList.value?.dispose())
|
|
|
|
const label = computed(() => {
|
|
return searchedWidgetsList.value.length !== 0
|
|
? t('rightSidePanel.inputs')
|
|
: t('rightSidePanel.inputsNone')
|
|
})
|
|
</script>
|
|
|
|
<template>
|
|
<div
|
|
class="flex items-center border-b border-interface-stroke px-4 pt-1 pb-4"
|
|
>
|
|
<FormSearchInput
|
|
v-model="searchQuery"
|
|
:searcher
|
|
:update-key="widgetsList"
|
|
class="flex-1"
|
|
/>
|
|
<CollapseToggleButton
|
|
v-model="isAllCollapsed"
|
|
:show="!isSearching && advancedInputsWidgets.length > 0"
|
|
/>
|
|
</div>
|
|
<SectionWidgets
|
|
ref="sectionWidgetsRef"
|
|
:collapse="firstSectionCollapsed && !isSearching"
|
|
:node
|
|
:label
|
|
:parents
|
|
:widgets="searchedWidgetsList"
|
|
:is-draggable="!isSearching"
|
|
:enable-empty-state="isSearching"
|
|
:tooltip="
|
|
isSearching || searchedWidgetsList.length
|
|
? ''
|
|
: t('rightSidePanel.inputsNoneTooltip')
|
|
"
|
|
class="border-b border-interface-stroke"
|
|
@update:collapse="
|
|
(v) => {
|
|
firstSectionCollapsed = v
|
|
nextTick(setDraggableState)
|
|
}
|
|
"
|
|
>
|
|
<template #empty>
|
|
<div class="px-4 pt-5 pb-15 text-center text-sm text-muted-foreground">
|
|
{{ t('rightSidePanel.noneSearchDesc') }}
|
|
</div>
|
|
</template>
|
|
</SectionWidgets>
|
|
<SectionWidgets
|
|
v-if="advancedInputsWidgets.length > 0"
|
|
ref="advancedInputsSectionRef"
|
|
v-model:collapse="advancedInputsCollapsed"
|
|
:label="t('rightSidePanel.advancedInputs')"
|
|
:parents="parents"
|
|
:widgets="advancedInputsWidgets"
|
|
show-node-name
|
|
class="border-b border-interface-stroke"
|
|
/>
|
|
</template>
|