Merge branch '3.4' into bug-fix-3.4/fix-internal-issue-4451

CHANGELOG

@@ -3,7 +3,10 @@ v3.4.9 (XXXX-XX-XX)
 
 * The _users collection is now properly restored when using arangorestore.
 
-* Updated arangosync to 0.7.0.
+* Updated arangosync to 0.7.1.
+
+* Fixed issue #10470: The WebUI now shows potential errors and details which
+  occured using _api/import (e.g. unique constraint violated).
 
 * Make the timeouts for replication requests (for active failover and master-slave 
   replication configurable via startup options:

VERSIONS

@@ -1,5 +1,5 @@
 STARTER_REV "0.14.12"
-SYNCER_REV "0.7.0"
+SYNCER_REV "0.7.1"
 OPENSSL_LINUX   "1.1.0l"
 OPENSSL_MACOS   "1.0.2t"
 OPENSSL_WINDOWS "1.1.0l"

js/apps/system/_admin/aardvark/APP/frontend/js/collections/arangoDocuments.js

@@ -371,9 +371,21 @@
     },
 
     uploadDocuments: function (file, callback) {
+      var analyzeResponse = function (data) {
+        if (data.hasOwnProperty('error')) {
+          delete data.error;
+        }
+
+        if (data.errors > 0) {
+          callback(true, 'Info: ' + JSON.stringify(data));
+        } else {
+          callback(false, 'Info: ' + JSON.stringify(data));
+        }
+      };
+
       $.ajax({
         type: 'POST',
-        url: arangoHelper.databaseUrl('/_api/import?type=auto&collection=' +
+        url: arangoHelper.databaseUrl('/_api/import?type=auto&details=true&collection=' +
           encodeURIComponent(this.collectionID) +
           '&createCollection=false'),
         data: file,
@@ -381,18 +393,8 @@
         contentType: 'json',
         dataType: 'json',
         complete: function (xhr) {
-          if (xhr.readyState === 4 && xhr.status === 201) {
+          if (xhr.responseJSON) {
-            callback(false);
+            analyzeResponse(xhr.responseJSON);
-          } else {
-            try {
-              var data = JSON.parse(xhr.responseText);
-              if (data.errors > 0) {
-                var result = 'At least one error occurred during upload';
-                callback(false, result);
-              }
-            } catch (err) {
-              console.log(err);
-            }
           }
         },
         error: function (msg) {

js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js

@@ -220,7 +220,7 @@
       $('#documents_first').css('visibility', 'visible');
       this.addDocumentSwitch = true;
       this.collection.resetFilter();
-      this.collection.loadTotal(callback);
+      this.collection.loadCollectionConfig(callback);
       this.restoredFilters = [];
 
       // for resetting json upload
@@ -249,6 +249,7 @@
         if (error) {
           arangoHelper.arangoError('Upload', msg);
         } else {
+          arangoHelper.arangoMessage('Upload', msg);
           this.hideImportModal();
           this.resetView();
         }

tests/js/server/upgrade-data/upgrade-data-views-msv3.2.1.js

@@ -47,7 +47,9 @@ function UpgradeData() {
       const c = db._collection('LargeCollection');
       assertEqual(c.count(), 10000);
 
-      const v = db._createView('TestView', 'arangosearch', {});
+      let v;
+      try {
+        v = db._createView('TestView', 'arangosearch', {});
         const properties = {
           links: {
             'LargeCollection': {
@@ -70,7 +72,10 @@ function UpgradeData() {
         assertEqual(results[2].name, "Name 1116");
         assertEqual(results[3].name, "Name 1117");
       }
-
+      finally {
+        db._dropView('TestView');
+      }
+    }
   };
 }