From fc697bcf2fab68adb8ff262183ae8a1e846413c6 Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Thu, 24 Sep 2020 12:11:12 -0700
Subject: [PATCH] DIV-1157 - Uploader error message updates

---
 vue/src/components/Uploader/ItemTile.vue |  2 +-
 vue/src/components/Uploader/Uploader.vue | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/vue/src/components/Uploader/ItemTile.vue b/vue/src/components/Uploader/ItemTile.vue
index 27c37bd8..b9c44196 100644
--- a/vue/src/components/Uploader/ItemTile.vue
+++ b/vue/src/components/Uploader/ItemTile.vue
@@ -20,7 +20,7 @@
             <i class="fa fa-undo fa-flip-horizontal"></i>
           </button>
         </div>
-        <div class="alert alert-danger" v-if="file.error">Upload Error</div>
+        <div class="alert alert-danger" v-if="file.error">File Upload Error</div>
       </div>
     </div>
   </div>
diff --git a/vue/src/components/Uploader/Uploader.vue b/vue/src/components/Uploader/Uploader.vue
index 94827b9b..e0c6a78f 100644
--- a/vue/src/components/Uploader/Uploader.vue
+++ b/vue/src/components/Uploader/Uploader.vue
@@ -36,10 +36,10 @@
     </div>
     <template v-else>
       <div class="text-danger error-top" v-if="fileErrors === 1">
-        <strong>One file has failed to upload to the server. Please remove the file marked 'Upload Error' and try uploading it again.</strong>
+        <strong>One file has failed to upload to the server. Please remove the file marked 'File Upload Error' and try uploading it again.</strong>
       </div>
       <div class="text-danger error-top" v-if="fileErrors > 1">
-        <strong>Some files have failed to upload to the server. Please remove the files marked 'Upload Error' and try uploading them again.</strong>
+        <strong>Some files have failed to upload to the server. Please remove the files marked 'File Upload Error' and try uploading them again.</strong>
       </div>      
       <div class="text-danger error-top" v-if="tooBig">
         <strong>The total of all uploaded files for this form cannot exceed {{ maxMegabytes }} MB.
@@ -77,7 +77,7 @@
   <div class="pull-right" v-if="!tooBig">
     <em>(Maximum {{ maxMegabytes }} MB)</em>
   </div>
-  <modal ref="warningModal" v-model="showWarning">
+  <modal ref="warningModal" class="warning-modal" v-model="showWarning">
     {{ warningText }}
   </modal>
 </div>
@@ -170,7 +170,7 @@ export default {
           //  Get the response status code (we can use this for error handling)
           if (newFile.xhr.status !== 200) {
             // todo: handler errors
-            this.showError('Error: ' + newFile.xhr.statusText);
+            this.showError('Error: ' + newFile.xhr.statusText + '. Please try the upload again. If this doesn\'t work, try again later.');
             console.log('status', newFile.xhr.status)
           }
         }
@@ -181,14 +181,14 @@ export default {
       if (newFile && !oldFile) {
         // Filter non-image file
         if (!/\.(jpeg|jpg|gif|png|pdf)$/i.test(newFile.name)) {
-          this.showError('Unsupported file type.  Allowed extensions are jpeg, jpg, gif,png and pdf.');
+          this.showError('Unsupported file type.  Allowed file types are .jpeg, .jpg, .gif, .png and .pdf.');
           return prevent()
         }
 
         this.files.forEach((file) => {
           // prevent duplicates (based on filename and length)
           if (file.name === newFile.name && file.length === newFile.length) {
-            this.showError('Duplicate file: ' + newFile.name);
+            this.showError('This file appears to have already been uploaded with for this document. Duplicate filename: ' + newFile.name);
             return prevent();
           }
         });
@@ -228,7 +228,7 @@ export default {
           // if it's not a PDF, make sure there are no PDFs already uplaoded
           this.files.forEach((file) => {
             if (file.type === 'application/pdf') {
-              this.showError('PDF documents cannot be combined with images.');
+              this.showError('PDF documents cannot be combined with images. Only a single PDF or multiple images can be uploaded into one form. ');
               this.$refs.upload.remove(newFile);
               return prevent();
             }
@@ -394,6 +394,15 @@ export default {
 </style>
 
 <style type="css">
+  /* hide the cancel button on the warnig modal */
+  .warning-modal button.btn-default {
+    display: none;
+  }
+
+  .warning-modal button.btn-primary {
+    min-width: 80px;
+  }
+
   /* override vue-upload-component styles for IE11 issues */
   .file-uploads-html5 input[type=file] {
     height: 0 !important;