Merge pull request #2451 from LibreSign/backport/2448/stable28

[stable28] Add sign button when have more than one signer
LibreSign · Mar 6, 2024 · be0bcdb · be0bcdb
2 parents 8fa55ae + 8af28df
commit be0bcdb
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 27 deletions.
diff --git a/src/Components/Request/RequestSignature.vue b/src/Components/Request/RequestSignature.vue
@@ -5,7 +5,7 @@
 	</div>
 	<div v-else
 		id="request-signature-list-signers">
-		<NcButton v-if="canRequestSign && !filesStore.isSigned()"
+		<NcButton v-if="canRequestSign && !filesStore.isFullSigned()"
 			@click="addSigner">
 			{{ t('libresign', 'Add signer') }}
 		</NcButton>
@@ -29,28 +29,33 @@
 				</NcActionButton>
 			</template>
 		</Signers>
-		<NcButton v-if="canSave"
-			type="primary"
-			:disabled="hasLoading"
-			@click="save()">
-			<template #icon>
-				<NcLoadingIcon v-if="hasLoading" :size="20" />
-			</template>
-			{{ t('libresign', 'Next') }}
-		</NcButton>
-		<NcButton v-else-if="canSign"
-			type="primary"
-			:disabled="hasLoading"
-			@click="sign()">
-			<template #icon>
-				<NcLoadingIcon v-if="hasLoading" :size="20" />
-			</template>
-			{{ t('libresign', 'Sign') }}
-		</NcButton>
-		<NcButton v-if="filesStore.isSigned()"
-			@click="validationFile()">
-			{{ t('libresign', 'Validate') }}
-		</NcButton>
+		<div class="action-buttons">
+			<NcButton v-if="canSave && !filesStore.isPartialSigned"
+				:type="{
+					primary: !canSign,
+					secondary: canSign
+				}"
+				:disabled="hasLoading"
+				@click="save()">
+				<template #icon>
+					<NcLoadingIcon v-if="hasLoading" :size="20" />
+				</template>
+				{{ t('libresign', 'Next') }}
+			</NcButton>
+			<NcButton v-if="canSign"
+				type="primary"
+				:disabled="hasLoading"
+				@click="sign()">
+				<template #icon>
+					<NcLoadingIcon v-if="hasLoading" :size="20" />
+				</template>
+				{{ t('libresign', 'Sign') }}
+			</NcButton>
+			<NcButton v-if="filesStore.isFullSigned()"
+				@click="validationFile()">
+				{{ t('libresign', 'Validate') }}
+			</NcButton>
+		</div>
 		<VisibleElements />
 	</div>
 </template>
@@ -100,11 +105,11 @@ export default {
 					!Object.hasOwn(this.filesStore.getFile(), 'requested_by')
 					|| this.filesStore.getFile().requested_by.uid === getCurrentUser().uid
 				)
-				&& !this.filesStore.isSigned()
+				&& !this.filesStore.isFullSigned()
 				&& this.filesStore.getFile()?.signers?.length > 0
 		},
 		canSign() {
-			return !this.filesStore.isSigned()
+			return !this.filesStore.isFullSigned()
 				&& this.filesStore.getFile()?.signers?.filter(signer => signer.me).length > 0
 		},
 		dataSigners() {
@@ -215,3 +220,11 @@ export default {
 	},
 }
 </script>
+<style lang="scss" scoped>
+
+.action-buttons{
+	display: flex;
+	box-sizing: border-box;
+	grid-gap: 10px;
+}
+</style>
diff --git a/src/store/files.js b/src/store/files.js
@@ -52,14 +52,25 @@ export const useFilesStore = defineStore('files', {
 		disableIdentifySigner() {
 			this.identifyingSigner = false
 		},
-		isSigned() {
+		isPartialSigned() {
 			if (this.selectedNodeId === 0) {
 				return false
 			}
 			if (!Object.hasOwn(this.getFile(), 'signers')) {
 				return false
 			}
-			return this.files[this.selectedNodeId].signers.filter(signer => signer.signed?.length > 0).length > 0
+			return this.files[this.selectedNodeId].signers
+				.filter(signer => signer.signed?.length > 0).length > 0
+		},
+		isFullSigned() {
+			if (this.selectedNodeId === 0) {
+				return false
+			}
+			if (!Object.hasOwn(this.getFile(), 'signers')) {
+				return false
+			}
+			return this.files[this.selectedNodeId].signers
+				.filter(signer => signer.signed?.length > 0).length === this.files[this.selectedNodeId].signers.length
 		},
 		getSubtitle() {
 			if (this.selectedNodeId === 0) {