sea-chart 0.0.44-alpha.0 → 0.0.44-alpha.1

package/dist/utils/chart-utils/original-data-utils/basic-chart-calculator.js

@@ -38,7 +38,7 @@ async function calculateBasicChart(chart, value, _ref) {
     summary_column_key = chart.y_axis_summary_column_key;
     groupby_date_granularity = chart.x_axis_date_granularity;
     groupby_geolocation_granularity = chart.x_axis_geolocation_granularity;
-    include_empty = chart.x_axis_include_empty;
+    include_empty = chart.x_axis_include_empty_cells;
   }
   const table = getTableById(value.tables, table_id);
   const view = table && getViewById(table.views, view_id);
@@ -83,7 +83,7 @@ async function calculateGroupingChart(chart, value, _ref2) {
     table_id,
     view_id,
     x_axis_column_key,
-    x_axis_include_empty,
+    x_axis_include_empty_cells,
     y_axis_summary_column_key,
     y_axis_summary_type,
     y_axis_summary_method,
@@ -95,7 +95,7 @@ async function calculateGroupingChart(chart, value, _ref2) {
   const column_groupby_geolocation_granularity = chart.column_groupby_geolocation_granularity;
   let groupby_date_granularity = chart.x_axis_date_granularity;
   let groupby_geolocation_granularity = chart.x_axis_geolocation_granularity;
-  let column_groupby_numeric_columns = chart.column_groupby_numeric_columns || [];
+  let column_groupby_numeric_columns = chart.summary_columns || [];
   const table = getTableById(value.tables, table_id);
   const view = table && getViewById(table.views, view_id);
   if (!view) {
@@ -117,7 +117,7 @@ async function calculateGroupingChart(chart, value, _ref2) {
   const yAxisType = null;
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
-  let results = getGroupingChartResults(statRows, formulaRows, groupbyColumn, x_axis_include_empty, groupby_date_granularity, groupby_geolocation_granularity, column_groupby_column_key, column_groupby_date_granularity, column_groupby_geolocation_granularity, y_axis_summary_column_key, y_axis_summary_type, y_axis_summary_method, column_groupby_multiple_numeric_column, column_groupby_numeric_columns, yAxisType, table, value);
+  let results = getGroupingChartResults(statRows, formulaRows, groupbyColumn, x_axis_include_empty_cells, groupby_date_granularity, groupby_geolocation_granularity, column_groupby_column_key, column_groupby_date_granularity, column_groupby_geolocation_granularity, y_axis_summary_column_key, y_axis_summary_type, y_axis_summary_method, column_groupby_multiple_numeric_column, column_groupby_numeric_columns, yAxisType, table, value);
   BaseUtils.sortCharts(results, groupbyColumn, 'name');
   results = results.map(result => {
     return {
@@ -321,9 +321,9 @@ async function calculateGeolocationBasicChart(chart, value, _ref3) {
     type,
     table_id,
     view_id,
-    geo_column,
+    geo_column_key,
     summary_type,
-    summary_column,
+    summary_column_key,
     summary_method
   } = chart;
   const table = getTableById(value.tables, table_id);
@@ -331,7 +331,7 @@ async function calculateGeolocationBasicChart(chart, value, _ref3) {
   if (!view) {
     return;
   }
-  const geoColumn = geo_column && getTableColumnByKey(table, geo_column);
+  const geoColumn = geo_column_key && getTableColumnByKey(table, geo_column_key);
   if (!geoColumn) {
     return;
   }
@@ -341,7 +341,7 @@ async function calculateGeolocationBasicChart(chart, value, _ref3) {
   } else {
     geolocationGranularity = fixGeoGranularity(chart);
   }
-  const summaryColumn = getTableColumnByKey(table, summary_column);
+  const summaryColumn = getTableColumnByKey(table, summary_column_key);
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   const geoColumnType = geoColumn.type;
@@ -391,7 +391,7 @@ async function calculateCustomBar(statItem, value, _ref4) {
     x_axis_column_key,
     x_axis_date_granularity,
     x_axis_geolocation_granularity,
-    x_axis_include_empty,
+    x_axis_include_empty_cells,
     y_axises
   } = statItem;
   const table = getTableById(value.tables, table_id);
@@ -435,7 +435,7 @@ async function calculateCustomBar(statItem, value, _ref4) {
           column_key: summary_column_key,
           summary_method
         } = numericSummaryColumn;
-        const currentResults = getGroupbyNumericColumnsChartResults(statRows, formulaRows, groupbyColumn, x_axis_include_empty, groupbyDateGranularity, groupbyGeolocationGranularity, summary_column_key, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, CHART_SUMMARY_TYPE.ADVANCED, summary_method, yAxisType, table, value);
+        const currentResults = getGroupbyNumericColumnsChartResults(statRows, formulaRows, groupbyColumn, x_axis_include_empty_cells, groupbyDateGranularity, groupbyGeolocationGranularity, summary_column_key, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, CHART_SUMMARY_TYPE.ADVANCED, summary_method, yAxisType, table, value);
         results = results.concat(currentResults);
       });
     }

package/dist/utils/chart-utils/original-data-utils/card-calculator.js

@@ -9,12 +9,12 @@ async function calculator(chart, dtableValue, _ref) {
   const {
     table_id,
     view_id,
-    numeric_column,
+    numeric_column_key,
     summary_method
   } = chart;
   const selectedTable = getTableById(dtableValue.tables, table_id);
   const selectedView = selectedTable && getViewById(selectedTable.views, view_id);
-  const selectedColumn = getTableColumnByKey(selectedTable, numeric_column);
+  const selectedColumn = getTableColumnByKey(selectedTable, numeric_column_key);
   const _isNumericColumn = selectedColumn && isNumericColumn(selectedColumn);
   const statRows = await getViewRows(selectedView, selectedTable);
   const formulaRows = _isNumericColumn ? await getTableFormulaResults(selectedTable, statRows) : {};

package/dist/utils/chart-utils/original-data-utils/combination-calculator.js

@@ -12,7 +12,7 @@ async function calculator(chart, value, _ref) {
     table_id,
     view_id,
     x_axis_column_key,
-    x_axis_include_empty,
+    x_axis_include_empty_cells,
     x_axis_date_granularity: groupby_date_granularity,
     x_axis_geolocation_granularity: groupby_geolocation_granularity,
     y_axis_left_summary_column,
@@ -84,13 +84,13 @@ async function calculator(chart, value, _ref) {
             leftResultMap.set(name, currentValue);
           });
         }
-        if (label.length === 0 && x_axis_include_empty) {
+        if (label.length === 0 && x_axis_include_empty_cells) {
           let currentValue = leftResultMap.get(null) || 0;
           currentValue += 1;
           leftResultMap.set(null, currentValue);
         }
       } else {
-        if (x_axis_include_empty || label) {
+        if (x_axis_include_empty_cells || label) {
           let currentLabelCount = leftResultMap.get(label) || 0;
           currentLabelCount = currentLabelCount + 1;
           leftResultMap.set(label, currentLabelCount);
@@ -116,7 +116,7 @@ async function calculator(chart, value, _ref) {
             leftResultMap.set(name, currentLabelMap);
           });
         }
-        if (label.length === 0 && x_axis_include_empty) {
+        if (label.length === 0 && x_axis_include_empty_cells) {
           let currentValue = leftResultMap.get(null) || {};
           leftSummaryColumnKeys.forEach(key => {
             const cellValue = getCellValue(row, formulaRow, {
@@ -132,7 +132,7 @@ async function calculator(chart, value, _ref) {
           leftResultMap.set(null, currentValue);
         }
       } else {
-        if (x_axis_include_empty || label) {
+        if (x_axis_include_empty_cells || label) {
           const currentValue = leftResultMap.get(label) || {};
           leftSummaryColumnKeys.forEach(key => {
             const cellValue = getCellValue(row, formulaRow, {
@@ -160,13 +160,13 @@ async function calculator(chart, value, _ref) {
             rightResultMap.set(name, currentValue);
           });
         }
-        if (label.length === 0 && x_axis_include_empty) {
+        if (label.length === 0 && x_axis_include_empty_cells) {
           let currentValue = rightResultMap.get(null) || 0;
           currentValue += 1;
           rightResultMap.set(null, currentValue);
         }
       } else {
-        if (x_axis_include_empty || label) {
+        if (x_axis_include_empty_cells || label) {
           let currentLabelCount = rightResultMap.get(label) || 0;
           currentLabelCount = currentLabelCount + 1;
           rightResultMap.set(label, currentLabelCount);
@@ -185,7 +185,7 @@ async function calculator(chart, value, _ref) {
             rightResultMap.set(name, currentLabelList);
           });
         }
-        if (label.length === 0 && x_axis_include_empty) {
+        if (label.length === 0 && x_axis_include_empty_cells) {
           let currentValue = rightResultMap.get(null) || [];
           if (isNumber(cellValue)) {
             currentValue.push(cellValue);
@@ -193,7 +193,7 @@ async function calculator(chart, value, _ref) {
           rightResultMap.set(null, currentValue);
         }
       } else {
-        if (x_axis_include_empty || label) {
+        if (x_axis_include_empty_cells || label) {
           const currentLabelList = rightResultMap.get(label) || [];
           if (isNumber(cellValue)) {
             currentLabelList.push(cellValue);

package/dist/utils/chart-utils/original-data-utils/compare-bar-chart-calculator.js

@@ -13,7 +13,7 @@ async function calculator(chart, value, _ref) {
     x_axis_column_key,
     y_axis_summary_type,
     y_axis_summary_method,
-    y_axis_column_key,
+    y_axis_summary_column_key,
     x_axis_date_granularity,
     x_axis_date_range_start,
     x_axis_date_range_end,
@@ -32,7 +32,7 @@ async function calculator(chart, value, _ref) {
   if (!groupbyColumn) {
     return [];
   }
-  const summaryColumn = getTableColumnByKey(table, y_axis_column_key) || {};
+  const summaryColumn = getTableColumnByKey(table, y_axis_summary_column_key) || {};
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   const dateRangeResultMap = new Map();

package/dist/utils/chart-utils/original-data-utils/completeness-calculator.js

@@ -11,9 +11,9 @@ async function calculator(chart, value, _ref) {
   const {
     table_id,
     view_id,
-    name_column,
-    completed_column,
-    target_column,
+    groupby_column_key,
+    completed_column_key,
+    target_column_key,
     group_column,
     date_granularity,
     geolocation_granularity
@@ -23,7 +23,7 @@ async function calculator(chart, value, _ref) {
   if (!view) {
     return [];
   }
-  const nameColumn = getTableColumnByKey(table, name_column);
+  const nameColumn = getTableColumnByKey(table, groupby_column_key);
   if (!nameColumn) return [];
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
@@ -32,8 +32,8 @@ async function calculator(chart, value, _ref) {
   const isGroupChart = !!groupColumn;
   let result = [];
   if (!isGroupChart) {
-    const completedColumn = getTableColumnByKey(table, completed_column);
-    const targetColumn = getTableColumnByKey(table, target_column);
+    const completedColumn = getTableColumnByKey(table, completed_column_key);
+    const targetColumn = getTableColumnByKey(table, target_column_key);
     let labelCountMap = {};
     let labels = [];
     statRows.forEach(row => {
@@ -96,8 +96,8 @@ async function calculator(chart, value, _ref) {
       }
     });
   } else {
-    const completedColumn = getTableColumnByKey(table, completed_column);
-    const targetColumn = getTableColumnByKey(table, target_column);
+    const completedColumn = getTableColumnByKey(table, completed_column_key);
+    const targetColumn = getTableColumnByKey(table, target_column_key);
     let labelCountMap = {};
     let colorMap = {};
     let labelGroups = [];

package/dist/utils/chart-utils/original-data-utils/dashboard-calculator.js

@@ -9,15 +9,15 @@ async function calculator(chart, value, _ref) {
   const {
     table_id,
     view_id,
-    target_value_column,
+    target_value_column_key,
     target_value_column_summary_method,
-    total_value_column,
+    total_value_column_key,
     total_value_column_summary_method
   } = chart;
   const selectedTable = getTableById(value.tables, table_id);
   const selectedView = selectedTable && getViewById(selectedTable.views, view_id);
-  const selectedColumn1 = getTableColumnByKey(selectedTable, target_value_column);
-  const selectedColumn2 = getTableColumnByKey(selectedTable, total_value_column);
+  const selectedColumn1 = getTableColumnByKey(selectedTable, target_value_column_key);
+  const selectedColumn2 = getTableColumnByKey(selectedTable, total_value_column_key);
   const statRows = await getViewRows(selectedView, selectedTable);
   if (statRows.length === 0) {
     return 0;

package/dist/utils/chart-utils/original-data-utils/mirror-calculator.js

@@ -60,19 +60,19 @@ async function calculator(chart, dtableValue, _ref) {
   const {
     table_id,
     view_id,
-    column,
+    column_key,
     summary_type,
-    summary_column,
+    summary_column_key,
     summary_method,
-    group_column
+    group_column_key
   } = chart;
   const table = getTableById(dtableValue.tables, table_id);
   const view = table && getViewById(table.views, view_id);
-  const columnItem = getTableColumnByKey(table, column);
+  const columnItem = getTableColumnByKey(table, column_key);
   const rows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, rows);
-  const groupColumn = getTableColumnByKey(table, group_column);
-  const numericColumn = summary_column && getTableColumnByKey(table, summary_column);
+  const groupColumn = getTableColumnByKey(table, group_column_key);
+  const numericColumn = summary_column_key && getTableColumnByKey(table, summary_column_key);
   const groupItems = getGroupItems(rows, groupColumn);
   if (groupColumn.length === 0) return;
   let result = {};

package/dist/utils/chart-utils/original-data-utils/pivot-table-calculator.js

@@ -18,7 +18,7 @@ async function calculateOneDimensionTable(chart, value, _ref) {
     groupby_include_empty_cells: include_empty,
     groupby_date_granularity,
     groupby_geolocation_granularity,
-    summary_columns_option
+    summary_columns
   } = chart;
   const table = getTableById(value.tables, table_id);
   const view = table && getViewById(table.views, view_id);
@@ -54,7 +54,7 @@ async function calculateOneDimensionTable(chart, value, _ref) {
       }
     }
   });
-  const summary_columns_option_keys = Array.isArray(summary_columns_option) ? summary_columns_option.map(option => option.key) : [];
+  const summary_columns_option_keys = Array.isArray(summary_columns) ? summary_columns.map(option => option.key) : [];
   const statisticColumnKeys = [summary_column_key, ...summary_columns_option_keys];
   const validStatisticColumnKeys = statisticColumnKeys;
   let statisticColumns = validStatisticColumnKeys.map(key => {
@@ -66,7 +66,7 @@ async function calculateOneDimensionTable(chart, value, _ref) {
   if (statisticColumns.length > 0) {
     statisticColumns[0].method = summary_method;
   }
-  Array.isArray(summary_columns_option) && summary_columns_option.forEach((option, index) => {
+  Array.isArray(summary_columns) && summary_columns.forEach((option, index) => {
     if (statisticColumns[index + 1]) {
       statisticColumns[index + 1].method = option.method;
     }

package/dist/utils/chart-utils/original-data-utils/scatter-calculator.js

@@ -35,18 +35,18 @@ async function calculator(chart, value, _ref) {
   const {
     table_id,
     view_id,
-    x_axis_column,
-    y_axis_column,
-    group_column
+    x_axis_column_key,
+    y_axis_column_key,
+    column_groupby_column_key
   } = chart;
   const table = getTableById(value.tables, table_id);
   const view = table && getViewById(table.views, view_id);
   if (!view) {
     return [];
   }
-  const selectedXAxisColumn = getTableColumnByKey(table, x_axis_column);
-  const selectedYAxisColumn = getTableColumnByKey(table, y_axis_column);
-  const selectedGroupColumn = getTableColumnByKey(table, group_column);
+  const selectedXAxisColumn = getTableColumnByKey(table, x_axis_column_key);
+  const selectedYAxisColumn = getTableColumnByKey(table, y_axis_column_key);
+  const selectedGroupColumn = getTableColumnByKey(table, column_groupby_column_key);
   const statRows = await getViewRows(view, table);
   const formulaRows = await getTableFormulaResults(table, statRows);
   const data = [];

package/dist/utils/chart-utils/original-data-utils/trend-calculator.js

@@ -14,19 +14,19 @@ async function calculator(chart, value, _ref) {
   const {
     table_id,
     view_id,
-    date_column,
+    date_column_key,
     date_granularity,
-    summary_column,
+    summary_column_key,
     summary_type,
     summary_method
   } = chart;
   const selectedTable = getTableById(value.tables, table_id);
   const selectedView = selectedTable && getViewById(selectedTable.views, view_id);
-  const selectedColumn = getTableColumnByKey(selectedTable, date_column);
+  const selectedColumn = getTableColumnByKey(selectedTable, date_column_key);
   const resultMap = new Map();
   let formulaRows = {};
   const rows = await getViewRows(selectedView, selectedTable);
-  const numericColumn = getTableColumnByKey(selectedTable, summary_column);
+  const numericColumn = getTableColumnByKey(selectedTable, summary_column_key);
   if (summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
     if (FORMULA_COLUMN_TYPES_MAP[numericColumn.type]) {
       formulaRows = await getTableFormulaResults(selectedTable, rows);
@@ -59,7 +59,7 @@ async function calculator(chart, value, _ref) {
     const {
       compareValue: value1,
       comparedValue: value2
-    } = summaryDurationResult(resultMap, date_granularity, summary_type, summary_column, false);
+    } = summaryDurationResult(resultMap, date_granularity, summary_type, summary_column_key, false);
     currentValues = value1;
     previousValues = value2;
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.44-alpha.0",
+  "version": "0.0.44-alpha.1",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",