dtable-statistic 4.0.9 → 4.0.10

package/es/calculator/workers/basic-chart-calculator-worker.js

@@ -306,8 +306,7 @@ function getGroupbyNumericColumnsChartResults(rows, formulaRows, groupbyColumn,
   return getGroupChartStatResult(table, value, groupbyColumn, numericSummaryColumnKey, rows, formulaRows, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryColumn, summaryType, summaryMethod, columnGroupbyMultipleNumericColumn, yAxisType);
 }
 function calculateGeolocationBasicChart(chart, value, username, userId) {
-  var type = chart.type,
-    table_id = chart.table_id,
+  var table_id = chart.table_id,
     view_id = chart.view_id,
     geo_column = chart.geo_column,
     geolocation_granularity = chart.geolocation_granularity,
@@ -315,9 +314,6 @@ function calculateGeolocationBasicChart(chart, value, username, userId) {
     summary_column = chart.summary_column,
     summary_method = chart.summary_method;
   var geolocationGranularity = geolocation_granularity;
-  if (type === STAT_TYPE.WORLD_MAP || type === STAT_TYPE.WORLD_MAP_BUBBLE) {
-    geolocationGranularity = null;
-  }
   var table = TableUtils.getTableById(value.tables, table_id);
   var view = table && Views.getViewById(table.views, view_id);
   if (!view) {

package/es/service/dashboard-service.js

@@ -24,8 +24,14 @@ var DashBoardService = /*#__PURE__*/function () {
   _createClass(DashBoardService, [{
     key: "initStatistics",
     value: function initStatistics(value, updateStatistics, deletePluginSettings) {
-      this.statistics = value && value.statistics || [];
-      if (this.statistics.length === 0) {
+      var baseStatistics = value && value.statistics || [];
+      var advancedStatistics = this.getAdvancedStatistics(value);
+      var hasBaseStatistics = baseStatistics.length > 0;
+      var hasAdvancedStatistics = advancedStatistics.length > 0;
+      this.statistics = baseStatistics;
+
+      // init default dashboard if neither base-statistics nor advanced-statistics
+      if (!hasBaseStatistics && !hasAdvancedStatistics) {
         this.statistics = [new StatisticDashBoard({
           _id: generatorUniqueId([]),
           stat_items: [],
@@ -36,11 +42,15 @@ var DashBoardService = /*#__PURE__*/function () {
       this.needSave = false;
 
       // convert to advance-statistic
-      if (!hasOwnProperty(this.statistics[0], 'stat_items')) {
+      if (hasBaseStatistics && !hasOwnProperty(this.statistics[0], 'stat_items')) {
         this.needSave = true;
         this.convert2AdvanceStatistic();
       }
-      this.mergeAdvancedStatistics(value, deletePluginSettings);
+
+      // merge advanced statistics
+      if (hasAdvancedStatistics) {
+        this.mergeAdvancedStatistics(advancedStatistics, deletePluginSettings);
+      }
       this.filterInvalidCharts();
       if (this.needSave) {
         this.needSave = false;
@@ -148,12 +158,16 @@ var DashBoardService = /*#__PURE__*/function () {
       return this.chartService.generatorChart(convertedChart);
     }
   }, {
-    key: "mergeAdvancedStatistics",
-    value: function mergeAdvancedStatistics(value, deletePluginSettings) {
+    key: "getAdvancedStatistics",
+    value: function getAdvancedStatistics(value) {
       if (!value || !hasOwnProperty(value, 'plugin_settings') || !hasOwnProperty(value.plugin_settings, ADVANCED_STATISTICS_NAME)) {
-        return;
+        return [];
       }
-      var advancedStatistics = value.plugin_settings[ADVANCED_STATISTICS_NAME];
+      return value.plugin_settings[ADVANCED_STATISTICS_NAME] || [];
+    }
+  }, {
+    key: "mergeAdvancedStatistics",
+    value: function mergeAdvancedStatistics(advancedStatistics, deletePluginSettings) {
       if (!Array.isArray(advancedStatistics) || advancedStatistics.length === 0 || this.statistics.some(function (dashboard) {
         return dashboard.from_advanced;
       }) // already merged from advanced

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -12,7 +12,7 @@
     "@seafile/seafile-calendar": "0.0.24",
     "comlink": "^4.3.1",
     "dayjs": "1.10.7",
-    "dtable-store": "4.0.2",
+    "dtable-store": "4.0.6",
     "dtable-web-api": "4.0.1",
     "glamor": "^2.20.40",
     "html2canvas": "^1.4.1",