From f6f4ed3b8c5fde9bbe8fb0f8fd4b08ba2d2f4012 Mon Sep 17 00:00:00 2001 From: Jin Yi Date: Wed, 30 Jul 2025 12:56:48 +0900 Subject: [PATCH] [refactor] node version status -> checkBannedStatus, checkPendingStatus --- src/composables/useConflictDetection.ts | 23 +++++++++++------------ src/types/conflictDetectionTypes.ts | 1 - 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/composables/useConflictDetection.ts b/src/composables/useConflictDetection.ts index b37802636..6d9e28089 100644 --- a/src/composables/useConflictDetection.ts +++ b/src/composables/useConflictDetection.ts @@ -800,19 +800,21 @@ export function useConflictDetection() { } // Check banned package status using shared logic - const bannedConflict = checkBannedStatus(node.status === 'NodeStatusBanned') + const bannedConflict = checkBannedStatus( + node.status === 'NodeStatusBanned' || + node.status === 'NodeVersionStatusBanned' + ) if (bannedConflict) { conflicts.push(bannedConflict) } - // TBD - // Check security/registry data status using shared logic - // const pendingConflict = checkPendingStatus( - // node.versionStatus === 'NodeVersionStatusPending' - // ) - // if (pendingConflict) { - // conflicts.push(pendingConflict) - // } + // Check pending status using shared logic + const pendingConflict = checkPendingStatus( + node.status === 'NodeVersionStatusPending' + ) + if (pendingConflict) { + conflicts.push(pendingConflict) + } return { hasConflict: conflicts.length > 0, @@ -1302,7 +1304,6 @@ function generateSummary( accelerator: 0, banned: 0, pending: 0 - // TBD // python_version: 0 } @@ -1314,7 +1315,6 @@ function generateSummary( accelerator: [], banned: [], pending: [] - // TBD // python_version: [], } @@ -1364,7 +1364,6 @@ function getEmptySummary(): ConflictDetectionSummary { accelerator: [], banned: [], pending: [] - // TBD // python_version: [], }, last_check_timestamp: new Date().toISOString(), diff --git a/src/types/conflictDetectionTypes.ts b/src/types/conflictDetectionTypes.ts index 479dde399..d6511ca7e 100644 --- a/src/types/conflictDetectionTypes.ts +++ b/src/types/conflictDetectionTypes.ts @@ -21,7 +21,6 @@ export type ConflictType = | 'comfyui_version' // ComfyUI version mismatch | 'frontend_version' // Frontend version mismatch | 'import_failed' - // TBD // | 'python_version' // Python version mismatch | 'os' // Operating system incompatibility | 'accelerator' // GPU/accelerator incompatibility