@dhis2/analytics 20.7.0 → 21.0.0-alpha.4

package/build/cjs/visualizations/util/getFilterText.js

@@ -31,15 +31,7 @@ function _default(filters, metaData) {
     }) => _ouIdHelper.ouIdHelper.hasGroupPrefix(id) || _ouIdHelper.ouIdHelper.hasLevelPrefix(id))) {
       titleFragments.push((0, _getOuLevelAndGroupText.getOuLevelAndGroupText)(filter, metaData));
     } else {
-      let filterItems = [];
-
-      if ((0, _dimensionIs.dimensionIs)(filter, _predefinedDimensions.DIMENSION_ID_PERIOD)) {
-        filterItems = items.map(({
-          id
-        }) => id);
-      } else {
-        filterItems = metaData.dimensions[filter.dimension];
-      }
+      const filterItems = metaData.dimensions[filter.dimension];
 
       if (Array.isArray(filterItems)) {
         l = filterItems.length;

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

@@ -0,0 +1,93 @@
+import { DataProvider } from '@dhis2/app-runtime';
+import { storiesOf } from '@storybook/react';
+import React, { useState } from 'react';
+import OrgUnitDimension from '../components/OrgUnitDimension/OrgUnitDimension';
+
+const Wrapper = story => /*#__PURE__*/React.createElement(DataProvider, {
+  baseUrl: "http://localhost:8080/",
+  apiVersion: ""
+}, story());
+
+const defaultRootOrgUnits = ['ImspTQPwCqd']; // Sierra Leone
+
+storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('None selected', () => {
+  const [selected, setSelected] = useState([]);
+  return /*#__PURE__*/React.createElement(OrgUnitDimension, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Root selected', () => {
+  const [selected, setSelected] = useState([{
+    id: 'ImspTQPwCqd',
+    path: '/ImspTQPwCqd',
+    name: 'Sierra Leone'
+  }]);
+  return /*#__PURE__*/React.createElement(OrgUnitDimension, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Single level 2 child selected', () => {
+  const [selected, setSelected] = useState([{
+    id: 'fdc6uOvgoji',
+    path: '/ImspTQPwCqd/fdc6uOvgoji',
+    name: 'Bombali'
+  }]);
+  return /*#__PURE__*/React.createElement(OrgUnitDimension, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple level 2 children selected', () => {
+  const [selected, setSelected] = useState([{
+    id: 'O6uvpzGd5pu',
+    path: '/ImspTQPwCqd/O6uvpzGd5pu',
+    name: 'Bo'
+  }, {
+    id: 'fdc6uOvgoji',
+    path: '/ImspTQPwCqd/fdc6uOvgoji',
+    name: 'Bombali'
+  }, {
+    id: 'lc3eMKXaEfw',
+    path: '/ImspTQPwCqd/lc3eMKXaEfw',
+    name: 'Bonthe'
+  }]);
+  return /*#__PURE__*/React.createElement(OrgUnitDimension, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple selected across different levels', () => {
+  const [selected, setSelected] = useState([{
+    id: 'fdc6uOvgoji',
+    path: '/ImspTQPwCqd/fdc6uOvgoji',
+    name: 'Bombali'
+  }, {
+    id: 'KKkLOTpMXGV',
+    path: '/ImspTQPwCqd/fdc6uOvgoji/KKkLOTpMXGV',
+    name: 'Bombali Sebora'
+  }, {
+    id: 'GQcsUZf81vP',
+    path: '/ImspTQPwCqd/fdc6uOvgoji/KKkLOTpMXGV/GQcsUZf81vP',
+    name: 'Govt. Hosp. Makeni'
+  }]);
+  return /*#__PURE__*/React.createElement(OrgUnitDimension, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple roots', () => {
+  const [selected, setSelected] = useState([]);
+  return /*#__PURE__*/React.createElement(OrgUnitDimension, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: ['O6uvpzGd5pu', 'fdc6uOvgoji'] // Bo + Bombali
+
+  });
+});

package/build/es/api/organisationUnits.js

@@ -1,49 +1,99 @@
 import { onError } from './index';
-export const apiFetchOrganisationUnitRoot = d2 => {
-  const endPoint = '/organisationUnits';
-  const fields = ['id', 'displayName', 'name'];
-  const url = "".concat(endPoint, "?paging=false&userDataViewFallback=true&fields=").concat(fields.join(','));
-  return d2.Api.getApi().get(url).then(({
-    organisationUnits
-  }) => organisationUnits[0]).catch(onError);
-};
-/**
- * Fetch organisation units
- * @returns {Promise<T | never>}
- */
-
-export const apiFetchOrganisationUnits = (d2, displayNameProperty) => {
-  const fields = ['id', 'path', "".concat(displayNameProperty, "~rename(displayName)"), 'children::isNotEmpty'];
-  return d2.models.organisationUnits.list({
-    paging: false,
+const orgUnitLevelsQuery = {
+  resource: 'organisationUnitLevels',
+  params: ({
+    displayNameProp = 'displayName'
+  }) => ({
+    fields: "id,level,".concat(displayNameProp, "~rename(displayName),name"),
+    paging: false
+  })
+};
+const orgUnitGroupsQuery = {
+  resource: 'organisationUnitGroups',
+  params: ({
+    displayNameProp = 'displayName'
+  }) => ({
+    fields: "id,".concat(displayNameProp, "~rename(displayName),name"),
+    paging: false
+  })
+};
+const orgUnitRootsQuery = {
+  resource: 'organisationUnits',
+  params: {
+    fields: 'id,displayName,name',
+    userDataViewFallback: true,
+    paging: false
+  }
+};
+const orgUnitsQuery = {
+  resource: 'organisationUnits',
+  params: ({
+    displayNameProp
+  }) => ({
+    fields: "id,path,".concat(displayNameProp, "~rename(displayName),children::isNotEmpty"),
     level: 1,
-    fields: fields.join(','),
-    userDataViewFallback: true
+    userDataViewFallback: true,
+    paging: false
+  })
+};
+const orgUnitQuery = {
+  resource: 'organisationUnits',
+  id: ({
+    id
+  }) => id,
+  params: {
+    fields: 'id,level,displayName~rename(name),path,parent[id,displayName~rename(name)],children[level]',
+    userDataViewFallback: true,
+    paging: false
+  }
+};
+export const apiFetchOrganisationUnitLevels = async dataEngine => {
+  const orgUnitLevelsData = await dataEngine.query({
+    orgUnitLevels: orgUnitLevelsQuery
+  }, {
+    onError
   });
+  return orgUnitLevelsData.orgUnitLevels.organisationUnitLevels;
 };
-/**
- * Fetch organisation unit groups
- * @returns {*}
- */
-
-export const apiFetchOrganisationUnitGroups = (d2, displayNameProperty) => {
-  const endPoint = '/organisationUnitGroups';
-  const fields = ['id', "".concat(displayNameProperty, "~rename(displayName)"), 'name'];
-  const url = "".concat(endPoint, "?paging=false&fields=").concat(fields.join(','));
-  return d2.Api.getApi().get(url).then(({
-    organisationUnitGroups
-  }) => organisationUnitGroups).catch(onError);
-};
-/**
- * Fetch organisation unit levels
- * @returns {*}
- */
+export const apiFetchOrganisationUnitGroups = async (dataEngine, displayNameProp) => {
+  const orgUnitGroupsData = await dataEngine.query({
+    orgUnitGroups: orgUnitGroupsQuery
+  }, {
+    variables: {
+      displayNameProp
+    },
+    onError
+  });
+  return orgUnitGroupsData.orgUnitGroups.organisationUnitGroups;
+};
+export const apiFetchOrganisationUnitRoots = async dataEngine => {
+  const orgUnitRootsData = await dataEngine.query({
+    orgUnitRoots: orgUnitRootsQuery
+  }, {
+    onError
+  });
+  return orgUnitRootsData.orgUnitRoots.organisationUnits;
+}; // TODO: Unused, previously used to load all org units for the tree, but that is done by the ui component internally now, remove?
 
-export const apiFetchOrganisationUnitLevels = d2 => {
-  const endPoint = '/organisationUnitLevels';
-  const fields = ['id', 'displayName', 'name', 'level'];
-  const url = "".concat(endPoint, "?paging=false&fields=").concat(fields.join(','));
-  return d2.Api.getApi().get(url).then(({
-    organisationUnitLevels
-  }) => organisationUnitLevels).catch(onError);
+export const apiFetchOrganisationUnits = async (dataEngine, displayNameProp) => {
+  const orgUnitsData = await dataEngine.query({
+    orgUnits: orgUnitsQuery
+  }, {
+    variables: {
+      displayNameProp
+    },
+    onError
+  });
+  return orgUnitsData.orgUnits.organisationUnits;
+};
+export const apiFetchOrganisationUnit = async (dataEngine, id) => {
+  const orgUnitData = await dataEngine.query({
+    orgUnit: orgUnitQuery
+  }, {
+    variables: {
+      id
+    },
+    onError
+  });
+  return orgUnitData.orgUnit;
 };

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

@@ -1,6 +1,6 @@
 import { useDataMutation } from '@dhis2/app-runtime';
-import PropTypes from '@dhis2/prop-types';
 import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button } from '@dhis2/ui';
+import PropTypes from 'prop-types';
 import React, { useMemo } from 'react';
 import i18n from '../../locales/index.js';
 import { supportedFileTypes, endpointFromFileType } from './utils';

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

@@ -1,7 +1,7 @@
 import _JSXStyle from "styled-jsx/style";
 import TranslationDialog from '@dhis2/d2-ui-translation-dialog';
-import PropTypes from '@dhis2/prop-types';
 import { IconAdd24, IconLaunch24, IconSave24, IconEdit24, IconTranslate24, IconShare24, IconLink24, IconDelete24, SharingDialog, colors, FlyoutMenu, Layer, MenuItem, MenuDivider, Popper } from '@dhis2/ui';
+import PropTypes from 'prop-types';
 import React, { createRef, useState } from 'react';
 import i18n from '../../locales/index.js';
 import { OpenFileDialog } from '../OpenFileDialog/OpenFileDialog';

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

@@ -1,6 +1,6 @@
 import { useConfig } from '@dhis2/app-runtime';
-import PropTypes from '@dhis2/prop-types';
 import { Modal, ModalContent, ModalActions, ButtonStrip, Button } from '@dhis2/ui';
+import PropTypes from 'prop-types';
 import React from 'react';
 import i18n from '../../locales/index.js';
 import { supportedFileTypes, appPathFor } from './utils';

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

@@ -1,6 +1,6 @@
 import { useDataMutation } from '@dhis2/app-runtime';
-import PropTypes from '@dhis2/prop-types';
 import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button, InputField, TextAreaField } from '@dhis2/ui';
+import PropTypes from 'prop-types';
 import React, { useMemo, useState } from 'react';
 import i18n from '../../locales/index.js';
 import { supportedFileTypes, endpointFromFileType } from './utils';

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

@@ -1,5 +1,5 @@
-import PropTypes from '@dhis2/prop-types';
 import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button, InputField, TextAreaField } from '@dhis2/ui';
+import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import i18n from '../../locales/index.js';
 import { supportedFileTypes } from './utils';