@dhis2/analytics 22.0.1 → 23.0.0-alpha.1

package/build/es/__demo__/OpenFileDialog.stories.js

@@ -2,6 +2,7 @@ import { Provider } from '@dhis2/app-runtime';
 import { storiesOf } from '@storybook/react';
 import React from 'react';
 import { OpenFileDialog } from '../components/OpenFileDialog/OpenFileDialog.js';
+import { VIS_TYPE_GROUP_ALL, VIS_TYPE_GROUP_CHARTS, VIS_TYPE_PIVOT_TABLE, VIS_TYPE_COLUMN, VIS_TYPE_BAR, VIS_TYPE_LINE_LIST } from '../modules/visTypes.js';
 const configMock = {
   baseUrl: 'https://debug.dhis2.org/dev',
   apiVersion: 37
@@ -14,17 +15,30 @@ const user = {
 
 const onFileSelect = id => alert("Opening ".concat(id));
 
-storiesOf('OpenFileDialog', module).add('List of visualizations', () => /*#__PURE__*/React.createElement(Provider, {
+const filterVisTypesWithGroupsAndDivider = [{
+  type: VIS_TYPE_GROUP_ALL
+}, {
+  type: VIS_TYPE_GROUP_CHARTS,
+  insertDivider: true
+}, {
+  type: VIS_TYPE_PIVOT_TABLE
+}, {
+  type: VIS_TYPE_COLUMN
+}, {
+  type: VIS_TYPE_BAR
+}];
+storiesOf('OpenFileDialog', module).add('List of visualizations with vis type filter and divider (no default vis type)', () => /*#__PURE__*/React.createElement(Provider, {
   config: configMock
 }, /*#__PURE__*/React.createElement(OpenFileDialog, {
   type: "visualization",
+  filterVisTypes: filterVisTypesWithGroupsAndDivider,
   onClose: Function.prototype,
   onFileSelect: onFileSelect,
   onNew: Function.prototype,
   open: true,
   currentUser: user
 })));
-storiesOf('OpenFileDialog', module).add('List of maps', () => /*#__PURE__*/React.createElement(Provider, {
+storiesOf('OpenFileDialog', module).add('List of maps (no vis type filter)', () => /*#__PURE__*/React.createElement(Provider, {
   config: configMock
 }, /*#__PURE__*/React.createElement(OpenFileDialog, {
   type: "map",
@@ -34,20 +48,38 @@ storiesOf('OpenFileDialog', module).add('List of maps', () => /*#__PURE__*/React
   open: true,
   currentUser: user
 })));
-storiesOf('OpenFileDialog', module).add('List of event reports (Line list only)', () => /*#__PURE__*/React.createElement(Provider, {
+const filterVisTypesWithDisabled = [{
+  type: VIS_TYPE_PIVOT_TABLE,
+  disabled: true
+}, {
+  type: VIS_TYPE_LINE_LIST
+}];
+storiesOf('OpenFileDialog', module).add('List of event visualizations with vis type filter, disabled type and default vis type', () => /*#__PURE__*/React.createElement(Provider, {
   config: configMock
 }, /*#__PURE__*/React.createElement(OpenFileDialog, {
-  type: "eventReport",
+  type: "eventVisualization",
+  filterVisTypes: filterVisTypesWithDisabled,
+  defaultFilterVisType: VIS_TYPE_LINE_LIST,
   onClose: Function.prototype,
   onFileSelect: onFileSelect,
   onNew: Function.prototype,
   open: true,
   currentUser: user
 })));
-storiesOf('OpenFileDialog', module).add('List of a supported type without custom titles/texts', () => /*#__PURE__*/React.createElement(Provider, {
+const filterVisTypesWithGroupDividerAndDisabled = [{
+  type: VIS_TYPE_GROUP_ALL
+}, {
+  type: VIS_TYPE_BAR,
+  insertDivider: true
+}, {
+  type: VIS_TYPE_COLUMN,
+  disabled: true
+}];
+storiesOf('OpenFileDialog', module).add('List of visualizations with vis type filter with group type, divider and disabled option (no default vis type)', () => /*#__PURE__*/React.createElement(Provider, {
   config: configMock
 }, /*#__PURE__*/React.createElement(OpenFileDialog, {
-  type: "eventChart",
+  type: "visualization",
+  filterVisTypes: filterVisTypesWithGroupDividerAndDisabled,
   onClose: Function.prototype,
   onFileSelect: onFileSelect,
   onNew: Function.prototype,

package/build/es/components/FileMenu/FileMenu.js

@@ -13,8 +13,10 @@ import { SaveAsDialog } from './SaveAsDialog.js';
 import { supportedFileTypes } from './utils.js';
 export const FileMenu = ({
   currentUser,
+  defaultFilterVisType,
   fileType,
   fileObject,
+  filterVisTypes,
   onNew,
   onOpen,
   onSave,
@@ -129,6 +131,8 @@ export const FileMenu = ({
   }, i18n.t('File'))), /*#__PURE__*/React.createElement(OpenFileDialog, {
     open: currentDialog === 'open',
     type: fileType,
+    filterVisTypes: filterVisTypes,
+    defaultFilterVisType: defaultFilterVisType,
     onClose: onDialogClose,
     onFileSelect: id => {
       onOpen(id);
@@ -237,8 +241,10 @@ FileMenu.defaultProps = {
 };
 FileMenu.propTypes = {
   currentUser: PropTypes.object,
+  defaultFilterVisType: PropTypes.string,
   fileObject: PropTypes.object,
   fileType: PropTypes.oneOf(supportedFileTypes),
+  filterVisTypes: PropTypes.array,
   onDelete: PropTypes.func,
   onError: PropTypes.func,
   onNew: PropTypes.func,

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

@@ -1,16 +1,20 @@
 import _JSXStyle from "styled-jsx/style";
+import i18n from '@dhis2/d2-i18n';
+import { MenuDivider, Tooltip } from '@dhis2/ui';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 import styles from './styles/CustomSelectOption.style.js';
-export const CustomSelectOption = ({
+
+const CustomSelectOptionItem = ({
   value,
   label,
   icon,
+  insertDivider,
   onClick,
   active,
   disabled
-}) => /*#__PURE__*/React.createElement("div", {
+}) => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
   onClick: e => onClick({}, e),
   "data-value": value,
   "data-label": label,
@@ -19,10 +23,18 @@ export const CustomSelectOption = ({
     disabled
   }) || "")
 }, icon, /*#__PURE__*/React.createElement("span", {
-  className: "jsx-".concat(styles.__hash) + " " + "label"
+  className: "jsx-".concat(styles.__hash) + " " + (cx({
+    label: icon
+  }) || "")
 }, label), /*#__PURE__*/React.createElement(_JSXStyle, {
   id: styles.__hash
-}, styles));
+}, styles)), insertDivider && /*#__PURE__*/React.createElement(MenuDivider, {
+  dense: true
+}));
+
+export const CustomSelectOption = props => props.disabled ? /*#__PURE__*/React.createElement(Tooltip, {
+  content: i18n.t('Not supported by this app yet')
+}, /*#__PURE__*/React.createElement(CustomSelectOptionItem, props)) : /*#__PURE__*/React.createElement(CustomSelectOptionItem, props);
 CustomSelectOption.propTypes = {
   icon: PropTypes.element.isRequired,
   label: PropTypes.string.isRequired,
@@ -31,4 +43,5 @@ CustomSelectOption.propTypes = {
   disabled: PropTypes.bool,
   onClick: PropTypes.func
 };
+CustomSelectOptionItem.propTypes = CustomSelectOption.propTypes;
 export default CustomSelectOption;

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

@@ -4,14 +4,14 @@ import React from 'react';
 import { VisTypeIcon } from '../VisTypeIcon.js';
 import { DateField } from './DateField.js';
 export const FileList = ({
-  type,
   data,
-  onSelect
+  onSelect,
+  showVisTypeColumn
 }) => /*#__PURE__*/React.createElement(React.Fragment, null, data.map(visualization => /*#__PURE__*/React.createElement(DataTableRow, {
   key: visualization.id
 }, /*#__PURE__*/React.createElement(DataTableCell, {
   onClick: () => onSelect(visualization.id)
-}, visualization.displayName), type === 'visualization' && /*#__PURE__*/React.createElement(DataTableCell, {
+}, visualization.displayName), showVisTypeColumn && /*#__PURE__*/React.createElement(DataTableCell, {
   align: "center"
 }, /*#__PURE__*/React.createElement(VisTypeIcon, {
   type: visualization.type,
@@ -30,7 +30,7 @@ FileList.propTypes = {
     lastUpdated: PropTypes.string.isRequired,
     type: PropTypes.string
   })).isRequired,
-  type: PropTypes.string.isRequired,
-  onSelect: PropTypes.func.isRequired
+  onSelect: PropTypes.func.isRequired,
+  showVisTypeColumn: PropTypes.bool
 };
 export default FileList;

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

@@ -5,13 +5,14 @@ import { Box, Modal, ModalTitle, ModalContent, DataTable, DataTableHead, DataTab
 import isEqual from 'lodash/isEqual';
 import PropTypes from 'prop-types';
 import React, { useEffect, useMemo, useState } from 'react';
+import { VIS_TYPE_GROUP_ALL, VIS_TYPE_GROUP_CHARTS } from '../../modules/visTypes.js';
 import { CreatedByFilter, CREATED_BY_ALL, CREATED_BY_ALL_BUT_CURRENT_USER, CREATED_BY_CURRENT_USER } from './CreatedByFilter.js';
 import { FileList } from './FileList.js';
 import { NameFilter } from './NameFilter.js';
 import { styles } from './OpenFileDialog.styles.js';
 import { PaginationControls } from './PaginationControls.js';
-import { getTranslatedString, AO_TYPE_VISUALIZATION, AO_TYPE_EVENT_REPORT, AO_TYPE_EVENT_VISUALIZATION, AOTypeMap } from './utils.js';
-import { VisTypeFilter, VIS_TYPE_ALL, VIS_TYPE_CHARTS } from './VisTypeFilter.js';
+import { getTranslatedString, AOTypeMap } from './utils.js';
+import { VisTypeFilter } from './VisTypeFilter.js';
 
 const getQuery = type => ({
   files: {
@@ -42,6 +43,8 @@ const getQuery = type => ({
 export const OpenFileDialog = ({
   type,
   open,
+  filterVisTypes,
+  defaultFilterVisType,
   onClose,
   onFileSelect,
   onNew,
@@ -51,7 +54,7 @@ export const OpenFileDialog = ({
   const defaultFilters = {
     searchTerm: '',
     createdBy: CREATED_BY_ALL,
-    visType: VIS_TYPE_ALL
+    visType: defaultFilterVisType
   };
   const [{
     sortField,
@@ -82,26 +85,23 @@ export const OpenFileDialog = ({
         break;
     }
 
-    switch (filters.visType) {
-      case VIS_TYPE_ALL:
-        break;
+    if (filters.visType) {
+      switch (filters.visType) {
+        case VIS_TYPE_GROUP_ALL:
+          break;
 
-      case VIS_TYPE_CHARTS:
-        queryFilters.push('type:!eq:PIVOT_TABLE');
-        break;
+        case VIS_TYPE_GROUP_CHARTS:
+          queryFilters.push('type:!eq:PIVOT_TABLE');
+          break;
 
-      default:
-        queryFilters.push("type:eq:".concat(filters.visType));
-        break;
+        default:
+          queryFilters.push("type:eq:".concat(filters.visType));
+          break;
+      }
     }
 
     if (filters.searchTerm) {
       queryFilters.push("name:ilike:".concat(filters.searchTerm));
-    } // for ER 2.38 only show line list ER types
-
-
-    if (type === AO_TYPE_EVENT_REPORT || type === AO_TYPE_EVENT_VISUALIZATION) {
-      queryFilters.push('dataType:eq:EVENTS');
     }
 
     return queryFilters;
@@ -127,7 +127,8 @@ export const OpenFileDialog = ({
       refetch({
         page,
         sortField,
-        sortDirection
+        sortDirection,
+        filters: formatFilters()
       });
     }
   }, [open, page, sortField, sortDirection]);
@@ -157,7 +158,7 @@ export const OpenFileDialog = ({
     width: '110px'
   }];
 
-  if (type === AO_TYPE_VISUALIZATION) {
+  if (filterVisTypes !== null && filterVisTypes !== void 0 && filterVisTypes.length) {
     headers.splice(1, 0, {
       field: 'type',
       label: i18n.t('Type'),
@@ -190,9 +191,10 @@ export const OpenFileDialog = ({
         searchTerm: value
       }), 200));
     }
-  })), type === AO_TYPE_VISUALIZATION && /*#__PURE__*/React.createElement("div", {
+  })), (filterVisTypes === null || filterVisTypes === void 0 ? void 0 : filterVisTypes.length) && /*#__PURE__*/React.createElement("div", {
     className: "jsx-".concat(styles.__hash) + " " + "type-field-container"
   }, /*#__PURE__*/React.createElement(VisTypeFilter, {
+    visTypes: filterVisTypes,
     selected: filters.visType,
     onChange: value => setFilters({ ...filters,
       visType: value
@@ -261,9 +263,9 @@ export const OpenFileDialog = ({
       onClose();
     }
   }, getTranslatedString(type, 'newButtonLabel'))))))))), (data === null || data === void 0 ? void 0 : data.files[AOTypeMap[type].apiEndpoint].length) > 0 && /*#__PURE__*/React.createElement(FileList, {
-    type: type,
     data: data.files[AOTypeMap[type].apiEndpoint],
-    onSelect: onFileSelect
+    onSelect: onFileSelect,
+    showVisTypeColumn: Boolean(filterVisTypes === null || filterVisTypes === void 0 ? void 0 : filterVisTypes.length)
   }))), (data === null || data === void 0 ? void 0 : data.files[AOTypeMap[type].apiEndpoint].length) > 0 && /*#__PURE__*/React.createElement(DataTableToolbar, {
     position: "bottom"
   }, /*#__PURE__*/React.createElement("div", {
@@ -282,6 +284,8 @@ OpenFileDialog.propTypes = {
   type: PropTypes.oneOf(Object.keys(AOTypeMap)).isRequired,
   onClose: PropTypes.func.isRequired,
   onFileSelect: PropTypes.func.isRequired,
-  onNew: PropTypes.func.isRequired
+  onNew: PropTypes.func.isRequired,
+  defaultFilterVisType: PropTypes.string,
+  filterVisTypes: PropTypes.array
 };
 export default OpenFileDialog;

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/components/OpenFileDialog/styles/FileList.style.js

@@ -0,0 +1,3 @@
+const _defaultExport = [".datatable-row.jsx-670715550{cursor:pointer;}"];
+_defaultExport.__hash = "670715550";
+export default _defaultExport;

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

@@ -1,8 +1,6 @@
 import i18n from '@dhis2/d2-i18n';
 export const AO_TYPE_VISUALIZATION = 'visualization';
 export const AO_TYPE_MAP = 'map';
-export const AO_TYPE_EVENT_CHART = 'eventChart';
-export const AO_TYPE_EVENT_REPORT = 'eventReport';
 export const AO_TYPE_EVENT_VISUALIZATION = 'eventVisualization';
 export const AOTypeMap = {
   [AO_TYPE_VISUALIZATION]: {
@@ -11,18 +9,13 @@ export const AOTypeMap = {
   [AO_TYPE_MAP]: {
     apiEndpoint: 'maps'
   },
-  [AO_TYPE_EVENT_CHART]: {
-    apiEndpoint: 'eventCharts'
-  },
-  [AO_TYPE_EVENT_REPORT]: {
-    apiEndpoint: 'eventReports'
-  },
   [AO_TYPE_EVENT_VISUALIZATION]: {
     apiEndpoint: 'eventVisualizations'
   }
 };
-export const getTranslatedString = (type, key) => {
-  let texts = {
+const NO_TYPE = 'NO_TYPE';
+const texts = {
+  [NO_TYPE]: {
     modalTitle: i18n.t('Open'),
     loadingText: i18n.t('Loading'),
     errorTitle: i18n.t("Couldn't load items"),
@@ -30,65 +23,33 @@ export const getTranslatedString = (type, key) => {
     noDataText: i18n.t('No items found. Create a new to get started.'),
     noFilteredDataText: i18n.t("No items found. Try adjusting your search or filter options to find what you're looking for."),
     newButtonLabel: i18n.t('Create new')
-  };
-
-  switch (type) {
-    case 'visualization':
-      {
-        texts = {
-          modalTitle: i18n.t('Open a visualization'),
-          loadingText: i18n.t('Loading visualizations'),
-          errorTitle: i18n.t("Couldn't load visualizations"),
-          errorText: i18n.t('There was a problem loading visualizations. Try again or contact your system administrator.'),
-          noDataText: i18n.t('No visualizations found. Click New visualization to get started.'),
-          noFilteredDataText: i18n.t("No visualizations found. Try adjusting your search or filter options to find what you're looking for."),
-          newButtonLabel: i18n.t('New visualization')
-        };
-        break;
-      }
-
-    case 'map':
-      {
-        texts = {
-          modalTitle: i18n.t('Open a map'),
-          loadingText: i18n.t('Loading maps'),
-          errorTitle: i18n.t("Couldn't load maps"),
-          errorText: i18n.t('There was a problem loading maps. Try again or contact your system administrator.'),
-          noDataText: i18n.t('No maps found. Click New map to get started.'),
-          noFilteredDataText: i18n.t("No maps found. Try adjusting your search or filter options to find what you're looking for."),
-          newButtonLabel: i18n.t('New map')
-        };
-        break;
-      }
-
-    case 'eventReport':
-      {
-        texts = {
-          modalTitle: i18n.t('Open an event report'),
-          loadingText: i18n.t('Loading event reports'),
-          errorTitle: i18n.t("Couldn't load event reports"),
-          errorText: i18n.t('There was a problem loading event reports. Try again or contact your system administrator.'),
-          noDataText: i18n.t('No event reports found. Click New event report to get started.'),
-          noFilteredDataText: i18n.t("No event reports found. Try adjusting your search or filter options to find what you're looking for."),
-          newButtonLabel: i18n.t('New event report')
-        };
-        break;
-      }
-
-    case 'eventVisualization':
-      {
-        texts = {
-          modalTitle: i18n.t('Open an event visualization'),
-          loadingText: i18n.t('Loading event visualizations'),
-          errorTitle: i18n.t("Couldn't load event visualizations"),
-          errorText: i18n.t('There was a problem loading event visualizations. Try again or contact your system administrator.'),
-          noDataText: i18n.t('No event visualizations found. Click New event visualization to get started.'),
-          noFilteredDataText: i18n.t("No event visualizations found. Try adjusting your search or filter options to find what you're looking for."),
-          newButtonLabel: i18n.t('New event visualization')
-        };
-        break;
-      }
+  },
+  [AO_TYPE_VISUALIZATION]: {
+    modalTitle: i18n.t('Open a visualization'),
+    loadingText: i18n.t('Loading visualizations'),
+    errorTitle: i18n.t("Couldn't load visualizations"),
+    errorText: i18n.t('There was a problem loading visualizations. Try again or contact your system administrator.'),
+    noDataText: i18n.t('No visualizations found. Click New visualization to get started.'),
+    noFilteredDataText: i18n.t("No visualizations found. Try adjusting your search or filter options to find what you're looking for."),
+    newButtonLabel: i18n.t('New visualization')
+  },
+  [AO_TYPE_MAP]: {
+    modalTitle: i18n.t('Open a map'),
+    loadingText: i18n.t('Loading maps'),
+    errorTitle: i18n.t("Couldn't load maps"),
+    errorText: i18n.t('There was a problem loading maps. Try again or contact your system administrator.'),
+    noDataText: i18n.t('No maps found. Click New map to get started.'),
+    noFilteredDataText: i18n.t("No maps found. Try adjusting your search or filter options to find what you're looking for."),
+    newButtonLabel: i18n.t('New map')
+  },
+  [AO_TYPE_EVENT_VISUALIZATION]: {
+    modalTitle: i18n.t('Open an event visualization'),
+    loadingText: i18n.t('Loading event visualizations'),
+    errorTitle: i18n.t("Couldn't load event visualizations"),
+    errorText: i18n.t('There was a problem loading event visualizations. Try again or contact your system administrator.'),
+    noDataText: i18n.t('No event visualizations found. Click New event visualization to get started.'),
+    noFilteredDataText: i18n.t("No event visualizations found. Try adjusting your search or filter options to find what you're looking for."),
+    newButtonLabel: i18n.t('New event visualization')
   }
-
-  return texts[key];
-};
+};
+export const getTranslatedString = (type, key) => (texts[type] || texts[NO_TYPE])[key];

package/build/es/index.js

@@ -69,7 +69,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_GROUP_ALL, VIS_TYPE_GROUP_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

@@ -83,13 +83,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.",
@@ -110,13 +110,6 @@
     "No maps found. Click New map to get started.": "No maps found. Click New map to get started.",
     "No maps found. Try adjusting your search or filter options to find what you're looking for.": "No maps found. Try adjusting your search or filter options to find what you're looking for.",
     "New map": "New map",
-    "Open an event report": "Open an event report",
-    "Loading event reports": "Loading event reports",
-    "Couldn't load event reports": "Couldn't load event reports",
-    "There was a problem loading event reports. Try again or contact your system administrator.": "There was a problem loading event reports. Try again or contact your system administrator.",
-    "No event reports found. Click New event report to get started.": "No event reports found. Click New event report to get started.",
-    "No event reports found. Try adjusting your search or filter options to find what you're looking for.": "No event reports found. Try adjusting your search or filter options to find what you're looking for.",
-    "New event report": "New event report",
     "Open an event visualization": "Open an event visualization",
     "Loading event visualizations": "Loading event visualizations",
     "Couldn't load event visualizations": "Couldn't load event visualizations",
@@ -318,19 +311,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

@@ -17,6 +17,8 @@ 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_GROUP_ALL = 'ALL';
+export const VIS_TYPE_GROUP_CHARTS = 'CHARTS';
 export const visTypeDisplayNames = {
   [VIS_TYPE_PIVOT_TABLE]: i18n.t('Pivot table'),
   [VIS_TYPE_COLUMN]: i18n.t('Column'),
@@ -32,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_GROUP_ALL]: i18n.t('All types'),
+  [VIS_TYPE_GROUP_CHARTS]: i18n.t('All charts')
 };
 export const visTypeIcons = {
   [VIS_TYPE_PIVOT_TABLE]: IconTable24,
@@ -66,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];