diff --git a/src/services/dialogService.ts b/src/services/dialogService.ts index 457fecc89..51f44131f 100644 --- a/src/services/dialogService.ts +++ b/src/services/dialogService.ts @@ -28,6 +28,7 @@ import { type ShowDialogOptions, useDialogStore } from '@/stores/dialogStore' +import type { ConflictDetectionResult } from '@/types/conflictDetectionTypes' export type ConfirmationDialogType = | 'default' @@ -432,14 +433,21 @@ export const useDialogService = () => { } function showNodeConflictDialog( - options: InstanceType['$props'] & { + options: { + showAfterWhatsNew?: boolean + conflictedPackages?: ConflictDetectionResult[] dialogComponentProps?: DialogComponentProps buttonText?: string onButtonClick?: () => void } = {} ) { - const { dialogComponentProps, buttonText, onButtonClick, ...props } = - options + const { + dialogComponentProps, + buttonText, + onButtonClick, + showAfterWhatsNew, + conflictedPackages + } = options return dialogStore.showDialog({ key: 'global-node-conflict', @@ -461,7 +469,10 @@ export const useDialogService = () => { }, ...dialogComponentProps }, - props, + props: { + showAfterWhatsNew, + conflictedPackages + }, footerProps: { buttonText, onButtonClick