Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk

js/apps/system/_admin/aardvark/APP/aardvark.js

@@ -323,13 +323,14 @@ controller.post("/graph-examples/create/:name", function(req, res) {
 
 controller.post("/job", function(req, res) {
 
-  if (req.body().id && req.body().collection && req.body().type) {
+  if (req.body().id && req.body().collection && req.body().type && req.body().desc) {
 
     //store id in _system
     db.aardvark.save({
       id: req.body().id,
       collection: req.body().collection, 
-      type: req.body().type
+      type: req.body().type,
+      desc: req.body().desc
     });
 
     res.json(true);

js/apps/system/_admin/aardvark/APP/frontend/build/arangoes6.js

@@ -49,22 +49,27 @@ if (global.ArangoError) {
       this.errorNum = error.errorNum;
       this.errorMessage = error.errorMessage;
     }
-
-    this.message = this.toString();
   };
 
   exports.ArangoError.prototype = new Error();
 }
 
+Object.defineProperty(exports.ArangoError.prototype, 'message', {
+  configurable: true,
+  enumerable: true,
+  get() {
+    return this.errorMessage;
+  }
+});
+
+exports.ArangoError.prototype.name = 'ArangoError';
+
 exports.ArangoError.prototype._PRINT = function(context) {
-  context.output += this.toString();
+  context.output += '[' + this.toString() + ']';
 };
 
 exports.ArangoError.prototype.toString = function() {
-  var errorNum = this.errorNum;
-  var errorMessage = this.errorMessage || this.message;
-
-  return '[ArangoError ' + errorNum + ': ' + errorMessage + ']';
+  return `${this.name} ${this.errorNum}: ${this.message}`;
 };
 
 
@@ -2071,31 +2076,14 @@ return exports;
     "SIMPLE_CLIENT_COULD_NOT_READ" : { "code" : 2003, "message" : "could not read from server" },
     "ERROR_MALFORMED_MANIFEST_FILE" : { "code" : 3000, "message" : "malformed manifest file" },
     "ERROR_INVALID_APPLICATION_MANIFEST" : { "code" : 3001, "message" : "manifest file is invalid" },
-    "ERROR_MANIFEST_FILE_ATTRIBUTE_MISSING" : { "code" : 3002, "message" : "missing manifest attribute" },
-    "ERROR_CANNOT_EXTRACT_APPLICATION_ROOT" : { "code" : 3003, "message" : "unable to extract app root path" },
     "ERROR_INVALID_FOXX_OPTIONS"   : { "code" : 3004, "message" : "invalid foxx options" },
-    "ERROR_FAILED_TO_EXECUTE_SCRIPT" : { "code" : 3005, "message" : "failed to execute script" },
-    "ERROR_SYNTAX_ERROR_IN_SCRIPT" : { "code" : 3006, "message" : "syntax error in script" },
     "ERROR_INVALID_MOUNTPOINT"     : { "code" : 3007, "message" : "mountpoint is invalid" },
-    "ERROR_NO_FOXX_FOUND"          : { "code" : 3008, "message" : "No foxx found at this location" },
     "ERROR_APP_NOT_FOUND"          : { "code" : 3009, "message" : "App not found" },
     "ERROR_APP_NEEDS_CONFIGURATION" : { "code" : 3010, "message" : "App not configured" },
     "ERROR_MODULE_NOT_FOUND"       : { "code" : 3100, "message" : "cannot locate module" },
-    "ERROR_MODULE_SYNTAX_ERROR"    : { "code" : 3101, "message" : "syntax error in module" },
-    "ERROR_MODULE_BAD_WRAPPER"     : { "code" : 3102, "message" : "failed to wrap module" },
     "ERROR_MODULE_FAILURE"         : { "code" : 3103, "message" : "failed to invoke module" },
-    "ERROR_MODULE_UNKNOWN_FILE_TYPE" : { "code" : 3110, "message" : "unknown file type" },
-    "ERROR_MODULE_PATH_MUST_BE_ABSOLUTE" : { "code" : 3111, "message" : "path must be absolute" },
-    "ERROR_MODULE_CAN_NOT_ESCAPE"  : { "code" : 3112, "message" : "cannot use '..' to escape top-level-directory" },
-    "ERROR_MODULE_DRIVE_LETTER"    : { "code" : 3113, "message" : "drive local path is not supported" },
-    "ERROR_MODULE_BAD_MODULE_ORIGIN" : { "code" : 3120, "message" : "corrupted module origin" },
-    "ERROR_MODULE_BAD_PACKAGE_ORIGIN" : { "code" : 3121, "message" : "corrupted package origin" },
-    "ERROR_MODULE_DOCUMENT_IS_EMPTY" : { "code" : 3125, "message" : "no content" },
-    "ERROR_MODULE_MAIN_NOT_READABLE" : { "code" : 3130, "message" : "cannot read main file" },
-    "ERROR_MODULE_MAIN_NOT_JS"     : { "code" : 3131, "message" : "main file is not of type 'js'" },
     "RESULT_ELEMENT_EXISTS"        : { "code" : 10000, "message" : "element not inserted into structure, because it already exists" },
     "RESULT_ELEMENT_NOT_FOUND"     : { "code" : 10001, "message" : "element not found in structure" },
-    "ERROR_APP_ALREADY_EXISTS"     : { "code" : 20000, "message" : "newest version of app already installed" },
     "ERROR_QUEUE_ALREADY_EXISTS"   : { "code" : 21000, "message" : "named queue already exists" },
     "ERROR_DISPATCHER_IS_STOPPING" : { "code" : 21001, "message" : "dispatcher stopped" },
     "ERROR_QUEUE_UNKNOWN"          : { "code" : 21002, "message" : "named queue does not exist" },
@@ -6007,7 +5995,9 @@ exports.checkRequestResult = function (requestResult) {
         throw new TypeError(requestResult.errorMessage);
       }
 
-      throw new ArangoError(requestResult);
+      const error = new ArangoError(requestResult);
+      error.message = requestResult.message;
+      throw error;
     }
 
     // remove the property from the original object

js/apps/system/_admin/aardvark/APP/frontend/build/scripts.html.part

@@ -1,3 +1,3 @@
-<script src="sharedLibs.js?version=1455532583470"></script>
-<script src="libs.js?version=1455532583470"></script>
-<script src="app.js?version=1455532583470"></script>
+<script src="sharedLibs.js?version=1455702778219"></script>
+<script src="libs.js?version=1455702778219"></script>
+<script src="app.js?version=1455702778219"></script>

js/apps/system/_admin/aardvark/APP/frontend/build/standalone-min.html

@@ -2780,4 +2780,4 @@ var cutByResolution = function (str) {
   </div>
 
   <div id="workMonitorContent" class="innerContent">
-  </div></script></head><body><nav class="navbar"><div class="resizecontainer"><div class="navlogo"><a class="logo" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a></div><div id="progressPlaceholderIcon"></div><div class="statmenu" id="statisticBar"></div><div class="usermenu" id="userBar" style="float:right"></div><div class="notificationmenu" id="notificationBar" style="float:right"></div><div class="navmenu" id="navigationBar"></div></div></nav><div class="centralRow resizecontainer"><div id="content" class="centralContent"></div></div><div id="modalPlaceholder"></div><div id="progressPlaceholder" style="display:none"></div><footer class="footer"><div class="resizecontainer" id="footerBar"></div></footer><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="sharedLibs.js?version=1455532583470"></script><script src="libs.js?version=1455532583470"></script><script src="app.js?version=1455532583470"></script></body></html>
+  </div></script></head><body><nav class="navbar"><div class="resizecontainer"><div class="navlogo"><a class="logo" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a></div><div id="progressPlaceholderIcon"></div><div class="statmenu" id="statisticBar"></div><div class="usermenu" id="userBar" style="float:right"></div><div class="notificationmenu" id="notificationBar" style="float:right"></div><div class="navmenu" id="navigationBar"></div></div></nav><div class="centralRow resizecontainer"><div id="content" class="centralContent"></div></div><div id="modalPlaceholder"></div><div id="progressPlaceholder" style="display:none"></div><footer class="footer"><div class="resizecontainer" id="footerBar"></div></footer><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="sharedLibs.js?version=1455702778219"></script><script src="libs.js?version=1455702778219"></script><script src="app.js?version=1455702778219"></script></body></html>

js/apps/system/_admin/aardvark/APP/frontend/build/standalone.html

@@ -3044,9 +3044,9 @@ var cutByResolution = function (str) {
     </div>
   </div>
 
-<script src="sharedLibs.js?version=1455532583470"></script>
-<script src="libs.js?version=1455532583470"></script>
-<script src="app.js?version=1455532583470"></script>
+<script src="sharedLibs.js?version=1455702778219"></script>
+<script src="libs.js?version=1455702778219"></script>
+<script src="app.js?version=1455702778219"></script>
 
   </body>
 </html>

js/apps/system/_admin/aardvark/APP/frontend/build/style.css

@@ -8022,7 +8022,7 @@ table.arangoDataTable tr.odd {
   display: none; }
 
 #documentsTableID_wrapper {
-  min-height: 480px !important;
+  min-height: 420px !important;
   padding-bottom: 0 !important; }
   #documentsTableID_wrapper .fg-toolbar {
     visibility: hidden; }
@@ -8091,6 +8091,8 @@ table .sorting {
   .edit-index-table .icon_arangodb_roundminus {
     font-size: 20px;
     margin-left: 10px; }
+  .edit-index-table .fa {
+    margin-left: 13px; }
 
 .contentIn .arangoicon {
   font-size: 25px;

js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js

@@ -112,6 +112,7 @@
               window.arangoHelper.addAardvarkJob({
                 id: xhr.getResponseHeader('x-arango-async-id'),
                 type: 'index',
+                desc: 'Creating index...',
                 collection: self.get("id")
               });
               callback(false, data);
@@ -143,6 +144,7 @@
               window.arangoHelper.addAardvarkJob({
                 id: xhr.getResponseHeader('x-arango-async-id'),
                 type: 'index',
+                desc: 'Removing index...',
                 collection: self.get("id")
               });
               callback(false, data);
@@ -176,7 +178,6 @@
     loadCollection: function (callback) {
 
       $.ajax({
-        async: true,
         cache: false,
         type: 'PUT',
         url: "/_api/collection/" + this.get("id") + "/load",
@@ -192,7 +193,6 @@
 
     unloadCollection: function (callback) {
       $.ajax({
-        async: true,
         cache: false,
         type: 'PUT',
         url: "/_api/collection/" + this.get("id") + "/unload?flush=true",

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

@@ -26,6 +26,13 @@
     render: function () {
       if (this.model.get("locked")) {
         $(this.el).addClass('locked');
+      } 
+      else {
+        $(this.el).removeClass('locked');
+      }
+
+      if (this.model.get("status") === 'loading') {
+        $(this.el).addClass('locked');
       }
       $(this.el).html(this.template.render({
         model: this.model
@@ -60,10 +67,19 @@
       if (this.model.get("locked")) {
         return 0;
       }
+      if (this.model.get("status") === 'loading' ) {
+        return 0;
+      }
+
+      if (this.model.get("status") === 'unloaded' ) {
+        this.loadCollection();
+      }
+      else {
+        window.App.navigate(
+          "collection/" + encodeURIComponent(this.model.get("name")) + "/documents/1", {trigger: true}
+        );
+      }
 
-      window.App.navigate(
-        "collection/" + encodeURIComponent(this.model.get("name")) + "/documents/1", {trigger: true}
-      );
     },
 
     noop: function(event) {

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

@@ -31,12 +31,15 @@
       });
 
       this.collection.each(function(model) {
-        if (model.get("locked")) {
+        if (model.get("locked") || model.get("status") === 'loading') {
           $('#collection_' + model.get("name")).addClass('locked');
         }
         else {
           $('#collection_' + model.get("name")).removeClass('locked');
         }
+        if (model.get("status") === 'loading') {
+          $('#collection_' + model.get("name")).removeClass('loading');
+        }
       });
 
     },

js/apps/system/_admin/aardvark/APP/frontend/scss/_dataTables.scss

@@ -84,7 +84,7 @@ table.arangoDataTable tr.odd {
 }
 
 #documentsTableID_wrapper {
-  min-height: 480px !important;
+  min-height: 420px !important;
   padding-bottom: 0 !important;
 
   .fg-toolbar {