-
Notifications
You must be signed in to change notification settings - Fork 502
refactor: simplify asset download state and fix deletion UI #7974
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
35a0c43
fix(upload-model): standardize link styling in upload dialogs
DrJKL 82e3f5c
fix(upload-model): increase warning/example text font size to 14px
DrJKL d7b661e
fix(upload-model): align padding between model name box and select dr…
DrJKL f246e8f
feat(upload-model): add Upload Another button for multi-model upload
DrJKL 4e966d4
fix: Close button size
DrJKL 044fdce
Upload to import for the loop button.
DrJKL 24a3895
refactor(assetDownloadStore): simplify state management
DrJKL 187f340
fix(AssetCard): emit deleted event instead of hiding with local state
DrJKL 480aa19
refactor: extract generateDownloadTrackingPlaceholder and guard again…
DrJKL f444e07
feat: add assetName parameter to trackDownload
DrJKL 5b41a79
Merge branch 'main' into drjkl/order-out-of
DrJKL File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import { useAsyncState } from '@vueuse/core' | ||
| import { useAsyncState, whenever } from '@vueuse/core' | ||
| import { isEqual } from 'es-toolkit' | ||
| import { defineStore } from 'pinia' | ||
| import { computed, shallowReactive, ref, watch } from 'vue' | ||
| import { computed, shallowReactive, ref } from 'vue' | ||
| import { | ||
| mapInputFileToAssetItem, | ||
| mapTaskOutputToAssetItem | ||
|
|
@@ -376,24 +376,32 @@ export const useAssetsStore = defineStore('assets', () => { | |
| } = getModelState() | ||
|
|
||
| // Watch for completed downloads and refresh model caches | ||
| watch( | ||
| () => assetDownloadStore.completedDownloads.at(-1), | ||
| whenever( | ||
| () => assetDownloadStore.lastCompletedDownload, | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. makes sense |
||
| async (latestDownload) => { | ||
| if (!latestDownload) return | ||
|
|
||
| const { modelType } = latestDownload | ||
|
|
||
| const providers = modelToNodeStore | ||
| .getAllNodeProviders(modelType) | ||
| .filter((provider) => provider.nodeDef?.name) | ||
| const results = await Promise.allSettled( | ||
| providers.map((provider) => | ||
| updateModelsForNodeType(provider.nodeDef.name).then( | ||
| () => provider.nodeDef.name | ||
| ) | ||
|
|
||
| const nodeTypeUpdates = providers.map((provider) => | ||
| updateModelsForNodeType(provider.nodeDef.name).then( | ||
| () => provider.nodeDef.name | ||
| ) | ||
| ) | ||
|
|
||
| // Also update by tag in case modal was opened with assetType | ||
| const tagUpdates = [ | ||
| updateModelsForTag(modelType), | ||
| updateModelsForTag('models') | ||
| ] | ||
|
|
||
| const results = await Promise.allSettled([ | ||
| ...nodeTypeUpdates, | ||
| ...tagUpdates | ||
| ]) | ||
|
|
||
| for (const result of results) { | ||
| if (result.status === 'rejected') { | ||
| console.error( | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
neat!