@dhis2/analytics 26.4.1 → 26.5.0

package/build/es/locales/en/translations.json

@@ -44,6 +44,7 @@
     "Drag items here, or double click in the list, to start building a calculation formula": "Drag items here, or double click in the list, to start building a calculation formula",
     "Math operators": "Math operators",
     "Data Type": "Data Type",
+    "Only {{dataType}} can be used in {{visType}}": "Only {{dataType}} can be used in {{visType}}",
     "All types": "All types",
     "Disaggregation": "Disaggregation",
     "No data": "No data",
@@ -54,10 +55,12 @@
     "No data sets found": "No data sets found",
     "No event data items found": "No event data items found",
     "No program indicators found": "No program indicators found",
+    "No calculations found": "No calculations found",
     "No indicators found for \"{{- searchTerm}}\"": "No indicators found for \"{{- searchTerm}}\"",
     "No data sets found for \"{{- searchTerm}}\"": "No data sets found for \"{{- searchTerm}}\"",
     "No event data items found for \"{{- searchTerm}}\"": "No event data items found for \"{{- searchTerm}}\"",
     "No program indicators found for \"{{- searchTerm}}\"": "No program indicators found for \"{{- searchTerm}}\"",
+    "No calculations found for \"{{- searchTerm}}\"": "No calculations found for \"{{- searchTerm}}\"",
     "Nothing found for \"{{- searchTerm}}\"": "Nothing found for \"{{- searchTerm}}\"",
     "Calculation": "Calculation",
     "Metric type": "Metric type",
@@ -201,9 +204,9 @@
     "Year": "Year",
     "Select year": "Select year",
     "Period": "Period",
+    "Selected Periods": "Selected Periods",
     "Relative periods": "Relative periods",
     "Fixed periods": "Fixed periods",
-    "Selected Periods": "Selected Periods",
     "No periods selected": "No periods selected",
     "Daily": "Daily",
     "Weekly": "Weekly",
@@ -371,6 +374,7 @@
     "Radar": "Radar",
     "Scatter": "Scatter",
     "Single value": "Single value",
+    "Outlier table": "Outlier table",
     "All charts": "All charts",
     "{{seriesName}} (trend)": "{{seriesName}} (trend)",
     "Trend": "Trend",

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

@@ -1,9 +1,10 @@
 import { getAdaptedUiLayoutByType } from '../getAdaptedUiLayoutByType.js';
 import { AXIS_ID_COLUMNS, AXIS_ID_ROWS, AXIS_ID_FILTERS } from '../layout/axis.js';
 import { DIMENSION_ID_DATA, DIMENSION_ID_PERIOD, DIMENSION_ID_ORGUNIT } from '../predefinedDimensions.js';
-import { VIS_TYPE_COLUMN, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_BAR, VIS_TYPE_PIE, VIS_TYPE_SINGLE_VALUE } from '../visTypes.js';
+import { VIS_TYPE_COLUMN, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_BAR, VIS_TYPE_PIE, VIS_TYPE_SINGLE_VALUE, VIS_TYPE_OUTLIER_TABLE } from '../visTypes.js';
 const someId = 'someId';
 const otherId = 'otherId';
+const thirdId = 'thirdId';
 describe('getAdaptedUiLayoutByType', () => {
   it('column: moves all extra dimensions in columns and rows to filters', () => {
     const initialState = {
@@ -107,6 +108,20 @@ describe('getAdaptedUiLayoutByType', () => {
     };
     expect(actualState).toEqual(expectedState);
   });
+  it('outlier table: removes all dimensions but dx,pe,ou which are moved to columns', () => {
+    const initialState = {
+      [AXIS_ID_COLUMNS]: [DIMENSION_ID_DATA, someId],
+      [AXIS_ID_ROWS]: [DIMENSION_ID_PERIOD, otherId],
+      [AXIS_ID_FILTERS]: [DIMENSION_ID_ORGUNIT, thirdId]
+    };
+    const actualState = getAdaptedUiLayoutByType(initialState, VIS_TYPE_OUTLIER_TABLE);
+    const expectedState = {
+      [AXIS_ID_COLUMNS]: [DIMENSION_ID_DATA, DIMENSION_ID_PERIOD, DIMENSION_ID_ORGUNIT],
+      [AXIS_ID_ROWS]: [],
+      [AXIS_ID_FILTERS]: []
+    };
+    expect(actualState).toEqual(expectedState);
+  });
   it('pivot -> sv with dimension strings', () => {
     const initialLayout = {
       [AXIS_ID_COLUMNS]: [DIMENSION_ID_DATA, DIMENSION_ID_PERIOD],

package/build/es/modules/axis.js

@@ -1,6 +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';
+import { LAYOUT_TYPE_DEFAULT, LAYOUT_TYPE_PIE, LAYOUT_TYPE_YEAR_OVER_YEAR, LAYOUT_TYPE_PIVOT_TABLE, LAYOUT_TYPE_SCATTER, LAYOUT_TYPE_LINE_LIST, LAYOUT_TYPE_OUTLIER_TABLE } from './layoutTypes.js';
 const getAxisNamesByLayoutType = layoutType => {
   switch (layoutType) {
     case LAYOUT_TYPE_DEFAULT:
@@ -28,6 +28,10 @@ const getAxisNamesByLayoutType = layoutType => {
         [AXIS_ID_ROWS]: i18n.t('Points'),
         [AXIS_ID_FILTERS]: i18n.t('Filter')
       };
+    case LAYOUT_TYPE_OUTLIER_TABLE:
+      return {
+        [AXIS_ID_COLUMNS]: i18n.t('Columns')
+      };
   }
 };
 export const getAxisNameByLayoutType = (axisId, layoutType) => {

package/build/es/modules/getAdaptedUiLayoutByType.js

@@ -1,7 +1,7 @@
 import isObject from 'lodash/isObject';
 import { AXIS_ID_COLUMNS, AXIS_ID_ROWS, AXIS_ID_FILTERS } from './layout/axis.js';
 import { DIMENSION_ID_DATA, DIMENSION_ID_ORGUNIT, DIMENSION_ID_PERIOD } from './predefinedDimensions.js';
-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';
+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, VIS_TYPE_OUTLIER_TABLE, 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) {
@@ -26,6 +26,8 @@ export const getAdaptedUiLayoutByType = (layout, type) => {
       return layout;
     case VIS_TYPE_SCATTER:
       return getScatterLayout(layout);
+    case VIS_TYPE_OUTLIER_TABLE:
+      return getOutlierTableLayout(layout);
     default:
       return getDefaultLayout(layout);
   }
@@ -99,6 +101,13 @@ const getSingleValueLayout = layout => {
   };
 };
 
+// Transform from ui.layout to outlier table layout format
+const getOutlierTableLayout = () => ({
+  [AXIS_ID_COLUMNS]: [DIMENSION_ID_DATA, DIMENSION_ID_PERIOD, DIMENSION_ID_ORGUNIT],
+  [AXIS_ID_ROWS]: [],
+  [AXIS_ID_FILTERS]: []
+});
+
 /**
  *
  * @param {string|object} dimension

package/build/es/modules/layoutTypes.js

@@ -4,4 +4,5 @@ export const LAYOUT_TYPE_SINGLE_VALUE = 'LAYOUT_TYPE_SINGLE_VALUE';
 export const LAYOUT_TYPE_YEAR_OVER_YEAR = 'LAYOUT_TYPE_YEAR_OVER_YEAR';
 export const LAYOUT_TYPE_PIVOT_TABLE = 'LAYOUT_TYPE_PIVOT_TABLE';
 export const LAYOUT_TYPE_SCATTER = 'LAYOUT_TYPE_SCATTER';
-export const LAYOUT_TYPE_LINE_LIST = 'LAYOUT_TYPE_LINE_LIST';
+export const LAYOUT_TYPE_LINE_LIST = 'LAYOUT_TYPE_LINE_LIST';
+export const LAYOUT_TYPE_OUTLIER_TABLE = 'LAYOUT_TYPE_OUTLIER_TABLE';

package/build/es/modules/layoutUiRules/__tests__/rules.spec.js

@@ -1,14 +1,16 @@
 import { ALL_AXIS_IDS } from '../../layout/axis.js';
-import { DIMENSION_ID_DATA, DIMENSION_ID_ORGUNIT, DIMENSION_ID_PERIOD } from '../../predefinedDimensions.js';
+import { DIMENSION_ID_DATA, DIMENSION_ID_ORGUNIT, DIMENSION_ID_PERIOD, DIMENSION_ID_ASSIGNED_CATEGORIES } from '../../predefinedDimensions.js';
 import { testResourceRules, testResourceRequiredProps, testResourceAllRuleProps } from '../rules.js';
 
 // Consts
+const validDims = [DIMENSION_ID_DATA, DIMENSION_ID_PERIOD, DIMENSION_ID_ORGUNIT];
 const lockableDims = [DIMENSION_ID_DATA, DIMENSION_ID_PERIOD, DIMENSION_ID_ORGUNIT];
-const disallowableDims = [DIMENSION_ID_DATA, DIMENSION_ID_PERIOD];
+const disallowableDims = [DIMENSION_ID_DATA, DIMENSION_ID_PERIOD, DIMENSION_ID_ASSIGNED_CATEGORIES];
 
 // Helper fns
 const allArrayItemsAreValid = (allItems, validItems) => allItems.every(value => validItems.includes(value));
 const allArrayItemsAreValidAxisIds = array => allArrayItemsAreValid(array, ALL_AXIS_IDS);
+const allArrayItemsAreValidDimensionIds = array => allArrayItemsAreValid(array, validDims);
 const onlyRulesWithProp = ruleProp => testResourceRules.filter(rule => rule[ruleProp]);
 
 // Partial tests
@@ -18,6 +20,9 @@ const testPropHasKeysAndValues = ruleProp => it('has keys and values', () => {
 const testPropIsArray = ruleProp => it('is an array', () => {
   expect(onlyRulesWithProp(ruleProp).every(rule => Array.isArray(rule[ruleProp]))).toBe(true);
 });
+const testKeysAreValidDimensionIds = ruleProp => it('keys should be valid dimension ids', () => {
+  expect(onlyRulesWithProp(ruleProp).every(rule => allArrayItemsAreValidDimensionIds(Object.keys(rule[ruleProp])))).toBe(true);
+});
 const testKeysAreValidAxisIds = ruleProp => it('keys should be valid axis ids', () => {
   expect(onlyRulesWithProp(ruleProp).every(rule => allArrayItemsAreValidAxisIds(Object.keys(rule[ruleProp])))).toBe(true);
 });
@@ -56,6 +61,13 @@ describe("verify each rule's ", () => {
       testNoValuesNegative(ruleProp);
     });
   });
+  describe('MAX_ITEMS_PER_DIM', () => {
+    const ruleProp = testResourceAllRuleProps['MAX_ITEMS_PER_DIM'];
+    testPropHasKeysAndValues(ruleProp);
+    testKeysAreValidDimensionIds(ruleProp);
+    testNoValuesZero(ruleProp);
+    testNoValuesNegative(ruleProp);
+  });
   describe('AVAILABLE_AXES', () => {
     const ruleProp = testResourceAllRuleProps['AVAILABLE_AXES'];
     testPropIsArray(ruleProp);

package/build/es/modules/layoutUiRules/index.js

@@ -1,2 +1,2 @@
-export { getAvailableAxesByVisType as getAvailableAxes, getDisallowedDimsByVisType as getDisallowedDimensions, getAxisMaxNumberOfItemsByVisType as getAxisMaxNumberOfItems, getAxisMaxNumberOfDimsByVisType as getAxisMaxNumberOfDimensions, getAxisMinNumberOfDimsByVisType as getAxisMinNumberOfDimensions, getAxisPerLockedDimByVisType as getAxisPerLockedDimension, getAllLockedDimIdsByVisType as getAllLockedDimensionIds } from './rulesHelper.js';
-export { hasAxisTooManyItemsByVisType as hasAxisTooManyItems, isDimensionLockedByVisType as isDimensionLocked, isAxisFullByVisType as isAxisFull, canDimensionBeAddedToAxisByVisType as canDimensionBeAddedToAxis, getTransferableDimensionPerAxisByVisType as getTransferableDimension } from './rulesUtils.js';
+export { getAvailableAxesByVisType as getAvailableAxes, getDisallowedDimsByVisType as getDisallowedDimensions, getAxisMaxNumberOfItemsByVisType as getAxisMaxNumberOfItems, getAxisMaxNumberOfDimsByVisType as getAxisMaxNumberOfDimensions, getAxisMinNumberOfDimsByVisType as getAxisMinNumberOfDimensions, getAxisPerLockedDimByVisType as getAxisPerLockedDimension, getAllLockedDimIdsByVisType as getAllLockedDimensionIds, getDimMaxNumberOfItemsByVisType as getDimensionMaxNumberOfItems } from './rulesHelper.js';
+export { hasAxisTooManyItemsByVisType as hasAxisTooManyItems, hasDimensionTooManyItemsByVisType as hasDimensionTooManyItems, isDimensionLockedByVisType as isDimensionLocked, isAxisFullByVisType as isAxisFull, canDimensionBeAddedToAxisByVisType as canDimensionBeAddedToAxis, getTransferableDimensionPerAxisByVisType as getTransferableDimension } from './rulesUtils.js';

package/build/es/modules/layoutUiRules/rules.js

@@ -1,10 +1,11 @@
 import { AXIS_ID_COLUMNS, AXIS_ID_ROWS, AXIS_ID_FILTERS } from '../layout/axis.js';
-import { DIMENSION_ID_PERIOD, DIMENSION_ID_DATA, DIMENSION_ID_ORGUNIT } from '../predefinedDimensions.js';
-import { VIS_TYPE_COLUMN, VIS_TYPE_STACKED_COLUMN, VIS_TYPE_BAR, VIS_TYPE_STACKED_BAR, VIS_TYPE_LINE, VIS_TYPE_AREA, VIS_TYPE_STACKED_AREA, VIS_TYPE_RADAR, VIS_TYPE_GAUGE, VIS_TYPE_PIE, VIS_TYPE_SINGLE_VALUE, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_PIVOT_TABLE, VIS_TYPE_SCATTER, VIS_TYPE_LINE_LIST } from '../visTypes.js';
+import { DIMENSION_ID_PERIOD, DIMENSION_ID_DATA, DIMENSION_ID_ORGUNIT, DIMENSION_ID_ASSIGNED_CATEGORIES } from '../predefinedDimensions.js';
+import { VIS_TYPE_COLUMN, VIS_TYPE_STACKED_COLUMN, VIS_TYPE_BAR, VIS_TYPE_STACKED_BAR, VIS_TYPE_LINE, VIS_TYPE_AREA, VIS_TYPE_STACKED_AREA, VIS_TYPE_RADAR, VIS_TYPE_GAUGE, VIS_TYPE_PIE, VIS_TYPE_SINGLE_VALUE, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_PIVOT_TABLE, VIS_TYPE_SCATTER, VIS_TYPE_LINE_LIST, VIS_TYPE_OUTLIER_TABLE } from '../visTypes.js';
 const RULE_PROP_AVAILABLE_AXES = 'availableAxes',
   RULE_PROP_MAX_DIMS_PER_AXIS = 'maxNumberOfDimsPerAxis',
   RULE_PROP_MIN_DIMS_PER_AXIS = 'minNumberOfDimsPerAxis',
   RULE_PROP_MAX_ITEMS_PER_AXIS = 'maxNumberOfItemsPerAxis',
+  RULE_PROP_MAX_ITEMS_PER_DIM = 'maxNumberOfItemsPerDim',
   RULE_PROP_DISALLOWED_DIMS = 'disallowedDims',
   RULE_PROP_LOCKED_DIMS = 'lockedDims';
 const defaultRules = {
@@ -82,6 +83,21 @@ const scatterRules = {
 const lineListRules = {
   [RULE_PROP_AVAILABLE_AXES]: [AXIS_ID_COLUMNS, AXIS_ID_FILTERS]
 };
+const outlierTableRules = {
+  [RULE_PROP_AVAILABLE_AXES]: [AXIS_ID_COLUMNS],
+  [RULE_PROP_MIN_DIMS_PER_AXIS]: {
+    [AXIS_ID_COLUMNS]: 3
+  },
+  [RULE_PROP_MAX_ITEMS_PER_DIM]: {
+    [DIMENSION_ID_PERIOD]: 1
+  },
+  [RULE_PROP_LOCKED_DIMS]: {
+    [DIMENSION_ID_DATA]: AXIS_ID_COLUMNS,
+    [DIMENSION_ID_PERIOD]: AXIS_ID_COLUMNS,
+    [DIMENSION_ID_ORGUNIT]: AXIS_ID_COLUMNS
+  },
+  [RULE_PROP_DISALLOWED_DIMS]: [DIMENSION_ID_ASSIGNED_CATEGORIES]
+};
 const visTypeToRules = {
   [VIS_TYPE_COLUMN]: defaultRules,
   [VIS_TYPE_STACKED_COLUMN]: defaultRules,
@@ -98,7 +114,8 @@ const visTypeToRules = {
   [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: yearOverYearRules,
   [VIS_TYPE_PIVOT_TABLE]: pivotTableRules,
   [VIS_TYPE_SCATTER]: scatterRules,
-  [VIS_TYPE_LINE_LIST]: lineListRules
+  [VIS_TYPE_LINE_LIST]: lineListRules,
+  [VIS_TYPE_OUTLIER_TABLE]: outlierTableRules
 };
 const getRulesByVisType = visType => {
   const rules = visTypeToRules[visType];
@@ -113,6 +130,7 @@ const getRulesByVisType = visType => {
 export const getAvailableAxesByVisType = visType => getRulesByVisType(visType)[RULE_PROP_AVAILABLE_AXES] || [];
 export const getMaxNumberOfDimsPerAxisByVisType = visType => getRulesByVisType(visType)[RULE_PROP_MAX_DIMS_PER_AXIS] || {};
 export const getMinNumberOfDimsPerAxisByVisType = visType => getRulesByVisType(visType)[RULE_PROP_MIN_DIMS_PER_AXIS] || {};
+export const getMaxNumberOfItemsPerDimByVisType = visType => getRulesByVisType(visType)[RULE_PROP_MAX_ITEMS_PER_DIM] || {};
 export const getMaxNumberOfItemsPerAxisByVisType = visType => getRulesByVisType(visType)[RULE_PROP_MAX_ITEMS_PER_AXIS] || {};
 export const getDisallowedDimsByVisType = visType => getRulesByVisType(visType)[RULE_PROP_DISALLOWED_DIMS] || [];
 export const getLockedDimsByVisType = visType => getRulesByVisType(visType)[RULE_PROP_LOCKED_DIMS] || {};
@@ -126,6 +144,7 @@ export const testResourceAllRuleProps = {
   MAX_DIMS_PER_AXIS: RULE_PROP_MAX_DIMS_PER_AXIS,
   MIN_DIMS_PER_AXIS: RULE_PROP_MIN_DIMS_PER_AXIS,
   MAX_ITEMS_PER_AXIS: RULE_PROP_MAX_ITEMS_PER_AXIS,
+  MAX_ITEMS_PER_DIM: RULE_PROP_MAX_ITEMS_PER_DIM,
   DISALLOWED_DIMS: RULE_PROP_DISALLOWED_DIMS,
   LOCKED_DIMS: RULE_PROP_LOCKED_DIMS
 };

package/build/es/modules/layoutUiRules/rulesHelper.js

@@ -1,4 +1,4 @@
-import { getMaxNumberOfItemsPerAxisByVisType, getMaxNumberOfDimsPerAxisByVisType, getMinNumberOfDimsPerAxisByVisType, getLockedDimsByVisType } from './rules.js';
+import { getMaxNumberOfItemsPerDimByVisType, getMaxNumberOfItemsPerAxisByVisType, getMaxNumberOfDimsPerAxisByVisType, getMinNumberOfDimsPerAxisByVisType, getLockedDimsByVisType } from './rules.js';
 
 // Selectors
 
@@ -7,4 +7,5 @@ export const getAxisMaxNumberOfItemsByVisType = (visType, axisId) => getMaxNumbe
 export const getAxisMaxNumberOfDimsByVisType = (visType, axisId) => getMaxNumberOfDimsPerAxisByVisType(visType)[axisId];
 export const getAxisMinNumberOfDimsByVisType = (visType, axisId) => getMinNumberOfDimsPerAxisByVisType(visType)[axisId];
 export const getAxisPerLockedDimByVisType = (visType, dimensionId) => getLockedDimsByVisType(visType)[dimensionId];
-export const getAllLockedDimIdsByVisType = visType => Object.keys(getLockedDimsByVisType(visType));
+export const getAllLockedDimIdsByVisType = visType => Object.keys(getLockedDimsByVisType(visType));
+export const getDimMaxNumberOfItemsByVisType = (visType, dimensionId) => getMaxNumberOfItemsPerDimByVisType(visType)[dimensionId];

package/build/es/modules/layoutUiRules/rulesUtils.js

@@ -1,8 +1,12 @@
 import { getLockedDimsByVisType } from './rules.js';
-import { getAxisMaxNumberOfDimsByVisType, getAxisMaxNumberOfItemsByVisType, getAllLockedDimIdsByVisType } from './rulesHelper.js';
+import { getAxisMaxNumberOfDimsByVisType, getAxisMaxNumberOfItemsByVisType, getDimMaxNumberOfItemsByVisType, getAllLockedDimIdsByVisType } from './rulesHelper.js';
 export const hasAxisTooManyItemsByVisType = (visType, axisId, numberOfItems) => {
   const maxNumberOfItemsPerAxis = getAxisMaxNumberOfItemsByVisType(visType, axisId);
-  return maxNumberOfItemsPerAxis ? numberOfItems > maxNumberOfItemsPerAxis : false;
+  return maxNumberOfItemsPerAxis && numberOfItems > maxNumberOfItemsPerAxis;
+};
+export const hasDimensionTooManyItemsByVisType = (visType, dimensionId, numberOfItems) => {
+  const maxNumberOfItemsPerDimension = getDimMaxNumberOfItemsByVisType(visType, dimensionId);
+  return maxNumberOfItemsPerDimension && numberOfItems > maxNumberOfItemsPerDimension;
 };
 export const isDimensionLockedByVisType = (visType, dimensionId) => getAllLockedDimIdsByVisType(visType).includes(dimensionId);
 export const isAxisFullByVisType = (visType, axisId, axisDimensionsCount) => axisDimensionsCount >= getAxisMaxNumberOfDimsByVisType(visType, axisId);

package/build/es/modules/visTypeToLayoutType.js

@@ -1,5 +1,5 @@
-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';
-import { VIS_TYPE_COLUMN, VIS_TYPE_STACKED_COLUMN, VIS_TYPE_BAR, VIS_TYPE_STACKED_BAR, VIS_TYPE_LINE, VIS_TYPE_AREA, VIS_TYPE_STACKED_AREA, VIS_TYPE_PIE, VIS_TYPE_RADAR, VIS_TYPE_GAUGE, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_SINGLE_VALUE, VIS_TYPE_PIVOT_TABLE, VIS_TYPE_SCATTER, VIS_TYPE_LINE_LIST } from './visTypes.js';
+import { LAYOUT_TYPE_DEFAULT, LAYOUT_TYPE_PIE, LAYOUT_TYPE_YEAR_OVER_YEAR, LAYOUT_TYPE_PIVOT_TABLE, LAYOUT_TYPE_SCATTER, LAYOUT_TYPE_LINE_LIST, LAYOUT_TYPE_OUTLIER_TABLE } from './layoutTypes.js';
+import { VIS_TYPE_COLUMN, VIS_TYPE_STACKED_COLUMN, VIS_TYPE_BAR, VIS_TYPE_STACKED_BAR, VIS_TYPE_LINE, VIS_TYPE_AREA, VIS_TYPE_STACKED_AREA, VIS_TYPE_PIE, VIS_TYPE_RADAR, VIS_TYPE_GAUGE, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_SINGLE_VALUE, VIS_TYPE_PIVOT_TABLE, VIS_TYPE_SCATTER, VIS_TYPE_LINE_LIST, VIS_TYPE_OUTLIER_TABLE } from './visTypes.js';
 const visTypeToLayoutType = {
   [VIS_TYPE_COLUMN]: LAYOUT_TYPE_DEFAULT,
   [VIS_TYPE_STACKED_COLUMN]: LAYOUT_TYPE_DEFAULT,
@@ -16,6 +16,7 @@ const visTypeToLayoutType = {
   [VIS_TYPE_SINGLE_VALUE]: LAYOUT_TYPE_PIE,
   [VIS_TYPE_PIVOT_TABLE]: LAYOUT_TYPE_PIVOT_TABLE,
   [VIS_TYPE_SCATTER]: LAYOUT_TYPE_SCATTER,
-  [VIS_TYPE_LINE_LIST]: LAYOUT_TYPE_LINE_LIST
+  [VIS_TYPE_LINE_LIST]: LAYOUT_TYPE_LINE_LIST,
+  [VIS_TYPE_OUTLIER_TABLE]: LAYOUT_TYPE_OUTLIER_TABLE
 };
 export const getLayoutTypeByVisType = visType => visTypeToLayoutType[visType];

package/build/es/modules/visTypes.js

@@ -1,4 +1,4 @@
-import { IconTable24, IconVisualizationArea24, IconVisualizationAreaStacked24, IconVisualizationBar24, IconVisualizationBarStacked24, IconVisualizationColumn24, IconVisualizationColumnMulti24, IconVisualizationColumnStacked24, IconVisualizationGauge24, IconVisualizationLine24, IconVisualizationLinelist24, IconVisualizationLineMulti24, IconVisualizationPie24, IconVisualizationRadar24, IconVisualizationScatter24, IconVisualizationSingleValue24 } from '@dhis2/ui';
+import { IconVisualizationArea24, IconVisualizationAreaStacked24, IconVisualizationBar24, IconVisualizationBarStacked24, IconVisualizationColumn24, IconVisualizationColumnMulti24, IconVisualizationColumnStacked24, IconVisualizationGauge24, IconVisualizationLine24, IconVisualizationLinelist24, IconVisualizationLineMulti24, IconVisualizationOutlierTable24, IconVisualizationPie24, IconVisualizationPivotTable24, IconVisualizationRadar24, IconVisualizationScatter24, IconVisualizationSingleValue24 } from '@dhis2/ui';
 import i18n from '../locales/index.js';
 export const VIS_TYPE_PIVOT_TABLE = 'PIVOT_TABLE';
 export const VIS_TYPE_AREA = 'AREA';
@@ -19,6 +19,7 @@ export const VIS_TYPE_SINGLE_VALUE = 'SINGLE_VALUE';
 export const VIS_TYPE_BUBBLE = 'BUBBLE';
 export const VIS_TYPE_GROUP_ALL = 'ALL';
 export const VIS_TYPE_GROUP_CHARTS = 'CHARTS';
+export const VIS_TYPE_OUTLIER_TABLE = 'OUTLIER_TABLE';
 export const visTypeDisplayNames = {
   [VIS_TYPE_PIVOT_TABLE]: i18n.t('Pivot table'),
   [VIS_TYPE_AREA]: i18n.t('Area'),
@@ -36,11 +37,12 @@ export const visTypeDisplayNames = {
   [VIS_TYPE_RADAR]: i18n.t('Radar'),
   [VIS_TYPE_SCATTER]: i18n.t('Scatter'),
   [VIS_TYPE_SINGLE_VALUE]: i18n.t('Single value'),
+  [VIS_TYPE_OUTLIER_TABLE]: i18n.t('Outlier table'),
   [VIS_TYPE_GROUP_ALL]: i18n.t('All types'),
   [VIS_TYPE_GROUP_CHARTS]: i18n.t('All charts')
 };
 export const visTypeIcons = {
-  [VIS_TYPE_PIVOT_TABLE]: IconTable24,
+  [VIS_TYPE_PIVOT_TABLE]: IconVisualizationPivotTable24,
   [VIS_TYPE_AREA]: IconVisualizationArea24,
   [VIS_TYPE_STACKED_AREA]: IconVisualizationAreaStacked24,
   [VIS_TYPE_BAR]: IconVisualizationBar24,
@@ -55,7 +57,8 @@ export const visTypeIcons = {
   [VIS_TYPE_PIE]: IconVisualizationPie24,
   [VIS_TYPE_RADAR]: IconVisualizationRadar24,
   [VIS_TYPE_SCATTER]: IconVisualizationScatter24,
-  [VIS_TYPE_SINGLE_VALUE]: IconVisualizationSingleValue24
+  [VIS_TYPE_SINGLE_VALUE]: IconVisualizationSingleValue24,
+  [VIS_TYPE_OUTLIER_TABLE]: IconVisualizationOutlierTable24
 };
 export const getDisplayNameByVisType = visType => {
   const displayName = visTypeDisplayNames[visType];
@@ -78,6 +81,7 @@ export const isYearOverYear = type => yearOverYearTypes.includes(type);
 export const isDualAxisType = type => dualAxisTypes.includes(type);
 export const isMultiType = type => multiTypeTypes.includes(type);
 export const isSingleValue = type => type === VIS_TYPE_SINGLE_VALUE;
+export const isOutlierTable = type => type === VIS_TYPE_OUTLIER_TABLE;
 export const isTwoCategoryChartType = type => twoCategoryChartTypes.includes(type);
 export const isVerticalType = type => verticalTypes.includes(type);
 export const isLegendSetType = type => legendSetTypes.includes(type);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.4.1",
+    "version": "26.5.0",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -35,7 +35,7 @@
         "@dhis2/cli-app-scripts": "^9.0.1",
         "@dhis2/cli-style": "^10.4.1",
         "@dhis2/d2-i18n": "^1.1.0",
-        "@dhis2/ui": "^8.4.11",
+        "@dhis2/ui": "^9.2.0",
         "@sambego/storybook-state": "^2.0.1",
         "@storybook/addons": "^6.5.16",
         "@storybook/preset-create-react-app": "^3.1.7",
@@ -52,7 +52,7 @@
     "peerDependencies": {
         "@dhis2/app-runtime": "^3",
         "@dhis2/d2-i18n": "^1.1",
-        "@dhis2/ui": "^8.2.5",
+        "@dhis2/ui": "^9.2.0",
         "prop-types": "^15",
         "react": "^16.3",
         "react-dom": "^16.3",
@@ -75,6 +75,9 @@
         "react-beautiful-dnd": "^10.1.1",
         "resize-observer-polyfill": "^1.5.1"
     },
+    "resolutions": {
+        "@dhis2/ui": "^9.2.0"
+    },
     "files": [
         "build"
     ]