From 5b7b9a9ae6bb357a05389a8667500ff8015c0360 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Fri, 10 Jul 2020 13:39:19 +0200
Subject: [PATCH] Integrate FileSource with modal dialog
 (VPU/WebComponents/FileHandling#6)

---
 src/i18n/de/translation.json              |  3 +++
 src/i18n/en/translation.json              |  3 +++
 src/vpu-official-signature-pdf-upload.js  |  9 +++++++++
 src/vpu-qualified-signature-pdf-upload.js | 10 ++++++++++
 src/vpu-signature-verification.js         |  9 +++++++++
 vendor/file-handling                      |  2 +-
 6 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/i18n/de/translation.json b/src/i18n/de/translation.json
index 8f49977..b84b328 100644
--- a/src/i18n/de/translation.json
+++ b/src/i18n/de/translation.json
@@ -1,6 +1,7 @@
 {
   "official-pdf-upload": {
     "upload-field-label": "PDF-Dokumente zum Signieren hochladen",
+    "upload-text": "Sie können in diesem Bereich PDF-Dokumente mit einer Maximalgröße von bis zu 32MB pro Dokument hochladen. Die PDF-Dokumente dürfen sich auch in ZIP-Dateien befinden.",
     "upload-area-text": "Sie können in diesem Bereich PDF-Dokumente mit einer Maximalgröße von bis zu 32MB pro Dokument per Drag & Drop oder per Direktauswahl hochladen. Die PDF-Dokumente dürfen sich auch in ZIP-Dateien befinden.",
     "queued-files-label": "Dokumente in der Warteschlange",
     "queued-files-empty1": "Kein Dokument in der Warteschlange",
@@ -30,6 +31,7 @@
   },
   "qualified-pdf-upload": {
     "upload-field-label": "PDF-Dokumente zum Signieren hochladen",
+    "upload-text": "Sie können in diesem Bereich PDF-Dokumente mit einer Maximalgröße von bis zu 32MB pro Dokument hochladen. Die PDF-Dokumente dürfen sich auch in ZIP-Dateien befinden.",
     "upload-area-text": "Sie können in diesem Bereich PDF-Dokumente mit einer Maximalgröße von bis zu 32MB pro Dokument per Drag & Drop oder per Direktauswahl hochladen. Die PDF-Dokumente dürfen sich auch in ZIP-Dateien befinden.",
     "current-signing-process-label": "Aktueller Signaturprozess",
     "queued-files-label": "Dokumente in der Warteschlange",
@@ -60,6 +62,7 @@
   },
   "signature-verification": {
     "upload-field-label": "PDF-Dokumente zum Überprüfen der Signaturen hochladen",
+    "upload-text": "Sie können in diesem Bereich PDF-Dokumente mit einer Maximalgröße von bis zu 32MB pro Dokument hochladen. Die PDF-Dokumente dürfen sich auch in ZIP-Dateien befinden.",
     "upload-area-text": "Sie können in diesem Bereich PDF-Dokumente mit einer Maximalgröße von bis zu 32MB pro Dokument per Drag & Drop oder per Direktauswahl hochladen. Die PDF-Dokumente dürfen sich auch in ZIP-Dateien befinden.",
     "queued-files-label": "Dokumente in der Warteschlange",
     "queued-files-empty1": "Kein Dokument in der Warteschlange",
diff --git a/src/i18n/en/translation.json b/src/i18n/en/translation.json
index e20a48d..6ef84ec 100644
--- a/src/i18n/en/translation.json
+++ b/src/i18n/en/translation.json
@@ -1,6 +1,7 @@
 {
   "official-pdf-upload": {
     "upload-field-label": "Upload PDF-documents to sign",
+    "upload-text": "In this area you can upload PDF-documents up to a size of 32MB. The PDF-documents can also be located in a ZIP-file.",
     "upload-area-text": "In this area you can upload PDF-documents up to a size of 32MB via Drag & Drop or by selecting them directly. The PDF-documents can also be located in a ZIP-file.",
     "queued-files-label": "Queued documents",
     "queued-files-empty1": "No queued documents",
@@ -30,6 +31,7 @@
   },
   "qualified-pdf-upload": {
     "upload-field-label": "Upload PDF-documents to sign",
+    "upload-text": "In this area you can upload PDF-documents up to a size of 32MB. The PDF-documents can also be located in a ZIP-file.",
     "upload-area-text": "In this area you can upload PDF-documents up to a size of 32MB via Drag & Drop or by selecting them directly. The PDF-documents can also be located in a ZIP-file.",
     "current-signing-process-label": "Current signing process",
     "queued-files-label": "Queued documents",
@@ -60,6 +62,7 @@
   },
   "signature-verification": {
     "upload-field-label": "Upload PDF-documents to verify",
+    "upload-text": "In this area you can upload PDF-documents up to a size of 32MB. The PDF-documents can also be located in a ZIP-file.",
     "upload-area-text": "In this area you can upload PDF-documents up to a size of 32MB via Drag & Drop or by selecting them directly. The PDF-documents can also be located in a ZIP-file.",
     "queued-files-label": "Queued documents",
     "queued-files-empty1": "No queued documents",
diff --git a/src/vpu-official-signature-pdf-upload.js b/src/vpu-official-signature-pdf-upload.js
index 22a44c5..a101351 100644
--- a/src/vpu-official-signature-pdf-upload.js
+++ b/src/vpu-official-signature-pdf-upload.js
@@ -702,7 +702,16 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
                 <div class="field">
                     <h2>${i18n.t('official-pdf-upload.upload-field-label')}</h2>
                     <div class="control">
+                        <p>
+                            ${i18n.t('qualified-pdf-upload.upload-text')}
+                        </p>
+                        <button @click="${() => { this._("#file-source").setAttribute("dialog-open", ""); }}"
+                                ?disabled="${this.signingProcessActive}"
+                                class="button is-primary">
+                            ${i18n.t('qualified-pdf-upload.upload-button-label')}
+                        </button>
                         <vpu-file-source
+                            id="file-source"
                             allowed-mime-types="application/pdf"
                             nextcloud-auth-url="${this.showTestNextcloudFilePicker ? nextcloudWebAppPasswordURL : ""}"
                             nextcloud-web-dav-url="${nextcloudWebDavURL}"
diff --git a/src/vpu-qualified-signature-pdf-upload.js b/src/vpu-qualified-signature-pdf-upload.js
index d7535a3..a1af1e5 100644
--- a/src/vpu-qualified-signature-pdf-upload.js
+++ b/src/vpu-qualified-signature-pdf-upload.js
@@ -872,7 +872,17 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
                 <div class="field ${classMap({"is-disabled": this.isUserInterfaceDisabled()})}">
                     <h2>${i18n.t('qualified-pdf-upload.upload-field-label')}</h2>
                     <div class="control">
+                        <p>
+                            ${i18n.t('qualified-pdf-upload.upload-text')}
+                        </p>
+                        <button @click="${() => { this._("#file-source").setAttribute("dialog-open", ""); }}"
+                                ?disabled="${this.signingProcessActive}"
+                                class="button is-primary">
+                            ${i18n.t('qualified-pdf-upload.upload-button-label')}
+                        </button>
+
                         <vpu-file-source
+                            id="file-source"
                             allowed-mime-types="application/pdf"
                             nextcloud-auth-url="${this.showTestNextcloudFilePicker ? nextcloudWebAppPasswordURL : ""}"
                             nextcloud-web-dav-url="${nextcloudWebDavURL}"
diff --git a/src/vpu-signature-verification.js b/src/vpu-signature-verification.js
index 4022c53..2c59133 100644
--- a/src/vpu-signature-verification.js
+++ b/src/vpu-signature-verification.js
@@ -671,7 +671,16 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
                 <div class="field">
                     <h2>${i18n.t('signature-verification.upload-field-label')}</h2>
                     <div class="control">
+                        <p>
+                            ${i18n.t('qualified-pdf-upload.upload-text')}
+                        </p>
+                        <button @click="${() => { this._("#file-source").setAttribute("dialog-open", ""); }}"
+                                ?disabled="${this.signingProcessActive}"
+                                class="button is-primary">
+                            ${i18n.t('qualified-pdf-upload.upload-button-label')}
+                        </button>
                         <vpu-file-source
+                            id="file-source"
                             allowed-mime-types="application/pdf"
                             nextcloud-auth-url="${this.showTestNextcloudFilePicker ? nextcloudWebAppPasswordURL : ""}"
                             nextcloud-web-dav-url="${nextcloudWebDavURL}"
diff --git a/vendor/file-handling b/vendor/file-handling
index 56f744f..bfea58b 160000
--- a/vendor/file-handling
+++ b/vendor/file-handling
@@ -1 +1 @@
-Subproject commit 56f744f842fea343f88fb0ef34f302f996a29061
+Subproject commit bfea58b1ef01b3d222d210dcd61061278328764b
-- 
GitLab