Upgrades to work with girder 2

package.json

@@ -5,14 +5,6 @@
   "license": "Apache-2.0",
   "repository": "https://github.com/opendataanalytics/gaia_minerva.git",
   "dependencies": {
-    "JSONPath": "0.10.0",
-    "bootstrap-select": "^1.10.0",
-    "bootstrap-slider": "^7.1.0",
-    "colorbrewer": "1.0.0",
-    "geojs": "0.10.1",
-    "jade": "~1.11.0",
-    "jquery-ui-bundle": "^1.11.4",
-    "underscore": "~1.5"
   },
   "devDependencies": {
     "grunt-contrib-watch": "^1.0.0",

web_client/main.js

@@ -0,0 +1,4 @@
+import analysisWidgetRegistry from '../../minerva/web_external/views/body/analysisWidgetRegistry'
+import GaiaProcessWidget from './views/gaiaProcessWidget';
+
+analysisWidgetRegistry.register('gaia_process', GaiaProcessWidget);

web_client/js/gaiaProcessWidget.js → web_client/views/gaiaProcessWidget.js

@@ -1,7 +1,13 @@
+import { restRequest } from 'girder/rest';
+import events from 'girder/events';
+import View from '../../../minerva/web_external/views/view';
+import gaiaProcessArgsWidgetTemplate from '../templates/gaiaProcessArgsWidget.pug';
+import gaiaProcessInputsWidgetTemplate from '../templates/gaiaProcessInputsWidget.pug';
+import gaiaProcessWidgetTemplate from '../templates/gaiaProcessWidget.pug';
 /**
 * This widget is used to add/edit gaia processes.
 */
-minerva.views.GaiaProcessWidget = minerva.View.extend({
+var GaiaProcessWidget = View.extend({
 
     events: {
         'submit #m-gaia-process-form': function (e) {
@@ -65,13 +71,13 @@ minerva.views.GaiaProcessWidget = minerva.View.extend({
 
             console.log(JSON.stringify(query));
 
-            girder.restRequest({
+            restRequest({
                 path: 'gaia_analysis',
                 type: 'POST',
                 contentType: 'application/json',
                 data: JSON.stringify(query)
             }).done(_.bind(function () {
-                girder.events.trigger('m:job.created');
+                events.trigger('m:job.created');
                 this.$el.modal('hide');
             }, this));
         },
@@ -96,15 +102,15 @@ minerva.views.GaiaProcessWidget = minerva.View.extend({
         this.requiredArguments = _.first(_.values(JSON.parse(process))).required_args;
 
         var gaiaArgsView = _.map(this.requiredArguments, _.bind(function (value) {
-            return girder.templates.gaiaProcessArgsWidget({
+            return gaiaProcessArgsWidgetTemplate({
                 value: value
             });
         }, this));
         $('#m-gaia-process-args').append(gaiaArgsView);
         var gaiaInputsView = _.flatten(_.map(this.requiredInputs, _.bind(function (value) {
             var numberOfPossibleLayers = value.max;
             return _.times(numberOfPossibleLayers, _.bind(function () {
-                return girder.templates.gaiaProcessInputsWidget({
+                return gaiaProcessInputsWidgetTemplate({
                     groups: this.layers,
                     type: value.type,
                     gaia_minerva_wms: this.gaia_minerva_wms
@@ -129,7 +135,7 @@ minerva.views.GaiaProcessWidget = minerva.View.extend({
     },
 
     renderListOfAvailableProcesses: function () {
-        girder.restRequest({
+        restRequest({
             path: 'gaia_process/classes',
             type: 'GET'
         }).done(_.bind(function (data) {
@@ -164,11 +170,13 @@ minerva.views.GaiaProcessWidget = minerva.View.extend({
             _.filter(this.collection.models, this.getSourceNameFromModel),
             this.getSourceNameFromModel
         );
-        var modal = this.$el.html(girder.templates.gaiaProcessWidget({
+        var modal = this.$el.html(gaiaProcessWidgetTemplate({
             processes: this.processes
         })).girderModal(this).on('ready.girder.modal', _.bind(function () {
         }, this));
         modal.trigger($.Event('ready.girder.modal', {relatedTarget: modal}));
         return this;
     }
 });
+
+export default GaiaProcessWidget;