Skip to content

Commit f7ce381

Browse files
fix: separate sign and validation UUID routing
Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
1 parent 301f383 commit f7ce381

1 file changed

Lines changed: 3 additions & 27 deletions

File tree

src/components/RightSidebar/RequestSignatureTab.vue

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ import svgSignal from '../../../img/logo-signal-app.svg?raw'
314314
import svgTelegram from '../../../img/logo-telegram-app.svg?raw'
315315
import { FILE_STATUS, SIGN_REQUEST_STATUS } from '../../constants.js'
316316
import { getSignRequestStatusText } from '../../utils/getSignRequestStatusText.ts'
317+
import { getSigningRouteUuid, getValidationRouteUuid } from '../../utils/signRequestUuid.ts'
317318
import { openDocument } from '../../utils/viewer.js'
318319
import router from '../../router/router'
319320
import { useFilesStore } from '../../store/files.js'
@@ -845,36 +846,11 @@ function closeModal() {
845846
846847
function getValidationFileUuid() {
847848
const file = filesStore.getFile()
848-
if (file?.uuid) {
849-
return file.uuid
850-
}
851-
852-
const signer = file?.signers?.find((row: EditableRequestSigner) => row.me) || file?.signers?.[0]
853-
if (signer?.sign_uuid) {
854-
return signer.sign_uuid
855-
}
856-
857-
const loadedUuid = loadState<string | null>('libresign', 'sign_request_uuid', null)
858-
if (loadedUuid) {
859-
return loadedUuid
860-
}
861-
862-
if (file?.id) {
863-
return file.id
864-
}
865-
866-
return null
849+
return getValidationRouteUuid(filesStore.getFile())
867850
}
868851
869852
function getSignRouteUuid() {
870-
const file = filesStore.getFile()
871-
const signer = file?.signers?.find((row: EditableRequestSigner) => row.me) || file?.signers?.[0]
872-
const fromFile = [file?.signUuid, signer?.sign_uuid]
873-
.find((value): value is string => typeof value === 'string' && value.length > 0)
874-
const fromSettings = typeof file?.settings?.signerFileUuid === 'string' && file.settings.signerFileUuid.length > 0
875-
? file.settings.signerFileUuid
876-
: null
877-
return fromFile || fromSettings || null
853+
return getSigningRouteUuid(filesStore.getFile())
878854
}
879855
880856
function validationFile() {

0 commit comments

Comments
 (0)