@dhis2/analytics 26.0.7 → 26.0.9

package/build/es/modules/__tests__/renderValue.spec.js

@@ -4,7 +4,8 @@ import { VALUE_TYPE_NUMBER, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VAL
 const DGS_COMMA = 'COMMA';
 const DGS_SPACE = 'SPACE';
 const DGS_NONE = 'NONE';
-const tests = [// Numbers
+const tests = [
+// Numbers
 {
   value: 1000.5,
   expected: '1 000.5',
@@ -66,7 +67,8 @@ const tests = [// Numbers
   valueType: VALUE_TYPE_NUMBER,
   round: false,
   dgs: DGS_SPACE
-}, // Numbers showing as column/row percentage
+},
+// Numbers showing as column/row percentage
 {
   value: 0.234,
   expected: '23.4%',
@@ -137,7 +139,8 @@ const tests = [// Numbers
   numberType: NUMBER_TYPE_COLUMN_PERCENTAGE,
   round: true,
   dgs: DGS_COMMA
-}, // Integers
+},
+// Integers
 {
   value: 99777888,
   expected: '99 777 888',
@@ -206,7 +209,8 @@ const tests = [// Numbers
   numberType: NUMBER_TYPE_COLUMN_PERCENTAGE,
   round: true,
   dgs: DGS_NONE
-}, // Phone number
+},
+// Phone number
 {
   value: '99777888',
   expected: '99777888',
@@ -231,7 +235,8 @@ const tests = [// Numbers
   valueType: VALUE_TYPE_PHONE_NUMBER,
   round: false,
   dgs: DGS_COMMA
-}, // Date
+},
+// Date
 {
   value: '05/04/2022',
   expected: '05/04/2022',
@@ -250,7 +255,8 @@ const tests = [// Numbers
   valueType: VALUE_TYPE_DATETIME,
   round: true,
   dgs: DGS_NONE
-}, // Percentage
+},
+// Percentage
 {
   value: 5,
   expected: '5',
@@ -270,7 +276,8 @@ const tests = [// Numbers
   numberType: NUMBER_TYPE_COLUMN_PERCENTAGE,
   round: true,
   dgs: DGS_SPACE
-}, // Unit interval
+},
+// Unit interval
 {
   value: 4,
   expected: '4',
@@ -290,7 +297,8 @@ const tests = [// Numbers
   numberType: NUMBER_TYPE_COLUMN_PERCENTAGE,
   round: true,
   dgs: DGS_COMMA
-}, // Texts
+},
+// Texts
 {
   value: 'This    string has multiple whitespace     characters',
   expected: 'This string has multiple whitespace     characters',
@@ -303,7 +311,8 @@ const tests = [// Numbers
   value: 'Characters          \nmorecharacters   here',
   expected: 'Characters \nmorecharacters   here',
   valueType: VALUE_TYPE_TEXT
-}, // Undefined values
+},
+// Undefined values
 {
   value: undefined,
   expected: 'undefined',
@@ -315,7 +324,7 @@ const tests = [// Numbers
 }];
 describe('renderValue', () => {
   tests.forEach(t => {
-    const testname = "valueType: ".concat(t.valueType, ", value: ").concat(t.value, ", dgs: ").concat(t.dgs, ", round: ").concat(t.round, ", isPercent: ").concat([NUMBER_TYPE_ROW_PERCENTAGE, NUMBER_TYPE_COLUMN_PERCENTAGE].includes(t.numberType));
+    const testname = `valueType: ${t.valueType}, value: ${t.value}, dgs: ${t.dgs}, round: ${t.round}, isPercent: ${[NUMBER_TYPE_ROW_PERCENTAGE, NUMBER_TYPE_COLUMN_PERCENTAGE].includes(t.numberType)}`;
     it(testname, () => {
       const actual = renderValue(t.value, t.valueType, {
         skipRounding: !t.round,

package/build/es/modules/axis.js

@@ -1,7 +1,6 @@
 import i18n from '../locales/index.js';
 import { AXIS_ID_COLUMNS, AXIS_ID_ROWS, AXIS_ID_FILTERS } from './layout/axis.js';
 import { LAYOUT_TYPE_DEFAULT, LAYOUT_TYPE_PIE, LAYOUT_TYPE_YEAR_OVER_YEAR, LAYOUT_TYPE_PIVOT_TABLE, LAYOUT_TYPE_SCATTER, LAYOUT_TYPE_LINE_LIST } from './layoutTypes.js';
-
 const getAxisNamesByLayoutType = layoutType => {
   switch (layoutType) {
     case LAYOUT_TYPE_DEFAULT:
@@ -13,20 +12,17 @@ const getAxisNamesByLayoutType = layoutType => {
         [AXIS_ID_ROWS]: i18n.t('Category'),
         [AXIS_ID_FILTERS]: i18n.t('Filter')
       };
-
     case LAYOUT_TYPE_PIVOT_TABLE:
       return {
         [AXIS_ID_COLUMNS]: i18n.t('Columns'),
         [AXIS_ID_ROWS]: i18n.t('Rows'),
         [AXIS_ID_FILTERS]: i18n.t('Filter')
       };
-
     case LAYOUT_TYPE_LINE_LIST:
       return {
         [AXIS_ID_COLUMNS]: i18n.t('Columns'),
         [AXIS_ID_FILTERS]: i18n.t('Filter')
       };
-
     case LAYOUT_TYPE_SCATTER:
       return {
         [AXIS_ID_ROWS]: i18n.t('Points'),
@@ -34,14 +30,11 @@ const getAxisNamesByLayoutType = layoutType => {
       };
   }
 };
-
 export const getAxisNameByLayoutType = (axisId, layoutType) => {
   const name = getAxisNamesByLayoutType(layoutType)[axisId];
-
   if (!name) {
-    throw new Error("".concat(axisId, " is not a valid axis id"));
+    throw new Error(`${axisId} is not a valid axis id`);
   }
-
   return name;
 };
 export const getAxisName = axisId => getAxisNameByLayoutType(axisId, LAYOUT_TYPE_DEFAULT);

package/build/es/modules/dataTypes.js

@@ -20,11 +20,8 @@ export const TOTALS = 'totals';
 export const DETAIL = 'detail';
 export const SUB_GROUP_DETAIL = 'DETAIL';
 export const SUB_GROUP_METRIC = 'METRIC';
-
 const getProgramText = () => i18n.t('Program');
-
 const getSelectProgramText = () => i18n.t('Select a program');
-
 export const dataTypeMap = {
   [DIMENSION_TYPE_INDICATOR]: {
     id: DIMENSION_TYPE_INDICATOR,

package/build/es/modules/dimensionListItem.js

@@ -7,27 +7,21 @@ import { REPORTING_RATE } from './dataSets.js';
 import { DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_ELEMENT_OPERAND, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM, DIMENSION_TYPE_PROGRAM_ATTRIBUTE, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, dataTypeMap as dataTypes, DIMENSION_TYPE_INDICATOR, DIMENSION_TYPE_PROGRAM_INDICATOR } from './dataTypes.js';
 export const getTooltipText = _ref => {
   var _dataTypes$type;
-
   let {
     type,
     expression
   } = _ref;
-
   if (type === DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM && expression) {
     return dataTypes[DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM].getItemName();
   }
-
   switch (type) {
     case DIMENSION_TYPE_DATA_ELEMENT_OPERAND:
       return dataTypes[DIMENSION_TYPE_DATA_ELEMENT].getItemName();
-
     case REPORTING_RATE:
       return dataTypes[DIMENSION_TYPE_DATA_SET].getItemName();
-
     case DIMENSION_TYPE_PROGRAM_DATA_ELEMENT:
     case DIMENSION_TYPE_PROGRAM_ATTRIBUTE:
       return dataTypes[DIMENSION_TYPE_EVENT_DATA_ITEM].getItemName();
-
     default:
       return (_dataTypes$type = dataTypes[type]) === null || _dataTypes$type === void 0 ? void 0 : _dataTypes$type.getItemName();
   }
@@ -36,25 +30,19 @@ export const getIcon = type => {
   switch (type) {
     case DIMENSION_TYPE_INDICATOR:
       return /*#__PURE__*/React.createElement(IconDimensionIndicator16, null);
-
     case DIMENSION_TYPE_DATA_ELEMENT_OPERAND:
     case DIMENSION_TYPE_DATA_ELEMENT:
       return DataElementIcon;
-
     case REPORTING_RATE:
       return /*#__PURE__*/React.createElement(IconDimensionDataSet16, null);
-
     case DIMENSION_TYPE_EVENT_DATA_ITEM:
     case DIMENSION_TYPE_PROGRAM_DATA_ELEMENT:
     case DIMENSION_TYPE_PROGRAM_ATTRIBUTE:
       return /*#__PURE__*/React.createElement(IconDimensionEventDataItem16, null);
-
     case DIMENSION_TYPE_PROGRAM_INDICATOR:
       return /*#__PURE__*/React.createElement(IconDimensionProgramIndicator16, null);
-
     case DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM:
       return CalculationIcon;
-
     default:
       return GenericIcon;
   }

package/build/es/modules/expressions.js

@@ -43,7 +43,6 @@ export const parseExpressionToArray = function () {
   return parseExpression(expression).map(value => {
     if (value.startsWith('#{') && value.endsWith('}')) {
       var _metadata$find;
-
       const id = value.slice(2, -1);
       const label = ((_metadata$find = metadata.find(item => item.id === id)) === null || _metadata$find === void 0 ? void 0 : _metadata$find.name) || id;
       return {
@@ -52,7 +51,6 @@ export const parseExpressionToArray = function () {
         type: EXPRESSION_TYPE_DATA
       };
     }
-
     if (isNaN(value)) {
       return {
         value,
@@ -60,7 +58,6 @@ export const parseExpressionToArray = function () {
         type: EXPRESSION_TYPE_OPERATOR
       };
     }
-
     return {
       value,
       label: value,
@@ -76,13 +73,13 @@ export const validateExpression = expression => {
   let result;
   const leftParenthesisCount = expression.split('(').length - 1;
   const rightParenthesisCount = expression.split(')').length - 1;
-
   if (!expression) {
     // empty formula
     result = {
       status: INVALID_EXPRESSION,
       message: i18n.t('Formula is empty. Add items to the formula from the lists on the left.')
-    }; // TODO: reimplement this but allow negative values, e.g. 10 / -5
+    };
+    // TODO: reimplement this but allow negative values, e.g. 10 / -5
     // } else if (/[-+/*]{2,}/.test(expression)) {
     //     // two math operators next to each other
     //     result = {
@@ -120,7 +117,6 @@ export const validateExpression = expression => {
       message: i18n.t('Missing left parenthesis (')
     };
   }
-
   return result;
 };
 export const getItemIdsFromExpression = function () {

package/build/es/modules/fontStyle.js

@@ -1,27 +1,29 @@
 /*eslint no-unused-vars: ["error", { "ignoreRestSiblings": true }]*/
 import { colors } from '@dhis2/ui';
-import i18n from '../locales/index.js'; // Font styles
+import i18n from '../locales/index.js';
 
+// Font styles
 export const FONT_STYLE_VISUALIZATION_TITLE = 'visualizationTitle';
 export const FONT_STYLE_VISUALIZATION_SUBTITLE = 'visualizationSubtitle';
 export const FONT_STYLE_HORIZONTAL_AXIS_TITLE = 'horizontalAxisTitle';
 export const FONT_STYLE_VERTICAL_AXIS_TITLE = 'verticalAxisTitle';
 export const FONT_STYLE_LEGEND = 'legend';
 export const FONT_STYLE_AXIS_LABELS = 'axisLabel';
-export const FONT_STYLE_REGRESSION_LINE_LABEL = 'regressionLineLabel'; // Options
-
+export const FONT_STYLE_REGRESSION_LINE_LABEL = 'regressionLineLabel';
+// Options
 export const FONT_STYLE_OPTION_FONT = 'font';
 export const FONT_STYLE_OPTION_FONT_SIZE = 'fontSize';
 export const FONT_STYLE_OPTION_BOLD = 'bold';
 export const FONT_STYLE_OPTION_ITALIC = 'italic';
 export const FONT_STYLE_OPTION_UNDERLINE = 'underline';
 export const FONT_STYLE_OPTION_TEXT_COLOR = 'textColor';
-export const FONT_STYLE_OPTION_TEXT_ALIGN = 'textAlign'; // Text align
-
+export const FONT_STYLE_OPTION_TEXT_ALIGN = 'textAlign';
+// Text align
 export const TEXT_ALIGN_LEFT = 'LEFT';
 export const TEXT_ALIGN_CENTER = 'CENTER';
-export const TEXT_ALIGN_RIGHT = 'RIGHT'; // Tiers
+export const TEXT_ALIGN_RIGHT = 'RIGHT';
 
+// Tiers
 const TIER1 = 'tier1';
 const TIER2 = 'tier2';
 export const getFontSizeOptions = fontStyleKey => {
@@ -66,18 +68,15 @@ export const getTextAlignOptions = (fontStyleKey, isVertical) => {
     case FONT_STYLE_HORIZONTAL_AXIS_TITLE:
     case FONT_STYLE_VERTICAL_AXIS_TITLE:
       return axisTitleAlignOptions();
-
     case FONT_STYLE_VISUALIZATION_TITLE:
     case FONT_STYLE_VISUALIZATION_SUBTITLE:
     case FONT_STYLE_LEGEND:
       return defaultAlignOptions();
-
     case FONT_STYLE_REGRESSION_LINE_LABEL:
     default:
       return isVertical ? verticalAlignOptions() : defaultAlignOptions();
   }
 };
-
 const defaultAlignOptions = () => [{
   label: i18n.t('Left'),
   value: TEXT_ALIGN_LEFT
@@ -88,7 +87,6 @@ const defaultAlignOptions = () => [{
   label: i18n.t('Right'),
   value: TEXT_ALIGN_RIGHT
 }];
-
 const axisTitleAlignOptions = () => [{
   label: i18n.t('Start'),
   value: TEXT_ALIGN_LEFT
@@ -99,7 +97,6 @@ const axisTitleAlignOptions = () => [{
   label: i18n.t('End'),
   value: TEXT_ALIGN_RIGHT
 }];
-
 const verticalAlignOptions = () => [{
   label: i18n.t('Top'),
   value: TEXT_ALIGN_LEFT
@@ -110,7 +107,6 @@ const verticalAlignOptions = () => [{
   label: i18n.t('Bottom'),
   value: TEXT_ALIGN_RIGHT
 }];
-
 const defaultFont = 'Roboto';
 export const defaultFontStyle = {
   [FONT_STYLE_VISUALIZATION_TITLE]: {
@@ -176,13 +172,17 @@ export const defaultFontStyle = {
     [FONT_STYLE_OPTION_TEXT_ALIGN]: TEXT_ALIGN_LEFT
   }
 };
-export const mergeFontStyleWithDefault = (fontStyle, fontStyleKey) => ({ ...defaultFontStyle[fontStyleKey],
+export const mergeFontStyleWithDefault = (fontStyle, fontStyleKey) => ({
+  ...defaultFontStyle[fontStyleKey],
   ...fontStyle
-}); //FIXME: Is this function unused? Remove?
+});
 
+//FIXME: Is this function unused? Remove?
 export const deleteFontStyleOption = (inputFontStyle, fontStyleKey, option) => {
-  const style = { ...inputFontStyle,
-    [fontStyleKey]: { ...inputFontStyle[fontStyleKey]
+  const style = {
+    ...inputFontStyle,
+    [fontStyleKey]: {
+      ...inputFontStyle[fontStyleKey]
     }
   };
   style[fontStyleKey] && delete style[fontStyleKey][option];

package/build/es/modules/getAdaptedUiLayoutByType.js

@@ -4,40 +4,34 @@ import { DIMENSION_ID_DATA, DIMENSION_ID_ORGUNIT, DIMENSION_ID_PERIOD } from './
 import { VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_PIE, VIS_TYPE_GAUGE, VIS_TYPE_SINGLE_VALUE, VIS_TYPE_PIVOT_TABLE, VIS_TYPE_SCATTER, isTwoCategoryChartType } from './visTypes.js';
 export const getAdaptedUiLayoutByType = (layout, type) => {
   var _layout$rows;
-
   if (isTwoCategoryChartType(type) && ((_layout$rows = layout.rows) === null || _layout$rows === void 0 ? void 0 : _layout$rows.length) > 1) {
     return getDualCategoryLayout(layout);
   }
-
   switch (type) {
     case VIS_TYPE_YEAR_OVER_YEAR_LINE:
     case VIS_TYPE_YEAR_OVER_YEAR_COLUMN:
       {
         return getYearOverYearLayout(layout);
       }
-
     case VIS_TYPE_PIE:
       {
         return getPieLayout(layout);
       }
-
     case VIS_TYPE_SINGLE_VALUE:
     case VIS_TYPE_GAUGE:
       {
         return getSingleValueLayout(layout);
       }
-
     case VIS_TYPE_PIVOT_TABLE:
       return layout;
-
     case VIS_TYPE_SCATTER:
       return getScatterLayout(layout);
-
     default:
       return getDefaultLayout(layout);
   }
-}; // Transform from ui.layout to default layout format
+};
 
+// Transform from ui.layout to default layout format
 const getDefaultLayout = layout => {
   const columns = layout[AXIS_ID_COLUMNS].slice();
   const rows = layout[AXIS_ID_ROWS].slice();
@@ -47,7 +41,6 @@ const getDefaultLayout = layout => {
     [AXIS_ID_FILTERS]: [...layout[AXIS_ID_FILTERS], ...columns, ...rows]
   };
 };
-
 const getDualCategoryLayout = layout => {
   const columns = layout[AXIS_ID_COLUMNS].slice();
   const rows = layout[AXIS_ID_ROWS].slice();
@@ -56,9 +49,9 @@ const getDualCategoryLayout = layout => {
     [AXIS_ID_ROWS]: rows.length > 2 ? rows.splice(0, 2) : rows.splice(0, rows.length),
     [AXIS_ID_FILTERS]: [...layout[AXIS_ID_FILTERS], ...columns, ...rows]
   };
-}; // Transform from ui.layout to pie layout format
-
+};
 
+// Transform from ui.layout to pie layout format
 const getPieLayout = layout => {
   const columns = layout[AXIS_ID_COLUMNS].slice();
   const rows = layout[AXIS_ID_ROWS].slice();
@@ -68,57 +61,49 @@ const getPieLayout = layout => {
     [AXIS_ID_FILTERS]: [...layout[AXIS_ID_FILTERS], ...columns, ...rows]
   };
 };
-
 const getYearOverYearLayout = layout => ({
   [AXIS_ID_COLUMNS]: [],
   [AXIS_ID_ROWS]: [],
   [AXIS_ID_FILTERS]: [...layout[AXIS_ID_FILTERS], ...layout[AXIS_ID_COLUMNS], ...layout[AXIS_ID_ROWS]].filter(dim => getDimensionId(dim) !== DIMENSION_ID_PERIOD)
 });
-
 const getScatterLayout = layout => ({
   [AXIS_ID_COLUMNS]: [DIMENSION_ID_DATA],
   [AXIS_ID_ROWS]: [DIMENSION_ID_ORGUNIT],
   [AXIS_ID_FILTERS]: [...layout[AXIS_ID_COLUMNS], ...layout[AXIS_ID_ROWS], ...layout[AXIS_ID_FILTERS]].filter(dim => ![DIMENSION_ID_DATA, DIMENSION_ID_ORGUNIT].includes(getDimensionId(dim)))
-}); // Transform from ui.layout to single value layout format
-
+});
 
+// Transform from ui.layout to single value layout format
 const getSingleValueLayout = layout => {
   const columns = layout[AXIS_ID_COLUMNS].slice();
   const rows = layout[AXIS_ID_ROWS].slice();
   const filters = layout[AXIS_ID_FILTERS].slice();
   let dxDimensionArr = [];
   const clonedLayout = [columns, rows, filters];
-
   for (let i = 0; i < clonedLayout.length; ++i) {
     const axis = clonedLayout[i];
-
     for (let j = 0; j < axis.length; ++j) {
       const dimension = axis[j];
-
       if (getDimensionId(dimension) == DIMENSION_ID_DATA) {
         dxDimensionArr = axis.splice(j, 1);
         break;
       }
     }
-
     if (dxDimensionArr.length > 0) {
       break;
     }
   }
-
   return {
     [AXIS_ID_COLUMNS]: dxDimensionArr,
     [AXIS_ID_ROWS]: [],
     [AXIS_ID_FILTERS]: [...filters, ...columns, ...rows]
   };
 };
+
 /**
  *
  * @param {string|object} dimension
  * @returns {string}
  */
-
-
 const getDimensionId = dimension => {
   return isObject(dimension) ? dimension.dimension : dimension;
 };

package/build/es/modules/getOuLevelAndGroupText.js

@@ -7,31 +7,24 @@ export const getOuLevelAndGroupText = (filter, metaData) => {
   if (!dimensionIs(DIMENSION_ID_ORGUNIT)) {
     return '';
   }
-
   const items = dimensionGetItems(filter);
   const hasOuLevel = items.some(item => ouIdHelper.hasLevelPrefix(item.id));
   const hasOuGroup = items.some(item => ouIdHelper.hasGroupPrefix(item.id));
   const filterFragments = [];
-
   if (hasOuGroup) {
     filterFragments.push(getLevelAndGroupText(items, metaData, false));
   }
-
   if (hasOuLevel) {
     filterFragments.push(getLevelAndGroupText(items, metaData, true));
   }
-
   return filterFragments.join(' - ');
 };
-
 const getLevelAndGroupText = (items, metaData, isLevel) => {
   const getNameFromMetadata = id => metaData.items[id] ? metaData.items[id].name : id;
-
   const dynamicOuItems = items.filter(item => isLevel ? ouIdHelper.hasLevelPrefix(item.id) : ouIdHelper.hasGroupPrefix(item.id));
   const lastItem = dynamicOuItems.length > 1 ? dynamicOuItems.pop() : null;
   const dynamicOuNames = dynamicOuItems.map(item => getNameFromMetadata(ouIdHelper.removePrefix(item.id))).join(', ');
   let allDynamicOuNames;
-
   if (lastItem) {
     const lastOuName = getNameFromMetadata(ouIdHelper.removePrefix(lastItem.id));
     allDynamicOuNames = i18n.t('{{dynamicOuNames}} and {{lastOuName}}', {
@@ -41,10 +34,8 @@ const getLevelAndGroupText = (items, metaData, isLevel) => {
   } else {
     allDynamicOuNames = dynamicOuNames;
   }
-
   const staticOuNames = items.filter(item => !ouIdHelper.hasGroupPrefix(item.id) && !ouIdHelper.hasLevelPrefix(item.id)).map(item => getNameFromMetadata(item.id)).join(', ');
   let ouLevelAndGroupText = '';
-
   if (!staticOuNames) {
     if (isLevel) {
       ouLevelAndGroupText = i18n.t('{{allDynamicOuNames}} levels', {
@@ -68,6 +59,5 @@ const getLevelAndGroupText = (items, metaData, isLevel) => {
       });
     }
   }
-
   return ouLevelAndGroupText;
 };

package/build/es/modules/hash.js

@@ -1,12 +1,9 @@
 import SHA1 from 'crypto-js/sha1';
 import { DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM } from './dataTypes.js';
 import { layoutGetAllItems } from './layout/layoutGetAllItems.js';
-
 const isValidValue = value => typeof value === 'string' && value.length;
-
 export const getHash = value => isValidValue(value) ? SHA1(value).toString() : undefined;
 export const getExpressionHashFromVisualization = visualization => {
   var _layoutGetAllItems;
-
   return getHash((_layoutGetAllItems = layoutGetAllItems(visualization)) === null || _layoutGetAllItems === void 0 ? void 0 : _layoutGetAllItems.filter(item => item.dimensionItemType === DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM && isValidValue(item.expression)).sort((i1, i2) => i1.id < i2.id ? -1 : i1.id > i2.id ? 1 : 0).map(edi => edi.expression).join(''));
 };

package/build/es/modules/layout/__tests__/layoutHasDataDimension.spec.js

@@ -4,7 +4,8 @@ import { TEST_LAYOUT } from '../testResources.js';
 describe('layoutHasDataDimension', () => {
   it('should return true if the dx dimension is found in the layout, otherwise false', () => {
     expect(layoutHasDataDimension(TEST_LAYOUT)).toBe(true);
-    const layoutWithoutData = { ...TEST_LAYOUT,
+    const layoutWithoutData = {
+      ...TEST_LAYOUT,
       [AXIS_ID_COLUMNS]: AXIS.defaultValue
     };
     expect(layoutHasDataDimension(layoutWithoutData)).toBe(false);

package/build/es/modules/layout/__tests__/layoutHasDimension.spec.js

@@ -5,7 +5,8 @@ import { TEST_LAYOUT } from '../testResources.js';
 describe('layoutHasDimension', () => {
   it('should return true if the dimension id is found in the layout, otherwise false', () => {
     expect(layoutHasDimension(TEST_LAYOUT, DIMENSION_ID_ORGUNIT)).toBe(true);
-    const layoutWithoutPeriod = { ...TEST_LAYOUT,
+    const layoutWithoutPeriod = {
+      ...TEST_LAYOUT,
       [AXIS_ID_FILTERS]: AXIS.defaultValue
     };
     expect(layoutHasDimension(layoutWithoutPeriod, DIMENSION_ID_ORGUNIT)).toBe(false);

package/build/es/modules/layout/__tests__/layoutHasDynamicDimension.spec.js

@@ -4,7 +4,8 @@ import { TEST_LAYOUT } from '../testResources.js';
 describe('layoutHasDynamicDimension', () => {
   it('should return true if a dynamic dimension id is found in the layout, otherwise false', () => {
     expect(layoutHasDynamicDimension(TEST_LAYOUT)).toBe(true);
-    const layoutWithoutDynamicDimension = { ...TEST_LAYOUT,
+    const layoutWithoutDynamicDimension = {
+      ...TEST_LAYOUT,
       [AXIS_ID_FILTERS]: AXIS.defaultValue
     };
     expect(layoutHasDynamicDimension(layoutWithoutDynamicDimension)).toBe(false);

package/build/es/modules/layout/__tests__/layoutHasPeriodDimension.spec.js

@@ -4,7 +4,8 @@ import { TEST_LAYOUT } from '../testResources.js';
 describe('layoutHasPeriodDimension', () => {
   it('should return true if the pe dimension is found in the layout, otherwise false', () => {
     expect(layoutHasPeriodDimension(TEST_LAYOUT)).toBe(true);
-    const layoutWithoutPeriod = { ...TEST_LAYOUT,
+    const layoutWithoutPeriod = {
+      ...TEST_LAYOUT,
       [AXIS_ID_ROWS]: AXIS.defaultValue
     };
     expect(layoutHasPeriodDimension(layoutWithoutPeriod)).toBe(false);

package/build/es/modules/layout/axis.js

@@ -1,14 +1,18 @@
 // Axis
+
 export const AXIS = {
   defaultValue: [],
   isValid: axis => Array.isArray(axis)
-}; // Axis ids
+};
+
+// Axis ids
 
 export const AXIS_ID_COLUMNS = 'columns';
 export const AXIS_ID_ROWS = 'rows';
 export const AXIS_ID_FILTERS = 'filters';
 export const AXIS_ID_YEAR_OVER_YEAR_SERIES = 'yearOverYearSeries';
-export const AXIS_ID_YEAR_OVER_YEAR_CATEGORY = 'yearOverYearCategory'; //export const AXIS_ID_POINTS_CATEGORY = 'pointsCategory'
+export const AXIS_ID_YEAR_OVER_YEAR_CATEGORY = 'yearOverYearCategory';
+//export const AXIS_ID_POINTS_CATEGORY = 'pointsCategory'
 
 export const DEFAULT_AXIS_IDS = [AXIS_ID_COLUMNS, AXIS_ID_ROWS, AXIS_ID_FILTERS];
 export const ALL_AXIS_IDS = [AXIS_ID_COLUMNS, AXIS_ID_ROWS, AXIS_ID_FILTERS, AXIS_ID_YEAR_OVER_YEAR_SERIES, AXIS_ID_YEAR_OVER_YEAR_CATEGORY];

package/build/es/modules/layout/dimension.js

@@ -1,9 +1,13 @@
 import isObject from 'lodash/isObject';
-import isString from 'lodash/isString'; // Dimension
+import isString from 'lodash/isString';
+
+// Dimension
 
 export const DIMENSION = {
   isValid: dimension => isObject(dimension)
-}; // Props
+};
+
+// Props
 
 export const DIMENSION_PROP_ID = {
   name: 'dimension',

package/build/es/modules/layout/dimensionGetId.js

@@ -1,6 +1,5 @@
 import { DIMENSION_PROP_ID, DIMENSION_PROP_PROGRAM_STAGE } from './dimension.js';
 export const dimensionGetId = dimension => {
   var _dimension$DIMENSION_;
-
-  return (_dimension$DIMENSION_ = dimension[DIMENSION_PROP_PROGRAM_STAGE.name]) !== null && _dimension$DIMENSION_ !== void 0 && _dimension$DIMENSION_.id ? "".concat(dimension[DIMENSION_PROP_PROGRAM_STAGE.name].id, ".").concat(dimension[DIMENSION_PROP_ID.name]) : dimension[DIMENSION_PROP_ID.name];
+  return (_dimension$DIMENSION_ = dimension[DIMENSION_PROP_PROGRAM_STAGE.name]) !== null && _dimension$DIMENSION_ !== void 0 && _dimension$DIMENSION_.id ? `${dimension[DIMENSION_PROP_PROGRAM_STAGE.name].id}.${dimension[DIMENSION_PROP_ID.name]}` : dimension[DIMENSION_PROP_ID.name];
 };

package/build/es/modules/layout/dimensionIsValid.js

@@ -4,20 +4,15 @@ export const dimensionIsValid = function (dimension) {
   let {
     requireItems
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
   if (!DIMENSION.isValid(dimension)) {
     return false;
   }
-
   const requiredProps = DIMENSION_PROPS.filter(prop => prop.required);
-
   if (!requiredProps.every(prop => prop.isValid(dimension[prop.name]))) {
     return false;
   }
-
   if (requireItems === true && dimensionIsEmpty(dimension)) {
     return false;
   }
-
   return true;
 };

package/build/es/modules/layout/item.js

@@ -1,9 +1,13 @@
 import isObject from 'lodash/isObject';
-import isString from 'lodash/isString'; // Item
+import isString from 'lodash/isString';
+
+// Item
 
 export const ITEM = {
   isValid: item => isObject(item)
-}; // Props
+};
+
+// Props
 
 export const ITEM_PROP_ID = {
   name: 'id',