@dhis2/analytics 20.7.0 → 21.0.0-alpha.4

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

@@ -0,0 +1,104 @@
+"use strict";
+
+var _appRuntime = require("@dhis2/app-runtime");
+
+var _react = require("@storybook/react");
+
+var _react2 = _interopRequireWildcard(require("react"));
+
+var _OrgUnitDimension = _interopRequireDefault(require("../components/OrgUnitDimension/OrgUnitDimension"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+const Wrapper = story => /*#__PURE__*/_react2.default.createElement(_appRuntime.DataProvider, {
+  baseUrl: "http://localhost:8080/",
+  apiVersion: ""
+}, story());
+
+const defaultRootOrgUnits = ['ImspTQPwCqd']; // Sierra Leone
+
+(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('None selected', () => {
+  const [selected, setSelected] = (0, _react2.useState)([]);
+  return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Root selected', () => {
+  const [selected, setSelected] = (0, _react2.useState)([{
+    id: 'ImspTQPwCqd',
+    path: '/ImspTQPwCqd',
+    name: 'Sierra Leone'
+  }]);
+  return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Single level 2 child selected', () => {
+  const [selected, setSelected] = (0, _react2.useState)([{
+    id: 'fdc6uOvgoji',
+    path: '/ImspTQPwCqd/fdc6uOvgoji',
+    name: 'Bombali'
+  }]);
+  return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple level 2 children selected', () => {
+  const [selected, setSelected] = (0, _react2.useState)([{
+    id: 'O6uvpzGd5pu',
+    path: '/ImspTQPwCqd/O6uvpzGd5pu',
+    name: 'Bo'
+  }, {
+    id: 'fdc6uOvgoji',
+    path: '/ImspTQPwCqd/fdc6uOvgoji',
+    name: 'Bombali'
+  }, {
+    id: 'lc3eMKXaEfw',
+    path: '/ImspTQPwCqd/lc3eMKXaEfw',
+    name: 'Bonthe'
+  }]);
+  return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple selected across different levels', () => {
+  const [selected, setSelected] = (0, _react2.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__*/_react2.default.createElement(_OrgUnitDimension.default, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple roots', () => {
+  const [selected, setSelected] = (0, _react2.useState)([]);
+  return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: ['O6uvpzGd5pu', 'fdc6uOvgoji'] // Bo + Bombali
+
+  });
+});

package/build/cjs/api/organisationUnits.js

@@ -3,66 +3,120 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.apiFetchOrganisationUnitLevels = exports.apiFetchOrganisationUnitGroups = exports.apiFetchOrganisationUnits = exports.apiFetchOrganisationUnitRoot = void 0;
+exports.apiFetchOrganisationUnit = exports.apiFetchOrganisationUnits = exports.apiFetchOrganisationUnitRoots = exports.apiFetchOrganisationUnitGroups = exports.apiFetchOrganisationUnitLevels = void 0;
 
 var _index = require("./index");
 
-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(_index.onError);
+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,
+    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
+  }
 };
-/**
- * Fetch organisation units
- * @returns {Promise<T | never>}
- */
 
+const apiFetchOrganisationUnitLevels = async dataEngine => {
+  const orgUnitLevelsData = await dataEngine.query({
+    orgUnitLevels: orgUnitLevelsQuery
+  }, {
+    onError: _index.onError
+  });
+  return orgUnitLevelsData.orgUnitLevels.organisationUnitLevels;
+};
 
-exports.apiFetchOrganisationUnitRoot = apiFetchOrganisationUnitRoot;
+exports.apiFetchOrganisationUnitLevels = apiFetchOrganisationUnitLevels;
 
-const apiFetchOrganisationUnits = (d2, displayNameProperty) => {
-  const fields = ['id', 'path', "".concat(displayNameProperty, "~rename(displayName)"), 'children::isNotEmpty'];
-  return d2.models.organisationUnits.list({
-    paging: false,
-    level: 1,
-    fields: fields.join(','),
-    userDataViewFallback: true
+const apiFetchOrganisationUnitGroups = async (dataEngine, displayNameProp) => {
+  const orgUnitGroupsData = await dataEngine.query({
+    orgUnitGroups: orgUnitGroupsQuery
+  }, {
+    variables: {
+      displayNameProp
+    },
+    onError: _index.onError
   });
+  return orgUnitGroupsData.orgUnitGroups.organisationUnitGroups;
 };
-/**
- * Fetch organisation unit groups
- * @returns {*}
- */
 
+exports.apiFetchOrganisationUnitGroups = apiFetchOrganisationUnitGroups;
+
+const apiFetchOrganisationUnitRoots = async dataEngine => {
+  const orgUnitRootsData = await dataEngine.query({
+    orgUnitRoots: orgUnitRootsQuery
+  }, {
+    onError: _index.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?
 
-exports.apiFetchOrganisationUnits = apiFetchOrganisationUnits;
 
-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(_index.onError);
-};
-/**
- * Fetch organisation unit levels
- * @returns {*}
- */
+exports.apiFetchOrganisationUnitRoots = apiFetchOrganisationUnitRoots;
 
+const apiFetchOrganisationUnits = async (dataEngine, displayNameProp) => {
+  const orgUnitsData = await dataEngine.query({
+    orgUnits: orgUnitsQuery
+  }, {
+    variables: {
+      displayNameProp
+    },
+    onError: _index.onError
+  });
+  return orgUnitsData.orgUnits.organisationUnits;
+};
 
-exports.apiFetchOrganisationUnitGroups = apiFetchOrganisationUnitGroups;
+exports.apiFetchOrganisationUnits = apiFetchOrganisationUnits;
 
-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(_index.onError);
+const apiFetchOrganisationUnit = async (dataEngine, id) => {
+  const orgUnitData = await dataEngine.query({
+    orgUnit: orgUnitQuery
+  }, {
+    variables: {
+      id
+    },
+    onError: _index.onError
+  });
+  return orgUnitData.orgUnit;
 };
 
-exports.apiFetchOrganisationUnitLevels = apiFetchOrganisationUnitLevels;
+exports.apiFetchOrganisationUnit = apiFetchOrganisationUnit;

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

@@ -7,10 +7,10 @@ exports.DeleteDialog = void 0;
 
 var _appRuntime = require("@dhis2/app-runtime");
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));

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

@@ -9,10 +9,10 @@ var _style = _interopRequireDefault(require("styled-jsx/style"));
 
 var _d2UiTranslationDialog = _interopRequireDefault(require("@dhis2/d2-ui-translation-dialog"));
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));

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

@@ -7,10 +7,10 @@ exports.GetLinkDialog = void 0;
 
 var _appRuntime = require("@dhis2/app-runtime");
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));

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

@@ -7,10 +7,10 @@ exports.RenameDialog = void 0;
 
 var _appRuntime = require("@dhis2/app-runtime");
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));

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

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SaveAsDialog = void 0;
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));