From 438ce11594c67750d196f8e7d86e781b3398da51 Mon Sep 17 00:00:00 2001
From: Vitor Mattos <vitor@php.rio>
Date: Fri, 12 Apr 2024 11:57:12 -0300
Subject: [PATCH] chore: Convert to ncdialog

Signed-off-by: Vitor Mattos <vitor@php.rio>
---
 src/Components/Request/VisibleElements.vue    | 49 ++++++++-----------
 .../RightSidebar/RequestSignatureTab.vue      |  1 -
 src/store/files.js                            |  2 -
 3 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/src/Components/Request/VisibleElements.vue b/src/Components/Request/VisibleElements.vue
index 20e9eb6a81..20ce42e854 100644
--- a/src/Components/Request/VisibleElements.vue
+++ b/src/Components/Request/VisibleElements.vue
@@ -1,12 +1,13 @@
 <template>
-	<NcModal v-if="modal"
-		class="view-sign-detail"
-		app-name="libresign"
-		@close="closeModal">
-		<div class="sign-details">
+	<NcDialog v-if="modal"
+		:name="document.name"
+		size="normal"
+		@closing="closeModal">
+		<div v-if="filesStore.loading">
+			<NcLoadingIcon :size="64" :name="t('libresign', 'Loading file')" />
+		</div>
+		<div v-else class="sign-details">
 			<h2>
-				{{ document.name }}
-				<br>
 				<Chip :state="isDraft ? 'warning' : 'default'">
 					{{ statusLabel }}
 				</Chip>
@@ -39,12 +40,7 @@
 				{{ t('libresign', 'Sign') }}
 			</NcButton>
 		</div>
-		<div v-if="filesStore.loading"
-			class="image-page">
-			<NcLoadingIcon :size="64" name="Loading" />
-			<p>{{ t('libresign', 'Loading file') }}</p>
-		</div>
-		<div v-else class="image-page">
+		<div class="image-page">
 			<PdfEditor ref="pdfEditor"
 				width="100%"
 				height="100%"
@@ -52,8 +48,8 @@
 				@pdf-editor:end-init="updateSigners"
 				@pdf-editor:on-delete-signer="onDeleteSigner" />
 		</div>
-		<NcDialog :open.sync="showConfirm"
-			v-if="showConfirm"
+		<NcDialog v-if="showConfirm"
+			:open.sync="showConfirm"
 			:name="t('libresign', 'Confirm')"
 			:can-close="!loading"
 			:message="t('libresign', 'Request signatures?')">
@@ -73,7 +69,7 @@
 				</NcButton>
 			</template>
 		</NcDialog>
-	</NcModal>
+	</NcDialog>
 </template>
 
 <script>
@@ -81,7 +77,6 @@ import { showError, showSuccess } from '@nextcloud/dialogs'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import { loadState } from '@nextcloud/initial-state'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcDialog from '@nextcloud/vue/dist/Components/NcDialog.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import { subscribe, unsubscribe, emit } from '@nextcloud/event-bus'
@@ -97,7 +92,6 @@ import { useFilesStore } from '../../store/files.js'
 export default {
 	name: 'VisibleElements',
 	components: {
-		NcModal,
 		NcDialog,
 		Signer,
 		Chip,
@@ -176,9 +170,11 @@ export default {
 				return
 			}
 			this.modal = true
+			this.filesStore.loading = true
 		},
 		closeModal() {
 			this.modal = false
+			this.filesStore.loading = true
 		},
 		onError(err) {
 			if (err.response) {
@@ -201,6 +197,7 @@ export default {
 					})
 				}
 			})
+			this.filesStore.loading = false
 		},
 		onSelectSigner(signer) {
 			signer.element = {
@@ -278,22 +275,16 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .image-page {
-	.py-12,.p-5 {
+	::v-deep .py-12{
 		all: unset;
 	}
-}
-
-.modal-container {
-	.dialog {
-		height: unset;
+	::v-deep .p-5 {
+		all: unset;
 	}
 }
-</style>
-
-<style lang="scss" scoped>
-.view-sign-detail {
+.modal-container {
 	&--sidebar {
 		width: 300px;
 	}
diff --git a/src/Components/RightSidebar/RequestSignatureTab.vue b/src/Components/RightSidebar/RequestSignatureTab.vue
index e4099a1b53..191eaf12a7 100644
--- a/src/Components/RightSidebar/RequestSignatureTab.vue
+++ b/src/Components/RightSidebar/RequestSignatureTab.vue
@@ -169,7 +169,6 @@ export default {
 			this.modalSrc = ''
 		},
 		validationFile() {
-			console.log('validationFile')
 			if (this.useModal) {
 				const route = router.resolve({ name: 'ValidationFileExternal', params: { uuid: this.filesStore.getFile().uuid } })
 				this.modalSrc = route.href
diff --git a/src/store/files.js b/src/store/files.js
index 24d210fa41..7551ed9e46 100644
--- a/src/store/files.js
+++ b/src/store/files.js
@@ -109,7 +109,6 @@ export const useFilesStore = defineStore('files', {
 			if (Object.hasOwn(this.files[nodeId], 'uuid')) {
 				return
 			}
-			this.loading = true
 			await axios.get(generateOcsUrl('/apps/libresign/api/v1/file/validate/file_id/{fileId}', {
 				fileId: nodeId,
 			}))
@@ -120,7 +119,6 @@ export const useFilesStore = defineStore('files', {
 				.catch(() => {
 					set(this.files[nodeId], 'signers', [])
 				})
-			this.loading = false
 		},
 		addUniqueIdentifierToAllSigners(signers) {
 			if (signers === undefined) {