Upstream ComfyUI Manager frontend and add custom node conflict detection #5291
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… imports in api.ts) (#4608) Co-authored-by: github-actions <[email protected]>
* fix: api.ts file is different with main branch * Update locales [skip ci] * fix: restore support dotprop access * fix: apply locales based on manager/menu-items-migration * fix: Add missing shortcuts translation section for CI tests - Added shortcuts section with keyboardShortcuts key - Fixes failing Playwright test looking for 'Keyboard Shortcuts' aria-label - Issue was caused by incomplete rebase from main branch 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * fix: Add missing versionMismatchWarning translations for CI tests - Added versionMismatchWarning section with all required keys - Added general versionMismatch related keys (updateFrontend, dismiss, etc.) - Fixes failing Playwright tests for version mismatch warnings - These keys were lost during the rebase from main branch 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> --------- Co-authored-by: github-actions <[email protected]> Co-authored-by: Claude <[email protected]>
- Fix missing footerProps property in DialogInstance interface - Add missing InstalledPacksResponse type import in tests - Add missing getImportFailInfoBulk method to test mock - Remove unused ManagerComponents import causing type error - All unit and component tests now pass successfully
Remove deprecated withDefaults usage in NodeConflictDialogContent.vue and use destructuring with default values instead
dosubot
bot
added
size:XXL
- Remove outdated legacy manager detection from LoadWorkflowWarning - Update InfoPanelHeader with conflict detection improvements - Fix all failing unit tests from state management transition - Clean up algolia search provider type mappings - Remove unused @ts-expect-error directives - Add .nx to .gitignore 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
christian-byrne
force-pushed
the
test-pr4654-integration-v2
branch
from
1dc386a to
a74085f
Compare
dosubot
bot
added
size:L
Replace legacy isLegacyManagerUI() call with new ManagerUIState system: - Use useManagerStateStore().managerUIState instead of async API call - Handle DISABLED state by showing settings dialog - Handle LEGACY_UI state with fallback to new UI on error - Handle NEW_UI state by showing manager dialog - Remove unused useComfyManagerService import 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
- Remove unused refreshTaskState function from useManagerQueue - Function was left as no-op only to make tests pass - Since queue is now push-based (WebSocket), no need to refresh state - Clean up export and remove extra blank lines 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
Merge latest main branch changes including: - Nx monorepo architecture and build system - Updated package management with pnpm - Enhanced CI/CD workflows and testing - UI component improvements and fixes - Updated documentation and project setup All conflicts resolved by taking main's infrastructure changes while preserving our manager migration work.
🎭 Playwright Test Results✅ All tests passed across all browsers! ⏰ Completed at: 09/01/2025, 10:38:49 PM UTC 📊 Test Reports by Browser🎉 Your tests are passing across all browsers! |
dosubot
bot
added
size:XXL
Replace lodash import with es-toolkit/compat to match project standards: - Change 'lodash' import to 'es-toolkit/compat' for pickBy function - Add specific type helper for history task filtering - Update JSDoc comment to remove lodash reference - Fixes component test failures from missing lodash dependency
During merge with main, the event emission was lost from the hide() function. - Add defineEmits for 'whats-new-dismissed' event - Emit event in hide() function to maintain test compatibility - Fixes 3 failing unit tests in WhatsNewPopup.test.ts
Previous commits contained [skip ci] which prevented test execution. This empty commit ensures all CI checks run properly.
This was referenced Sep 1, 2025
This was referenced Sep 1, 2025
|
Only one test is failing which is expected because the button only appears when the backend has the manager feature flags set. 
For now, we can disable this test. We need to adjust the test asset to use a core node so it doesn't open the missing nodes dialog, as that is generally outside the scope of AVIF loading functionality which the test covers. |
christian-byrne
added
New Browser Test Expectations
The workflow.avif test asset contains custom nodes that trigger the missing nodes dialog, which is outside the scope of AVIF loading functionality testing. TODO: Update test asset to use core nodes only, then re-enable the test.
christian-byrne
changed the title
DrJKL
approved these changes
Sep 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Combines all manager features:
resolves #4069