mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 14:30:41 +00:00
## Summary Fixes two bugs in the node replacement flow: placeholder detection failing after workflow execution or pack reinstallation, and missing UI sync in the Errors Tab when replacements are applied from the modal dialog. ## Changes - **Placeholder detection**: Node placeholder detection now matches against `targetTypes` (derived from the replaceable node list built at workflow load time) instead of relying on `has_errors` flag or `registered_node_types` lookup. This ensures replacement works reliably after execution (where `has_errors` gets cleared) and after pack reinstallation (where the type becomes registered). - **Modal → Errors Tab sync**: Added `executionErrorStore.removeMissingNodesByType()` call in `MissingNodesContent.vue` after replacement, so the Errors Tab reflects changes immediately without requiring a page reload. ## Review Focus - `collectAllNodes` predicate change in `useNodeReplacement.ts`: now uses `targetTypes.has(originalType)` to find nodes by their original serialized type. This is independent of runtime state like `has_errors` or `registered_node_types`. - `executionErrorStore.removeMissingNodesByType` call timing in `MissingNodesContent.vue` — runs synchronously after `replaceNodesInPlace` resolves, before auto-close logic. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-9269-fix-node-replacement-fails-after-execution-and-modal-sync-3146d73d365081218398c961639b450f) by [Unito](https://www.unito.io)
361 lines
12 KiB
Vue
361 lines
12 KiB
Vue
<template>
|
|
<div
|
|
data-testid="missing-nodes-warning"
|
|
class="comfy-missing-nodes flex w-[490px] flex-col border-t border-border-default"
|
|
:class="isCloud ? 'border-b' : ''"
|
|
>
|
|
<div class="flex h-full w-full flex-col gap-4 p-4">
|
|
<!-- Description -->
|
|
<div>
|
|
<p class="m-0 text-sm leading-5 text-muted-foreground">
|
|
{{
|
|
isCloud
|
|
? $t('missingNodes.cloud.description')
|
|
: $t('missingNodes.oss.description')
|
|
}}
|
|
</p>
|
|
</div>
|
|
|
|
<MissingCoreNodesMessage v-if="!isCloud" :missing-core-nodes />
|
|
|
|
<!-- QUICK FIX AVAILABLE Section -->
|
|
<div v-if="replaceableNodes.length > 0" class="flex flex-col gap-2">
|
|
<!-- Section header with Replace button -->
|
|
<div class="flex items-center justify-between">
|
|
<div class="flex items-center gap-2">
|
|
<span class="text-xs font-semibold uppercase text-primary">
|
|
{{ $t('nodeReplacement.quickFixAvailable') }}
|
|
</span>
|
|
<div class="h-2 w-2 rounded-full bg-primary" />
|
|
</div>
|
|
<Button
|
|
v-tooltip.top="$t('nodeReplacement.replaceWarning')"
|
|
variant="primary"
|
|
size="md"
|
|
:disabled="selectedTypes.size === 0"
|
|
@click="handleReplaceSelected"
|
|
>
|
|
<i class="icon-[lucide--refresh-cw] mr-1.5 h-4 w-4" />
|
|
{{
|
|
$t('nodeReplacement.replaceSelected', {
|
|
count: selectedTypes.size
|
|
})
|
|
}}
|
|
</Button>
|
|
</div>
|
|
|
|
<!-- Replaceable nodes list -->
|
|
<div
|
|
class="flex max-h-[200px] flex-col overflow-y-auto rounded-lg bg-secondary-background scrollbar-custom"
|
|
>
|
|
<!-- Select All row (sticky header) -->
|
|
<div
|
|
:class="
|
|
cn(
|
|
'sticky top-0 z-10 flex items-center gap-3 border-b border-border-default bg-secondary-background px-3 py-2',
|
|
pendingNodes.length > 0
|
|
? 'cursor-pointer hover:bg-secondary-background-hover'
|
|
: 'opacity-50 pointer-events-none'
|
|
)
|
|
"
|
|
tabindex="0"
|
|
role="checkbox"
|
|
:aria-checked="
|
|
isAllSelected ? 'true' : isSomeSelected ? 'mixed' : 'false'
|
|
"
|
|
@click="toggleSelectAll"
|
|
@keydown.enter.prevent="toggleSelectAll"
|
|
@keydown.space.prevent="toggleSelectAll"
|
|
>
|
|
<div
|
|
class="flex size-4 shrink-0 items-center justify-center rounded p-0.5 transition-all duration-200"
|
|
:class="
|
|
isAllSelected || isSomeSelected
|
|
? 'bg-primary-background'
|
|
: 'bg-secondary-background'
|
|
"
|
|
>
|
|
<i
|
|
v-if="isAllSelected"
|
|
class="icon-[lucide--check] text-bold text-xs text-base-foreground"
|
|
/>
|
|
<i
|
|
v-else-if="isSomeSelected"
|
|
class="icon-[lucide--minus] text-bold text-xs text-base-foreground"
|
|
/>
|
|
</div>
|
|
<span class="text-xs font-medium uppercase text-muted-foreground">
|
|
{{ $t('nodeReplacement.compatibleAlternatives') }}
|
|
</span>
|
|
</div>
|
|
|
|
<!-- Replaceable node items -->
|
|
<div
|
|
v-for="node in replaceableNodes"
|
|
:key="node.label"
|
|
:class="
|
|
cn(
|
|
'flex items-center gap-3 px-3 py-2',
|
|
replacedTypes.has(node.label)
|
|
? 'opacity-50 pointer-events-none'
|
|
: 'cursor-pointer hover:bg-secondary-background-hover'
|
|
)
|
|
"
|
|
tabindex="0"
|
|
role="checkbox"
|
|
:aria-checked="
|
|
replacedTypes.has(node.label) || selectedTypes.has(node.label)
|
|
? 'true'
|
|
: 'false'
|
|
"
|
|
@click="toggleNode(node.label)"
|
|
@keydown.enter.prevent="toggleNode(node.label)"
|
|
@keydown.space.prevent="toggleNode(node.label)"
|
|
>
|
|
<div
|
|
class="flex size-4 shrink-0 items-center justify-center rounded p-0.5 transition-all duration-200"
|
|
:class="
|
|
replacedTypes.has(node.label) || selectedTypes.has(node.label)
|
|
? 'bg-primary-background'
|
|
: 'bg-secondary-background'
|
|
"
|
|
>
|
|
<i
|
|
v-if="
|
|
replacedTypes.has(node.label) || selectedTypes.has(node.label)
|
|
"
|
|
class="icon-[lucide--check] text-bold text-xs text-base-foreground"
|
|
/>
|
|
</div>
|
|
<div class="flex flex-col gap-0.5">
|
|
<div class="flex items-center gap-2">
|
|
<span
|
|
v-if="replacedTypes.has(node.label)"
|
|
class="inline-flex h-4 items-center rounded-full border border-success bg-success/10 px-1.5 text-xxxs font-semibold uppercase text-success"
|
|
>
|
|
{{ $t('nodeReplacement.replaced') }}
|
|
</span>
|
|
<span
|
|
v-else
|
|
class="inline-flex h-4 items-center rounded-full border border-primary bg-primary/10 px-1.5 text-xxxs font-semibold uppercase text-primary"
|
|
>
|
|
{{ $t('nodeReplacement.replaceable') }}
|
|
</span>
|
|
<span class="text-sm text-foreground">
|
|
{{ node.label }}
|
|
</span>
|
|
</div>
|
|
<span class="text-xs text-muted-foreground">
|
|
{{ node.replacement?.new_node_id ?? node.hint ?? '' }}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- MANUAL INSTALLATION REQUIRED Section -->
|
|
<div
|
|
v-if="nonReplaceableNodes.length > 0"
|
|
class="flex max-h-[200px] flex-col gap-2"
|
|
>
|
|
<!-- Section header -->
|
|
<div class="flex items-center gap-2">
|
|
<span class="text-xs font-semibold uppercase text-error">
|
|
{{ $t('nodeReplacement.installationRequired') }}
|
|
</span>
|
|
<i class="icon-[lucide--info] text-xs text-error" />
|
|
</div>
|
|
|
|
<!-- Non-replaceable nodes list -->
|
|
<div
|
|
class="flex flex-col overflow-y-auto rounded-lg bg-secondary-background scrollbar-custom"
|
|
>
|
|
<div
|
|
v-for="node in nonReplaceableNodes"
|
|
:key="node.label"
|
|
class="flex items-center justify-between px-4 py-3"
|
|
>
|
|
<div class="flex items-center gap-3">
|
|
<div class="flex flex-col gap-0.5">
|
|
<div class="flex items-center gap-2">
|
|
<span
|
|
class="inline-flex h-4 items-center rounded-full border border-error bg-error/10 px-1.5 text-xxxs font-semibold uppercase text-error"
|
|
>
|
|
{{ $t('nodeReplacement.notReplaceable') }}
|
|
</span>
|
|
<span class="text-sm text-foreground">
|
|
{{ node.label }}
|
|
</span>
|
|
</div>
|
|
<span v-if="node.hint" class="text-xs text-muted-foreground">
|
|
{{ node.hint }}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
<Button
|
|
v-if="node.action"
|
|
variant="destructive-textonly"
|
|
size="sm"
|
|
@click="node.action.callback"
|
|
>
|
|
{{ node.action.text }}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Bottom instruction box -->
|
|
<div
|
|
class="flex gap-3 rounded-lg border border-warning-background bg-warning-background/10 p-3"
|
|
>
|
|
<i
|
|
class="icon-[lucide--triangle-alert] mt-0.5 h-4 w-4 shrink-0 text-warning-background"
|
|
/>
|
|
<p class="m-0 text-xs leading-5 text-neutral-foreground">
|
|
<i18n-t keypath="nodeReplacement.instructionMessage">
|
|
<template #red>
|
|
<span class="text-error">{{
|
|
$t('nodeReplacement.redHighlight')
|
|
}}</span>
|
|
</template>
|
|
</i18n-t>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { computed, ref } from 'vue'
|
|
|
|
import MissingCoreNodesMessage from '@/components/dialog/content/MissingCoreNodesMessage.vue'
|
|
import Button from '@/components/ui/button/Button.vue'
|
|
import { isCloud } from '@/platform/distribution/types'
|
|
import type { NodeReplacement } from '@/platform/nodeReplacement/types'
|
|
import { useNodeReplacement } from '@/platform/nodeReplacement/useNodeReplacement'
|
|
import { useDialogStore } from '@/stores/dialogStore'
|
|
import { useExecutionErrorStore } from '@/stores/executionErrorStore'
|
|
import type { MissingNodeType } from '@/types/comfy'
|
|
import { cn } from '@/utils/tailwindUtil'
|
|
import { useMissingNodes } from '@/workbench/extensions/manager/composables/nodePack/useMissingNodes'
|
|
|
|
const { missingNodeTypes } = defineProps<{
|
|
missingNodeTypes: MissingNodeType[]
|
|
}>()
|
|
|
|
const { missingCoreNodes } = useMissingNodes()
|
|
const { replaceNodesInPlace } = useNodeReplacement()
|
|
const dialogStore = useDialogStore()
|
|
const executionErrorStore = useExecutionErrorStore()
|
|
|
|
interface ProcessedNode {
|
|
label: string
|
|
hint?: string
|
|
action?: { text: string; callback: () => void }
|
|
isReplaceable: boolean
|
|
replacement?: NodeReplacement
|
|
}
|
|
|
|
const replacedTypes = ref<Set<string>>(new Set())
|
|
|
|
const uniqueNodes = computed<ProcessedNode[]>(() => {
|
|
const seenTypes = new Set<string>()
|
|
return missingNodeTypes
|
|
.filter((node) => {
|
|
const type = typeof node === 'object' ? node.type : node
|
|
if (seenTypes.has(type)) return false
|
|
seenTypes.add(type)
|
|
return true
|
|
})
|
|
.map((node) => {
|
|
if (typeof node === 'object') {
|
|
return {
|
|
label: node.type,
|
|
hint: node.hint,
|
|
action: node.action,
|
|
isReplaceable: node.isReplaceable ?? false,
|
|
replacement: node.replacement
|
|
}
|
|
}
|
|
return { label: node, isReplaceable: false }
|
|
})
|
|
})
|
|
|
|
const replaceableNodes = computed(() =>
|
|
uniqueNodes.value.filter((n) => n.isReplaceable)
|
|
)
|
|
|
|
const pendingNodes = computed(() =>
|
|
replaceableNodes.value.filter((n) => !replacedTypes.value.has(n.label))
|
|
)
|
|
|
|
const nonReplaceableNodes = computed(() =>
|
|
uniqueNodes.value.filter((n) => !n.isReplaceable)
|
|
)
|
|
|
|
// Selection state - all pending nodes selected by default
|
|
const selectedTypes = ref(new Set(pendingNodes.value.map((n) => n.label)))
|
|
|
|
const isAllSelected = computed(
|
|
() =>
|
|
pendingNodes.value.length > 0 &&
|
|
pendingNodes.value.every((n) => selectedTypes.value.has(n.label))
|
|
)
|
|
|
|
const isSomeSelected = computed(
|
|
() => selectedTypes.value.size > 0 && !isAllSelected.value
|
|
)
|
|
|
|
function toggleNode(label: string) {
|
|
if (replacedTypes.value.has(label)) return
|
|
const next = new Set(selectedTypes.value)
|
|
if (next.has(label)) {
|
|
next.delete(label)
|
|
} else {
|
|
next.add(label)
|
|
}
|
|
selectedTypes.value = next
|
|
}
|
|
|
|
function toggleSelectAll() {
|
|
if (isAllSelected.value) {
|
|
selectedTypes.value = new Set()
|
|
} else {
|
|
selectedTypes.value = new Set(pendingNodes.value.map((n) => n.label))
|
|
}
|
|
}
|
|
|
|
function handleReplaceSelected() {
|
|
const selected = missingNodeTypes.filter((node) => {
|
|
const type = typeof node === 'object' ? node.type : node
|
|
return selectedTypes.value.has(type)
|
|
})
|
|
|
|
const result = replaceNodesInPlace(selected)
|
|
const nextReplaced = new Set(replacedTypes.value)
|
|
const nextSelected = new Set(selectedTypes.value)
|
|
for (const type of result) {
|
|
nextReplaced.add(type)
|
|
nextSelected.delete(type)
|
|
}
|
|
replacedTypes.value = nextReplaced
|
|
selectedTypes.value = nextSelected
|
|
|
|
// replaceNodesInPlace() handles canvas rendering via onNodeAdded(),
|
|
// but the modal only updates its own local UI state above.
|
|
// Without this call the Errors Tab would still list the replaced nodes
|
|
// as missing because executionErrorStore is not aware of the replacement.
|
|
if (result.length > 0) {
|
|
executionErrorStore.removeMissingNodesByType(result)
|
|
}
|
|
|
|
// Auto-close when all replaceable nodes replaced and no non-replaceable remain
|
|
const allReplaced = replaceableNodes.value.every((n) =>
|
|
nextReplaced.has(n.label)
|
|
)
|
|
if (allReplaced && nonReplaceableNodes.value.length === 0) {
|
|
dialogStore.closeDialog({ key: 'global-missing-nodes' })
|
|
}
|
|
}
|
|
</script>
|