[refactor] Extract dialog composables and add showSmallDialog helper #6846
+177
−128
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import MissingNodesContent from '@/components/dialog/content/MissingNodesContent.vue' | ||
| import MissingNodesFooter from '@/components/dialog/content/MissingNodesFooter.vue' | ||
| import MissingNodesHeader from '@/components/dialog/content/MissingNodesHeader.vue' | ||
| import { useDialogService } from '@/services/dialogService' | ||
| import { useDialogStore } from '@/stores/dialogStore' | ||
| import type { ComponentProps } from 'vue-component-type-helpers' | ||
|
|
||
| const DIALOG_KEY = 'global-missing-nodes' | ||
|
|
||
| export const useMissingNodesDialog = () => { | ||
| const dialogService = useDialogService() | ||
| const dialogStore = useDialogStore() | ||
|
|
||
| function hide() { | ||
| dialogStore.closeDialog({ key: DIALOG_KEY }) | ||
| } | ||
|
|
||
| function show(props: ComponentProps<typeof MissingNodesContent>) { | ||
| dialogService.showSmallDialog({ | ||
| key: DIALOG_KEY, | ||
| headerComponent: MissingNodesHeader, | ||
| footerComponent: MissingNodesFooter, | ||
| component: MissingNodesContent, | ||
| props | ||
| }) | ||
| } | ||
|
|
||
| return { show, hide } | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import NodeConflictDialogContent from '@/workbench/extensions/manager/components/manager/NodeConflictDialogContent.vue' | ||
| import NodeConflictFooter from '@/workbench/extensions/manager/components/manager/NodeConflictFooter.vue' | ||
| import NodeConflictHeader from '@/workbench/extensions/manager/components/manager/NodeConflictHeader.vue' | ||
| import { useDialogService } from '@/services/dialogService' | ||
| import { useDialogStore } from '@/stores/dialogStore' | ||
| import type { DialogComponentProps } from '@/stores/dialogStore' | ||
| import type { ConflictDetectionResult } from '@/workbench/extensions/manager/types/conflictDetectionTypes' | ||
|
|
||
| const DIALOG_KEY = 'global-node-conflict' | ||
|
|
||
| export const useNodeConflictDialog = () => { | ||
| const dialogService = useDialogService() | ||
| const dialogStore = useDialogStore() | ||
|
|
||
| function hide() { | ||
| dialogStore.closeDialog({ key: DIALOG_KEY }) | ||
| } | ||
|
|
||
| function show( | ||
| options: { | ||
| showAfterWhatsNew?: boolean | ||
| conflictedPackages?: ConflictDetectionResult[] | ||
| dialogComponentProps?: DialogComponentProps | ||
| buttonText?: string | ||
| onButtonClick?: () => void | ||
| } = {} | ||
| ) { | ||
| const { buttonText, onButtonClick, showAfterWhatsNew, conflictedPackages } = | ||
| options | ||
|
|
||
| return dialogService.showSmallDialog({ | ||
| key: DIALOG_KEY, | ||
| headerComponent: NodeConflictHeader, | ||
| footerComponent: NodeConflictFooter, | ||
| component: NodeConflictDialogContent, | ||
| props: { | ||
| showAfterWhatsNew, | ||
| conflictedPackages | ||
| }, | ||
| footerProps: { | ||
| buttonText, | ||
| onButtonClick | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| return { show, hide } | ||
| } | ||
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
Oops, something went wrong.
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.
LGTM with one concern! Well-structured composable with flexible options.
The composable follows Vue best practices and provides a clean API for displaying node conflict dialogs. However, there's a potential issue:
The
dialogComponentPropsfrom the options parameter (line 23) is destructured (line 28) but not passed toshowSmallDialog()(lines 31-44).Apply this diff to pass through dialog component props:
return dialogService.showSmallDialog({ key: DIALOG_KEY, headerComponent: NodeConflictHeader, footerComponent: NodeConflictFooter, component: NodeConflictDialogContent, props: { showAfterWhatsNew, conflictedPackages }, footerProps: { buttonText, onButtonClick - } + }, + dialogComponentProps })🤖 Prompt for AI Agents