@dhis2/analytics 21.2.5 → 22.0.0-alpha.1

package/build/cjs/components/FileMenu/FileMenu.js

@@ -40,8 +40,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const FileMenu = ({
   d2,
   // to be removed as soon as TranslateDialog and FavoritesDialog are rewritten
+  defaultFilterVisType,
   fileType,
   fileObject,
+  filterVisTypes,
   onNew,
   onOpen,
   onSave,
@@ -156,6 +158,8 @@ const FileMenu = ({
   }, _index.default.t('File'))), /*#__PURE__*/_react.default.createElement(_OpenFileDialog.OpenFileDialog, {
     open: currentDialog === 'open',
     type: fileType,
+    filterVisTypes: filterVisTypes,
+    defaultFilterVisType: defaultFilterVisType,
     onClose: onDialogClose,
     onFileSelect: id => {
       onOpen(id);
@@ -266,8 +270,10 @@ FileMenu.defaultProps = {
 };
 FileMenu.propTypes = {
   d2: _propTypes.default.object,
+  defaultFilterVisType: _propTypes.default.string,
   fileObject: _propTypes.default.object,
   fileType: _propTypes.default.oneOf(_utils.supportedFileTypes),
+  filterVisTypes: _propTypes.default.array,
   onDelete: _propTypes.default.func,
   onError: _propTypes.default.func,
   onNew: _propTypes.default.func,

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

@@ -7,6 +7,10 @@ exports.default = exports.CustomSelectOption = void 0;
 
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 
+var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
+
+var _ui = require("@dhis2/ui");
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -17,14 +21,15 @@ var _CustomSelectOptionStyle = _interopRequireDefault(require("./styles/CustomSe
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const CustomSelectOption = ({
+const CustomSelectOptionItem = ({
   value,
   label,
   icon,
+  insertDivider,
   onClick,
   active,
   disabled
-}) => /*#__PURE__*/_react.default.createElement("div", {
+}) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
   onClick: e => onClick({}, e),
   "data-value": value,
   "data-label": label,
@@ -33,10 +38,18 @@ const CustomSelectOption = ({
     disabled
   }) || "")
 }, icon, /*#__PURE__*/_react.default.createElement("span", {
-  className: "jsx-".concat(_CustomSelectOptionStyle.default.__hash) + " " + "label"
+  className: "jsx-".concat(_CustomSelectOptionStyle.default.__hash) + " " + ((0, _classnames.default)({
+    label: icon
+  }) || "")
 }, label), /*#__PURE__*/_react.default.createElement(_style.default, {
   id: _CustomSelectOptionStyle.default.__hash
-}, _CustomSelectOptionStyle.default));
+}, _CustomSelectOptionStyle.default)), insertDivider ? /*#__PURE__*/_react.default.createElement(_ui.MenuDivider, {
+  dense: true
+}) : null);
+
+const CustomSelectOption = props => props.disabled ? /*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
+  content: _d2I18n.default.t('Not supported by this app yet')
+}, /*#__PURE__*/_react.default.createElement(CustomSelectOptionItem, props)) : /*#__PURE__*/_react.default.createElement(CustomSelectOptionItem, props);
 
 exports.CustomSelectOption = CustomSelectOption;
 CustomSelectOption.propTypes = {
@@ -47,5 +60,6 @@ CustomSelectOption.propTypes = {
   disabled: _propTypes.default.bool,
   onClick: _propTypes.default.func
 };
+CustomSelectOptionItem.propTypes = CustomSelectOption.propTypes;
 var _default = CustomSelectOption;
 exports.default = _default;

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

@@ -18,14 +18,14 @@ var _DateField = require("./DateField.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const FileList = ({
-  type,
   data,
-  onSelect
+  onSelect,
+  showVisTypeColumn
 }) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, data.map(visualization => /*#__PURE__*/_react.default.createElement(_ui.DataTableRow, {
   key: visualization.id
 }, /*#__PURE__*/_react.default.createElement(_ui.DataTableCell, {
   onClick: () => onSelect(visualization.id)
-}, visualization.displayName), type === 'visualization' && /*#__PURE__*/_react.default.createElement(_ui.DataTableCell, {
+}, visualization.displayName), showVisTypeColumn && /*#__PURE__*/_react.default.createElement(_ui.DataTableCell, {
   align: "center"
 }, /*#__PURE__*/_react.default.createElement(_VisTypeIcon.VisTypeIcon, {
   type: visualization.type,
@@ -46,8 +46,8 @@ FileList.propTypes = {
     lastUpdated: _propTypes.default.string.isRequired,
     type: _propTypes.default.string
   })).isRequired,
-  type: _propTypes.default.string.isRequired,
-  onSelect: _propTypes.default.func.isRequired
+  onSelect: _propTypes.default.func.isRequired,
+  showVisTypeColumn: _propTypes.default.bool
 };
 var _default = FileList;
 exports.default = _default;

package/build/cjs/components/OpenFileDialog/OpenFileDialog.js

@@ -19,6 +19,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _visTypes = require("../../modules/visTypes.js");
+
 var _CreatedByFilter = require("./CreatedByFilter.js");
 
 var _FileList = require("./FileList.js");
@@ -68,6 +70,8 @@ const getQuery = type => ({
 const OpenFileDialog = ({
   type,
   open,
+  filterVisTypes,
+  defaultFilterVisType,
   onClose,
   onFileSelect,
   onNew,
@@ -77,7 +81,7 @@ const OpenFileDialog = ({
   const defaultFilters = {
     searchTerm: '',
     createdBy: _CreatedByFilter.CREATED_BY_ALL,
-    visType: _VisTypeFilter.VIS_TYPE_ALL
+    visType: defaultFilterVisType
   };
   const [{
     sortField,
@@ -108,26 +112,23 @@ const OpenFileDialog = ({
         break;
     }
 
-    switch (filters.visType) {
-      case _VisTypeFilter.VIS_TYPE_ALL:
-        break;
+    if (filters.visType) {
+      switch (filters.visType) {
+        case _visTypes.VIS_TYPE_ALL:
+          break;
 
-      case _VisTypeFilter.VIS_TYPE_CHARTS:
-        queryFilters.push('type:!eq:PIVOT_TABLE');
-        break;
+        case _visTypes.VIS_TYPE_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 === _utils.AO_TYPE_EVENT_REPORT) {
-      queryFilters.push('dataType:eq:EVENTS');
     }
 
     return queryFilters;
@@ -180,7 +181,7 @@ const OpenFileDialog = ({
     width: '110px'
   }];
 
-  if (type === _utils.AO_TYPE_VISUALIZATION) {
+  if (filterVisTypes !== null && filterVisTypes !== void 0 && filterVisTypes.length) {
     headers.splice(1, 0, {
       field: 'type',
       label: _d2I18n.default.t('Type'),
@@ -213,9 +214,10 @@ const OpenFileDialog = ({
         searchTerm: value
       }), 200));
     }
-  })), type === _utils.AO_TYPE_VISUALIZATION && /*#__PURE__*/_react.default.createElement("div", {
+  })), (filterVisTypes === null || filterVisTypes === void 0 ? void 0 : filterVisTypes.length) && /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-".concat(_OpenFileDialogStyles.styles.__hash) + " " + "type-field-container"
   }, /*#__PURE__*/_react.default.createElement(_VisTypeFilter.VisTypeFilter, {
+    visTypes: filterVisTypes,
     selected: filters.visType,
     onChange: value => setFilters({ ...filters,
       visType: value
@@ -284,9 +286,9 @@ const OpenFileDialog = ({
       onClose();
     }
   }, (0, _utils.getTranslatedString)(type, 'newButtonLabel'))))))))), (data === null || data === void 0 ? void 0 : data.files[_utils.AOTypeMap[type].apiEndpoint].length) > 0 && /*#__PURE__*/_react.default.createElement(_FileList.FileList, {
-    type: type,
     data: data.files[_utils.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[_utils.AOTypeMap[type].apiEndpoint].length) > 0 && /*#__PURE__*/_react.default.createElement(_ui.DataTableToolbar, {
     position: "bottom"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -307,7 +309,9 @@ OpenFileDialog.propTypes = {
   type: _propTypes.default.oneOf(Object.keys(_utils.AOTypeMap)).isRequired,
   onClose: _propTypes.default.func.isRequired,
   onFileSelect: _propTypes.default.func.isRequired,
-  onNew: _propTypes.default.func.isRequired
+  onNew: _propTypes.default.func.isRequired,
+  defaultFilterVisType: _propTypes.default.string,
+  filterVisTypes: _propTypes.default.array
 };
 var _default = OpenFileDialog;
 exports.default = _default;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.VisTypeFilter = exports.VIS_TYPE_CHARTS = exports.VIS_TYPE_ALL = void 0;
+exports.default = exports.VisTypeFilter = void 0;
 
 var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
 
@@ -21,12 +21,8 @@ var _CustomSelectOption = require("./CustomSelectOption.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const VIS_TYPE_ALL = 'all';
-exports.VIS_TYPE_ALL = VIS_TYPE_ALL;
-const VIS_TYPE_CHARTS = 'charts';
-exports.VIS_TYPE_CHARTS = VIS_TYPE_CHARTS;
-
 const VisTypeFilter = ({
+  visTypes,
   selected,
   onChange
 }) => /*#__PURE__*/_react.default.createElement(_ui.SingleSelect, {
@@ -37,26 +33,31 @@ const VisTypeFilter = ({
   prefix: _d2I18n.default.t('Type'),
   dense: true,
   maxHeight: "400px"
-}, /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
-  label: _d2I18n.default.t('All types'),
-  value: VIS_TYPE_ALL
-}), /*#__PURE__*/_react.default.createElement(_ui.SingleSelectOption, {
-  label: _d2I18n.default.t('All charts'),
-  value: VIS_TYPE_CHARTS
-}), /*#__PURE__*/_react.default.createElement(_ui.Divider, null), Object.entries(_visTypes.visTypeDisplayNames).map(([type, label]) => /*#__PURE__*/_react.default.createElement(_CustomSelectOption.CustomSelectOption, {
+}, visTypes === null || visTypes === void 0 ? void 0 : visTypes.map(({
+  type,
+  disabled,
+  insertDivider
+}) => /*#__PURE__*/_react.default.createElement(_CustomSelectOption.CustomSelectOption, {
   key: type,
-  label: label,
+  disabled: disabled,
+  label: (0, _visTypes.getDisplayNameByVisType)(type),
+  insertDivider: insertDivider,
   value: type,
-  icon: /*#__PURE__*/_react.default.createElement(_VisTypeIcon.VisTypeIcon, {
+  icon: _visTypes.visTypeIcons[type] ? /*#__PURE__*/_react.default.createElement(_VisTypeIcon.VisTypeIcon, {
     type: type,
     useSmall: true,
     color: _ui.colors.grey600
-  })
+  }) : undefined
 })));
 
 exports.VisTypeFilter = VisTypeFilter;
 VisTypeFilter.propTypes = {
   selected: _propTypes.default.string,
+  visTypes: _propTypes.default.arrayOf(_propTypes.default.shape({
+    disabled: _propTypes.default.bool,
+    insertDivider: _propTypes.default.bool,
+    type: _propTypes.default.string
+  })),
   onChange: _propTypes.default.func
 };
 var _default = VisTypeFilter;

package/build/cjs/index.js

@@ -525,6 +525,18 @@ Object.defineProperty(exports, "getLayoutTypeByVisType", {
     return _visTypeToLayoutType.getLayoutTypeByVisType;
   }
 });
+Object.defineProperty(exports, "VIS_TYPE_ALL", {
+  enumerable: true,
+  get: function () {
+    return _visTypes.VIS_TYPE_ALL;
+  }
+});
+Object.defineProperty(exports, "VIS_TYPE_CHARTS", {
+  enumerable: true,
+  get: function () {
+    return _visTypes.VIS_TYPE_CHARTS;
+  }
+});
 Object.defineProperty(exports, "VIS_TYPE_COLUMN", {
   enumerable: true,
   get: function () {
@@ -621,16 +633,16 @@ Object.defineProperty(exports, "VIS_TYPE_SCATTER", {
     return _visTypes.VIS_TYPE_SCATTER;
   }
 });
-Object.defineProperty(exports, "visTypeDisplayNames", {
+Object.defineProperty(exports, "VIS_TYPE_LINE_LIST", {
   enumerable: true,
   get: function () {
-    return _visTypes.visTypeDisplayNames;
+    return _visTypes.VIS_TYPE_LINE_LIST;
   }
 });
-Object.defineProperty(exports, "visTypeDescriptions", {
+Object.defineProperty(exports, "visTypeDisplayNames", {
   enumerable: true,
   get: function () {
-    return _visTypes.visTypeDescriptions;
+    return _visTypes.visTypeDisplayNames;
   }
 });
 Object.defineProperty(exports, "visTypeIcons", {

package/build/cjs/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/cjs/modules/visTypes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isColumnBasedType = exports.isLegendSetType = exports.isVerticalType = exports.isTwoCategoryChartType = exports.isSingleValue = exports.isMultiType = exports.isDualAxisType = exports.isYearOverYear = exports.isStacked = exports.defaultVisType = exports.getDisplayNameByVisType = exports.visTypeIcons = exports.visTypeDescriptions = exports.visTypeDisplayNames = exports.VIS_TYPE_SCATTER = exports.VIS_TYPE_PIVOT_TABLE = exports.VIS_TYPE_SINGLE_VALUE = exports.VIS_TYPE_YEAR_OVER_YEAR_COLUMN = exports.VIS_TYPE_YEAR_OVER_YEAR_LINE = exports.VIS_TYPE_BUBBLE = exports.VIS_TYPE_GAUGE = exports.VIS_TYPE_RADAR = exports.VIS_TYPE_PIE = exports.VIS_TYPE_STACKED_AREA = exports.VIS_TYPE_AREA = exports.VIS_TYPE_LINE = exports.VIS_TYPE_STACKED_BAR = exports.VIS_TYPE_BAR = exports.VIS_TYPE_STACKED_COLUMN = exports.VIS_TYPE_COLUMN = void 0;
+exports.isColumnBasedType = exports.isLegendSetType = exports.isVerticalType = exports.isTwoCategoryChartType = exports.isSingleValue = exports.isMultiType = exports.isDualAxisType = exports.isYearOverYear = exports.isStacked = exports.defaultVisType = exports.getDisplayNameByVisType = exports.visTypeIcons = exports.visTypeDisplayNames = exports.VIS_TYPE_CHARTS = exports.VIS_TYPE_ALL = exports.VIS_TYPE_LINE_LIST = exports.VIS_TYPE_SCATTER = exports.VIS_TYPE_PIVOT_TABLE = exports.VIS_TYPE_SINGLE_VALUE = exports.VIS_TYPE_YEAR_OVER_YEAR_COLUMN = exports.VIS_TYPE_YEAR_OVER_YEAR_LINE = exports.VIS_TYPE_BUBBLE = exports.VIS_TYPE_GAUGE = exports.VIS_TYPE_RADAR = exports.VIS_TYPE_PIE = exports.VIS_TYPE_STACKED_AREA = exports.VIS_TYPE_AREA = exports.VIS_TYPE_LINE = exports.VIS_TYPE_STACKED_BAR = exports.VIS_TYPE_BAR = exports.VIS_TYPE_STACKED_COLUMN = exports.VIS_TYPE_COLUMN = void 0;
 
 var _ui = require("@dhis2/ui");
 
@@ -43,6 +43,12 @@ const VIS_TYPE_PIVOT_TABLE = 'PIVOT_TABLE';
 exports.VIS_TYPE_PIVOT_TABLE = VIS_TYPE_PIVOT_TABLE;
 const VIS_TYPE_SCATTER = 'SCATTER';
 exports.VIS_TYPE_SCATTER = VIS_TYPE_SCATTER;
+const VIS_TYPE_LINE_LIST = 'LINE_LIST';
+exports.VIS_TYPE_LINE_LIST = VIS_TYPE_LINE_LIST;
+const VIS_TYPE_ALL = 'ALL';
+exports.VIS_TYPE_ALL = VIS_TYPE_ALL;
+const VIS_TYPE_CHARTS = 'CHARTS';
+exports.VIS_TYPE_CHARTS = VIS_TYPE_CHARTS;
 const visTypeDisplayNames = {
   [VIS_TYPE_PIVOT_TABLE]: _index.default.t('Pivot table'),
   [VIS_TYPE_COLUMN]: _index.default.t('Column'),
@@ -58,27 +64,12 @@ const visTypeDisplayNames = {
   [VIS_TYPE_YEAR_OVER_YEAR_LINE]: _index.default.t('Year over year (line)'),
   [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: _index.default.t('Year over year (column)'),
   [VIS_TYPE_SINGLE_VALUE]: _index.default.t('Single value'),
-  [VIS_TYPE_SCATTER]: _index.default.t('Scatter')
+  [VIS_TYPE_SCATTER]: _index.default.t('Scatter'),
+  [VIS_TYPE_LINE_LIST]: _index.default.t('Line list'),
+  [VIS_TYPE_ALL]: _index.default.t('All types'),
+  [VIS_TYPE_CHARTS]: _index.default.t('All charts')
 };
 exports.visTypeDisplayNames = visTypeDisplayNames;
-const visTypeDescriptions = {
-  [VIS_TYPE_PIVOT_TABLE]: _index.default.t('View data and indicators in a manipulatable table.'),
-  [VIS_TYPE_COLUMN]: _index.default.t('Compare sizes of related elements vertically. Recommend period as filter.'),
-  [VIS_TYPE_STACKED_COLUMN]: _index.default.t('Compare parts of a whole against related elements vertically. Recommend data or org. unit as series.'),
-  [VIS_TYPE_BAR]: _index.default.t('Compare sizes of related elements horizontally. Recommend period as filter.'),
-  [VIS_TYPE_STACKED_BAR]: _index.default.t('Compare parts of a whole against related elements horizontally. Recommend data or org. unit as series.'),
-  [VIS_TYPE_LINE]: _index.default.t('Track or compare changes over time. Recommend period as category.'),
-  [VIS_TYPE_AREA]: _index.default.t('Track or compare changes over time. Recommend period as category.'),
-  [VIS_TYPE_STACKED_AREA]: _index.default.t('Track or compare parts of a whole over time. Recommend data as series and period as category.'),
-  [VIS_TYPE_PIE]: _index.default.t('Compare parts of a whole at a single point in time. Recommend period as filter.'),
-  [VIS_TYPE_RADAR]: _index.default.t('Compare several items against multiple variables.'),
-  [VIS_TYPE_GAUGE]: _index.default.t('Compare a percentage indicator against a 100% scale. Recommend period as filter.'),
-  [VIS_TYPE_YEAR_OVER_YEAR_LINE]: _index.default.t('Compare changes over time between multiple time periods.'),
-  [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: _index.default.t('Compare changes over time between multiple time periods.'),
-  [VIS_TYPE_SINGLE_VALUE]: _index.default.t('Display a single value. Recommend relative period to show latest data.'),
-  [VIS_TYPE_SCATTER]: _index.default.t('View the relationship between two data items at a place or time. Recommended for finding outliers.')
-};
-exports.visTypeDescriptions = visTypeDescriptions;
 const visTypeIcons = {
   [VIS_TYPE_PIVOT_TABLE]: _ui.IconTable24,
   [VIS_TYPE_BAR]: _ui.IconVisualizationBar24,
@@ -94,7 +85,9 @@ const visTypeIcons = {
   [VIS_TYPE_YEAR_OVER_YEAR_LINE]: _ui.IconVisualizationLineMulti24,
   [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: _ui.IconVisualizationColumnMulti24,
   [VIS_TYPE_SINGLE_VALUE]: _ui.IconVisualizationSingleValue24,
-  [VIS_TYPE_SCATTER]: _ui.IconVisualizationScatter24
+  [VIS_TYPE_SCATTER]: _ui.IconVisualizationScatter24,
+  [VIS_TYPE_LINE_LIST]: _ui.IconTable24 // TODO different icon @joe
+
 };
 exports.visTypeIcons = visTypeIcons;
 

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

@@ -14,8 +14,10 @@ import { supportedFileTypes } from './utils.js';
 export const FileMenu = ({
   d2,
   // to be removed as soon as TranslateDialog and FavoritesDialog are rewritten
+  defaultFilterVisType,
   fileType,
   fileObject,
+  filterVisTypes,
   onNew,
   onOpen,
   onSave,
@@ -130,6 +132,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);
@@ -238,8 +242,10 @@ FileMenu.defaultProps = {
 };
 FileMenu.propTypes = {
   d2: 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
+}) : null);
+
+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_ALL, VIS_TYPE_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, 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_ALL:
+          break;
 
-      case VIS_TYPE_CHARTS:
-        queryFilters.push('type:!eq:PIVOT_TABLE');
-        break;
+        case VIS_TYPE_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) {
-      queryFilters.push('dataType:eq:EVENTS');
     }
 
     return queryFilters;
@@ -154,7 +154,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'),
@@ -187,9 +187,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
@@ -258,9 +259,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", {
@@ -279,6 +280,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;