Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3e3448e
[restore] conflict notification commits restore
viva-jinyi Aug 2, 2025
a1ea18c
[fix] Restore conflict notification work and fix tests
viva-jinyi Aug 2, 2025
aefa3a9
[fix] Use Vue 3.5 destructuring syntax for props with defaults
viva-jinyi Aug 2, 2025
7389790
[feature] dual modal supported
viva-jinyi Aug 2, 2025
134341d
[fix] Fix date format in PackCard test for locale consistency
viva-jinyi Aug 2, 2025
ff31e2d
[fix] title text modified
viva-jinyi Aug 5, 2025
42ad8eb
[fix] Fix conflict red dot not syncing
viva-jinyi Aug 5, 2025
63b6af5
[fix] Add conflict detection when installed packages list updates
viva-jinyi Aug 6, 2025
73f2489
fix: use selected target_branch for PR base in update-manager-types w…
viva-jinyi Aug 6, 2025
87db9cc
[fix] test code timeout error fixed
viva-jinyi Aug 6, 2025
7d0e971
[chore] Update ComfyUI-Manager API types from ComfyUI-Manager@4e6f970…
comfy-pr-bot Aug 6, 2025
4c99172
[types] Add proper types for ImportFailInfo API endpoints (#4783)
viva-jinyi Aug 6, 2025
33bf377
[fix] ci error fixed & button max-width modified
viva-jinyi Aug 7, 2025
59e1945
fix: node pack card width adapted
viva-jinyi Aug 12, 2025
35873fa
fix: prevent duplicate api calls & installedPacksWithVersions instead…
viva-jinyi Aug 12, 2025
a5153cd
feat: run conflict detection after Apply Changes
viva-jinyi Aug 17, 2025
267e07e
refactor: simplify PackInstallButton isInstalling state management
viva-jinyi Aug 27, 2025
91e462d
feat: improve multi-package selection handling (#5116)
viva-jinyi Aug 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[fix] Add conflict detection when installed packages list updates
- Import useConflictDetection composable in comfyManagerStore
- Call performConflictDetection after refreshing installed packages list
- Ensures conflict status stays up-to-date when packages change
- Follows existing codebase patterns for composable usage
  • Loading branch information
viva-jinyi committed Aug 27, 2025
commit 63b6af5e274b71632040ad7ad6dc1e1e8a7422ef
4 changes: 3 additions & 1 deletion src/composables/useConflictDetection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ export function useConflictDetection() {
try {
// Get system stats from store (primary source of system information)
const systemStatsStore = useSystemStatsStore()
await systemStatsStore.fetchSystemStats()
if (!systemStatsStore.systemStats) {
await systemStatsStore.fetchSystemStats()
}

// Fetch version information from backend (with error resilience)
const [frontendVersion] = await Promise.allSettled([
Expand Down
5 changes: 5 additions & 0 deletions src/stores/comfyManagerStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { ref, watch } from 'vue'
import { useI18n } from 'vue-i18n'

import { useCachedRequest } from '@/composables/useCachedRequest'
import { useConflictDetection } from '@/composables/useConflictDetection'
import { useManagerQueue } from '@/composables/useManagerQueue'
import { useServerLogs } from '@/composables/useServerLogs'
import { useComfyManagerService } from '@/services/comfyManagerService'
Expand Down Expand Up @@ -122,6 +123,10 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
return key.split('@')[0]
})
installedPacks.value = packsWithCleanedKeys
// Run conflict detection for all installed packages
// This ensures conflict status is always up-to-date when installed list changes
const { performConflictDetection } = useConflictDetection()
await performConflictDetection()
}
isStale.value = false
}
Expand Down