@@ -74,6 +74,7 @@ import { loadState } from '@nextcloud/initial-state'
7474import { generateUrl } from ' @nextcloud/router'
7575
7676import { openDocument } from ' ../../../utils/viewer.js'
77+ import { getSigningRouteUuid } from ' ../../../utils/signRequestUuid.ts'
7778import NcActionButton from ' @nextcloud/vue/components/NcActionButton'
7879import NcActions from ' @nextcloud/vue/components/NcActions'
7980import NcButton from ' @nextcloud/vue/components/NcButton'
@@ -93,13 +94,12 @@ defineOptions({
9394})
9495
9596type SourceFile = FileEntrySource & {
96- signUuid? : string | null
9797 settings? : {
98- signerFileUuid ? : string | null
98+ isApprover ? : boolean
9999 }
100100 signers? : Array <{
101101 me? : boolean
102- sign_uuid ? : string | null
102+ sign_request_uuid ? : string | null
103103 }>
104104}
105105
@@ -154,13 +154,7 @@ function registerAction(action: MenuAction) {
154154}
155155
156156function getSignRouteUuid(file : SourceFile | null | undefined ) {
157- const signer = file ?.signers ?.find ((row ) => row ?.me ) || file ?.signers ?.[0 ]
158- const fromSettings = typeof file ?.settings ?.signerFileUuid === ' string' && file .settings .signerFileUuid .length > 0
159- ? file .settings .signerFileUuid
160- : null
161-
162- return [file ?.signUuid , signer ?.sign_uuid , fromSettings , props .source .signUuid ]
163- .find ((value ): value is string => typeof value === ' string' && value .length > 0 ) || ' '
157+ return getSigningRouteUuid (file ) || ' '
164158}
165159
166160function visibleIf(action : Pick <MenuAction , ' id' >) {
@@ -191,16 +185,16 @@ async function onActionClick(action: Pick<MenuAction, 'id'>) {
191185 sidebarStore .activeRequestSignatureTab ()
192186 } else if (action .id === ' sign' ) {
193187 const detailedFile = await filesStore .fetchFileDetail ({ fileId: props .source .id , force: true }) as SourceFile | undefined
194- const signUuid = getSignRouteUuid (detailedFile )
195- if (! signUuid || ! detailedFile ) {
188+ const signRequestUuid = getSignRouteUuid (detailedFile )
189+ if (! signRequestUuid || ! detailedFile ) {
196190 return
197191 }
198192 filesStore .selectFile (props .source .id )
199193 signStore .setFileToSign (detailedFile )
200194 await router .push ({
201195 name: ' SignPDF' ,
202196 params: {
203- uuid: signUuid ,
197+ uuid: signRequestUuid ,
204198 },
205199 })
206200 sidebarStore .activeSignTab ()
0 commit comments