@dhis2/analytics 26.11.1 → 26.12.1

package/build/cjs/components/DashboardPluginWrapper/DashboardPluginWrapper.js

@@ -0,0 +1,92 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DashboardPluginWrapper = void 0;
+var _appRuntime = require("@dhis2/app-runtime");
+var _ui = require("@dhis2/ui");
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = _interopRequireWildcard(require("react"));
+var _getPWAInstallationStatus = require("../../modules/getPWAInstallationStatus.js");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const LoadingMask = () => {
+  return /*#__PURE__*/_react.default.createElement(_ui.Layer, null, /*#__PURE__*/_react.default.createElement(_ui.CenteredContent, null, /*#__PURE__*/_react.default.createElement(_ui.CircularLoader, null)));
+};
+const CacheableSectionWrapper = _ref => {
+  let {
+    id,
+    children,
+    isParentCached
+  } = _ref;
+  const {
+    startRecording,
+    isCached,
+    remove
+  } = (0, _appRuntime.useCacheableSection)(id);
+  (0, _react.useEffect)(() => {
+    if (isParentCached && !isCached) {
+      startRecording({
+        onError: console.error
+      });
+    } else if (!isParentCached && isCached) {
+      // Synchronize cache state on load or prop update
+      // -- a back-up to imperative `removeCachedData`
+      remove();
+    }
+  }, [isCached, isParentCached, remove, startRecording]);
+  return /*#__PURE__*/_react.default.createElement(_appRuntime.CacheableSection, {
+    id: id,
+    loadingMask: /*#__PURE__*/_react.default.createElement(LoadingMask, null)
+  }, children);
+};
+CacheableSectionWrapper.propTypes = {
+  children: _propTypes.default.node,
+  id: _propTypes.default.string,
+  isParentCached: _propTypes.default.bool
+};
+const DashboardPluginWrapper = _ref2 => {
+  let {
+    onInstallationStatusChange,
+    children,
+    cacheId,
+    isParentCached,
+    ...props
+  } = _ref2;
+  const {
+    pwaEnabled
+  } = (0, _appRuntime.useConfig)();
+  (0, _react.useEffect)(() => {
+    // Get & send PWA installation status now
+    (0, _getPWAInstallationStatus.getPWAInstallationStatus)({
+      onStateChange: onInstallationStatusChange
+    }).then(onInstallationStatusChange);
+  }, [onInstallationStatusChange]);
+  return props ? /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      display: 'flex',
+      height: '100%',
+      overflow: 'hidden'
+    }
+  }, pwaEnabled ? /*#__PURE__*/_react.default.createElement(CacheableSectionWrapper, {
+    id: cacheId,
+    isParentCached: isParentCached
+  }, children(props)) : children(props), /*#__PURE__*/_react.default.createElement(_ui.CssVariables, {
+    colors: true,
+    spacers: true,
+    elevations: true
+  })) : null;
+};
+exports.DashboardPluginWrapper = DashboardPluginWrapper;
+DashboardPluginWrapper.defaultProps = {
+  isParentCached: false,
+  onInstallationStatusChange: Function.prototype
+};
+DashboardPluginWrapper.propTypes = {
+  cacheId: _propTypes.default.string,
+  children: _propTypes.default.func,
+  isParentCached: _propTypes.default.bool,
+  onInstallationStatusChange: _propTypes.default.func
+};

package/build/cjs/components/Toolbar/HoverMenuBar/HoverMenuDropdown.js

@@ -5,8 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.HoverMenuDropdown = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
-var _popper = require("@dhis2-ui/popper");
-var _portal = require("@dhis2-ui/portal");
+var _ui = require("@dhis2/ui");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
@@ -41,7 +40,7 @@ const HoverMenuDropdown = _ref => {
     }) || "")
   }, label, /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _MenuButtonStyles.default.__hash
-  }, _MenuButtonStyles.default)), isOpen && /*#__PURE__*/_react.default.createElement(_portal.Portal, null, /*#__PURE__*/_react.default.createElement(_popper.Popper, {
+  }, _MenuButtonStyles.default)), isOpen && /*#__PURE__*/_react.default.createElement(_ui.Portal, null, /*#__PURE__*/_react.default.createElement(_ui.Popper, {
     placement: "bottom-start",
     reference: buttonRef
   }, children)));

package/build/cjs/components/Toolbar/HoverMenuBar/HoverMenuList.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useHoverMenuListContext = exports.HoverMenuList = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
-var _uiConstants = require("@dhis2/ui-constants");
+var _ui = require("@dhis2/ui");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _HoverMenuBar = require("./HoverMenuBar.js");
@@ -55,11 +55,11 @@ const HoverMenuList = _ref => {
     }
   }, /*#__PURE__*/_react.default.createElement("ul", {
     "data-test": dataTest,
-    className: _style.default.dynamic([["3026610659", [_uiConstants.colors.white, _uiConstants.colors.grey200, _uiConstants.elevations.e300, dense ? '128' : '180', maxWidth, maxHeight, _uiConstants.spacers.dp4]]]) + " " + (className || "")
+    className: _style.default.dynamic([["3026610659", [_ui.colors.white, _ui.colors.grey200, _ui.elevations.e300, dense ? '128' : '180', maxWidth, maxHeight, _ui.spacers.dp4]]]) + " " + (className || "")
   }, children, /*#__PURE__*/_react.default.createElement(_style.default, {
     id: "3026610659",
-    dynamic: [_uiConstants.colors.white, _uiConstants.colors.grey200, _uiConstants.elevations.e300, dense ? '128' : '180', maxWidth, maxHeight, _uiConstants.spacers.dp4]
-  }, [`ul.__jsx-style-dynamic-selector{position:relative;margin:0;padding:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background:${_uiConstants.colors.white};border:1px solid ${_uiConstants.colors.grey200};border-radius:3px;box-shadow:${_uiConstants.elevations.e300};display:inline-block;min-width:${dense ? '128' : '180'}px;max-width:${maxWidth};max-height:${maxHeight};padding:${_uiConstants.spacers.dp4} 0;overflow:auto;list-style:none;}`])));
+    dynamic: [_ui.colors.white, _ui.colors.grey200, _ui.elevations.e300, dense ? '128' : '180', maxWidth, maxHeight, _ui.spacers.dp4]
+  }, [`ul.__jsx-style-dynamic-selector{position:relative;margin:0;padding:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background:${_ui.colors.white};border:1px solid ${_ui.colors.grey200};border-radius:3px;box-shadow:${_ui.elevations.e300};display:inline-block;min-width:${dense ? '128' : '180'}px;max-width:${maxWidth};max-height:${maxHeight};padding:${_ui.spacers.dp4} 0;overflow:auto;list-style:none;}`])));
 };
 exports.HoverMenuList = HoverMenuList;
 HoverMenuList.defaultProps = {

package/build/cjs/components/Toolbar/HoverMenuBar/HoverMenuListItem.js

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.HoverMenuListItem = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
-var _uiIcons = require("@dhis2/ui-icons");
-var _popper = require("@dhis2-ui/popper");
-var _portal = require("@dhis2-ui/portal");
+var _ui = require("@dhis2/ui");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
@@ -53,9 +51,9 @@ const HoverMenuListItem = _ref => {
     className: `jsx-${_HoverMenuListItemStyles.default.__hash}` + " " + "label"
   }, label), !!children && /*#__PURE__*/_react.default.createElement("span", {
     className: `jsx-${_HoverMenuListItemStyles.default.__hash}` + " " + "chevron"
-  }, /*#__PURE__*/_react.default.createElement(_uiIcons.IconChevronRight24, null)), /*#__PURE__*/_react.default.createElement(_style.default, {
+  }, /*#__PURE__*/_react.default.createElement(_ui.IconChevronRight24, null)), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _HoverMenuListItemStyles.default.__hash
-  }, _HoverMenuListItemStyles.default)), children && isSubMenuOpen && /*#__PURE__*/_react.default.createElement(_portal.Portal, null, /*#__PURE__*/_react.default.createElement(_popper.Popper, {
+  }, _HoverMenuListItemStyles.default)), children && isSubMenuOpen && /*#__PURE__*/_react.default.createElement(_ui.Portal, null, /*#__PURE__*/_react.default.createElement(_ui.Popper, {
     placement: "right-start",
     reference: ref
   }, /*#__PURE__*/_react.default.createElement(_HoverMenuList.HoverMenuList, {

package/build/cjs/components/Toolbar/HoverMenuBar/HoverMenuListItem.styles.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _uiConstants = require("@dhis2/ui-constants");
-const _defaultExport = [`li.jsx-3263820070{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0px ${_uiConstants.spacers.dp24};cursor:pointer;list-style:none;background-color:${_uiConstants.colors.white};color:${_uiConstants.colors.grey900};fill:${_uiConstants.colors.grey900};font-size:14px;line-height:16px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}`, `li.jsx-3263820070:hover,li.jsx-3263820070:active,li.active.jsx-3263820070{background-color:${_uiConstants.colors.grey200};}`, `li.dense.jsx-3263820070{padding:0px ${_uiConstants.spacers.dp12};}`, `li.destructive.jsx-3263820070{color:${_uiConstants.colors.red700};fill:${_uiConstants.colors.red600};}`, `li.destructive.jsx-3263820070:hover{background-color:${_uiConstants.colors.red050};}`, `li.destructive.jsx-3263820070:active,li.destructive.active.jsx-3263820070{background-color:${_uiConstants.colors.red100};}`, `li.disabled.jsx-3263820070{cursor:not-allowed;color:${_uiConstants.colors.grey500};fill:${_uiConstants.colors.grey500};}`, `li.disabled.jsx-3263820070:hover{background-color:${_uiConstants.colors.white};}`, `.label.jsx-3263820070{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:${_uiConstants.spacers.dp12} 0;}`, `li.dense.jsx-3263820070 .label.jsx-3263820070{padding:${_uiConstants.spacers.dp8} 0;}`, `.icon.jsx-3263820070{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;margin-right:${_uiConstants.spacers.dp12};width:24px;height:24px;}`, `.chevron.jsx-3263820070{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;margin-left:${_uiConstants.spacers.dp24};}`, `li.dense.jsx-3263820070 .icon.jsx-3263820070{margin-right:${_uiConstants.spacers.dp8};width:16px;height:16px;}`, "li.jsx-3263820070 .icon.jsx-3263820070>svg{width:24px;height:24px;}", "li.dense.jsx-3263820070 .icon.jsx-3263820070>svg,li.jsx-3263820070 .chevron.jsx-3263820070>svg{width:16px;height:16px;}"];
+var _ui = require("@dhis2/ui");
+const _defaultExport = [`li.jsx-3263820070{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0px ${_ui.spacers.dp24};cursor:pointer;list-style:none;background-color:${_ui.colors.white};color:${_ui.colors.grey900};fill:${_ui.colors.grey900};font-size:14px;line-height:16px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}`, `li.jsx-3263820070:hover,li.jsx-3263820070:active,li.active.jsx-3263820070{background-color:${_ui.colors.grey200};}`, `li.dense.jsx-3263820070{padding:0px ${_ui.spacers.dp12};}`, `li.destructive.jsx-3263820070{color:${_ui.colors.red700};fill:${_ui.colors.red600};}`, `li.destructive.jsx-3263820070:hover{background-color:${_ui.colors.red050};}`, `li.destructive.jsx-3263820070:active,li.destructive.active.jsx-3263820070{background-color:${_ui.colors.red100};}`, `li.disabled.jsx-3263820070{cursor:not-allowed;color:${_ui.colors.grey500};fill:${_ui.colors.grey500};}`, `li.disabled.jsx-3263820070:hover{background-color:${_ui.colors.white};}`, `.label.jsx-3263820070{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:${_ui.spacers.dp12} 0;}`, `li.dense.jsx-3263820070 .label.jsx-3263820070{padding:${_ui.spacers.dp8} 0;}`, `.icon.jsx-3263820070{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;margin-right:${_ui.spacers.dp12};width:24px;height:24px;}`, `.chevron.jsx-3263820070{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;margin-left:${_ui.spacers.dp24};}`, `li.dense.jsx-3263820070 .icon.jsx-3263820070{margin-right:${_ui.spacers.dp8};width:16px;height:16px;}`, "li.jsx-3263820070 .icon.jsx-3263820070>svg{width:24px;height:24px;}", "li.dense.jsx-3263820070 .icon.jsx-3263820070>svg,li.jsx-3263820070 .chevron.jsx-3263820070>svg{width:16px;height:16px;}"];
 _defaultExport.__hash = "3263820070";
 var _default = exports.default = _defaultExport;

package/build/cjs/components/Toolbar/MenuButton.styles.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _uiConstants = require("@dhis2/ui-constants");
-const _defaultExport = [`button.jsx-3546699693{all:unset;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;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;font-size:14px;line-height:14px;padding:0 ${_uiConstants.spacers.dp12};color:${_uiConstants.colors.grey900};cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}`, `button.jsx-3546699693:hover.jsx-3546699693:enabled,button.jsx-3546699693:active.jsx-3546699693:enabled,button.isOpen.jsx-3546699693{background-color:${_uiConstants.colors.grey200};}`, `button.jsx-3546699693:focus{outline:3px solid ${_uiConstants.theme.focus};outline-offset:-3px;}`, "button.jsx-3546699693:focus.jsx-3546699693:not(:focus-visible){outline:none;}", `button.jsx-3546699693:disabled{color:${_uiConstants.colors.grey500};cursor:not-allowed;}`];
+var _ui = require("@dhis2/ui");
+const _defaultExport = [`button.jsx-3546699693{all:unset;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;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;font-size:14px;line-height:14px;padding:0 ${_ui.spacers.dp12};color:${_ui.colors.grey900};cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}`, `button.jsx-3546699693:hover.jsx-3546699693:enabled,button.jsx-3546699693:active.jsx-3546699693:enabled,button.isOpen.jsx-3546699693{background-color:${_ui.colors.grey200};}`, `button.jsx-3546699693:focus{outline:3px solid ${_ui.theme.focus};outline-offset:-3px;}`, "button.jsx-3546699693:focus.jsx-3546699693:not(:focus-visible){outline:none;}", `button.jsx-3546699693:disabled{color:${_ui.colors.grey500};cursor:not-allowed;}`];
 _defaultExport.__hash = "3546699693";
 var _default = exports.default = _defaultExport;

package/build/cjs/components/Toolbar/Toolbar.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Toolbar = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
-var _uiConstants = require("@dhis2/ui-constants");
+var _ui = require("@dhis2/ui");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -16,11 +16,11 @@ const Toolbar = _ref => {
   } = _ref;
   return /*#__PURE__*/_react.default.createElement("div", {
     "data-test": dataTest,
-    className: _style.default.dynamic([["2617706539", [_uiConstants.colors.grey400, _uiConstants.colors.white]]])
+    className: _style.default.dynamic([["2617706539", [_ui.colors.grey400, _ui.colors.white]]])
   }, children, /*#__PURE__*/_react.default.createElement(_style.default, {
     id: "2617706539",
-    dynamic: [_uiConstants.colors.grey400, _uiConstants.colors.white]
-  }, [`div.__jsx-style-dynamic-selector{box-sizing:border-box;min-height:32px;max-height:32px;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-bottom:1px solid ${_uiConstants.colors.grey400};background-color:${_uiConstants.colors.white};}`]));
+    dynamic: [_ui.colors.grey400, _ui.colors.white]
+  }, [`div.__jsx-style-dynamic-selector{box-sizing:border-box;min-height:32px;max-height:32px;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-bottom:1px solid ${_ui.colors.grey400};background-color:${_ui.colors.white};}`]));
 };
 exports.Toolbar = Toolbar;
 Toolbar.defaultProps = {

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ToolbarSidebar = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
-var _uiConstants = require("@dhis2/ui-constants");
+var _ui = require("@dhis2/ui");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
@@ -18,13 +18,13 @@ const ToolbarSidebar = _ref => {
   } = _ref;
   return /*#__PURE__*/_react.default.createElement("div", {
     "data-test": dataTest,
-    className: _style.default.dynamic([["1150014343", [_uiConstants.colors.grey400]]]) + " " + ((0, _classnames.default)('container', {
+    className: _style.default.dynamic([["1150014343", [_ui.colors.grey400]]]) + " " + ((0, _classnames.default)('container', {
       isHidden
     }) || "")
   }, children, /*#__PURE__*/_react.default.createElement(_style.default, {
     id: "1150014343",
-    dynamic: [_uiConstants.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 ${_uiConstants.colors.grey400};}`, "div.isHidden.__jsx-style-dynamic-selector{display:none;}"]));
+    dynamic: [_ui.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 ${_ui.colors.grey400};}`, "div.isHidden.__jsx-style-dynamic-selector{display:none;}"]));
 };
 exports.ToolbarSidebar = ToolbarSidebar;
 ToolbarSidebar.defaultProps = {

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

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.UpdateButton = void 0;
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
-var _uiConstants = require("@dhis2/ui-constants");
-var _uiIcons = require("@dhis2/ui-icons");
-var _loader = require("@dhis2-ui/loader");
+var _ui = require("@dhis2/ui");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
 var _MenuButtonStyles = _interopRequireDefault(require("./MenuButton.styles.js"));
@@ -24,15 +22,15 @@ const UpdateButton = _ref => {
     onClick: onClick,
     disabled: disabled,
     "data-test": dataTest,
-    className: `jsx-${_MenuButtonStyles.default.__hash}` + " " + _style.default.dynamic([["2364287882", [_uiConstants.colors.blue700, _uiConstants.colors.blue100, _uiConstants.colors.blue200]]])
-  }, loading ? /*#__PURE__*/_react.default.createElement(_loader.CircularLoader, {
+    className: `jsx-${_MenuButtonStyles.default.__hash}` + " " + _style.default.dynamic([["2364287882", [_ui.colors.blue700, _ui.colors.blue100, _ui.colors.blue200]]])
+  }, loading ? /*#__PURE__*/_react.default.createElement(_ui.CircularLoader, {
     extrasmall: true
-  }) : /*#__PURE__*/_react.default.createElement(_uiIcons.IconSync16, null), _d2I18n.default.t('Update'), /*#__PURE__*/_react.default.createElement(_style.default, {
+  }) : /*#__PURE__*/_react.default.createElement(_ui.IconSync16, null), _d2I18n.default.t('Update'), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: _MenuButtonStyles.default.__hash
   }, _MenuButtonStyles.default), /*#__PURE__*/_react.default.createElement(_style.default, {
     id: "2364287882",
-    dynamic: [_uiConstants.colors.blue700, _uiConstants.colors.blue100, _uiConstants.colors.blue200]
-  }, [`button.__jsx-style-dynamic-selector{gap:8px;color:${_uiConstants.colors.blue700};font-weight:500;}`, `button.__jsx-style-dynamic-selector:hover.__jsx-style-dynamic-selector:enabled{background:${_uiConstants.colors.blue100};}`, `button.__jsx-style-dynamic-selector:active{background:${_uiConstants.colors.blue200};}`]));
+    dynamic: [_ui.colors.blue700, _ui.colors.blue100, _ui.colors.blue200]
+  }, [`button.__jsx-style-dynamic-selector{gap:8px;color:${_ui.colors.blue700};font-weight:500;}`, `button.__jsx-style-dynamic-selector:hover.__jsx-style-dynamic-selector:enabled{background:${_ui.colors.blue100};}`, `button.__jsx-style-dynamic-selector:active{background:${_ui.colors.blue200};}`]));
 };
 exports.UpdateButton = UpdateButton;
 UpdateButton.defaultProps = {

package/build/cjs/index.js

@@ -27,6 +27,7 @@ var _exportNames = {
   OfflineTooltip: true,
   CachedDataQueryProvider: true,
   useCachedDataQuery: true,
+  DashboardPluginWrapper: true,
   Analytics: true,
   apiFetchDimensions: true,
   apiFetchRecommendedIds: true,
@@ -542,6 +543,12 @@ Object.defineProperty(exports, "DIMENSION_TYPE_PROGRAM_INDICATOR", {
     return _dataTypes.DIMENSION_TYPE_PROGRAM_INDICATOR;
   }
 });
+Object.defineProperty(exports, "DashboardPluginWrapper", {
+  enumerable: true,
+  get: function () {
+    return _DashboardPluginWrapper.DashboardPluginWrapper;
+  }
+});
 Object.defineProperty(exports, "DataDimension", {
   enumerable: true,
   get: function () {
@@ -1877,6 +1884,7 @@ Object.keys(_index6).forEach(function (key) {
     }
   });
 });
+var _DashboardPluginWrapper = require("./components/DashboardPluginWrapper/DashboardPluginWrapper.js");
 var _Analytics = _interopRequireDefault(require("./api/analytics/Analytics.js"));
 var _dimensions = require("./api/dimensions.js");
 var _organisationUnits = require("./api/organisationUnits.js");

package/build/cjs/locales/fr/translations.json

@@ -2,7 +2,7 @@
     "view only": "",
     "view and edit": "",
     "all users ({{accessLevel}})": "",
-    "{{userOrGroup}} ({{accessLevel}})": "",
+    "{{userOrGroup}} ({{accessLevel}})": "{{userOrGroup}} ({{accessLevel}})",
     "Shared with {{commaSeparatedListOfUsersAndGroups}}": "",
     "Not shared with any users or groups": "",
     "No description": "Aucune description",

package/build/cjs/modules/getPWAInstallationStatus.js

@@ -0,0 +1,77 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.INSTALLATION_STATES = void 0;
+exports.getPWAInstallationStatus = getPWAInstallationStatus;
+const INSTALLATION_STATES = exports.INSTALLATION_STATES = {
+  READY: 'READY',
+  INSTALLING: 'INSTALLING'
+};
+function handleInstallingWorker(_ref) {
+  let {
+    installingWorker,
+    onStateChange
+  } = _ref;
+  installingWorker.onstatechange = () => {
+    if (installingWorker.state === 'activated') {
+      // ... and update state to 'ready'
+      onStateChange(INSTALLATION_STATES.READY);
+    }
+  };
+}
+
+/**
+ * Gets the current installation state of the PWA features, which is intended
+ * to be reported from this plugin to the parent app to indicate that the
+ * static assets are cached and ready to be accessed locally instead of over
+ * the network.
+ *
+ * Returns either READY, INSTALLING, or `null` for not installed/won't install
+ */
+async function getPWAInstallationStatus(_ref2) {
+  let {
+    onStateChange
+  } = _ref2;
+  if (!navigator.serviceWorker) {
+    // Nothing to do here
+    return null;
+  }
+  const registration = await navigator.serviceWorker.getRegistration();
+  if (!registration) {
+    // This shouldn't happen since this is a PWA app, but return null
+    return null;
+  }
+  if (registration.active) {
+    return INSTALLATION_STATES.READY;
+  }
+  // note that 'registration.waiting' is skipped - it implies there's an active one
+  if (registration.installing) {
+    handleInstallingWorker({
+      installingWorker: registration.installing,
+      onStateChange
+    });
+    return INSTALLATION_STATES.INSTALLING;
+  }
+
+  // It shouldn't normally be possible to get here, but just in case,
+  // listen for installations
+  registration.onupdatefound = () => {
+    // update state for this plugin to 'installing'
+    onStateChange(INSTALLATION_STATES.INSTALLING);
+
+    // also listen for the installing worker to become active
+    const installingWorker = registration.installing;
+    if (!installingWorker) {
+      return;
+    }
+    handleInstallingWorker({
+      installingWorker,
+      onStateChange
+    });
+  };
+
+  // and in the mean time, return null to show 'not installed'
+  return null;
+}

package/build/cjs/visualizations/config/adapters/dhis_highcharts/index.js

@@ -194,6 +194,5 @@ function _default(_ref) {
 
   // force apply extra config
   Object.assign(config, extraConfig);
-  console.log((0, _objectClean.default)(config));
   return (0, _objectClean.default)(config);
 }

package/build/es/components/DashboardPluginWrapper/DashboardPluginWrapper.js

@@ -0,0 +1,82 @@
+import { useCacheableSection, CacheableSection, useConfig } from '@dhis2/app-runtime';
+import { CenteredContent, CircularLoader, CssVariables, Layer } from '@dhis2/ui';
+import PropTypes from 'prop-types';
+import React, { useEffect } from 'react';
+import { getPWAInstallationStatus } from '../../modules/getPWAInstallationStatus.js';
+const LoadingMask = () => {
+  return /*#__PURE__*/React.createElement(Layer, null, /*#__PURE__*/React.createElement(CenteredContent, null, /*#__PURE__*/React.createElement(CircularLoader, null)));
+};
+const CacheableSectionWrapper = _ref => {
+  let {
+    id,
+    children,
+    isParentCached
+  } = _ref;
+  const {
+    startRecording,
+    isCached,
+    remove
+  } = useCacheableSection(id);
+  useEffect(() => {
+    if (isParentCached && !isCached) {
+      startRecording({
+        onError: console.error
+      });
+    } else if (!isParentCached && isCached) {
+      // Synchronize cache state on load or prop update
+      // -- a back-up to imperative `removeCachedData`
+      remove();
+    }
+  }, [isCached, isParentCached, remove, startRecording]);
+  return /*#__PURE__*/React.createElement(CacheableSection, {
+    id: id,
+    loadingMask: /*#__PURE__*/React.createElement(LoadingMask, null)
+  }, children);
+};
+CacheableSectionWrapper.propTypes = {
+  children: PropTypes.node,
+  id: PropTypes.string,
+  isParentCached: PropTypes.bool
+};
+export const DashboardPluginWrapper = _ref2 => {
+  let {
+    onInstallationStatusChange,
+    children,
+    cacheId,
+    isParentCached,
+    ...props
+  } = _ref2;
+  const {
+    pwaEnabled
+  } = useConfig();
+  useEffect(() => {
+    // Get & send PWA installation status now
+    getPWAInstallationStatus({
+      onStateChange: onInstallationStatusChange
+    }).then(onInstallationStatusChange);
+  }, [onInstallationStatusChange]);
+  return props ? /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex',
+      height: '100%',
+      overflow: 'hidden'
+    }
+  }, pwaEnabled ? /*#__PURE__*/React.createElement(CacheableSectionWrapper, {
+    id: cacheId,
+    isParentCached: isParentCached
+  }, children(props)) : children(props), /*#__PURE__*/React.createElement(CssVariables, {
+    colors: true,
+    spacers: true,
+    elevations: true
+  })) : null;
+};
+DashboardPluginWrapper.defaultProps = {
+  isParentCached: false,
+  onInstallationStatusChange: Function.prototype
+};
+DashboardPluginWrapper.propTypes = {
+  cacheId: PropTypes.string,
+  children: PropTypes.func,
+  isParentCached: PropTypes.bool,
+  onInstallationStatusChange: PropTypes.func
+};

package/build/es/components/Toolbar/HoverMenuBar/HoverMenuDropdown.js

@@ -1,6 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
-import { Popper } from '@dhis2-ui/popper';
-import { Portal } from '@dhis2-ui/portal';
+import { Popper, Portal } from '@dhis2/ui';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React, { useRef } from 'react';

package/build/es/components/Toolbar/HoverMenuBar/HoverMenuList.js

@@ -1,5 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
-import { colors, elevations, spacers } from '@dhis2/ui-constants';
+import { colors, elevations, spacers } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React, { createContext, useCallback, useContext, useState } from 'react';
 import { useHoverMenubarContext } from './HoverMenuBar.js';

package/build/es/components/Toolbar/HoverMenuBar/HoverMenuListItem.js

@@ -1,7 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
-import { IconChevronRight24 } from '@dhis2/ui-icons';
-import { Popper } from '@dhis2-ui/popper';
-import { Portal } from '@dhis2-ui/portal';
+import { IconChevronRight24, Popper, Portal } from '@dhis2/ui';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React, { useRef } from 'react';

package/build/es/components/Toolbar/HoverMenuBar/HoverMenuListItem.styles.js

@@ -1,4 +1,4 @@
-import { colors, spacers } from '@dhis2/ui-constants';
+import { colors, spacers } from '@dhis2/ui';
 const _defaultExport = [`li.jsx-3263820070{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0px ${spacers.dp24};cursor:pointer;list-style:none;background-color:${colors.white};color:${colors.grey900};fill:${colors.grey900};font-size:14px;line-height:16px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}`, `li.jsx-3263820070:hover,li.jsx-3263820070:active,li.active.jsx-3263820070{background-color:${colors.grey200};}`, `li.dense.jsx-3263820070{padding:0px ${spacers.dp12};}`, `li.destructive.jsx-3263820070{color:${colors.red700};fill:${colors.red600};}`, `li.destructive.jsx-3263820070:hover{background-color:${colors.red050};}`, `li.destructive.jsx-3263820070:active,li.destructive.active.jsx-3263820070{background-color:${colors.red100};}`, `li.disabled.jsx-3263820070{cursor:not-allowed;color:${colors.grey500};fill:${colors.grey500};}`, `li.disabled.jsx-3263820070:hover{background-color:${colors.white};}`, `.label.jsx-3263820070{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:${spacers.dp12} 0;}`, `li.dense.jsx-3263820070 .label.jsx-3263820070{padding:${spacers.dp8} 0;}`, `.icon.jsx-3263820070{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;margin-right:${spacers.dp12};width:24px;height:24px;}`, `.chevron.jsx-3263820070{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;margin-left:${spacers.dp24};}`, `li.dense.jsx-3263820070 .icon.jsx-3263820070{margin-right:${spacers.dp8};width:16px;height:16px;}`, "li.jsx-3263820070 .icon.jsx-3263820070>svg{width:24px;height:24px;}", "li.dense.jsx-3263820070 .icon.jsx-3263820070>svg,li.jsx-3263820070 .chevron.jsx-3263820070>svg{width:16px;height:16px;}"];
 _defaultExport.__hash = "3263820070";
 export default _defaultExport;

package/build/es/components/Toolbar/MenuButton.styles.js

@@ -1,4 +1,4 @@
-import { colors, spacers, theme } from '@dhis2/ui-constants';
+import { colors, spacers, theme } from '@dhis2/ui';
 const _defaultExport = [`button.jsx-3546699693{all:unset;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;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;font-size:14px;line-height:14px;padding:0 ${spacers.dp12};color:${colors.grey900};cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}`, `button.jsx-3546699693:hover.jsx-3546699693:enabled,button.jsx-3546699693:active.jsx-3546699693:enabled,button.isOpen.jsx-3546699693{background-color:${colors.grey200};}`, `button.jsx-3546699693:focus{outline:3px solid ${theme.focus};outline-offset:-3px;}`, "button.jsx-3546699693:focus.jsx-3546699693:not(:focus-visible){outline:none;}", `button.jsx-3546699693:disabled{color:${colors.grey500};cursor:not-allowed;}`];
 _defaultExport.__hash = "3546699693";
 export default _defaultExport;

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

@@ -1,5 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
-import { colors } from '@dhis2/ui-constants';
+import { colors } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
 export const Toolbar = _ref => {

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

@@ -1,5 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
-import { colors } from '@dhis2/ui-constants';
+import { colors } from '@dhis2/ui';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';

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

@@ -1,8 +1,6 @@
 import _JSXStyle from "styled-jsx/style";
 import i18n from '@dhis2/d2-i18n';
-import { colors } from '@dhis2/ui-constants';
-import { IconSync16 } from '@dhis2/ui-icons';
-import { CircularLoader } from '@dhis2-ui/loader';
+import { CircularLoader, IconSync16, colors } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
 import menuButtonStyles from './MenuButton.styles.js';

package/build/es/index.js

@@ -23,6 +23,7 @@ export { TranslationDialog } from './components/TranslationDialog/index.js';
 export { OfflineTooltip } from './components/OfflineTooltip.js';
 export { CachedDataQueryProvider, useCachedDataQuery } from './components/CachedDataQueryProvider.js';
 export * from './components/RichText/index.js';
+export { DashboardPluginWrapper } from './components/DashboardPluginWrapper/DashboardPluginWrapper.js';
 
 // Api
 

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

@@ -2,7 +2,7 @@
     "view only": "",
     "view and edit": "",
     "all users ({{accessLevel}})": "",
-    "{{userOrGroup}} ({{accessLevel}})": "",
+    "{{userOrGroup}} ({{accessLevel}})": "{{userOrGroup}} ({{accessLevel}})",
     "Shared with {{commaSeparatedListOfUsersAndGroups}}": "",
     "Not shared with any users or groups": "",
     "No description": "Aucune description",

package/build/es/modules/getPWAInstallationStatus.js

@@ -0,0 +1,70 @@
+export const INSTALLATION_STATES = {
+  READY: 'READY',
+  INSTALLING: 'INSTALLING'
+};
+function handleInstallingWorker(_ref) {
+  let {
+    installingWorker,
+    onStateChange
+  } = _ref;
+  installingWorker.onstatechange = () => {
+    if (installingWorker.state === 'activated') {
+      // ... and update state to 'ready'
+      onStateChange(INSTALLATION_STATES.READY);
+    }
+  };
+}
+
+/**
+ * Gets the current installation state of the PWA features, which is intended
+ * to be reported from this plugin to the parent app to indicate that the
+ * static assets are cached and ready to be accessed locally instead of over
+ * the network.
+ *
+ * Returns either READY, INSTALLING, or `null` for not installed/won't install
+ */
+export async function getPWAInstallationStatus(_ref2) {
+  let {
+    onStateChange
+  } = _ref2;
+  if (!navigator.serviceWorker) {
+    // Nothing to do here
+    return null;
+  }
+  const registration = await navigator.serviceWorker.getRegistration();
+  if (!registration) {
+    // This shouldn't happen since this is a PWA app, but return null
+    return null;
+  }
+  if (registration.active) {
+    return INSTALLATION_STATES.READY;
+  }
+  // note that 'registration.waiting' is skipped - it implies there's an active one
+  if (registration.installing) {
+    handleInstallingWorker({
+      installingWorker: registration.installing,
+      onStateChange
+    });
+    return INSTALLATION_STATES.INSTALLING;
+  }
+
+  // It shouldn't normally be possible to get here, but just in case,
+  // listen for installations
+  registration.onupdatefound = () => {
+    // update state for this plugin to 'installing'
+    onStateChange(INSTALLATION_STATES.INSTALLING);
+
+    // also listen for the installing worker to become active
+    const installingWorker = registration.installing;
+    if (!installingWorker) {
+      return;
+    }
+    handleInstallingWorker({
+      installingWorker,
+      onStateChange
+    });
+  };
+
+  // and in the mean time, return null to show 'not installed'
+  return null;
+}

package/build/es/visualizations/config/adapters/dhis_highcharts/index.js

@@ -185,6 +185,5 @@ export default function (_ref) {
 
   // force apply extra config
   Object.assign(config, extraConfig);
-  console.log(objectClean(config));
   return objectClean(config);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.11.1",
+    "version": "26.12.1",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -30,8 +30,8 @@
         "validate-push": "yarn test"
     },
     "devDependencies": {
-        "@dhis2/app-runtime": "^3.11.3",
-        "@dhis2/cli-app-scripts": "^11.7.4",
+        "@dhis2/app-runtime": "^3.13.2",
+        "@dhis2/cli-app-scripts": "^11.8.0",
         "@dhis2/cli-style": "^10.7.4",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/ui": "^10.1.9",