sync calls to async

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

@@ -1,5 +1,5 @@
 /*jshint unused: false */
-/*global window, $, document, _ */
+/*global window, $, document, arangoHelper, _ */
 
 (function() {
   "use strict";
@@ -443,16 +443,28 @@
       this.arangoDocumentStore = a;
     },
 
-    collectionApiType: function (identifier, refresh) {
+    collectionApiType: function (identifier, refresh, toRun) {
       // set "refresh" to disable caching collection type
       if (refresh || this.CollectionTypes[identifier] === undefined) {
-        this.CollectionTypes[identifier] = this.arangoDocumentStore
+        var callback = function(error, data, toRun) {
-        .getCollectionInfo(identifier).type;
+          if (error) {
+            arangoHelper.arangoError("Error", "Could not detect collection type");
           }
+          else {
+            this.CollectionTypes[identifier] = data.type;
             if (this.CollectionTypes[identifier] === 3) {
-        return "edge";
+              toRun(false, "edge");
+            }
+            else {
+              toRun(false, "document");
+            }
+          }
+        }.bind(this);
+        this.arangoDocumentStore.getCollectionInfo(identifier, callback, toRun);
+      }
+      else {
+        toRun(false, this.CollectionTypes[identifier]);
       }
-      return "document";
     },
 
     collectionType: function (val) {

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

@@ -6,9 +6,7 @@ window.arangoDocument = Backbone.Collection.extend({
   url: '/_api/document/',
   model: arangoDocumentModel,
   collectionInfo: {},
-  deleteEdge: function (colid, docid) {
+  deleteEdge: function (colid, docid, callback) {
-    var returnval = false;
-    try {
     $.ajax({
       cache: false,
       type: 'DELETE',
@@ -16,21 +14,14 @@ window.arangoDocument = Backbone.Collection.extend({
       contentType: "application/json",
       url: "/_api/edge/" + colid + "/" + docid,
       success: function () {
-          returnval = true;
+        callback(false);
       },
       error: function () {
-          returnval = false;
+        callback(true);
       }
     });
-    }
-    catch (e) {
-          returnval = false;
-    }
-    return returnval;
   },
-  deleteDocument: function (colid, docid){
+  deleteDocument: function (colid, docid, callback) {
-    var returnval = false;
-    try {
     $.ajax({
       cache: false,
       type: 'DELETE',
@@ -38,24 +29,19 @@ window.arangoDocument = Backbone.Collection.extend({
       contentType: "application/json",
       url: "/_api/document/" + colid + "/" + docid,
       success: function () {
-          returnval = true;
+        callback(false);
       },
       error: function () {
-          returnval = false;
+        callback(true);
       }
     });
-    }
-    catch (e) {
-          returnval = false;
-    }
-    return returnval;
   },
   addDocument: function (collectionID, key) {
     var self = this;
     self.createTypeDocument(collectionID, key);
   },
-  createTypeEdge: function (collectionID, from, to, key) {
+  createTypeEdge: function (collectionID, from, to, key, callback) {
-    var result = false, newEdge;
+    var newEdge;
 
     if (key) {
       newEdge = JSON.stringify({
@@ -69,22 +55,20 @@ window.arangoDocument = Backbone.Collection.extend({
     $.ajax({
       cache: false,
       type: "POST",
-      async: false,
       url: "/_api/edge?collection=" + collectionID + "&from=" + from + "&to=" + to,
       data: newEdge,
       contentType: "application/json",
       processData: false,
       success: function(data) {
-        result = data._id;
+        callback(false, data);
       },
       error: function(data) {
-        result = false;
+        callback(true, data);
       }
     });
-    return result;
   },
-  createTypeDocument: function (collectionID, key) {
+  createTypeDocument: function (collectionID, key, callback) {
-    var result = false, newDocument;
+    var newDocument;
 
     if (key) {
       newDocument = JSON.stringify({
@@ -98,21 +82,19 @@ window.arangoDocument = Backbone.Collection.extend({
     $.ajax({
       cache: false,
       type: "POST",
-      async: false,
       url: "/_api/document?collection=" + encodeURIComponent(collectionID),
       data: newDocument,
       contentType: "application/json",
       processData: false,
       success: function(data) {
-        result = data._id;
+        callback(false, data._id);
       },
       error: function(data) {
-        result = false;
+        callback(true, data._id);
       }
     });
-    return result;
   },
-  getCollectionInfo: function (identifier) {
+  getCollectionInfo: function (identifier, callback, toRun) {
     var self = this;
 
     $.ajax({
@@ -121,15 +103,14 @@ window.arangoDocument = Backbone.Collection.extend({
       url: "/_api/collection/" + identifier + "?" + arangoHelper.getRandomToken(),
       contentType: "application/json",
       processData: false,
-      async: false,
       success: function(data) {
         self.collectionInfo = data;
+        callback(false, data, toRun);
       },
       error: function(data) {
+        callback(true, data, toRun);
       }
     });
-
-    return self.collectionInfo;
   },
   getEdge: function (colid, docid){
     var result = false, self = this;

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

@@ -19,22 +19,11 @@
         url: "/_api/gharial/" + encodeURIComponent(name) + "?dropCollections=true",
         contentType: "application/json",
         processData: true,
-        async: false,
         success: function() {
-          arangoHelper.arangoNotification("Graph deleted.");
           callback(true);
-          return true;
         },
-        error: function(data) {
+        error: function() {
-          try {
-            var errorMsg = JSON.parse(data.responseText).errorMessage;
-            arangoHelper.arangoError("Graph", errorMsg);
-          }
-          catch (e) {
-            arangoHelper.arangoError("Graph", "Could not delete Graph.");
-          }
           callback(false);
-          return false;
         }
       });
     },

js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js

@@ -254,8 +254,17 @@
       this.documentView.colid = colid;
       this.documentView.docid = docid;
       this.documentView.render();
-      var type = arangoHelper.collectionApiType(colid);
+
+      var callback = function(error, type) {
+        if (!error) {
           this.documentView.setType(type);
+        }
+        else {
+          console.log("Error", "Could not fetch collection type");
+        }
+      }.bind(this);
+
+      arangoHelper.collectionApiType(colid, null, callback);
     },
 
     shell: function (initialized) {

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

@@ -53,6 +53,13 @@
     editor: 0,
 
     setType: function (type) {
+      if (type === 2) {
+        type = 'document';
+      }
+      else {
+        type = 'edge';
+      }
+
       var result, type2;
       if (type === 'edge') {
         result = this.collection.getEdge(this.colid, this.docid);
@@ -91,23 +98,7 @@
 
     deleteDocument: function() {
 
-      var result;
+      var successFunction = function() {
-
-      if (this.type === 'document') {
-        result = this.collection.deleteDocument(this.colid, this.docid);
-        if (result === false) {
-          arangoHelper.arangoError('Document error:','Could not delete');
-          return;
-        }
-      }
-      else if (this.type === 'edge') {
-        result = this.collection.deleteEdge(this.colid, this.docid);
-        if (result === false) {
-          arangoHelper.arangoError('Edge error:', 'Could not delete');
-          return;
-        }
-      }
-      if (result === true) {
         if (this.customView) {
           this.customDeleteFunction();
         }
@@ -116,6 +107,29 @@
           window.modalView.hide();
           window.App.navigate(navigateTo, {trigger: true});
         }
+      }.bind(this);
+
+      if (this.type === 'document') {
+        var callbackDoc = function(error) {
+          if (error) {
+            arangoHelper.arangoError('Error', 'Could not delete document');
+          }
+          else {
+            successFunction();
+          }
+        }.bind(this);
+        this.collection.deleteDocument(this.colid, this.docid, callbackDoc);
+      }
+      else if (this.type === 'edge') {
+        var callbackEdge = function(error) {
+          if (error) {
+            arangoHelper.arangoError('Edge error', 'Could not delete edge');
+          }
+          else {
+            successFunction();
+          }
+        }.bind(this);
+        this.collection.deleteEdge(this.colid, this.docid, callbackEdge);
       }
     },
 

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

@@ -46,12 +46,20 @@
     setCollectionId : function (colid, page) {
       this.collection.setCollection(colid);
       this.collection.setPage(page);
-      var type = arangoHelper.collectionApiType(colid);
       this.page = page;
-      this.type = type;
 
+      var callback = function(error, type) {
+        if (error) {
+          arangoHelper.arangoError("Error", "Could not get collection properties.");
+        }
+        else {
+          this.type = type;
           this.collection.getDocuments(this.getDocsCallback.bind(this));
           this.collectionModel = this.collectionsStore.get(colid);
+        }
+      }.bind(this);
+
+      arangoHelper.collectionApiType(colid, null, callback);
     },
 
     getDocsCallback: function(error) {
@@ -459,10 +467,15 @@
 
     addDocumentModal: function () {
       var collid  = window.location.hash.split("/")[1],
-      buttons = [], tableContent = [],
+      buttons = [], tableContent = [];
       // second parameter is "true" to disable caching of collection type
-      doctype = arangoHelper.collectionApiType(collid, true);
+
-      if (doctype === 'edge') {
+      var callback = function(error, type) {
+        if (error) {
+          arangoHelper.arangoError("Error", "Could not fetch collection type");
+        }
+        else {
+          if (type === 'edge') {
 
             tableContent.push(
               window.modalView.createTextEntry(
@@ -514,7 +527,6 @@
                 ]
               )
             );
-
             buttons.push(
               window.modalView.createSuccessButton('Create', this.addEdge.bind(this))
             );
@@ -555,6 +567,9 @@
               tableContent
             );
           }
+        }
+      }.bind(this);
+      arangoHelper.collectionApiType(collid, true, callback);
     },
 
     addEdge: function () {
@@ -563,42 +578,44 @@
       var to = $('.modal-body #new-edge-to').last().val();
       var key = $('.modal-body #new-edge-key-attr').last().val();
 
-      var result;
-      if (key !== '' || key !== undefined) {
-        result = this.documentStore.createTypeEdge(collid, from, to, key);
-      }
-      else {
-        result = this.documentStore.createTypeEdge(collid, from, to);
-      }
 
-      if (result !== false) {
+      var callback = function(error, data) {
-        //$('#edgeCreateModal').modal('hide');
+        if (error) {
-        window.modalView.hide();
+          arangoHelper.arangoError('Error', 'Could not create edge');
-        window.location.hash = "collection/"+result;
         }
-      //Error
         else {
-        arangoHelper.arangoError('Edge error', 'Creation failed.');
+          window.modalView.hide();
+          window.location.hash = "collection/" + data;
+        }
+      }.bind(this);
+
+      if (key !== '' || key !== undefined) {
+        this.documentStore.createTypeEdge(collid, from, to, key, callback);
+      }
+      else {
+        this.documentStore.createTypeEdge(collid, from, to, null, callback);
       }
     },
 
     addDocument: function() {
       var collid = window.location.hash.split("/")[1];
       var key = $('.modal-body #new-document-key-attr').last().val();
-      var result;
+
-      if (key !== '' || key !== undefined) {
+      var callback = function(error, data) {
-        result = this.documentStore.createTypeDocument(collid, key);
+        if (error) {
+          arangoHelper.arangoError('Error', 'Could not create document');
         }
         else {
-        result = this.documentStore.createTypeDocument(collid);
-      }
-      //Success
-      if (result !== false) {
           window.modalView.hide();
-        window.location.hash = "collection/" + result;
+          window.location.hash = "collection/" + data;
+        }
+      }.bind(this);
+
+      if (key !== '' || key !== undefined) {
+        this.documentStore.createTypeDocument(collid, key, callback);
       }
       else {
-        arangoHelper.arangoError('Document error', 'Creation failed.');
+        this.documentStore.createTypeDocument(collid, null, callback);
       }
     },
 

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

@@ -11,10 +11,16 @@
   };
 
   var installCallback = function(result) {
+    var self = this;
+
     if (result.error === false) {
-      this.collection.fetch({ async: false });
+      this.collection.fetch({
+        success: function() {
           window.modalView.hide();
-      this.reload();
+          self.reload();
+        }
+      });
+                           
     } else {
       var res = result;
       if (result.hasOwnProperty("responseJSON")) {

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

@@ -105,8 +105,9 @@
           }
           else {
             window.modalView.hide();
+            arangoHelper.arangoError("Graph", "Could not delete Graph.");
           }
-        };
+        }.bind(this);
 
         this.collection.dropAndDeleteGraph(name, callback);
       }
@@ -187,30 +188,31 @@
     },
 
     render: function() {
+
+      var self = this;
       this.collection.fetch({
-        async: false
-      });
 
-      this.collection.sort();
+        success: function() {
+          self.collection.sort();
 
-      $(this.el).html(this.template.render({
+          $(self.el).html(self.template.render({
-        graphs: this.collection,
+            graphs: self.collection,
             searchString : ''
           }));
 
-      if (this.dropdownVisible === true) {
+          if (self.dropdownVisible === true) {
             $('#graphManagementDropdown2').show();
-        $('#graphSortDesc').attr('checked', this.collection.sortOptions.desc);
+            $('#graphSortDesc').attr('checked', self.collection.sortOptions.desc);
             $('#graphManagementToggle').toggleClass('activated');
             $('#graphManagementDropdown').show();
           }
 
-      this.events["click .tableRow"] = this.showHideDefinition.bind(this);
+          self.events["click .tableRow"] = self.showHideDefinition.bind(self);
-      this.events['change tr[id*="newEdgeDefinitions"]'] = this.setFromAndTo.bind(this);
+          self.events['change tr[id*="newEdgeDefinitions"]'] = self.setFromAndTo.bind(self);
-      this.events["click .graphViewer-icon-button"] = this.addRemoveDefinition.bind(this);
+          self.events["click .graphViewer-icon-button"] = self.addRemoveDefinition.bind(self);
-      this.events["click #graphTab a"] = this.toggleTab.bind(this);
+          self.events["click #graphTab a"] = self.toggleTab.bind(self);
-      this.events["click .createExampleGraphs"] = this.createExampleGraphs.bind(this);
+          self.events["click .createExampleGraphs"] = self.createExampleGraphs.bind(self);
-      this.events["focusout .select2-search-field input"] = function(e){
+          self.events["focusout .select2-search-field input"] = function(e){
             if ($('.select2-drop').is(':visible')) {
               if (!$('#select2-search-field input').is(':focus')) {
                 window.setTimeout(function() { 
@@ -218,8 +220,10 @@
                 }, 80);
               }
             } 
-      }.bind(this);
+          }.bind(self);
           arangoHelper.setCheckboxStatus("#graphManagementDropdown");
+        }
+      });
 
       return this;
     },