From a0a3a7dfb70278e4c375cd69c0c8e3bba2dcb007 Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Fri, 25 Sep 2020 07:59:21 -0700
Subject: [PATCH] Minor updates to Vue.js error handling (to work with new
 back-end validation)

---
 edivorce/apps/core/serializer.py         |  2 +-
 vue/src/components/Uploader/Uploader.vue | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/edivorce/apps/core/serializer.py b/edivorce/apps/core/serializer.py
index 12981ab5..d3835aaa 100644
--- a/edivorce/apps/core/serializer.py
+++ b/edivorce/apps/core/serializer.py
@@ -45,5 +45,5 @@ class DocumentSerializer(serializers.ModelSerializer):
         try:
             response.save()
         except IntegrityError:
-            raise ValidationError("You have already uploaded that file")
+            raise ValidationError("This file appears to have already been uploaded with for this document. Duplicate filename: " + filename)
         return response
diff --git a/vue/src/components/Uploader/Uploader.vue b/vue/src/components/Uploader/Uploader.vue
index b61a5eac..d8ca4a84 100644
--- a/vue/src/components/Uploader/Uploader.vue
+++ b/vue/src/components/Uploader/Uploader.vue
@@ -161,15 +161,17 @@ export default {
 
       // upload is complete
       if (newFile && oldFile && !newFile.active && oldFile.active) {
-
-        // todo: send metadata to the server 
-        console.log('Upload Complete; file=' + newFile.name)
         this.saveMetaData();
 
         if (newFile.xhr) {
-          //  Get the response status code (we can use this for error handling)
-          if (newFile.xhr.status !== 200) {
-            // todo: handler errors
+          //  Error Handling 
+          if (newFile.xhr.status === 400) {
+            // 400 validation error: show the message returned by the server
+            const message = JSON.parse(newFile.xhr.responseText)[0];
+            this.showError(message);
+            this.$refs.upload.remove(newFile);
+          } else if (newFile.xhr.status !== 200) {
+            // 500 server error: show the status text and a generic message
             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)
           }
@@ -304,7 +306,8 @@ export default {
   created() {
     // call the API to update the metadata every second, but only if
     // the data has changed (throttling requests because rotating and
-    //  re-ordering images can cause a lot of traffic)
+    // re-ordering images can cause a lot of traffic and possibly 
+    // result in out-of-order requests)
     setInterval(() => {
       if (this.isDirty) {
         this.saveMetaData();