@@ -19,6 +19,7 @@ import { useFiltersStore } from './filters.js'
1919import { useIdentificationDocumentStore } from './identificationDocument.js'
2020import { useSidebarStore } from './sidebar.js'
2121import { FILE_STATUS } from '../constants.js'
22+ import { getSigningRouteUuid } from '../utils/signRequestUuid.ts'
2223
2324/** @typedef {import('../types/index').IdentifyMethodRecord } SignerMethodRecord */
2425/** @typedef {import('../types/index').FileSettings } FileSettings */
@@ -57,7 +58,7 @@ import { FILE_STATUS } from '../constants.js'
5758 * visibleElements?: (VisibleElementRecord | VisibleElementDraft)[]
5859 * me?: boolean
5960 * signed?: string | null | boolean | unknown[]
60- * sign_uuid ?: string | null
61+ * sign_request_uuid ?: string | null
6162 * }} EditableSignerDraft
6263 */
6364
@@ -71,7 +72,6 @@ import { FILE_STATUS } from '../constants.js'
7172 * nodeType?: string
7273 * name?: string
7374 * docmdpLevel?: number | string
74- * signUuid?: string | null
7575 * file?: string | EditableFileReferenceDraft | null
7676 * files?: EditableFileReferenceDraft[]
7777 * path?: string
@@ -104,7 +104,6 @@ import { FILE_STATUS } from '../constants.js'
104104 * docmdpLevel?: number | string
105105 * status?: FileStatus
106106 * statusText?: FileStatusText
107- * signUuid?: string | null
108107 * file?: string | EditableFileReferenceDraft | null
109108 * files?: EditableFileReferenceDraft[]
110109 * loading?: string | boolean
@@ -139,7 +138,6 @@ import { FILE_STATUS } from '../constants.js'
139138 * statusText?: FileStatusText
140139 * nodeId?: number | string | null
141140 * nodeType?: string
142- * signUuid?: string | null
143141 * file?: string | EditableFileReferenceDraft | null
144142 * files?: EditableFileReferenceDraft[]
145143 * loading?: string | boolean
@@ -714,17 +712,19 @@ const _filesStore = defineStore('files', () => {
714712 const isSigned = ( signer ) => Array . isArray ( signer . signed )
715713 ? signer . signed . length > 0
716714 : ! ! signer . signed
717- const signerFileUuid = typeof selectedFile ?. settings ?. signerFileUuid === 'string'
718- ? selectedFile . settings . signerFileUuid
719- : ''
720715 const mySigners = selectedFile ?. signers ?. filter ( signer => signer . me ) || [ ]
721716 if ( isFullSigned ( selectedFile )
722717 || selectedFile . status <= 0
723718 || mySigners . some ( ( signer ) => isSigned ( signer ) ) ) {
724719 return false
725720 }
721+ const signingRouteUuid = getSigningRouteUuid ( selectedFile )
726722 if ( mySigners . length === 0 ) {
727- return signerFileUuid . length > 0
723+ return typeof signingRouteUuid === 'string' && signingRouteUuid . length > 0
724+ }
725+
726+ if ( typeof signingRouteUuid !== 'string' || signingRouteUuid . length === 0 ) {
727+ return false
728728 }
729729
730730 const flow = selectedFile ?. signatureFlow
@@ -1110,7 +1110,7 @@ const _filesStore = defineStore('files', () => {
11101110 // return true when found signer by signer_uuid
11111111 return value . signers ?. filter ( ( signer ) => {
11121112 // filter signers by signer_uuid
1113- return signer . sign_uuid === filter . signer_uuid
1113+ return signer . sign_request_uuid === filter . signer_uuid
11141114 } ) . length > 0
11151115 }
11161116 return false
0 commit comments