@dhis2/analytics 26.0.8 → 26.0.9

package/build/es/modules/pivotTable/applyLegendSet.js

@@ -1,71 +1,52 @@
 import { colors } from '@dhis2/ui';
 import { getColorByValueFromLegendSet, LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM, LEGEND_DISPLAY_STRATEGY_FIXED, LEGEND_DISPLAY_STYLE_TEXT, LEGEND_DISPLAY_STYLE_FILL } from '../legends.js';
 import { isColorBright } from './isColorBright.js';
-
 const getLegendSet = (engine, dxDimension) => {
   var _engine$visualization, _engine$visualization2, _engine$visualization3;
-
   let legendSetId;
-
   switch ((_engine$visualization = engine.visualization.legend) === null || _engine$visualization === void 0 ? void 0 : _engine$visualization.strategy) {
     case LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM:
       if (dxDimension && dxDimension.legendSet) {
         legendSetId = dxDimension.legendSet;
       }
-
       break;
-
     case LEGEND_DISPLAY_STRATEGY_FIXED:
     default:
       legendSetId = (_engine$visualization2 = engine.visualization.legend) === null || _engine$visualization2 === void 0 ? void 0 : (_engine$visualization3 = _engine$visualization2.set) === null || _engine$visualization3 === void 0 ? void 0 : _engine$visualization3.id;
       break;
   }
-
   return engine.legendSets[legendSetId];
 };
-
 const buildStyleObject = (legendColor, engine) => {
   var _engine$visualization4;
-
   const style = {};
-
   switch ((_engine$visualization4 = engine.visualization.legend) === null || _engine$visualization4 === void 0 ? void 0 : _engine$visualization4.style) {
     case LEGEND_DISPLAY_STYLE_TEXT:
       style.color = legendColor;
       break;
-
     case LEGEND_DISPLAY_STYLE_FILL:
     default:
       style.backgroundColor = legendColor;
-
       if (isColorBright(legendColor)) {
         style.color = colors.grey900;
       } else {
         style.color = colors.white;
       }
-
       break;
   }
-
   return style;
 };
-
 export const applyLegendSet = (value, dxDimension, engine) => {
   if (isNaN(value) || !engine.legendSets) {
     return {};
   }
-
   const legendSet = getLegendSet(engine, dxDimension);
-
   if (!legendSet) {
     return {};
   }
-
   const legendColor = getColorByValueFromLegendSet(legendSet, value);
-
   if (!legendColor) {
     return {};
   }
-
   return buildStyleObject(legendColor, engine);
 };

package/build/es/modules/pivotTable/clipAxis.js

@@ -12,10 +12,11 @@ export const clipAxis = _ref => {
   // step: height of cell in px
   // totalCount: number of rows
   // headerCount: number of header rows (plus 1 for title plus 1 for subtitle)
+
   // height in px of all row headers section, including title and subtitle when not using
   // fixed column headers
-  const floor = headerCount * step; // offset in px for the clipping content
-
+  const floor = headerCount * step;
+  // offset in px for the clipping content
   const offset = position < floor ? floor - position : 0;
   const count = Math.min(totalCount, Math.ceil((size - offset) / step) + 1);
   position = Math.max(0, position - floor);

package/build/es/modules/pivotTable/clipPartitionedAxis.js

@@ -9,7 +9,6 @@ export const clipPartitionedAxis = _ref => {
     totalWidth
   } = _ref;
   const partition = Math.floor(viewportPosition / partitionSize);
-
   if (partitions[partition] === undefined) {
     return {
       indices: [0],
@@ -17,23 +16,18 @@ export const clipPartitionedAxis = _ref => {
       post: 0
     };
   }
-
   let start = partitions[partition] - partitions[0];
-
   while (start < axisMap.length && widthMap[axisMap[start]].pre < viewportPosition) {
     ++start;
   }
-
   start = start === 0 ? start : start - 1;
   const pre = widthMap[axisMap[start]].pre;
   const indices = [];
   let end = start;
-
   while (end < axisMap.length && widthMap[axisMap[end]].pre < viewportPosition + viewportWidth) {
     indices.push(end);
     ++end;
   }
-
   end = end === 0 ? end : end - 1;
   const post = totalWidth - (widthMap[axisMap[end]].pre + widthMap[axisMap[end]].size);
   return {

package/build/es/modules/pivotTable/getHeaderForDisplay.js

@@ -4,10 +4,8 @@ const headerStacksAreEqual = (a, b, limit) => {
       return false;
     }
   }
-
   return true;
 };
-
 export const getHeaderForDisplay = _ref => {
   let {
     start,
@@ -19,21 +17,16 @@ export const getHeaderForDisplay = _ref => {
   } = _ref;
   const header = getHeader(index);
   const showHeader = index === start || !headerStacksAreEqual(header, getHeader(index - 1), dimensionLevel);
-
   if (!showHeader) {
     return null;
   }
-
   let span = 1;
-
   for (let i = index + 1; i < start + count; ++i) {
     if (!headerStacksAreEqual(getHeader(i), header, dimensionLevel)) {
       break;
     }
-
     ++span;
   }
-
   const currentHeader = header[dimensionLevel];
   const includesHierarchy = showHierarchy && (currentHeader === null || currentHeader === void 0 ? void 0 : currentHeader.hierarchy);
   const label = includesHierarchy ? currentHeader.hierarchy.join(' / ') : currentHeader === null || currentHeader === void 0 ? void 0 : currentHeader.name;

package/build/es/modules/pivotTable/isColorBright.js

@@ -1,20 +1,16 @@
 const calculateColorBrightness = function (rgb) {
   return Math.round((parseInt(rgb[0]) * 299 + parseInt(rgb[1]) * 587 + parseInt(rgb[2]) * 114) / 1000);
 };
-
 const isHex = color => {
   return typeof color === 'string' && color.charAt(0) === '#';
 };
-
 const hexToRgb = hex => {
   const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
   return result ? [parseInt(result[1], 16), parseInt(result[2], 16), parseInt(result[3], 16)] : null;
 };
-
 export const isColorBright = color => {
   if (isHex(color)) {
     color = hexToRgb(color);
   }
-
   return calculateColorBrightness(color) > 125;
 };

package/build/es/modules/pivotTable/measureText.js

@@ -1,23 +1,19 @@
 import { CLIPPED_CELL_MAX_SIZE, WRAPPED_TEXT_JUSTIFY_BUFFER, WRAPPED_TEXT_LINE_HEIGHT } from './pivotTableConstants.js';
 let canvas;
-
 const getContext = fontSize => {
   if (!canvas) {
     canvas = document.createElement('canvas');
   }
-
   const ctx = canvas.getContext('2d');
-  ctx.font = "".concat(fontSize, "px Roboto, Arial, sans-serif");
+  ctx.font = `${fontSize}px Roboto, Arial, sans-serif`;
   return ctx;
 };
-
 const measureText = function (text) {
   let fontSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 11;
   const ctx = getContext(fontSize);
   const textMetrics = ctx.measureText(text);
   return textMetrics.width;
 };
-
 export const measureTextWithWrapping = (text, _ref) => {
   let {
     fontSize = 11,
@@ -25,31 +21,27 @@ export const measureTextWithWrapping = (text, _ref) => {
     justifyBuffer = WRAPPED_TEXT_JUSTIFY_BUFFER,
     lineHeight = WRAPPED_TEXT_LINE_HEIGHT
   } = _ref;
-
   if (!text) {
     return {
       width: 0,
       height: 0
     };
-  } // Multiple consecutive linebreaks are combined into one
-
-
+  }
+  // Multiple consecutive linebreaks are combined into one
   const paragraphs = String(text).split(/\n/);
   const lines = [];
   let currentLine = '';
   let currentLineWidth = 0;
   let maxLineWidth = 0;
-
   while (paragraphs.length) {
     // Currently, all different whitespace types are ignored and assumed to be just a space
     const words = paragraphs.shift().split(/\s+/);
-
     while (words.length) {
       const nextWord = (currentLineWidth === 0 ? '' : ' ') + words.shift();
       const nextWordWidth = measureText(nextWord, fontSize);
-
       if (maxWidth && currentLineWidth + nextWordWidth > maxWidth) {
-        if (currentLineWidth <= maxWidth - justifyBuffer) {// Wrapping this word would cause an unnaturally short line
+        if (currentLineWidth <= maxWidth - justifyBuffer) {
+          // Wrapping this word would cause an unnaturally short line
           // For now we allow the cell to expand to fit this word
           // In the future, we might intelligently hyphenate the word
           // TODO: if splitting words how would we localize hyphens?
@@ -60,25 +52,20 @@ export const measureTextWithWrapping = (text, _ref) => {
           currentLine = '';
           currentLineWidth = 0;
           words.unshift(nextWord.substring(1)); // Get rid of the extra space
-
           continue;
         }
       }
-
       currentLine += nextWord;
       currentLineWidth += nextWordWidth;
     }
-
     if (currentLineWidth > 0) {
       maxLineWidth = Math.max(currentLineWidth, maxLineWidth);
       lines.push(currentLine);
     }
   }
-
   return {
     normalizedText: lines.join('\n'),
     width: maxLineWidth,
     height: lines.length * fontSize * lineHeight // TODO: use lineHeight=1 for last line?
-
   };
 };

package/build/es/modules/pivotTable/parseValue.js

@@ -1,9 +1,7 @@
 export const parseValue = valueString => {
   const parsedValue = parseFloat(valueString);
-
   if (isNaN(parsedValue)) {
     return valueString;
   }
-
   return parsedValue;
 };

package/build/es/modules/pivotTable/useParentSize.js

@@ -12,24 +12,19 @@ export const useParentSize = function (elementRef, renderCounter) {
   });
   useEffect(() => {
     const el = elementRef.current && elementRef.current.parentElement;
-
     if (!el) {
       return;
     }
-
     const onResize = () => {
       setSize({
         width: el.clientWidth,
         height: el.clientHeight
       });
     };
-
     onResize(el);
-
     if (renderCounter) {
       setSize(initialState);
     }
-
     const observer = new ResizeObserver(onResize);
     observer.observe(el);
     return () => observer.disconnect();

package/build/es/modules/pivotTable/useScrollPosition.js

@@ -15,11 +15,9 @@ export const useScrollPosition = function (containerRef) {
   }, debounceWait));
   useEffect(() => {
     const currentRef = containerRef.current;
-
     if (!currentRef) {
       return;
     }
-
     currentRef.addEventListener('scroll', onScroll);
     return () => {
       currentRef.removeEventListener('scroll', onScroll);

package/build/es/modules/pivotTable/useSortableColumns.js

@@ -2,10 +2,8 @@ import { useState } from 'react';
 import { SORT_ORDER_ASCENDING, SORT_ORDER_DESCENDING } from './pivotTableConstants.js';
 export const useSortableColumns = engine => {
   const [sortBy, setSortBy] = useState(null);
-
   const onSortByColumn = column => {
     let order = SORT_ORDER_ASCENDING;
-
     if (sortBy && sortBy.column === column) {
       if (sortBy.order === SORT_ORDER_ASCENDING) {
         order = SORT_ORDER_DESCENDING;
@@ -15,7 +13,6 @@ export const useSortableColumns = engine => {
         return;
       }
     }
-
     engine.sort(column, order);
     setSortBy({
       column,

package/build/es/modules/predefinedDimensions.js

@@ -35,7 +35,8 @@ export const getDynamicDimensions = () => ({
     [DIMENSION_PROP_NO_ITEMS]: true
   }
 });
-export const getPredefinedDimensions = () => ({ ...getFixedDimensions(),
+export const getPredefinedDimensions = () => ({
+  ...getFixedDimensions(),
   ...getDynamicDimensions()
 });
 export const filterOutPredefinedDimensions = dimensionIds => dimensionIds.filter(dimensionId => !Object.keys(getPredefinedDimensions()).includes(dimensionId));

package/build/es/modules/renderValue.js

@@ -1,63 +1,48 @@
 import { NUMBER_TYPE_ROW_PERCENTAGE, NUMBER_TYPE_COLUMN_PERCENTAGE } from './pivotTable/pivotTableConstants.js';
 import { isNumericValueType } from './valueTypes.js';
-
 const trimTrailingZeros = stringValue => stringValue.replace(/\.?0+$/, '');
-
 const decimalSeparator = '.';
-
 const separateDigitGroups = (stringValue, decimalSeparator) => {
   const isNegative = stringValue[0] === '-';
   const [integer, remainder] = stringValue.replace(/^-/, '').split('.');
   const groups = [];
-
   for (let i = integer.length; i > 0; i -= 3) {
     groups.unshift(integer.substring(i - 3, i));
   }
-
   if (isNegative) {
     groups[0] = '-' + groups[0];
   }
-
   if (remainder) {
     const trimmedRemainder = trimTrailingZeros(remainder);
-
     if (trimmedRemainder.length) {
       groups[groups.length - 1] += decimalSeparator + remainder;
     }
   }
-
   return groups;
 };
-
 const getSeparator = visualization => {
   switch (visualization.digitGroupSeparator) {
     case 'SPACE':
       return ' ';
-
     case 'COMMA':
       return ',';
-
     case 'NONE':
     default:
       return '';
   }
 };
-
 const toFixedPrecisionString = (value, skipRounding) => {
   if (typeof value !== 'number') {
     // Values returned from the server should keep their string representation
     return value;
   }
-
   const precision = skipRounding ? 10 : value > -1 && value < 1 ? 2 : 1;
   return value.toFixed(precision);
 };
-
 export const renderValue = (value, valueType, visualization) => {
   if (!isNumericValueType(valueType) || value === undefined) {
     return String(value).replace(/[^\S\n]+/, ' ');
   }
-
   if (visualization.numberType === NUMBER_TYPE_ROW_PERCENTAGE || visualization.numberType === NUMBER_TYPE_COLUMN_PERCENTAGE) {
     const stringValue = trimTrailingZeros(toFixedPrecisionString(value * 100, visualization.skipRounding));
     return separateDigitGroups(stringValue, decimalSeparator).join(getSeparator(visualization)) + '%';

package/build/es/modules/valueTypes.js

@@ -1,6 +1,7 @@
 /* These types match the types in the backend
   https://github.com/dhis2/dhis2-core/blob/master/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ValueType.java
 */
+
 export const VALUE_TYPE_NUMBER = 'NUMBER';
 export const VALUE_TYPE_UNIT_INTERVAL = 'UNIT_INTERVAL';
 export const VALUE_TYPE_PERCENTAGE = 'PERCENTAGE';

package/build/es/modules/visTypes.js

@@ -59,11 +59,9 @@ export const visTypeIcons = {
 };
 export const getDisplayNameByVisType = visType => {
   const displayName = visTypeDisplayNames[visType];
-
   if (!displayName) {
-    throw new Error("".concat(visType, " is not a valid visualization type"));
+    throw new Error(`${visType} is not a valid visualization type`);
   }
-
   return displayName;
 };
 const stackedTypes = [VIS_TYPE_STACKED_COLUMN, VIS_TYPE_STACKED_BAR, VIS_TYPE_STACKED_AREA];

package/build/es/visualizations/config/adapters/dhis_dhis/index.js

@@ -20,11 +20,11 @@ export default function (_ref) {
     title: getTitle(layout, metaData, extraOptions.dashboard),
     subtitle: getSubtitle(layout, metaData, extraOptions.dashboard)
   };
-  const indicatorType = metaData.items[metaData.dimensions.dx[0]].indicatorType; // Use % symbol for factor 100 and the full string for others
+  const indicatorType = metaData.items[metaData.dimensions.dx[0]].indicatorType;
 
+  // Use % symbol for factor 100 and the full string for others
   if ((indicatorType === null || indicatorType === void 0 ? void 0 : indicatorType.factor) !== INDICATOR_FACTOR_100) {
     config.subText = indicatorType === null || indicatorType === void 0 ? void 0 : indicatorType.displayName;
   }
-
   return config;
 }

package/build/es/visualizations/config/adapters/dhis_dhis/subtitle/index.js

@@ -1,34 +1,27 @@
 import { VIS_TYPE_SINGLE_VALUE } from '../../../../../modules/visTypes.js';
 import getFilterText from '../../../../util/getFilterText.js';
 import getSingleValueTitle from './singleValue.js';
-
 function getDefault(layout, dashboard, metaData) {
   if (dashboard || typeof layout.title === 'string') {
     return getFilterText(layout.filters, metaData);
   }
-
   return '';
 }
-
 export default function (layout, metaData, dashboard) {
   if (layout.hideSubtitle) {
     return '';
   }
-
   if (typeof layout.subtitle === 'string' && layout.subtitle.length) {
     return layout.subtitle;
   } else {
     let subtitle;
-
     switch (layout.type) {
       case VIS_TYPE_SINGLE_VALUE:
         subtitle = getSingleValueTitle(layout, metaData);
         break;
-
       default:
         subtitle = getDefault(layout, dashboard, metaData);
     }
-
     return subtitle;
   }
 }

package/build/es/visualizations/config/adapters/dhis_dhis/title/index.js

@@ -1,30 +1,24 @@
 import { VIS_TYPE_SINGLE_VALUE } from '../../../../../modules/visTypes.js';
 import getFilterText from '../../../../util/getFilterText.js';
 import getSingleValueTitle from './singleValue.js';
-
 function getDefault(layout, metaData, dashboard) {
   return layout.filters && !dashboard ? getFilterText(layout.filters, metaData) : '';
 }
-
 export default function (layout, metaData, dashboard) {
   if (layout.hideTitle) {
     return '';
   }
-
   if (typeof layout.title === 'string' && layout.title.length) {
     return layout.title;
   } else {
     let title;
-
     switch (layout.type) {
       case VIS_TYPE_SINGLE_VALUE:
         title = getSingleValueTitle(layout, metaData);
         break;
-
       default:
         title = getDefault(layout, metaData, dashboard);
     }
-
     return title;
   }
 }

package/build/es/visualizations/config/adapters/dhis_dhis/title/singleValue.js

@@ -7,6 +7,5 @@ export default function (layout, metaData) {
     });
     return getFilterText([column], metaData);
   }
-
   return '';
 }

package/build/es/visualizations/config/adapters/dhis_dhis/type.js

@@ -5,7 +5,6 @@ export default function (type) {
       return {
         type: VIS_TYPE_SINGLE_VALUE
       };
-
     default:
       return {
         type: VIS_TYPE_SINGLE_VALUE

package/build/es/visualizations/config/adapters/dhis_dhis/value/index.js

@@ -7,12 +7,12 @@ export default function (value, layout, metaData) {
   let formattedValue = renderValue(value, valueType || VALUE_TYPE_TEXT, {
     digitGroupSeparator: layout.digitGroupSeparator,
     skipRounding: layout.skipRounding
-  }); // only show the percentage symbol for per cent
-  // for other factors, show the full text under the value
+  });
 
+  // only show the percentage symbol for per cent
+  // for other factors, show the full text under the value
   if ((indicatorType === null || indicatorType === void 0 ? void 0 : indicatorType.factor) === INDICATOR_FACTOR_100) {
     formattedValue += '%';
   }
-
   return formattedValue;
 }