@dhis2/analytics 24.5.0 → 24.7.0

package/CHANGELOG.md

@@ -1,9 +1,23 @@
-# [24.5.0](https://github.com/dhis2/analytics/compare/v24.4.2...v24.5.0) (2023-02-02)
+# [24.7.0](https://github.com/dhis2/analytics/compare/v24.6.0...v24.7.0) (2023-02-15)
 
 
 ### Features
 
-* use multi-calendar-dates library to generate fixed periods ([acc3801](https://github.com/dhis2/analytics/commit/acc380156092f888cfa55f70b4bade1c6516d034))
+* new props for customising OrgUnitDimension DHIS2-14744 ([#1427](https://github.com/dhis2/analytics/issues/1427)) ([ae2f886](https://github.com/dhis2/analytics/commit/ae2f886167a487271bf42c2f4c694e45ea4b25b3))
+
+# [24.6.0](https://github.com/dhis2/analytics/compare/v24.5.0...v24.6.0) (2023-02-13)
+
+
+### Features
+
+* single value background color change based upon legend (DHIS2-13702) ([#1402](https://github.com/dhis2/analytics/issues/1402)) ([ad437c6](https://github.com/dhis2/analytics/commit/ad437c6a1fcbcb71cee7b6945c6bc83ed2bc3bb3))
+
+# [24.5.0](https://github.com/dhis2/analytics/compare/v24.4.2...v24.5.0) (2023-02-06)
+
+
+### Features
+
+* [reverted] use multi-calendar-dates library to generate fixed periods ([acc3801](https://github.com/dhis2/analytics/commit/acc380156092f888cfa55f70b4bade1c6516d034)). This work was added to "next" release channel, but was reverted afterwards because of the restrictions "next" channel puts on what can be released from master afterwards. It will be added to "alpha" channel instead until it's ready for the main channel.
 
 ## [24.4.2](https://github.com/dhis2/analytics/compare/v24.4.1...v24.4.2) (2023-01-25)
 

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

@@ -15,7 +15,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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/",
+  baseUrl: "https://debug.dhis2.org/analytics-dev/",
   apiVersion: ""
 }, story());
 
@@ -101,4 +101,43 @@ const defaultRootOrgUnits = ['ImspTQPwCqd']; // Sierra Leone
     roots: ['O6uvpzGd5pu', 'fdc6uOvgoji'] // Bo + Bombali
 
   });
+});
+(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Without level selector', () => {
+  const [selected, setSelected] = (0, _react2.useState)([]);
+  return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
+    hideLevelSelect: true,
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Without group selector', () => {
+  const [selected, setSelected] = (0, _react2.useState)([]);
+  return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
+    hideGroupSelect: true,
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Without level and group selector', () => {
+  const [selected, setSelected] = (0, _react2.useState)([]);
+  return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
+    hideLevelSelect: true,
+    hideGroupSelect: true,
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits
+  });
+});
+(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Without level and group selector, with warning text', () => {
+  const [selected, setSelected] = (0, _react2.useState)([]);
+  return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
+    hideLevelSelect: true,
+    hideGroupSelect: true,
+    selected: selected,
+    onSelect: response => setSelected(response.items),
+    roots: defaultRootOrgUnits,
+    warning: 'No org. units selected'
+  });
 });

package/build/cjs/components/OrgUnitDimension/OrgUnitDimension.js

@@ -41,7 +41,10 @@ const OrgUnitDimension = _ref => {
   let {
     roots,
     selected,
-    onSelect
+    onSelect,
+    hideGroupSelect,
+    hideLevelSelect,
+    warning
   } = _ref;
   const [ouLevels, setOuLevels] = (0, _react.useState)([]);
   const [ouGroups, setOuGroups] = (0, _react.useState)([]);
@@ -94,9 +97,9 @@ const OrgUnitDimension = _ref => {
       setOuGroups(result);
     };
 
-    doFetchOuLevels();
-    doFetchOuGroups();
-  }, [dataEngine]);
+    !hideLevelSelect && doFetchOuLevels();
+    !hideGroupSelect && doFetchOuGroups();
+  }, [dataEngine, hideLevelSelect, hideGroupSelect]);
 
   const onLevelChange = ids => {
     const items = ids.map(id => ({
@@ -227,9 +230,10 @@ const OrgUnitDimension = _ref => {
     dataTest: 'org-unit-tree'
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + ((0, _classnames.default)('selectsWrapper', {
-      disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id))
+      disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id)),
+      hidden: hideLevelSelect && hideGroupSelect
     }) || "")
-  }, /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
+  }, !hideLevelSelect && /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
     selected: ouLevels.length ? selected.filter(item => _index2.ouIdHelper.hasLevelPrefix(item.id)).map(item => _index2.ouIdHelper.removePrefix(item.id)) : [],
     onChange: _ref5 => {
       let {
@@ -246,7 +250,7 @@ const OrgUnitDimension = _ref => {
     value: level.id,
     label: level.displayName,
     dataTest: "org-unit-level-select-option-".concat(level.id)
-  }))), /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
+  }))), !hideGroupSelect && /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
     selected: ouGroups.length ? selected.filter(item => _index2.ouIdHelper.hasGroupPrefix(item.id)).map(item => _index2.ouIdHelper.removePrefix(item.id)) : [],
     onChange: _ref6 => {
       let {
@@ -265,7 +269,13 @@ const OrgUnitDimension = _ref => {
     dataTest: "org-unit-group-select-option-".concat(group.id)
   })))), /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + "summaryWrapper"
-  }, /*#__PURE__*/_react.default.createElement("span", {
+  }, warning ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + "warningWrapper"
+  }, /*#__PURE__*/_react.default.createElement(_ui.IconWarningFilled16, {
+    color: _ui.colors.red500
+  }), /*#__PURE__*/_react.default.createElement("span", {
+    className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + "warningText"
+  }, warning)) : /*#__PURE__*/_react.default.createElement("span", {
     className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + "summaryText"
   }, getSummary()), /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + "deselectButton"
@@ -279,13 +289,20 @@ const OrgUnitDimension = _ref => {
   }, _OrgUnitDimensionStyle.default));
 };
 
+OrgUnitDimension.defaultProps = {
+  hideGroupSelect: false,
+  hideLevelSelect: false
+};
 OrgUnitDimension.propTypes = {
+  hideGroupSelect: _propTypes.default.bool,
+  hideLevelSelect: _propTypes.default.bool,
   roots: _propTypes.default.arrayOf(_propTypes.default.string),
   selected: _propTypes.default.arrayOf(_propTypes.default.shape({
     id: _propTypes.default.string.isRequired,
     name: _propTypes.default.string.isRequired,
     path: _propTypes.default.string
   })),
+  warning: _propTypes.default.string,
   onSelect: _propTypes.default.func
 };
 var _default = OrgUnitDimension;

package/build/cjs/components/OrgUnitDimension/styles/OrgUnitDimension.style.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _ui = require("@dhis2/ui");
 
-const _defaultExport = [".container.jsx-3879278432{height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}", ".orgUnitTreeWrapper.jsx-3879278432{height:382px;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;overflow:auto;}", ".orgUnitTreeWrapper.jsx-3879278432>*{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}", ".disabled.jsx-3879278432{cursor:not-allowed;opacity:0.5;}", ".disabled.jsx-3879278432>*{pointer-events:none;}", ".userOrgUnitsWrapper.jsx-3879278432{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;background:".concat(_ui.colors.grey200, ";padding:").concat(_ui.spacers.dp8, " ").concat(_ui.spacers.dp8, " ").concat(_ui.spacers.dp8, " ").concat(_ui.spacers.dp24, ";margin-bottom:").concat(_ui.spacers.dp12, ";}"), ".userOrgUnitsWrapper.jsx-3879278432>*{margin-right:".concat(_ui.spacers.dp48, ";}"), ".selectsWrapper.jsx-3879278432{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;gap:".concat(_ui.spacers.dp8, ";margin-top:").concat(_ui.spacers.dp12, ";}"), ".selectsWrapper.jsx-3879278432>*{width:50%;}", ".summaryWrapper.jsx-3879278432{margin-top:".concat(_ui.spacers.dp8, ";}"), ".summaryText.jsx-3879278432{font-size:14px;line-height:18px;color:".concat(_ui.colors.grey700, ";}"), ".deselectButton.jsx-3879278432{display:inline-block;margin-left:".concat(_ui.spacers.dp8, ";}")];
-_defaultExport.__hash = "3879278432";
+const _defaultExport = [".container.jsx-2348205733{height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}", ".orgUnitTreeWrapper.jsx-2348205733{height:382px;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;overflow:auto;}", ".orgUnitTreeWrapper.jsx-2348205733>*{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}", ".disabled.jsx-2348205733{cursor:not-allowed;opacity:0.5;}", ".disabled.jsx-2348205733>*{pointer-events:none;}", ".userOrgUnitsWrapper.jsx-2348205733{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;background:".concat(_ui.colors.grey200, ";padding:").concat(_ui.spacers.dp8, " ").concat(_ui.spacers.dp8, " ").concat(_ui.spacers.dp8, " ").concat(_ui.spacers.dp24, ";margin-bottom:").concat(_ui.spacers.dp12, ";}"), ".userOrgUnitsWrapper.jsx-2348205733>*{margin-right:".concat(_ui.spacers.dp48, ";}"), ".selectsWrapper.jsx-2348205733{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;gap:".concat(_ui.spacers.dp8, ";margin-top:").concat(_ui.spacers.dp12, ";}"), ".selectsWrapper.hidden.jsx-2348205733{display:none;}", ".selectsWrapper.jsx-2348205733>*{width:50%;}", ".summaryWrapper.jsx-2348205733{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:".concat(_ui.spacers.dp8, ";}"), ".warningWrapper.jsx-2348205733{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}", ".warningText.jsx-2348205733{margin-left:".concat(_ui.spacers.dp8, ";font-size:14px;line-height:18px;color:").concat(_ui.colors.red600, ";}"), ".summaryText.jsx-2348205733{font-size:14px;line-height:18px;color:".concat(_ui.colors.grey700, ";}"), ".deselectButton.jsx-2348205733{display:inline-block;margin-left:".concat(_ui.spacers.dp8, ";}")];
+_defaultExport.__hash = "2348205733";
 var _default = _defaultExport;
 exports.default = _default;

package/build/cjs/components/PeriodDimension/PeriodTransfer.js

@@ -7,10 +7,6 @@ exports.default = void 0;
 
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 
-var _appRuntime = require("@dhis2/app-runtime");
-
-var _multiCalendarDates = require("@dhis2/multi-calendar-dates");
-
 var _ui = require("@dhis2/ui");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -53,17 +49,9 @@ const PeriodTransfer = _ref => {
     rightFooter,
     excludedPeriodTypes
   } = _ref;
-  const {
-    systemInfo = {}
-  } = (0, _appRuntime.useConfig)();
-  const {
-    calendar = 'gregory'
-  } = systemInfo;
   const defaultRelativePeriodType = excludedPeriodTypes.includes(_index2.MONTHLY) ? (0, _relativePeriods.getRelativePeriodsOptionsById)(_index2.QUARTERLY) : (0, _relativePeriods.getRelativePeriodsOptionsById)(_index2.MONTHLY);
-  const defaultFixedPeriodType = excludedPeriodTypes.includes(_index2.MONTHLY) ? (0, _fixedPeriods.getFixedPeriodsOptionsById)(_index2.QUARTERLY, calendar) : (0, _fixedPeriods.getFixedPeriodsOptionsById)(_index2.MONTHLY, calendar); // use ".eraYear" rather than ".year" because in Ethiopian calendar, eraYear is what our users expect to see (for other calendars, it doesn't matter)
-  // there is still a pending decision in Temporal regarding which era to use by default: https://github.com/js-temporal/temporal-polyfill/blob/9350ee7dd0d29f329fc097debf923a517c32f813/lib/calendar.ts#L1964
-
-  const defaultFixedPeriodYear = (0, _multiCalendarDates.getNowInCalendar)(calendar).eraYear;
+  const defaultFixedPeriodType = excludedPeriodTypes.includes(_index2.MONTHLY) ? (0, _fixedPeriods.getFixedPeriodsOptionsById)(_index2.QUARTERLY) : (0, _fixedPeriods.getFixedPeriodsOptionsById)(_index2.MONTHLY);
+  const defaultFixedPeriodYear = new Date().getFullYear();
 
   const fixedPeriodConfig = year => ({
     offset: year - defaultFixedPeriodYear,
@@ -85,7 +73,7 @@ const PeriodTransfer = _ref => {
   const onIsRelativeClick = state => {
     if (state !== isRelative) {
       setIsRelative(state);
-      setAllPeriods(state ? (0, _relativePeriods.getRelativePeriodsOptionsById)(relativeFilter.periodType).getPeriods() : (0, _fixedPeriods.getFixedPeriodsOptionsById)(fixedFilter.periodType, calendar).getPeriods(fixedPeriodConfig(Number(fixedFilter.year))));
+      setAllPeriods(state ? (0, _relativePeriods.getRelativePeriodsOptionsById)(relativeFilter.periodType).getPeriods() : (0, _fixedPeriods.getFixedPeriodsOptionsById)(fixedFilter.periodType).getPeriods(fixedPeriodConfig(Number(fixedFilter.year))));
     }
   };
 
@@ -138,7 +126,7 @@ const PeriodTransfer = _ref => {
 
   const onSelectFixedPeriods = filter => {
     setFixedFilter(filter);
-    setAllPeriods((0, _fixedPeriods.getFixedPeriodsOptionsById)(filter.periodType, calendar).getPeriods(fixedPeriodConfig(Number(filter.year)), calendar));
+    setAllPeriods((0, _fixedPeriods.getFixedPeriodsOptionsById)(filter.periodType).getPeriods(fixedPeriodConfig(Number(filter.year))));
   };
 
   const renderEmptySelection = () => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {