@dhis2/analytics 21.2.5 → 22.0.0-alpha.1

package/build/es/components/OpenFileDialog/VisTypeFilter.js

@@ -1,13 +1,12 @@
 import i18n from '@dhis2/d2-i18n';
-import { Divider, SingleSelect, SingleSelectOption, colors } from '@dhis2/ui';
+import { SingleSelect, colors } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
-import { visTypeDisplayNames } from '../../modules/visTypes.js';
+import { getDisplayNameByVisType, visTypeIcons } from '../../modules/visTypes.js';
 import { VisTypeIcon } from '../VisTypeIcon.js';
 import { CustomSelectOption } from './CustomSelectOption.js';
-export const VIS_TYPE_ALL = 'all';
-export const VIS_TYPE_CHARTS = 'charts';
 export const VisTypeFilter = ({
+  visTypes,
   selected,
   onChange
 }) => /*#__PURE__*/React.createElement(SingleSelect, {
@@ -18,24 +17,29 @@ export const VisTypeFilter = ({
   prefix: i18n.t('Type'),
   dense: true,
   maxHeight: "400px"
-}, /*#__PURE__*/React.createElement(SingleSelectOption, {
-  label: i18n.t('All types'),
-  value: VIS_TYPE_ALL
-}), /*#__PURE__*/React.createElement(SingleSelectOption, {
-  label: i18n.t('All charts'),
-  value: VIS_TYPE_CHARTS
-}), /*#__PURE__*/React.createElement(Divider, null), Object.entries(visTypeDisplayNames).map(([type, label]) => /*#__PURE__*/React.createElement(CustomSelectOption, {
+}, visTypes === null || visTypes === void 0 ? void 0 : visTypes.map(({
+  type,
+  disabled,
+  insertDivider
+}) => /*#__PURE__*/React.createElement(CustomSelectOption, {
   key: type,
-  label: label,
+  disabled: disabled,
+  label: getDisplayNameByVisType(type),
+  insertDivider: insertDivider,
   value: type,
-  icon: /*#__PURE__*/React.createElement(VisTypeIcon, {
+  icon: visTypeIcons[type] ? /*#__PURE__*/React.createElement(VisTypeIcon, {
     type: type,
     useSmall: true,
     color: colors.grey600
-  })
+  }) : undefined
 })));
 VisTypeFilter.propTypes = {
   selected: PropTypes.string,
+  visTypes: PropTypes.arrayOf(PropTypes.shape({
+    disabled: PropTypes.bool,
+    insertDivider: PropTypes.bool,
+    type: PropTypes.string
+  })),
   onChange: PropTypes.func
 };
 export default VisTypeFilter;

package/build/es/index.js

@@ -68,7 +68,7 @@ export { itemIsValid } from './modules/layout/itemIsValid.js'; // Modules: visTy
 
 export { getLayoutTypeByVisType } from './modules/visTypeToLayoutType.js'; // Modules: visTypes
 
-export { 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_BUBBLE, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_SINGLE_VALUE, VIS_TYPE_PIVOT_TABLE, VIS_TYPE_SCATTER, visTypeDisplayNames, visTypeDescriptions, visTypeIcons, getDisplayNameByVisType, defaultVisType, isStacked, isMultiType, isYearOverYear, isDualAxisType, isSingleValue, isTwoCategoryChartType, isLegendSetType, isColumnBasedType, isVerticalType } from './modules/visTypes.js'; // Modules: layoutTypes
+export { VIS_TYPE_ALL, VIS_TYPE_CHARTS, 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_BUBBLE, 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, visTypeDisplayNames, visTypeIcons, getDisplayNameByVisType, defaultVisType, isStacked, isMultiType, isYearOverYear, isDualAxisType, isSingleValue, isTwoCategoryChartType, isLegendSetType, isColumnBasedType, isVerticalType } from './modules/visTypes.js'; // Modules: layoutTypes
 
 export { LAYOUT_TYPE_DEFAULT, LAYOUT_TYPE_PIE, LAYOUT_TYPE_SINGLE_VALUE, LAYOUT_TYPE_YEAR_OVER_YEAR, LAYOUT_TYPE_PIVOT_TABLE, LAYOUT_TYPE_SCATTER } from './modules/layoutTypes.js'; // Modules: layoutUiRules
 

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

@@ -81,13 +81,13 @@
     "Anyone": "Anyone",
     "Only you": "Only you",
     "Others": "Others",
+    "Not supported by this app yet": "Not supported by this app yet",
     "Filter by name": "Filter by name",
     "Created": "Created",
     "Last updated": "Last updated",
     "Type": "Type",
     "Clear filters": "Clear filters",
     "{{firstItemIndex}}-{{lastItemIndex}} of {{totalNumberOfItems}}": "{{firstItemIndex}}-{{lastItemIndex}} of {{totalNumberOfItems}}",
-    "All charts": "All charts",
     "Open": "Open",
     "Couldn't load items": "Couldn't load items",
     "There was a problem loading items. Try again or contact your system administrator.": "There was a problem loading items. Try again or contact your system administrator.",
@@ -309,19 +309,8 @@
     "Year over year (column)": "Year over year (column)",
     "Single value": "Single value",
     "Scatter": "Scatter",
-    "View data and indicators in a manipulatable table.": "View data and indicators in a manipulatable table.",
-    "Compare sizes of related elements vertically. Recommend period as filter.": "Compare sizes of related elements vertically. Recommend period as filter.",
-    "Compare parts of a whole against related elements vertically. Recommend data or org. unit as series.": "Compare parts of a whole against related elements vertically. Recommend data or org. unit as series.",
-    "Compare sizes of related elements horizontally. Recommend period as filter.": "Compare sizes of related elements horizontally. Recommend period as filter.",
-    "Compare parts of a whole against related elements horizontally. Recommend data or org. unit as series.": "Compare parts of a whole against related elements horizontally. Recommend data or org. unit as series.",
-    "Track or compare changes over time. Recommend period as category.": "Track or compare changes over time. Recommend period as category.",
-    "Track or compare parts of a whole over time. Recommend data as series and period as category.": "Track or compare parts of a whole over time. Recommend data as series and period as category.",
-    "Compare parts of a whole at a single point in time. Recommend period as filter.": "Compare parts of a whole at a single point in time. Recommend period as filter.",
-    "Compare several items against multiple variables.": "Compare several items against multiple variables.",
-    "Compare a percentage indicator against a 100% scale. Recommend period as filter.": "Compare a percentage indicator against a 100% scale. Recommend period as filter.",
-    "Compare changes over time between multiple time periods.": "Compare changes over time between multiple time periods.",
-    "Display a single value. Recommend relative period to show latest data.": "Display a single value. Recommend relative period to show latest data.",
-    "View the relationship between two data items at a place or time. Recommended for finding outliers.": "View the relationship between two data items at a place or time. Recommended for finding outliers.",
+    "Line list": "Line list",
+    "All charts": "All charts",
     "{{seriesName}} (trend)": "{{seriesName}} (trend)",
     "Trend": "Trend",
     "No legend for this series": "No legend for this series",

package/build/es/modules/visTypes.js

@@ -16,6 +16,9 @@ export const VIS_TYPE_YEAR_OVER_YEAR_COLUMN = 'YEAR_OVER_YEAR_COLUMN';
 export const VIS_TYPE_SINGLE_VALUE = 'SINGLE_VALUE';
 export const VIS_TYPE_PIVOT_TABLE = 'PIVOT_TABLE';
 export const VIS_TYPE_SCATTER = 'SCATTER';
+export const VIS_TYPE_LINE_LIST = 'LINE_LIST';
+export const VIS_TYPE_ALL = 'ALL';
+export const VIS_TYPE_CHARTS = 'CHARTS';
 export const visTypeDisplayNames = {
   [VIS_TYPE_PIVOT_TABLE]: i18n.t('Pivot table'),
   [VIS_TYPE_COLUMN]: i18n.t('Column'),
@@ -31,24 +34,10 @@ export const visTypeDisplayNames = {
   [VIS_TYPE_YEAR_OVER_YEAR_LINE]: i18n.t('Year over year (line)'),
   [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: i18n.t('Year over year (column)'),
   [VIS_TYPE_SINGLE_VALUE]: i18n.t('Single value'),
-  [VIS_TYPE_SCATTER]: i18n.t('Scatter')
-};
-export const visTypeDescriptions = {
-  [VIS_TYPE_PIVOT_TABLE]: i18n.t('View data and indicators in a manipulatable table.'),
-  [VIS_TYPE_COLUMN]: i18n.t('Compare sizes of related elements vertically. Recommend period as filter.'),
-  [VIS_TYPE_STACKED_COLUMN]: i18n.t('Compare parts of a whole against related elements vertically. Recommend data or org. unit as series.'),
-  [VIS_TYPE_BAR]: i18n.t('Compare sizes of related elements horizontally. Recommend period as filter.'),
-  [VIS_TYPE_STACKED_BAR]: i18n.t('Compare parts of a whole against related elements horizontally. Recommend data or org. unit as series.'),
-  [VIS_TYPE_LINE]: i18n.t('Track or compare changes over time. Recommend period as category.'),
-  [VIS_TYPE_AREA]: i18n.t('Track or compare changes over time. Recommend period as category.'),
-  [VIS_TYPE_STACKED_AREA]: i18n.t('Track or compare parts of a whole over time. Recommend data as series and period as category.'),
-  [VIS_TYPE_PIE]: i18n.t('Compare parts of a whole at a single point in time. Recommend period as filter.'),
-  [VIS_TYPE_RADAR]: i18n.t('Compare several items against multiple variables.'),
-  [VIS_TYPE_GAUGE]: i18n.t('Compare a percentage indicator against a 100% scale. Recommend period as filter.'),
-  [VIS_TYPE_YEAR_OVER_YEAR_LINE]: i18n.t('Compare changes over time between multiple time periods.'),
-  [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: i18n.t('Compare changes over time between multiple time periods.'),
-  [VIS_TYPE_SINGLE_VALUE]: i18n.t('Display a single value. Recommend relative period to show latest data.'),
-  [VIS_TYPE_SCATTER]: i18n.t('View the relationship between two data items at a place or time. Recommended for finding outliers.')
+  [VIS_TYPE_SCATTER]: i18n.t('Scatter'),
+  [VIS_TYPE_LINE_LIST]: i18n.t('Line list'),
+  [VIS_TYPE_ALL]: i18n.t('All types'),
+  [VIS_TYPE_CHARTS]: i18n.t('All charts')
 };
 export const visTypeIcons = {
   [VIS_TYPE_PIVOT_TABLE]: IconTable24,
@@ -65,7 +54,9 @@ export const visTypeIcons = {
   [VIS_TYPE_YEAR_OVER_YEAR_LINE]: IconVisualizationLineMulti24,
   [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: IconVisualizationColumnMulti24,
   [VIS_TYPE_SINGLE_VALUE]: IconVisualizationSingleValue24,
-  [VIS_TYPE_SCATTER]: IconVisualizationScatter24
+  [VIS_TYPE_SCATTER]: IconVisualizationScatter24,
+  [VIS_TYPE_LINE_LIST]: IconTable24 // TODO different icon @joe
+
 };
 export const getDisplayNameByVisType = visType => {
   const displayName = visTypeDisplayNames[visType];

package/package.json

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