Allows to install apps from fishbowl in web interface.

js/apps/system/aardvark/aardvark.js

@@ -1,4 +1,4 @@
-/*global require, applicationContext*/
+/*global require, applicationContext, parseInt*/
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief A Foxx.Controller to show all Foxx Applications
@@ -45,6 +45,45 @@ var FoxxController = require("org/arangodb/foxx").Controller,
 var foxxes = new (require("lib/foxxes").Foxxes)();
 var FoxxManager = require("org/arangodb/foxx/manager");
 var docus = new (require("lib/swagger").Swagger)();
+var sortVersions = function(a, b) {
+  var left = a.split(".").map(function(c) {
+    return parseInt(c, 10);
+  });
+  var right = b.split(".").map(function(c) {
+    return parseInt(c, 10);
+  });
+  if (left[0] === right[0]) {
+    if (left[1] === right[1]) {
+      if (left[2] < right[2]) {
+        return 1;
+      }
+      if (left[2] < right[2]) {
+        return -1;
+      }
+      return 0;
+    }
+    if (left[1] < right[1]) {
+      return 1;
+    }
+    return -1;
+  }
+  if (left[0] < right[0]) {
+    return 1;
+  }
+  return -1;
+};
+
+var installFromGithub = function(res, url, name, version) {
+  var appID = FoxxManager.fetchFromGithub(url, name, version);
+  var app = db._aal.firstExample({"app": appID});
+  res.json({
+    error: false,
+    configuration: app.manifest.configuration || {},
+    app: appID,
+    name: app.name,
+    version: app.version
+  });
+};
 
 controller.get("/whoAmI", function(req, res) {
   res.json({
@@ -106,29 +145,45 @@ controller.put("/foxxes/install", function (req, res) {
 }).summary("Installs a new foxx")
 .notes("This function is used to install a new foxx.");
 
+/** Install a Foxx from fishbowl
+ *
+ * Downloads a Foxx from the fishbowl and returns the required configuration for this foxx.
+ */
+controller.post("/foxxes/fishbowlinstall", function (req, res) {
+  var content = JSON.parse(req.requestBody),
+    name = content.name,
+    version = content.version,
+    url,
+    appInfo = FoxxManager.getFishbowlStorage().firstExample({
+    name: name
+  });
+  if (version !== undefined) {
+    if (appInfo.versions.hasOwnProperty(version)) {
+      url = appInfo.versions[version].location;
+    } else {
+      throw "Banana";
+    }
+  } else {
+    var keys = Object.keys(appInfo.versions);
+    if (keys.length > 1) {
+      keys = keys.sort(sortVersions);
+    }
+    url = appInfo.versions[keys[0]].location;
+  }
+  installFromGithub(res, url, name, "v" + version);
+});
+
 /** Install a Foxx from Github
  *
  * Install a Foxx with URL and .....
  */
-
 controller.post("/foxxes/gitinstall", function (req, res) {
-
   var content = JSON.parse(req.requestBody),
   name = content.name,
   url = content.url,
   version = content.version;
-
-  var appID = FoxxManager.fetchFromGithub(url, name, version);
-  var app = db._aal.firstExample({"app": appID});
-  res.json({
-    error: false,
-    configuration: app.manifest.configuration || {},
-    app: appID,
-    name: app.name,
-    version: app.version
-  });
-}).summary("Installs a foxx or update existing")
-.notes("This function is used to install or update a (new) foxx.");
+  installFromGithub(res, url, name, version);
+});
 
 /** Remove an uninstalled Foxx
  *

js/apps/system/aardvark/frontend/js/views/applicationsView.js

@@ -433,8 +433,19 @@
       }
     },
 
-    installFoxxFromStore: function() {
-      //Todo
+    installFoxxFromStore: function(e) {
+      var toInstall = $(e.currentTarget).attr("appId");
+      var version = $(e.currentTarget).attr("appVersion");
+      var self = this;
+      $.post("foxxes/fishbowlinstall", JSON.stringify({
+        name: toInstall,
+        version: version
+      }), function(result) {
+        if (result.error === false) {
+          window.modalView.hide();
+          self.showConfigureDialog(result.configuration, result.name, result.version);
+        }
+      });
     },
 
     installFoxxFromGithub: function() {