@dhis2/analytics 28.0.2 → 28.0.4

package/build/es/components/Toolbar/ToolbarSidebar.js

@@ -3,25 +3,19 @@ import { colors } from '@dhis2/ui';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
-export const ToolbarSidebar = _ref => {
-  let {
-    children,
-    dataTest,
+export const ToolbarSidebar = ({
+  children,
+  dataTest = 'dhis2-analytics-toolbarsidebar',
+  isHidden
+}) => /*#__PURE__*/React.createElement("div", {
+  "data-test": dataTest,
+  className: _JSXStyle.dynamic([["1150014343", [colors.grey400]]]) + " " + (cx('container', {
     isHidden
-  } = _ref;
-  return /*#__PURE__*/React.createElement("div", {
-    "data-test": dataTest,
-    className: _JSXStyle.dynamic([["1150014343", [colors.grey400]]]) + " " + (cx('container', {
-      isHidden
-    }) || "")
-  }, children, /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "1150014343",
-    dynamic: [colors.grey400]
-  }, [`div.__jsx-style-dynamic-selector{width:260px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:stretch;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch;border-right:1px solid ${colors.grey400};}`, "div.isHidden.__jsx-style-dynamic-selector{display:none;}"]));
-};
-ToolbarSidebar.defaultProps = {
-  dataTest: 'dhis2-analytics-toolbarsidebar'
-};
+  }) || "")
+}, children, /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "1150014343",
+  dynamic: [colors.grey400]
+}, [`div.__jsx-style-dynamic-selector{width:260px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:stretch;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch;border-right:1px solid ${colors.grey400};}`, "div.isHidden.__jsx-style-dynamic-selector{display:none;}"]));
 ToolbarSidebar.propTypes = {
   children: PropTypes.node,
   dataTest: PropTypes.string,

package/build/es/components/Toolbar/UpdateButton.js

@@ -4,30 +4,24 @@ import { CircularLoader, IconSync16, colors } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
 import menuButtonStyles from './MenuButton.styles.js';
-export const UpdateButton = _ref => {
-  let {
-    onClick,
-    disabled,
-    loading,
-    dataTest
-  } = _ref;
-  return /*#__PURE__*/React.createElement("button", {
-    onClick: onClick,
-    disabled: disabled,
-    "data-test": dataTest,
-    className: `jsx-${menuButtonStyles.__hash}` + " " + _JSXStyle.dynamic([["2364287882", [colors.blue700, colors.blue100, colors.blue200]]])
-  }, loading ? /*#__PURE__*/React.createElement(CircularLoader, {
-    extrasmall: true
-  }) : /*#__PURE__*/React.createElement(IconSync16, null), i18n.t('Update'), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: menuButtonStyles.__hash
-  }, menuButtonStyles), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "2364287882",
-    dynamic: [colors.blue700, colors.blue100, colors.blue200]
-  }, [`button.__jsx-style-dynamic-selector{gap:8px;color:${colors.blue700};font-weight:500;}`, `button.__jsx-style-dynamic-selector:hover.__jsx-style-dynamic-selector:enabled{background:${colors.blue100};}`, `button.__jsx-style-dynamic-selector:active{background:${colors.blue200};}`]));
-};
-UpdateButton.defaultProps = {
-  dataTest: 'dhis2-analytics-updatebutton'
-};
+export const UpdateButton = ({
+  onClick,
+  disabled,
+  loading,
+  dataTest = 'dhis2-analytics-updatebutton'
+}) => /*#__PURE__*/React.createElement("button", {
+  onClick: onClick,
+  disabled: disabled,
+  "data-test": dataTest,
+  className: `jsx-${menuButtonStyles.__hash}` + " " + _JSXStyle.dynamic([["2364287882", [colors.blue700, colors.blue100, colors.blue200]]])
+}, loading ? /*#__PURE__*/React.createElement(CircularLoader, {
+  extrasmall: true
+}) : /*#__PURE__*/React.createElement(IconSync16, null), i18n.t('Update'), /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: menuButtonStyles.__hash
+}, menuButtonStyles), /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "2364287882",
+  dynamic: [colors.blue700, colors.blue100, colors.blue200]
+}, [`button.__jsx-style-dynamic-selector{gap:8px;color:${colors.blue700};font-weight:500;}`, `button.__jsx-style-dynamic-selector:hover.__jsx-style-dynamic-selector:enabled{background:${colors.blue100};}`, `button.__jsx-style-dynamic-selector:active{background:${colors.blue200};}`]));
 UpdateButton.propTypes = {
   onClick: PropTypes.func.isRequired,
   dataTest: PropTypes.string,

package/build/es/components/TransferOption.js

@@ -4,21 +4,20 @@ import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 import styles from './styles/TransferOption.style.js';
-export const TransferOption = _ref => {
-  let {
-    disabled,
-    label,
-    highlighted,
-    selected,
-    onClick,
-    onDoubleClick,
-    value,
-    icon,
-    active,
-    tooltipText,
-    dataTest,
-    onEditClick
-  } = _ref;
+export const TransferOption = ({
+  disabled,
+  label,
+  highlighted,
+  selected,
+  onClick,
+  onDoubleClick,
+  value,
+  icon,
+  active,
+  tooltipText,
+  dataTest,
+  onEditClick
+}) => {
   const renderContent = () => /*#__PURE__*/React.createElement("div", {
     "data-test": `${dataTest}-content`,
     onClick: event => {

package/build/es/components/TranslationDialog/TranslationModal/LocalesSelect.js

@@ -8,33 +8,28 @@ const query = {
     resource: 'locales/db'
   }
 };
-export const LocalesSelect = _ref => {
-  let {
-    onChange,
-    selected
-  } = _ref;
+export const LocalesSelect = ({
+  onChange,
+  selected
+}) => {
   const {
     data,
     fetching
   } = useDataQuery(query);
   return /*#__PURE__*/React.createElement(SingleSelect, {
     prefix: selected ? i18n.t('Translating to') : i18n.t('Choose a locale'),
-    onChange: _ref2 => {
-      let {
-        selected
-      } = _ref2;
-      return onChange(selected);
-    },
+    onChange: ({
+      selected
+    }) => onChange(selected),
     loading: fetching,
     selected: data && selected ? selected : '',
     dense: true
   }, data && data.locales
   // XXX remove duplicates ?! fr_SN - French (Senegal)
-  .reduce((locales, _ref3) => {
-    let {
-      locale,
-      name
-    } = _ref3;
+  .reduce((locales, {
+    locale,
+    name
+  }) => {
     if (!locales.find(entry => entry.locale === locale)) {
       locales.push({
         locale,
@@ -42,17 +37,14 @@ export const LocalesSelect = _ref => {
       });
     }
     return locales;
-  }, []).map(_ref4 => {
-    let {
-      locale,
-      name
-    } = _ref4;
-    return /*#__PURE__*/React.createElement(SingleSelectOption, {
-      key: locale,
-      value: locale,
-      label: name
-    });
-  }));
+  }, []).map(({
+    locale,
+    name
+  }) => /*#__PURE__*/React.createElement(SingleSelectOption, {
+    key: locale,
+    value: locale,
+    label: name
+  })));
 };
 LocalesSelect.propTypes = {
   onChange: PropTypes.func.isRequired,

package/build/es/components/TranslationDialog/TranslationModal/TranslationForm.js

@@ -7,15 +7,14 @@ import { LocalesSelect } from './LocalesSelect.js';
 import { TranslationModalActions } from './TranslationModalActions.js';
 const SESSION_STORAGE_TRANSLATION_LOCALE_KEY = 'translation-dialog-selected-locale';
 const camelCaseToUnderscores = field => field.replace(/[a-z][A-Z]/g, match => [match.charAt(0), match.charAt(1)].join('_')).toLowerCase();
-export const TranslationForm = _ref => {
-  let {
-    fieldsToTranslate,
-    objectToTranslate,
-    translations,
-    resource,
-    onTranslationSaved,
-    onClose
-  } = _ref;
+export const TranslationForm = ({
+  fieldsToTranslate,
+  objectToTranslate,
+  translations,
+  resource,
+  onTranslationSaved,
+  onClose
+}) => {
   const [newTranslations, setNewTranslations] = useState();
   const [translationLocale, setTranslationLocale] = useState();
   const [fieldsTranslations, setFieldsTranslations] = useState({});
@@ -68,14 +67,11 @@ export const TranslationForm = _ref => {
   const translationsMutationRef = useRef({
     resource: `${resource}/translations`,
     type: 'update',
-    data: _ref2 => {
-      let {
-        translations
-      } = _ref2;
-      return {
-        translations
-      };
-    }
+    data: ({
+      translations
+    }) => ({
+      translations
+    })
   });
   const [saveTranslations, {
     loading: saveInProgress
@@ -119,12 +115,9 @@ export const TranslationForm = _ref => {
   })), translationLocale && /*#__PURE__*/React.createElement(DataTableCell, null, /*#__PURE__*/React.createElement(TextAreaField, {
     label: fieldsTranslations[field],
     value: getTranslationForField(field),
-    onChange: _ref3 => {
-      let {
-        value
-      } = _ref3;
-      return setTranslationForField(field, value);
-    },
+    onChange: ({
+      value
+    }) => setTranslationForField(field, value),
     rows: 3
   })), !translationLocale && index === 0 && /*#__PURE__*/React.createElement(DataTableCell, {
     rowSpan: String(fieldsToTranslate.length)

package/build/es/components/TranslationDialog/TranslationModal/TranslationModal.js

@@ -5,16 +5,15 @@ import React, { useEffect, useState } from 'react';
 import { TranslationForm } from './TranslationForm.js';
 import { TranslationModalActions } from './TranslationModalActions.js';
 import { useTranslationsResults } from './useTranslationsResults.js';
-export const TranslationModal = _ref => {
-  let {
-    objectToTranslate,
-    fieldsToTranslate,
-    onClose,
-    onTranslationSaved
-  } = _ref;
+export const TranslationModal = ({
+  objectToTranslate,
+  fieldsToTranslate,
+  onClose,
+  onTranslationSaved
+}) => {
   const [translations, setTranslations] = useState([]);
   const endpointPath = new URL(objectToTranslate.href).pathname;
-  const endpointPathMatch = endpointPath.match(/api\/\d+\/(?<resource>.+)/);
+  const endpointPathMatch = endpointPath.match(/api\/(?:\d+\/)?(?<resource>.+)/);
   const resource = endpointPathMatch !== null && endpointPathMatch !== void 0 && endpointPathMatch.groups ? endpointPathMatch.groups.resource : null;
   const {
     translationsData,

package/build/es/components/TranslationDialog/TranslationModal/TranslationModalActions.js

@@ -4,36 +4,27 @@ import { Button, ButtonStrip, ModalActions } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { OfflineTooltip } from '../../OfflineTooltip.js';
-const SaveButton = _ref => {
-  let {
-    disabled,
-    loading,
-    onClick
-  } = _ref;
-  return /*#__PURE__*/React.createElement(Button, {
-    primary: true,
-    onClick: onClick,
-    loading: loading,
-    disabled: disabled
-  }, i18n.t('Save translations'));
-};
-SaveButton.defaultProps = {
-  disabled: false,
-  loading: false,
-  onClick: Function.prototype
-};
+const SaveButton = ({
+  disabled = false,
+  loading = false,
+  onClick = Function.prototype
+}) => /*#__PURE__*/React.createElement(Button, {
+  primary: true,
+  onClick: onClick,
+  loading: loading,
+  disabled: disabled
+}, i18n.t('Save translations'));
 SaveButton.propTypes = {
   disabled: PropTypes.bool.isRequired,
-  loading: PropTypes.bool.isRequired,
-  onClick: PropTypes.func.isRequired
+  onClick: PropTypes.func.isRequired,
+  loading: PropTypes.bool
 };
-export const TranslationModalActions = _ref2 => {
-  let {
-    onClose,
-    onSave,
-    saveInProgress,
-    saveButtonDisabled
-  } = _ref2;
+export const TranslationModalActions = ({
+  onClose,
+  onSave = Function.prototype,
+  saveInProgress,
+  saveButtonDisabled
+}) => {
   const {
     isDisconnected: offline
   } = useDhis2ConnectionStatus();

package/build/es/components/TranslationDialog/TranslationModal/__tests__/TranslationModal.spec.js

@@ -0,0 +1,49 @@
+import { ModalTitle, Modal } from '@dhis2/ui';
+import { shallow } from 'enzyme';
+import React from 'react';
+import { TranslationModal } from '../TranslationModal.js';
+const mockUseTranslationResults = jest.fn(() => ({
+  translationsData: undefined,
+  fetching: false
+}));
+jest.mock('../useTranslationsResults.js', () => ({
+  useTranslationsResults: args => mockUseTranslationResults(args)
+}));
+describe('The Translation Dialog component', () => {
+  let shallowTranslationModal;
+  let props;
+  const onClose = jest.fn();
+  const onTranslationSaved = jest.fn();
+  const getTranslationModalComponent = props => {
+    if (!shallowTranslationModal) {
+      shallowTranslationModal = shallow(/*#__PURE__*/React.createElement(TranslationModal, props));
+    }
+    return shallowTranslationModal;
+  };
+  beforeEach(() => {
+    shallowTranslationModal = undefined;
+    props = {
+      fieldsToTranslate: ['name', 'description'],
+      objectToTranslate: {
+        name: 'Test object',
+        href: 'https://dhis2.tld/path/api/visualization/object-id'
+      },
+      onClose,
+      onTranslationSaved
+    };
+  });
+  it('renders a Modal component', () => {
+    expect(getTranslationModalComponent(props).find(Modal)).toHaveLength(1);
+  });
+  it("renders a ModalTitle containing the object's name", () => {
+    expect(getTranslationModalComponent(props).find(ModalTitle).childAt(0).text()).toEqual(`Translate: ${props.objectToTranslate.name}`);
+  });
+  test.each(['https://dhis2.tld/path/api/visualization/object-id', 'https://dhis2.tld/path/api/42/visualization/object-id'])('uses the correct resource for the translation endpoint', href => {
+    props.objectToTranslate.href = href;
+    getTranslationModalComponent(props);
+    expect(mockUseTranslationResults).toHaveBeenCalled();
+    expect(mockUseTranslationResults).toHaveBeenCalledWith({
+      resource: 'visualization/object-id'
+    });
+  });
+});

package/build/es/components/TranslationDialog/TranslationModal/useTranslationsResults.js

@@ -1,10 +1,9 @@
 import { useAlert, useDataQuery } from '@dhis2/app-runtime';
 import i18n from '@dhis2/d2-i18n';
 import { useRef } from 'react';
-export const useTranslationsResults = _ref => {
-  let {
-    resource
-  } = _ref;
+export const useTranslationsResults = ({
+  resource
+}) => {
   const translationsQueryRef = useRef({
     translations: {
       resource: `${resource}/translations`

package/build/es/components/UserMention/UserList.js

@@ -2,13 +2,12 @@ import i18n from '@dhis2/d2-i18n';
 import { MenuItem } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
-export const UserList = _ref => {
-  let {
-    users,
-    selectedUserIndex,
-    onUserClick,
-    pager
-  } = _ref;
+export const UserList = ({
+  users,
+  selectedUserIndex,
+  onUserClick,
+  pager
+}) => {
   return /*#__PURE__*/React.createElement(React.Fragment, null, users.map(u => {
     var _users$selectedUserIn;
     return /*#__PURE__*/React.createElement(MenuItem, {

package/build/es/components/UserMention/UserMentionWrapper.js

@@ -23,12 +23,11 @@ const getVirtualPopperReference = ref => {
     })
   };
 };
-export const UserMentionWrapper = _ref => {
-  let {
-    children,
-    inputReference,
-    onUserSelect
-  } = _ref;
+export const UserMentionWrapper = ({
+  children,
+  inputReference,
+  onUserSelect = Function.prototype
+}) => {
   const [listIsOpen, setListIsOpen] = useState(false);
   const [captureText, setCaptureText] = useState(false);
   const [capturedText, setCapturedText] = useState('');
@@ -61,10 +60,9 @@ export const UserMentionWrapper = _ref => {
   const onUserListClose = () => reset();
 
   // event bubbles up from the input/textarea
-  const onInput = _ref2 => {
-    let {
-      target
-    } = _ref2;
+  const onInput = ({
+    target
+  }) => {
     const {
       selectionEnd,
       value
@@ -83,11 +81,10 @@ export const UserMentionWrapper = _ref => {
   };
 
   // event bubbles up from the wrapped input/textarea
-  const onKeyDown = _ref3 => {
-    let {
-      key,
-      target
-    } = _ref3;
+  const onKeyDown = ({
+    key,
+    target
+  }) => {
     const {
       selectionStart
     } = target;
@@ -187,9 +184,6 @@ export const UserMentionWrapper = _ref => {
     id: userMentionWrapperClasses.__hash
   }, userMentionWrapperClasses), resolvedHeaderStyle.styles);
 };
-UserMentionWrapper.defaultProps = {
-  onUserSelect: Function.prototype
-};
 UserMentionWrapper.propTypes = {
   inputReference: PropTypes.object.isRequired,
   onUserSelect: PropTypes.func.isRequired,

package/build/es/components/UserMention/useUserSearchResults.js

@@ -4,24 +4,20 @@ import { useCallback, useEffect, useState } from 'react';
 const usersQuery = {
   users: {
     resource: 'users/gist',
-    params: _ref => {
-      let {
-        searchText
-      } = _ref;
-      return {
-        fields: 'id,displayName,username',
-        order: 'firstName,surname',
-        total: true,
-        filter: `username:ilike:${searchText},firstName:ilike:${searchText},surname:ilike:${searchText},email:ilike:${searchText}`,
-        rootJunction: 'OR'
-      };
-    }
+    params: ({
+      searchText
+    }) => ({
+      fields: 'id,displayName,username',
+      order: 'firstName,surname',
+      total: true,
+      filter: `username:ilike:${searchText},firstName:ilike:${searchText},surname:ilike:${searchText},email:ilike:${searchText}`,
+      rootJunction: 'OR'
+    })
   }
 };
-export const useUserSearchResults = _ref2 => {
-  let {
-    searchText
-  } = _ref2;
+export const useUserSearchResults = ({
+  searchText
+}) => {
   const [{
     users,
     pager

package/build/es/components/VisTypeIcon.js

@@ -2,12 +2,11 @@ import { IconVisualizationArea16, IconVisualizationAreaStacked16, IconVisualizat
 import PropTypes from 'prop-types';
 import React from 'react';
 import { VIS_TYPE_LINE_LIST, VIS_TYPE_PIVOT_TABLE, 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_SCATTER, VIS_TYPE_OUTLIER_TABLE } from '../modules/visTypes.js';
-export const VisTypeIcon = _ref => {
-  let {
-    type,
-    useSmall = false,
-    ...props
-  } = _ref;
+export const VisTypeIcon = ({
+  type,
+  useSmall = false,
+  ...props
+}) => {
   let VisIcon;
   switch (type) {
     case VIS_TYPE_LINE_LIST:

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

@@ -49,11 +49,6 @@
     "No data elements found": "",
     "Drag items here, or double click in the list, to start building a calculation formula": "",
     "Math operators": "",
-    "Data Type": "",
-    "Only {{dataType}} can be used in {{visType}}": "",
-    "All types": "",
-    "Disaggregation": "",
-    "No data": "",
     "Expression description": "",
     "Error loading value": "",
     "None": "لا شيء",
@@ -102,9 +97,24 @@
     "{{ offsetPeriodType }} × {{ offsetPeriods }}": "",
     "Expression": "",
     "Filter": "",
+    "All available options are already selected": "",
+    "No available options for this item": "",
+    "Search by option name": "",
+    "Back to all items": "",
+    "Options": "الخيارات",
+    "Selected items": "",
+    "Data Type": "",
+    "Only {{dataType}} can be used in {{visType}}": "",
+    "All types": "",
+    "Disaggregation": "",
+    "No data": "",
     "Search by data item name": "",
-    "No items selected": "",
     "Selected Items": "",
+    "All available items are already selected": "",
+    "Calculation": "",
+    "Metric type": "",
+    "All metrics": "",
+    "No items selected": "",
     "No indicators found": "",
     "No data sets found": "",
     "No event data items found": "",
@@ -116,9 +126,7 @@
     "No program indicators found for \"{{- searchTerm}}\"": "",
     "No calculations found for \"{{- searchTerm}}\"": "",
     "Nothing found for \"{{- searchTerm}}\"": "",
-    "Calculation": "",
-    "Metric type": "",
-    "All metrics": "",
+    "Click to choose from available options": "",
     "Move to {{axisName}}": "",
     "Add to {{axisName}}": "",
     "Not available for {{visualizationType}}": "",
@@ -135,7 +143,6 @@
     "Manually select items...": "",
     "Nothing found in {{- dimensionTitle}}": "",
     "Search": "البحث",
-    "Nothing found for {{- searchTerm}}": "",
     "Delete {{fileType}}": "",
     "This {{fileType}} and related interpretations will be deleted. Continue?": "",
     "Delete": "حذف",
@@ -159,6 +166,7 @@
     "line list": "",
     "map": "",
     "visualization": "",
+    "Untitled {{visualizationType}}, {{date}}": "",
     "Edit": "تعديل",
     "Write a reply": "",
     "Post reply": "",
@@ -227,7 +235,6 @@
     "No line lists found. Click New line list to get started.": "",
     "No line lists found. Try adjusting your search or filter options to find what you're looking for.": "",
     "New line list": "",
-    "Options": "الخيارات",
     "Hide": "إخفاء",
     "{{count}} org units_0": "",
     "{{count}} org units_1": "",
@@ -383,6 +390,7 @@
     "Program indicators": "",
     "Program indicator": "",
     "Calculations": "",
+    "Option": "",
     "Number": "",
     "Formula is empty. Add items to the formula from the lists on the left.": "",
     "Consecutive math operators": "",
@@ -464,6 +472,7 @@
     "Single value": "",
     "Outlier table": "",
     "All charts": "",
+    "Map": "الخريطة",
     "{{seriesName}} (trend)": "",
     "Trend": "",
     "No legend for this series": "",

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

@@ -164,6 +164,7 @@
     "line list": "seznam řádků",
     "map": "mapa",
     "visualization": "vizualizace",
+    "Untitled {{visualizationType}}, {{date}}": "",
     "Edit": "Upravit",
     "Write a reply": "Napsat odpověď",
     "Post reply": "Odpovědět",
@@ -461,6 +462,7 @@
     "Single value": "Jedna hodnota",
     "Outlier table": "",
     "All charts": "Všechny grafy",
+    "Map": "Mapa",
     "{{seriesName}} (trend)": "{{seriesName}} (trend)",
     "Trend": "Trend",
     "No legend for this series": "Pro tuto sérii není legenda",

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

@@ -153,6 +153,7 @@
     "Share…": "Share…",
     "Get link…": "Get link…",
     "Open in this app": "Open in this app",
+    "Copy to clipboard": "Copy to clipboard",
     "Close": "Close",
     "Rename {{fileType}}": "Rename {{fileType}}",
     "Rename": "Rename",