@dhis2/analytics 26.0.19 → 26.0.21

package/build/cjs/components/FileMenu/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.supportedFileTypes = exports.labelForFileType = exports.endpointFromFileType = exports.appPathFor = exports.FILE_TYPE_VISUALIZATION = exports.FILE_TYPE_MAP = exports.FILE_TYPE_EVENT_VISUALIZATION = exports.FILE_TYPE_EVENT_REPORT = void 0;
+exports.supportedFileTypes = exports.preparePayloadForSaveAs = exports.labelForFileType = exports.endpointFromFileType = exports.appPathFor = exports.FILE_TYPE_VISUALIZATION = exports.FILE_TYPE_MAP = exports.FILE_TYPE_EVENT_VISUALIZATION = exports.FILE_TYPE_EVENT_REPORT = void 0;
 var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const FILE_TYPE_EVENT_REPORT = 'eventReport';
@@ -43,4 +43,15 @@ const appPathFor = (fileType, id) => {
       return `${window.location.search}${window.location.hash}`;
   }
 };
-exports.appPathFor = appPathFor;
+exports.appPathFor = appPathFor;
+const preparePayloadForSaveAs = _ref => {
+  let {
+    ...visualization
+  } = _ref;
+  delete visualization.id;
+  delete visualization.created;
+  delete visualization.createdBy;
+  delete visualization.user;
+  return visualization;
+};
+exports.preparePayloadForSaveAs = preparePayloadForSaveAs;

package/build/cjs/index.js

@@ -16,6 +16,7 @@ var _exportNames = {
   DimensionMenu: true,
   PivotTable: true,
   FileMenu: true,
+  preparePayloadForSaveAs: true,
   VisTypeIcon: true,
   LegendKey: true,
   AboutAOUnit: true,
@@ -1681,6 +1682,12 @@ Object.defineProperty(exports, "ouIdHelper", {
     return _index4.ouIdHelper;
   }
 });
+Object.defineProperty(exports, "preparePayloadForSaveAs", {
+  enumerable: true,
+  get: function () {
+    return _utils.preparePayloadForSaveAs;
+  }
+});
 Object.defineProperty(exports, "useCachedDataQuery", {
   enumerable: true,
   get: function () {
@@ -1711,6 +1718,7 @@ var _Filter = _interopRequireDefault(require("./components/Filter/Filter.js"));
 var _DimensionMenu = _interopRequireDefault(require("./components/DimensionMenu.js"));
 var _PivotTable = _interopRequireDefault(require("./components/PivotTable/PivotTable.js"));
 var _FileMenu = _interopRequireDefault(require("./components/FileMenu/FileMenu.js"));
+var _utils = require("./components/FileMenu/utils.js");
 var _VisTypeIcon = _interopRequireDefault(require("./components/VisTypeIcon.js"));
 var _LegendKey = _interopRequireDefault(require("./components/LegendKey/LegendKey.js"));
 var _AboutAOUnit = _interopRequireDefault(require("./components/AboutAOUnit/AboutAOUnit.js"));

package/build/cjs/visualizations/config/adapters/dhis_highcharts/chart.js

@@ -25,7 +25,7 @@ const getEvents = () => ({
       this.legend.allItems.forEach(item => {
         if (item.legendSymbol) {
           item.legendSymbol.attr({
-            translateY: -(item.legendItem.getBBox().height * 0.75 / 4) + item.legendSymbol.r / 2
+            translateY: -(item.legendItem.label.getBBox().height * 0.75 / 4) + item.legendSymbol.r / 2
           });
         }
       });

package/build/cjs/visualizations/config/generators/highcharts/index.js

@@ -23,6 +23,7 @@ function drawLegendSymbolWrap() {
   const pick = _highcharts.default.pick;
   _highcharts.default.wrap(_highcharts.default.seriesTypes.column.prototype, 'drawLegendSymbol', function (proceed, legend, item) {
     var _this$options$legendS, _this$options$legendS2;
+    const legendItem = item.legendItem;
     if ((_this$options$legendS = this.options.legendSet) !== null && _this$options$legendS !== void 0 && (_this$options$legendS2 = _this$options$legendS.legends) !== null && _this$options$legendS2 !== void 0 && _this$options$legendS2.length) {
       const ys = legend.baseline - legend.symbolHeight + 1,
         // y start
@@ -32,18 +33,18 @@ function drawLegendSymbolWrap() {
       const legends = this.options.legendSet.legends.sort((a, b) => a.startValue - b.startValue);
       this.chart.renderer.path(['M', x, ys, 'A', 1, 1, 0, 0, 0, x, ye, 'V', ys]).attr({
         fill: legends[legends.length >= 5 ? 1 : 0].color
-      }).add(this.legendGroup);
+      }).add(legendItem.group);
       this.chart.renderer.path(['M', x, ye, 'A', 1, 1, 0, 0, 0, x, ys, 'V', ye]).attr({
         fill: legends[legends.length >= 5 ? legends.length - 2 : legends.length - 1].color
-      }).add(this.legendGroup);
+      }).add(legendItem.group);
     } else {
       var options = legend.options,
         symbolHeight = legend.symbolHeight,
         square = options.squareSymbol,
         symbolWidth = square ? symbolHeight : legend.symbolWidth;
-      item.legendSymbol = this.chart.renderer.rect(square ? (legend.symbolWidth - symbolHeight) / 2 : 0, legend.baseline - symbolHeight + 1, symbolWidth, symbolHeight, pick(legend.options.symbolRadius, symbolHeight / 2)).addClass('highcharts-point').attr({
+      legendItem.symbol = this.chart.renderer.rect(square ? (legend.symbolWidth - symbolHeight) / 2 : 0, legend.baseline - symbolHeight + 1, symbolWidth, symbolHeight, pick(legend.options.symbolRadius, symbolHeight / 2)).addClass('highcharts-point').attr({
         zIndex: 3
-      }).add(item.legendGroup);
+      }).add(legendItem.group);
     }
   });
 }

package/build/es/components/FileMenu/utils.js

@@ -28,4 +28,14 @@ export const appPathFor = (fileType, id) => {
     default:
       return `${window.location.search}${window.location.hash}`;
   }
+};
+export const preparePayloadForSaveAs = _ref => {
+  let {
+    ...visualization
+  } = _ref;
+  delete visualization.id;
+  delete visualization.created;
+  delete visualization.createdBy;
+  delete visualization.user;
+  return visualization;
 };

package/build/es/index.js

@@ -12,6 +12,7 @@ export { default as DimensionFilter } from './components/Filter/Filter.js';
 export { default as DimensionMenu } from './components/DimensionMenu.js';
 export { default as PivotTable } from './components/PivotTable/PivotTable.js';
 export { default as FileMenu } from './components/FileMenu/FileMenu.js';
+export { preparePayloadForSaveAs } from './components/FileMenu/utils.js';
 export { default as VisTypeIcon } from './components/VisTypeIcon.js';
 export { default as LegendKey } from './components/LegendKey/LegendKey.js';
 export { default as AboutAOUnit } from './components/AboutAOUnit/AboutAOUnit.js';

package/build/es/visualizations/config/adapters/dhis_highcharts/chart.js

@@ -18,7 +18,7 @@ const getEvents = () => ({
       this.legend.allItems.forEach(item => {
         if (item.legendSymbol) {
           item.legendSymbol.attr({
-            translateY: -(item.legendItem.getBBox().height * 0.75 / 4) + item.legendSymbol.r / 2
+            translateY: -(item.legendItem.label.getBBox().height * 0.75 / 4) + item.legendSymbol.r / 2
           });
         }
       });

package/build/es/visualizations/config/generators/highcharts/index.js

@@ -17,6 +17,7 @@ function drawLegendSymbolWrap() {
   const pick = H.pick;
   H.wrap(H.seriesTypes.column.prototype, 'drawLegendSymbol', function (proceed, legend, item) {
     var _this$options$legendS, _this$options$legendS2;
+    const legendItem = item.legendItem;
     if ((_this$options$legendS = this.options.legendSet) !== null && _this$options$legendS !== void 0 && (_this$options$legendS2 = _this$options$legendS.legends) !== null && _this$options$legendS2 !== void 0 && _this$options$legendS2.length) {
       const ys = legend.baseline - legend.symbolHeight + 1,
         // y start
@@ -26,18 +27,18 @@ function drawLegendSymbolWrap() {
       const legends = this.options.legendSet.legends.sort((a, b) => a.startValue - b.startValue);
       this.chart.renderer.path(['M', x, ys, 'A', 1, 1, 0, 0, 0, x, ye, 'V', ys]).attr({
         fill: legends[legends.length >= 5 ? 1 : 0].color
-      }).add(this.legendGroup);
+      }).add(legendItem.group);
       this.chart.renderer.path(['M', x, ye, 'A', 1, 1, 0, 0, 0, x, ys, 'V', ye]).attr({
         fill: legends[legends.length >= 5 ? legends.length - 2 : legends.length - 1].color
-      }).add(this.legendGroup);
+      }).add(legendItem.group);
     } else {
       var options = legend.options,
         symbolHeight = legend.symbolHeight,
         square = options.squareSymbol,
         symbolWidth = square ? symbolHeight : legend.symbolWidth;
-      item.legendSymbol = this.chart.renderer.rect(square ? (legend.symbolWidth - symbolHeight) / 2 : 0, legend.baseline - symbolHeight + 1, symbolWidth, symbolHeight, pick(legend.options.symbolRadius, symbolHeight / 2)).addClass('highcharts-point').attr({
+      legendItem.symbol = this.chart.renderer.rect(square ? (legend.symbolWidth - symbolHeight) / 2 : 0, legend.baseline - symbolHeight + 1, symbolWidth, symbolHeight, pick(legend.options.symbolRadius, symbolHeight / 2)).addClass('highcharts-point').attr({
         zIndex: 3
-      }).add(item.legendGroup);
+      }).add(legendItem.group);
     }
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.0.19",
+    "version": "26.0.21",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {