[WIP] Receive prefetched Babbage model, remove API calls

openspending · Jul 2, 2019 · 64ea071 · 64ea071
1 parent 5f57e07
commit 64ea071
Show file tree

Hide file tree

Showing 21 changed files with 141 additions and 165 deletions.
diff --git a/src/api/index.js b/src/api/index.js
@@ -74,14 +74,6 @@ export class Api {
     );
   }
 
-  getPackageModel(endpoint, cube) {
-    return this.getJson(
-      this.buildUrl(endpoint, cube, 'model/')
-    ).then((result) => {
-      return result.model;
-    });
-  }
-
   getDisplayField(model, field) {
     var result = field;
     var dimension = _.find(model.dimensions, {
@@ -101,34 +93,21 @@ export class Api {
 
   getMeasuresFromModel(model) {
     var result = [];
-    _.each(model.aggregates, function(value, key) {
-      if (value.measure) {
-        result.push({
-          key: key,
-          value: value.label
-        });
-      }
-    });
-    return result;
-  }
-
-  getMeasures(endpoint, cube) {
-    var that = this;
-    return this.getPackageModel(endpoint, cube)
-      .then((model) => {
-        return that.getMeasuresFromModel(model);
-      });
-  }
-
-  getDimensions(endpoint, cube) {
-    var that = this;
-    return this.getPackageModel(endpoint, cube)
-      .then((model) => {
-        return that.getDimensionsFromModel(model);
+    if (model.aggregates) {
+      _.each(model.aggregates, function(value, key) {
+        if (value.measure) {
+          result.push({
+            key: key,
+            value: value.label
+          });
+        }
       });
+    } else {
+      console.error('No model!', model);
+    }
+    return result;
   }
 
-
   getDimensionKeyById(model, id) {
     // jscs:disable
     return model.dimensions[id].key_ref;
@@ -182,34 +161,32 @@ export class Api {
     return (parts.length == 2) ? parts[1] : key;
   }
 
-  facts(endpoint, cube, originParams) {
+  facts(endpoint, cube, originParams, model) {
     var that = this;
     var params = _.cloneDeep(originParams) || {};
     var measureFields = [];
     params.page = params.page || 0;
     params.pagesize = params.pagesize || 20;
-    var model;
-
-    return this.getPackageModel(endpoint, cube).then((packageModel) => {
-      model = packageModel;
-      var dimensions = that.getDimensionsFromModel(model);
-      var measures = that.getMeasuresFromModel(model);
-      if (!originParams.fields){
-        originParams.fields = [];
-        _.each(dimensions, (dimension) => {
-          originParams.fields.push(dimension.key);
-        });
-        _.each(measures, (measure) => {
-          originParams.fields.push(measure.value);
-        });
-      }
-      _.each(model.measures, (measure, key) => {
-        measureFields.push(key);
+
+    var dimensions = that.getDimensionsFromModel(model);
+    var measures = that.getMeasuresFromModel(model);
+
+    if (!originParams.fields){
+      originParams.fields = [];
+      _.each(dimensions, (dimension) => {
+        originParams.fields.push(dimension.key);
+      });
+      _.each(measures, (measure) => {
+        originParams.fields.push(measure.value);
       });
+    }
+    _.each(model.measures, (measure, key) => {
+      measureFields.push(key);
+    });
+
+    var factsUrl = that.buildUrl(endpoint, cube, 'facts/', params);
 
-      var factsUrl = that.buildUrl(endpoint, cube, 'facts/', params);
-      return that.getJson(factsUrl);
-    }).then((facts) => {
+    return that.getJson(factsUrl).then((facts) => {
       var result = {};
       result.headers = [];
       result.columns = [];
@@ -249,39 +226,36 @@ export class Api {
     });
   }
 
-  buildAggregateUrl(endpoint, cube, originParams) {
+  buildAggregateUrl(endpoint, cube, originParams, model) {
     const that = this;
     const params = _.cloneDeep(originParams) || {};
 
     params.page = params.page || 0;
     params.pagesize = params.pagesize || 30;
 
-    return this.getPackageModel(endpoint, cube)
-      .then((model) => {
-        const measures = that.getMeasuresFromModel(model);
-
-        if (!params.aggregates) {
-          params.aggregates = _.first(measures).key;
-        }
-        params.order = params.order || [{key: params.aggregates, direction: 'desc'}];
-        delete params.aggregates;
+    const measures = that.getMeasuresFromModel(model);
 
-        var newExtendedGroup = [];
-        _.each(params.group, (dimensionKey) => {
-          newExtendedGroup.push(dimensionKey);
-          const dimensionDisplay = that.getDisplayField(model, dimensionKey);
+    if (!params.aggregates) {
+      params.aggregates = _.first(measures).key;
+    }
+    params.order = params.order || [{key: params.aggregates, direction: 'desc'}];
+    delete params.aggregates;
 
-          if (newExtendedGroup.indexOf(dimensionDisplay) == -1) {
-            newExtendedGroup.push(dimensionDisplay);
-          }
-        });
-        params.group = newExtendedGroup;
+    var newExtendedGroup = [];
+    _.each(params.group, (dimensionKey) => {
+      newExtendedGroup.push(dimensionKey);
+      const dimensionDisplay = that.getDisplayField(model, dimensionKey);
 
-        return that.buildUrl(endpoint, cube, 'aggregate/', params);
+      if (newExtendedGroup.indexOf(dimensionDisplay) == -1) {
+        newExtendedGroup.push(dimensionDisplay);
+      }
     });
+    params.group = newExtendedGroup;
+
+    return that.buildUrl(endpoint, cube, 'aggregate/', params);
   }
 
-  aggregate(endpoint, cube, originParams) {
+  aggregate(endpoint, cube, originParams, model) {
     var that = this;
     var params = _.cloneDeep(originParams) || {};
 
@@ -292,11 +266,9 @@ export class Api {
     var measureModelList;
 
     return Promise.all([
-      that.getPackageModel(endpoint, cube),
-      that.buildAggregateUrl(endpoint, cube, originParams)
+      that.buildAggregateUrl(endpoint, cube, originParams, model)
     ]).then((values) => {
-      const model = values[0];
-      const aggregateUrl = values[1];
+      const aggregateUrl = values[0];
       measures = that.getMeasuresFromModel(model);
       measureModelList = _.values(model.measures);
 

diff --git a/src/bindings/angular/bubbletree/index.js b/src/bindings/angular/bubbletree/index.js
@@ -14,6 +14,7 @@ export class BubbleTreeDirective {
             cube: '@',
             type: '@',
             state: '=',
+            model: '=',
             downloader: '=?',
             formatValue: '=?',
             messages: '=?',
@@ -73,7 +74,7 @@ export class BubbleTreeDirective {
 
             $scope.$emit('babbage-ui.initialize', component);
             component.build($scope.endpoint, $scope.cube,
-              $scope.state, wrapper);
+              $scope.state, wrapper, $scope.model);
 
             $scope.$emit('babbage-ui.create');
             $scope.$on('$destroy', function() {

diff --git a/src/bindings/angular/chart/index.js b/src/bindings/angular/chart/index.js
@@ -14,6 +14,7 @@ export class ChartDirective {
             cube: '@',
             type: '@',
             state: '=',
+            model: '=',
             downloader: '=?',
             formatValue: '=?',
             messages: '=?',
@@ -75,7 +76,8 @@ export class ChartDirective {
               $scope.cube,
               $scope.state,
               wrapper,
-              $scope.colorScale()
+              $scope.colorScale(),
+              $scope.model
             );
 
             $scope.$emit('babbage-ui.create');

diff --git a/src/bindings/angular/facts/index.js b/src/bindings/angular/facts/index.js
@@ -13,6 +13,7 @@ export class FactsDirective {
             endpoint: '@',
             cube: '@',
             state: '=',
+            model: '=',
             downloader: '=?',
             formatValue: '=?',
             messages: '=?'
@@ -48,7 +49,7 @@ export class FactsDirective {
               $q((resolve, reject) => {
                 component.downloader = $scope.downloader;
                 $scope.$emit('babbage-ui.initialize', component);
-                component.getTableData($scope.endpoint, $scope.cube, $scope.state)
+                component.getTableData($scope.endpoint, $scope.cube, $scope.state, $scope.model)
                   .then(resolve)
                   .catch(reject)
               })
@@ -132,4 +133,4 @@ export class FactsDirective {
   }
 }
 
-export default FactsDirective
+export default FactsDirective
diff --git a/src/bindings/angular/geoview/index.js b/src/bindings/angular/geoview/index.js
@@ -18,6 +18,7 @@ export class GeoViewDirective {
             cube: '@',
             type: '@',
             state: '=',
+            model: '=',
             countryCode: '@',
             currencySign: '@?',
             downloader: '=?',
@@ -70,7 +71,8 @@ export class GeoViewDirective {
               component.getGeoMapData(
                 $scope.endpoint,
                 $scope.cube,
-                $scope.state
+                $scope.state,
+                $scope.model
               ).then(resolve).catch(reject)
             })
             .then((result) => {
@@ -93,4 +95,4 @@ export class GeoViewDirective {
   }
 }
 
-export default GeoViewDirective
+export default GeoViewDirective
diff --git a/src/bindings/angular/pie/index.js b/src/bindings/angular/pie/index.js
@@ -15,6 +15,7 @@ export class PieChartDirective {
             type: '@',
             maxSlices: '@',
             state: '=',
+            model: '=',
             downloader: '=?',
             formatValue: '=?',
             messages: '=?',
@@ -78,7 +79,8 @@ export class PieChartDirective {
               $scope.state,
               wrapper,
               $scope.maxSlices,
-              $scope.colorScale()
+              $scope.colorScale(),
+              $scope.model
             );
 
             $scope.$emit('babbage-ui.create');

diff --git a/src/bindings/angular/pivottable/index.js b/src/bindings/angular/pivottable/index.js
@@ -17,6 +17,7 @@ export class PivotTableDirective {
             endpoint: '@',
             cube: '@',
             state: '=',
+            model: '=',
             downloader: '=?',
             formatValue: '=?',
             maxValueLimit: '@?',
@@ -74,7 +75,7 @@ export class PivotTableDirective {
             let wrapper = element.find('.pivot-table')[0];
             component.downloader = $scope.downloader;
             $scope.$emit('babbage-ui.initialize', component);
-            component.getPivotData($scope.endpoint, $scope.cube, $scope.state)
+            component.getPivotData($scope.endpoint, $scope.cube, $scope.state, $scope.model)
               .then((result) => {
                 let limit = parseInt($scope.maxValueLimit, 10) || 0;
                 if (
@@ -107,4 +108,4 @@ export class PivotTableDirective {
   }
 }
 
-export default PivotTableDirective
+export default PivotTableDirective
diff --git a/src/bindings/angular/radar/index.js b/src/bindings/angular/radar/index.js
@@ -13,6 +13,7 @@ export class RadarChartDirective {
             endpoint: '@',
             cube: '@',
             state: '=',
+            model: '=',
             downloader: '=?',
             formatValue: '=?',
             messages: '=?',
@@ -68,7 +69,8 @@ export class RadarChartDirective {
               $scope.cube,
               $scope.state,
               wrapper,
-              $scope.colorScale()
+              $scope.colorScale(),
+              $scope.model
             );
 
             $scope.$emit('babbage-ui.create');
@@ -82,4 +84,4 @@ export class RadarChartDirective {
   }
 }
 
-export default RadarChartDirective
+export default RadarChartDirective
diff --git a/src/bindings/angular/sankey/index.js b/src/bindings/angular/sankey/index.js
@@ -13,6 +13,7 @@ export class SanKeyChartDirective {
             endpoint: '@',
             cube: '@',
             state: '=',
+            model: '=',
             downloader: '=?',
             formatValue: '=?',
             messages: '=?',
@@ -73,7 +74,8 @@ export class SanKeyChartDirective {
               $scope.cube,
               $scope.state,
               wrapper,
-              $scope.colorScale()
+              $scope.colorScale(),
+              $scope.model
             );
 
             $scope.$emit('babbage-ui.create');
@@ -87,4 +89,4 @@ export class SanKeyChartDirective {
   }
 }
 
-export default SanKeyChartDirective
+export default SanKeyChartDirective
diff --git a/src/bindings/angular/table/index.js b/src/bindings/angular/table/index.js
@@ -13,6 +13,7 @@ export class BabbageTableDirective {
             endpoint: '@',
             cube: '@',
             state: '=',
+            model: '=',
             downloader: '=?',
             formatValue: '=?',
             messages: '=?'
@@ -28,6 +29,7 @@ export class BabbageTableDirective {
               cutoff: 0
             };
 
+
             $scope.i18n = createI18NMapper($scope.messages);
             $scope.$watch('messages', function(newValue, oldValue) {
               if (newValue !== oldValue) {
@@ -66,7 +68,7 @@ export class BabbageTableDirective {
             $q((resolve, reject) => {
               component.downloader = $scope.downloader;
               $scope.$emit('babbage-ui.initialize', component);
-              component.getTableData($scope.endpoint, $scope.cube, $scope.state)
+              component.getTableData($scope.endpoint, $scope.cube, $scope.state, $scope.model)
                 .then(resolve)
                 .catch(reject)
             })
@@ -85,4 +87,4 @@ export class BabbageTableDirective {
   }
 }
 
-export default BabbageTableDirective
+export default BabbageTableDirective