Christian Byrne
b210e63f3c
[backport rh-test] make 'require subscription' toggleable ( #6147 )
...
## Summary
Backport of PR #6144 to the `rh-test` branch.
This adds build time feature flags system starting with a flag that
indicates whether subscription is required to use the app. This is only
used on cloud.
## Changes
- Added build feature flags system via `__BUILD_FLAGS__` global
- Added `REQUIRE_SUBSCRIPTION` flag that can be set via environment
variable
- Conditionally load subscription-related components based on the flag
- Updated run button logic to respect the subscription requirement flag
- Updated settings UI to show subscription panel only when required
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6147-Backport-make-require-subscription-toggleable-in-build-to-rh-test-2916d73d365081e89bcfc4502315a812 )
by [Unito](https://www.unito.io )
2025-10-19 12:08:57 -07:00
Christian Byrne
a9db25ecc3
[backport rh-test] subscription panel ( #6140 )
...
## Summary
Backport of #6064 (subscription page) to the `rh-test` branch.
This PR manually cherry-picks commit
7e1e8e3b65 to the rh-test branch and
resolves merge conflicts that prevented automatic backporting.
## Conflicts Resolved
### 1. `src/components/actionbar/ComfyActionbar.vue`
- **Conflict**: HEAD (rh-test) used `<ComfyQueueButton />` while the
subscription PR introduced `<ComfyRunButton />`
- **Resolution**: Updated to use `<ComfyRunButton />` to include the
subscription functionality wrapper while maintaining the existing
rh-test template structure
### 2. `src/composables/auth/useFirebaseAuthActions.ts`
- **Conflict**: Simple ordering difference in the return statement
- **Resolution**: Used the subscription PR's ordering: `deleteAccount,
accessError, reportError`
## Testing
The cherry-pick completed successfully and passed all pre-commit hooks:
- ✅ ESLint
- ✅ Prettier formatting
- ⚠️ Note: 2 unused i18n keys detected (informational only, same as
original PR)
## Related
- Original PR: #6064
- Cherry-picked commit: 7e1e8e3b65
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6140-backport-subscription-page-to-rh-test-2916d73d365081f38f00df422004f61a )
by [Unito](https://www.unito.io )
Co-authored-by: Terry Jia <terryjia88@gmail.com >
Co-authored-by: GitHub Action <action@github.com >
2025-10-19 00:14:03 -07:00
Arjan Singh
0239a83da2
Update rh-test (as of 2025-10-11) ( #6044 )
...
## Summary
Tested these changes and confirmed that:
1. Feedback button shows.
2. You can run workflows and switch out models.
3. You can use the mask editor. (thank you @ric-yu for helping me
verify).
## Changes
A lot, please see commits.
Gets us up to date with `main` as of 10-11-2025.
---------
Co-authored-by: Simula_r <18093452+simula-r@users.noreply.github.com >
Co-authored-by: github-actions <github-actions@github.com >
Co-authored-by: snomiao <snomiao@gmail.com >
Co-authored-by: Christian Byrne <cbyrne@comfy.org >
Co-authored-by: Claude <noreply@anthropic.com >
Co-authored-by: DrJKL <DrJKL@users.noreply.github.com >
Co-authored-by: Alexander Brown <drjkl@comfy.org >
Co-authored-by: Marwan Ahmed <155799754+marawan206@users.noreply.github.com >
Co-authored-by: DrJKL <DrJKL0424@gmail.com >
Co-authored-by: Rizumu Ayaka <rizumu@ayaka.moe >
Co-authored-by: Comfy Org PR Bot <snomiao+comfy-pr@gmail.com >
Co-authored-by: AustinMroz <4284322+AustinMroz@users.noreply.github.com >
Co-authored-by: Austin Mroz <austin@comfy.org >
Co-authored-by: Johnpaul Chiwetelu <49923152+Myestery@users.noreply.github.com >
Co-authored-by: GitHub Action <action@github.com >
Co-authored-by: filtered <176114999+webfiltered@users.noreply.github.com >
Co-authored-by: Benjamin Lu <benceruleanlu@proton.me >
Co-authored-by: Jin Yi <jin12cc@gmail.com >
Co-authored-by: Robin Huang <robin.j.huang@gmail.com >
2025-10-14 15:59:26 -07:00
Arjan Singh
5869b04e57
Merge main (as of 10-06-2025) into rh-test ( #5965 )
...
## Summary
Merges latest changes from `main` as of 10-06-2025.
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-5965-Merge-main-as-of-10-06-2025-into-rh-test-2856d73d3650812cb95fd8917278a770 )
by [Unito](https://www.unito.io )
---------
Signed-off-by: Marcel Petrick <mail@marcelpetrick.it >
Co-authored-by: filtered <176114999+webfiltered@users.noreply.github.com >
Co-authored-by: Christian Byrne <cbyrne@comfy.org >
Co-authored-by: github-actions <github-actions@github.com >
Co-authored-by: Claude <noreply@anthropic.com >
Co-authored-by: Alexander Brown <drjkl@comfy.org >
Co-authored-by: Benjamin Lu <benceruleanlu@proton.me >
Co-authored-by: Terry Jia <terryjia88@gmail.com >
Co-authored-by: snomiao <snomiao@gmail.com >
Co-authored-by: Simula_r <18093452+simula-r@users.noreply.github.com >
Co-authored-by: Jake Schroeder <jake.schroeder@isophex.com >
Co-authored-by: Comfy Org PR Bot <snomiao+comfy-pr@gmail.com >
Co-authored-by: AustinMroz <4284322+AustinMroz@users.noreply.github.com >
Co-authored-by: GitHub Action <action@github.com >
Co-authored-by: Johnpaul Chiwetelu <49923152+Myestery@users.noreply.github.com >
Co-authored-by: Marcel Petrick <mail@marcelpetrick.it >
Co-authored-by: Alexander Brown <DrJKL0424@gmail.com >
Co-authored-by: Benjamin Lu <benjaminlu1107@gmail.com >
Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com >
Co-authored-by: Rizumu Ayaka <rizumu@ayaka.moe >
Co-authored-by: JakeSchroeder <jake@axiom.co >
Co-authored-by: AustinMroz <austin@comfy.org >
Co-authored-by: DrJKL <DrJKL@users.noreply.github.com >
Co-authored-by: ComfyUI Wiki <contact@comfyui-wiki.com >
2025-10-08 19:06:40 -07:00
bymyself
ff0c15b119
merge main into rh-test
2025-09-28 15:33:29 -07:00
Jin Yi
727a3494e0
Modal Component & Custom UI Components ( #4908 )
2025-08-19 11:56:17 +09:00
Jin Yi
ceac8f3741
Modal Standardization ( #4784 )
2025-08-18 09:41:15 +09:00
Sidharth
b240c090aa
Fix: Escape closes Settings dialog if login dialog open ( #4364 )
2025-07-23 22:41:26 -07:00
Jin Yi
47145ce4b8
[Manager] Modal UI Adjustment (Align with Design) ( #4222 )
2025-06-23 21:30:56 -07:00
Christian Byrne
2ef760c599
[Manager] Keep progress dialog on top using priority system ( #4225 )
2025-06-20 15:22:42 -07:00
Christian Byrne
a6bd04f951
[Manager] Make dialog closeable with button and hotkey ( #4179 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-06-14 15:21:43 -07:00
Christian Byrne
5b32d2aad0
[Manager] Persist/Restore Manager UI state ( #4180 )
2025-06-14 15:19:56 -07:00
filtered
0cdaa512c8
Allow extensions to raise their own Vue dialogs ( #4008 )
2025-05-29 21:05:52 +10:00
Chenlei Hu
c1442ec755
[Cleanup] Remove api nodes news dialog ( #3890 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-05-14 21:06:08 -04:00
Christian Byrne
6b98f1de0e
[API Node] Adjust notification dismiss logic and message ( #3778 )
2025-05-06 00:51:47 -07:00
Chenlei Hu
93d7d2c69c
[Bug] Remove default dialog close button on news dialog ( #3758 )
2025-05-04 19:07:13 -04:00
Chenlei Hu
2d9a0d02ab
[API Nodes] Add API Nodes new feature dialog ( #3755 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-05-04 17:20:05 -04:00
Chenlei Hu
834d5820d2
[Auth] Allow change password in user panel ( #3699 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-04-30 16:12:57 -04:00
Chenlei Hu
4c23cfbd4d
[API Node] Better execution error handling ( #3587 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-04-23 11:15:38 -04:00
Christian Byrne
1bcf5e28d4
[API Node] Contact support button ( #3571 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-04-22 19:47:23 -04:00
Christian Byrne
8558f87547
[API Node] User management ( #3567 )
...
Co-authored-by: github-actions <github-actions@github.com >
Co-authored-by: Chenlei Hu <hcl@comfy.org >
2025-04-22 18:48:45 -04:00
Chenlei Hu
b5c1da22db
[API Nodes] Remove cost from signin required dialog ( #3532 )
2025-04-20 17:02:42 -04:00
Chenlei Hu
9935b322f0
[API Nodes] Signin/Signup dialog ( #3466 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-04-15 17:37:53 -04:00
Chenlei Hu
851739a768
[API Node] Sign in required dialog ( #3457 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-04-14 17:49:17 -04:00
Christian Byrne
05e0036898
[Manager] Button to open manager from Missing Nodes dialog ( #3395 )
2025-04-10 21:28:42 -04:00
Chenlei Hu
504b717575
[Refactor] Unify error dialog component ( #3265 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-03-28 11:53:29 -04:00
Chenlei Hu
ae64721555
Implement load workflow error dialog in Vue ( #3225 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-03-24 21:00:50 -04:00
Christian Byrne
bd1be28478
[Manager] Add progress queue dialog ( #3091 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-03-17 12:16:36 -04:00
Christian Byrne
d8721760f1
Add custom nodes manager UI ( #2923 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-03-08 18:54:08 -05:00
Christian Byrne
367a1c63a5
Fix template dialog double scrollbar ( #2896 )
2025-03-06 11:17:53 -05:00
bymyself
e58fab92d1
Use responsive grid for templates dialog ( #2791 )
2025-03-01 17:08:41 -05:00
bymyself
bfec9b692b
Add keybind hint to confirm close dialog ( #2529 )
...
Co-authored-by: github-actions <github-actions@github.com >
2025-02-12 10:02:27 -05:00
bymyself
654d72b4cc
Add issue report dialog service ( #2284 )
...
Co-authored-by: huchenlei <huchenlei@proton.me >
2025-01-19 20:44:11 -05:00
bymyself
a1ed67fc74
Add User Feedback buttons ( #2275 )
...
Co-authored-by: github-actions <github-actions@github.com >
Co-authored-by: huchenlei <huchenlei@proton.me >
2025-01-19 19:41:58 -05:00
bymyself
816574e0ab
[Refactor] improve type safety in dialog service ( #2283 )
2025-01-18 15:46:57 -05:00
Chenlei Hu
3189e310a8
Add default confirm dialog ( #2114 )
2024-12-31 18:18:48 -05:00
Chenlei Hu
174a9a114a
Expose dialogService to extensionManager ( #2113 )
2024-12-31 17:01:37 -05:00
Chenlei Hu
d8f074fea0
[Lint] Sort imports ( #2104 )
2024-12-30 17:26:37 -05:00
Chenlei Hu
f69e88bf41
[Refactor] Convert dialogService to composable ( #2058 )
2024-12-26 00:26:01 -05:00
filtered
3767749398
Add About to Help menu ( #2010 )
...
Co-authored-by: github-actions <github-actions@github.com >
2024-12-22 16:17:25 -05:00
Chenlei Hu
59b62eadf1
[i18n] Translate save/export workflow dialog ( #1906 )
...
* [i18n] Translate save/export workflow dialog
* Update locales [skip ci]
---------
Co-authored-by: github-actions <github-actions@github.com >
2024-12-13 16:56:37 -08:00
filtered
0e385c4262
Require confirmation for desktop reinstall ( #1835 )
...
* Add generic default button for unknown dialogs
* Add reinstall confirmation dialog
* Prevent removal of newlines in i18n dialogs
* Update locales [skip ci]
---------
Co-authored-by: github-actions <github-actions@github.com >
2024-12-07 10:24:00 -05:00
filtered
735153886f
Confirm delete workflow ( #1772 )
...
* Add confirm delete workflow prompt
* Add confirm delete workflow setting
* Add delete workflow tests
* Change dialog to modal, set default cancel
* Fix setting version key
* Rename for clarity
* Fix tests
- Move into correct section
- Add confirm control
* Export type: ShowDialogOptions
* Replace workflow overwrite with new dialog
* Add delete workflow confirmation dialog
* Update i18n
* Add item list support to confirmation dialog
* Prevent multiple dialogs for same action
* Add confirm close file when dirty
* Add i18n for overwrite dialog
* Fix regression: confirm dialog setting ignored
* Fix delete last workflow does not open replacement
* Update tests
2024-12-04 14:11:49 -05:00
Hayden
e893f3ed03
Add a unique key to each showDialog ( #1786 )
2024-12-03 23:04:27 -05:00
Chenlei Hu
87517daf1f
Restyle missing model warning dialog ( #1354 )
...
* Restyle missing model dialog
* nit
* nit
* nit
* nit
2024-10-29 09:26:02 -04:00
Chenlei Hu
44b109a449
Add type annotation for missingNodeTypes ( #1349 )
...
* Add type annotation for missingNodeTypes
* nit
* nit
2024-10-28 17:26:52 -04:00
Chenlei Hu
229896a4b7
Restyle missing node warning dialog ( #1348 )
...
* nit
* Restyle missing node warning dialog
* nit
* nit
2024-10-28 16:45:47 -04:00
Chenlei Hu
ebc71b0e46
Add PromptDialog to replace window.prompt ( #1104 )
...
* Save file prompt dialog
* Don't download if dialog dismissed
* refactor
* style dialog
* nit
* Autofocus
2024-10-04 15:33:27 -04:00
Alex "mcmonkey" Goodwin
35a7c81fd8
initial download-folder-selector interface ( #890 )
...
* initial download-folder-selector interface
* use primevue select
* add a folder select visibility checkbox
* slightly reduce indirection
* fix up select box updating
* revert bad upstream changes
* cleanup
* allow localhost sourced models in ui side
(for testing purposes only basically, but does no harm in deployed envs)
* add screenshot expectations to test
* Update test expectations [skip ci]
* add testing of folder select
* fix test
* don't exclude folder selector when there's only 1
since the checkbox covers that better anyway
* oo - fix checkbox
* Update test expectations [skip ci]
* testing - don't expect screenshots :(
* experimental new test code
* toHaveClass is silly
* add // comments documenting intent of allowedSources
---------
Co-authored-by: github-actions <github-actions@github.com >
2024-09-25 16:01:50 +09:00
pythongosssss
bf7652227a
Workflow templates ( #938 )
...
* Add template gallery
* Add simple test
* Add examples
* Enable floating menu in test
2024-09-25 16:01:50 +09:00