@dhis2/analytics 26.4.0 → 26.5.0

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/build/es/visualizations/config/adapters/dhis_highcharts/subtitle/index.js

@@ -30,8 +30,9 @@ export default function (series, layout, metaData, dashboard) {
   }
 
   // DHIS2-578: allow for optional custom subtitle
-  if (isString(layout.subtitle)) {
-    subtitle.text = layout.subtitle;
+  const customSubtitle = layout.subtitle && layout.displaySubtitle || layout.subtitle;
+  if (isString(customSubtitle) && customSubtitle.length) {
+    subtitle.text = customSubtitle;
   } else {
     const filterTitle = getFilterText(layout.filters, metaData);
     switch (layout.type) {

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

@@ -31,8 +31,9 @@ export default function (layout, metaData, dashboard) {
   if (layout.hideTitle) {
     return title;
   }
-  if (isString(layout.title) && layout.title.length) {
-    title.text = layout.title;
+  const customTitle = layout.title && layout.displayTitle || layout.title;
+  if (isString(customTitle) && customTitle.length) {
+    title.text = customTitle;
   } else {
     switch (layout.type) {
       case VIS_TYPE_GAUGE:

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.4.0",
+    "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"
     ]