@dhis2/analytics 21.5.1 → 22.0.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [22.0.0](https://github.com/dhis2/analytics/compare/v21.5.1...v22.0.0) (2022-02-01)
+
+
+### Features
+
+* remove d2 and implement a generic provider component and hook ([#1114](https://github.com/dhis2/analytics/issues/1114)) ([f76233b](https://github.com/dhis2/analytics/commit/f76233bf961d1bea5586e2cffeba8e4c5a8ee254))
+
+
+### BREAKING CHANGES
+
+* currentUser is a new prop required in FileMenu in place of d2.
+
 ## [21.5.1](https://github.com/dhis2/analytics/compare/v21.5.0...v21.5.1) (2022-01-27)
 
 

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

@@ -14,10 +14,10 @@ const configMock = {
   baseUrl: 'http://localhost:8080',
   apiVersion: 33
 };
-const d2Mock = {
-  i18n: {
-    getTranslation: string => string
-  }
+const user = {
+  displayName: 'John Traore',
+  id: 'xE7jOejl9FI',
+  username: 'admin'
 };
 const visObject = {
   lastUpdated: '2020-10-12T09:44:46.194',
@@ -38,16 +38,8 @@ const visObject = {
     write: true,
     manage: true
   },
-  lastUpdatedBy: {
-    displayName: 'John Traore',
-    id: 'xE7jOejl9FI',
-    username: 'admin'
-  },
-  user: {
-    displayName: 'John Traore',
-    id: 'xE7jOejl9FI',
-    username: 'admin'
-  },
+  lastUpdatedBy: user,
+  user,
   translations: [],
   userAccesses: [{
     access: 'rw------',
@@ -67,18 +59,18 @@ const visReadonlyObject = { ...visObject,
   }
 };
 (0, _react.storiesOf)('FileMenu', module).add('Simple', () => /*#__PURE__*/_react2.default.createElement(_FileMenu.FileMenu, {
-  d2: d2Mock,
+  currentUser: user,
   fileType: "visualization"
 })).add('With AO', () => /*#__PURE__*/_react2.default.createElement(_appRuntime.Provider, {
   config: configMock
 }, /*#__PURE__*/_react2.default.createElement(_FileMenu.FileMenu, {
-  d2: d2Mock,
+  currentUser: user,
   fileType: "visualization",
   fileObject: visObject
 }))).add('With readonly AO', () => /*#__PURE__*/_react2.default.createElement(_appRuntime.Provider, {
   config: configMock
 }, /*#__PURE__*/_react2.default.createElement(_FileMenu.FileMenu, {
-  d2: d2Mock,
+  currentUser: user,
   fileType: "visualization",
   fileObject: visReadonlyObject
 })));

package/build/cjs/components/CachedDataQueryProvider.js

@@ -0,0 +1,70 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useCachedDataQuery = exports.CachedDataQueryProvider = void 0;
+
+var _appRuntime = require("@dhis2/app-runtime");
+
+var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
+
+var _ui = require("@dhis2/ui");
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+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; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const CachedDataQueryCtx = /*#__PURE__*/(0, _react.createContext)({});
+
+const CachedDataQueryProvider = ({
+  query,
+  dataTransformation,
+  children
+}) => {
+  const {
+    data: rawData,
+    ...rest
+  } = (0, _appRuntime.useDataQuery)(query);
+  const {
+    error,
+    loading
+  } = rest;
+  const data = rawData && dataTransformation ? dataTransformation(rawData) : rawData;
+
+  if (loading) {
+    return /*#__PURE__*/_react.default.createElement(_ui.Layer, {
+      translucent: true
+    }, /*#__PURE__*/_react.default.createElement(_ui.CenteredContent, null, /*#__PURE__*/_react.default.createElement(_ui.CircularLoader, null)));
+  }
+
+  if (error) {
+    const fallbackMsg = _d2I18n.default.t('This app could not retrieve required data.');
+
+    return /*#__PURE__*/_react.default.createElement(_ui.NoticeBox, {
+      error: true,
+      title: _d2I18n.default.t('Network error')
+    }, error.message || fallbackMsg);
+  }
+
+  return /*#__PURE__*/_react.default.createElement(CachedDataQueryCtx.Provider, {
+    value: data
+  }, children);
+};
+
+exports.CachedDataQueryProvider = CachedDataQueryProvider;
+CachedDataQueryProvider.propTypes = {
+  children: _propTypes.default.node.isRequired,
+  query: _propTypes.default.object.isRequired,
+  dataTransformation: _propTypes.default.func
+};
+
+const useCachedDataQuery = () => (0, _react.useContext)(CachedDataQueryCtx);
+
+exports.useCachedDataQuery = useCachedDataQuery;

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

@@ -38,8 +38,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const FileMenu = ({
-  d2,
-  // to be removed as soon as TranslateDialog and FavoritesDialog are rewritten
+  currentUser,
   fileType,
   fileObject,
   onNew,
@@ -162,7 +161,7 @@ const FileMenu = ({
       onDialogClose();
     },
     onNew: onNew,
-    currentUser: d2.currentUser
+    currentUser: currentUser
   }), menuIsOpen && /*#__PURE__*/_react.default.createElement(_ui.Layer, {
     onClick: toggleMenu,
     position: "fixed",
@@ -265,7 +264,7 @@ FileMenu.defaultProps = {
   onTranslate: Function.prototype
 };
 FileMenu.propTypes = {
-  d2: _propTypes.default.object,
+  currentUser: _propTypes.default.object,
   fileObject: _propTypes.default.object,
   fileType: _propTypes.default.oneOf(_utils.supportedFileTypes),
   onDelete: _propTypes.default.func,

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

@@ -46,11 +46,9 @@ describe('The FileMenu component ', () => {
   beforeEach(() => {
     shallowFileMenu = undefined;
     props = {
-      d2: {
-        currentUser: {
-          id: 'u1',
-          displayName: 'Test user'
-        }
+      currentUser: {
+        id: 'u1',
+        displayName: 'Test user'
       },
       fileType: 'visualization',
       fileObject: undefined,

package/build/cjs/components/OpenFileDialog/OpenFileDialog.js

@@ -158,13 +158,16 @@ const OpenFileDialog = ({
     }
   }, [open, page, sortField, sortDirection]);
   (0, _react.useEffect)(() => {
-    // reset pagination when filters are applied/changed
-    setPage(1);
-    refetch({
-      sortField,
-      sortDirection,
-      filters: formatFilters()
-    });
+    // avoid fetching data when the dialog is first rendered (hidden)
+    if (open) {
+      // reset pagination when filters are applied/changed
+      setPage(1);
+      refetch({
+        sortField,
+        sortDirection,
+        filters: formatFilters()
+      });
+    }
   }, [filters]);
   const headers = [{
     field: 'displayName',

package/build/cjs/components/OpenFileDialog/OpenFileDialog.styles.js

@@ -7,6 +7,6 @@ exports.styles = void 0;
 
 var _ui = require("@dhis2/ui");
 
-const styles = [".data-table-body.jsx-2890213967{min-height:465px;}", ".pagination-controls.jsx-2890213967{width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end;}", ".search-and-filter-bar.jsx-2890213967{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;margin-bottom:".concat(_ui.spacers.dp8, ";}"), ".search-field-container.jsx-2890213967{min-width:220px;}", ".type-field-container.jsx-2890213967,.created-by-field-container.jsx-2890213967{min-width:180px;}", ".info-cell.jsx-2890213967{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-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;margin:".concat(_ui.spacers.dp32, " 0;}"), ".info-container.jsx-2890213967{max-width:400px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-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;}", ".info-text.jsx-2890213967{text-align:center;font-size:14px;line-height:19px;color:".concat(_ui.colors.grey700, ";}"), ".info-button.jsx-2890213967{margin-top:".concat(_ui.spacers.dp12, ";}")];
+const styles = [".data-table-body.jsx-1047699013{min-height:465px;}", ".pagination-controls.jsx-1047699013{width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end;}", ".search-and-filter-bar.jsx-1047699013{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:".concat(_ui.spacers.dp4, ";-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:").concat(_ui.spacers.dp8, ";}"), ".search-field-container.jsx-1047699013{min-width:220px;}", ".type-field-container.jsx-1047699013,.created-by-field-container.jsx-1047699013{min-width:180px;}", ".info-cell.jsx-1047699013{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-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;margin:".concat(_ui.spacers.dp32, " 0;}"), ".info-container.jsx-1047699013{max-width:400px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-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;}", ".info-text.jsx-1047699013{text-align:center;font-size:14px;line-height:19px;color:".concat(_ui.colors.grey700, ";}"), ".info-button.jsx-1047699013{margin-top:".concat(_ui.spacers.dp12, ";}")];
 exports.styles = styles;
-styles.__hash = "2890213967";
+styles.__hash = "1047699013";

package/build/cjs/index.js

@@ -93,6 +93,18 @@ Object.defineProperty(exports, "AboutAOUnit", {
     return _AboutAOUnit.default;
   }
 });
+Object.defineProperty(exports, "CachedDataQueryProvider", {
+  enumerable: true,
+  get: function () {
+    return _CachedDataQueryProvider.CachedDataQueryProvider;
+  }
+});
+Object.defineProperty(exports, "useCachedDataQuery", {
+  enumerable: true,
+  get: function () {
+    return _CachedDataQueryProvider.useCachedDataQuery;
+  }
+});
 Object.defineProperty(exports, "Analytics", {
   enumerable: true,
   get: function () {
@@ -1174,6 +1186,8 @@ var _LegendKey = _interopRequireDefault(require("./components/LegendKey/LegendKe
 
 var _AboutAOUnit = _interopRequireDefault(require("./components/AboutAOUnit/AboutAOUnit.js"));
 
+var _CachedDataQueryProvider = require("./components/CachedDataQueryProvider.js");
+
 var _Analytics = _interopRequireDefault(require("./api/analytics/Analytics.js"));
 
 var _dimensions = require("./api/dimensions.js");

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

@@ -16,6 +16,8 @@
     "Unsubscribe": "Unsubscribe",
     "Subscribe to get updates about new interpretations.": "Subscribe to get updates about new interpretations.",
     "Subscribe": "Subscribe",
+    "This app could not retrieve required data.": "This app could not retrieve required data.",
+    "Network error": "Network error",
     "Data Type": "Data Type",
     "All types": "All types",
     "Totals only": "Totals only",

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

@@ -6,10 +6,10 @@ const configMock = {
   baseUrl: 'http://localhost:8080',
   apiVersion: 33
 };
-const d2Mock = {
-  i18n: {
-    getTranslation: string => string
-  }
+const user = {
+  displayName: 'John Traore',
+  id: 'xE7jOejl9FI',
+  username: 'admin'
 };
 const visObject = {
   lastUpdated: '2020-10-12T09:44:46.194',
@@ -30,16 +30,8 @@ const visObject = {
     write: true,
     manage: true
   },
-  lastUpdatedBy: {
-    displayName: 'John Traore',
-    id: 'xE7jOejl9FI',
-    username: 'admin'
-  },
-  user: {
-    displayName: 'John Traore',
-    id: 'xE7jOejl9FI',
-    username: 'admin'
-  },
+  lastUpdatedBy: user,
+  user,
   translations: [],
   userAccesses: [{
     access: 'rw------',
@@ -59,18 +51,18 @@ const visReadonlyObject = { ...visObject,
   }
 };
 storiesOf('FileMenu', module).add('Simple', () => /*#__PURE__*/React.createElement(FileMenu, {
-  d2: d2Mock,
+  currentUser: user,
   fileType: "visualization"
 })).add('With AO', () => /*#__PURE__*/React.createElement(Provider, {
   config: configMock
 }, /*#__PURE__*/React.createElement(FileMenu, {
-  d2: d2Mock,
+  currentUser: user,
   fileType: "visualization",
   fileObject: visObject
 }))).add('With readonly AO', () => /*#__PURE__*/React.createElement(Provider, {
   config: configMock
 }, /*#__PURE__*/React.createElement(FileMenu, {
-  d2: d2Mock,
+  currentUser: user,
   fileType: "visualization",
   fileObject: visReadonlyObject
 })));

package/build/es/components/CachedDataQueryProvider.js

@@ -0,0 +1,50 @@
+import { useDataQuery } from '@dhis2/app-runtime';
+import i18n from '@dhis2/d2-i18n';
+import { Layer, CenteredContent, CircularLoader, NoticeBox } from '@dhis2/ui';
+import PropTypes from 'prop-types';
+import React, { createContext, useContext } from 'react';
+const CachedDataQueryCtx = /*#__PURE__*/createContext({});
+
+const CachedDataQueryProvider = ({
+  query,
+  dataTransformation,
+  children
+}) => {
+  const {
+    data: rawData,
+    ...rest
+  } = useDataQuery(query);
+  const {
+    error,
+    loading
+  } = rest;
+  const data = rawData && dataTransformation ? dataTransformation(rawData) : rawData;
+
+  if (loading) {
+    return /*#__PURE__*/React.createElement(Layer, {
+      translucent: true
+    }, /*#__PURE__*/React.createElement(CenteredContent, null, /*#__PURE__*/React.createElement(CircularLoader, null)));
+  }
+
+  if (error) {
+    const fallbackMsg = i18n.t('This app could not retrieve required data.');
+    return /*#__PURE__*/React.createElement(NoticeBox, {
+      error: true,
+      title: i18n.t('Network error')
+    }, error.message || fallbackMsg);
+  }
+
+  return /*#__PURE__*/React.createElement(CachedDataQueryCtx.Provider, {
+    value: data
+  }, children);
+};
+
+CachedDataQueryProvider.propTypes = {
+  children: PropTypes.node.isRequired,
+  query: PropTypes.object.isRequired,
+  dataTransformation: PropTypes.func
+};
+
+const useCachedDataQuery = () => useContext(CachedDataQueryCtx);
+
+export { CachedDataQueryProvider, useCachedDataQuery };

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

@@ -12,8 +12,7 @@ import { RenameDialog } from './RenameDialog.js';
 import { SaveAsDialog } from './SaveAsDialog.js';
 import { supportedFileTypes } from './utils.js';
 export const FileMenu = ({
-  d2,
-  // to be removed as soon as TranslateDialog and FavoritesDialog are rewritten
+  currentUser,
   fileType,
   fileObject,
   onNew,
@@ -136,7 +135,7 @@ export const FileMenu = ({
       onDialogClose();
     },
     onNew: onNew,
-    currentUser: d2.currentUser
+    currentUser: currentUser
   }), menuIsOpen && /*#__PURE__*/React.createElement(Layer, {
     onClick: toggleMenu,
     position: "fixed",
@@ -237,7 +236,7 @@ FileMenu.defaultProps = {
   onTranslate: Function.prototype
 };
 FileMenu.propTypes = {
-  d2: PropTypes.object,
+  currentUser: PropTypes.object,
   fileObject: PropTypes.object,
   fileType: PropTypes.oneOf(supportedFileTypes),
   onDelete: PropTypes.func,

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

@@ -32,11 +32,9 @@ describe('The FileMenu component ', () => {
   beforeEach(() => {
     shallowFileMenu = undefined;
     props = {
-      d2: {
-        currentUser: {
-          id: 'u1',
-          displayName: 'Test user'
-        }
+      currentUser: {
+        id: 'u1',
+        displayName: 'Test user'
       },
       fileType: 'visualization',
       fileObject: undefined,

package/build/es/components/OpenFileDialog/OpenFileDialog.js

@@ -132,13 +132,16 @@ export const OpenFileDialog = ({
     }
   }, [open, page, sortField, sortDirection]);
   useEffect(() => {
-    // reset pagination when filters are applied/changed
-    setPage(1);
-    refetch({
-      sortField,
-      sortDirection,
-      filters: formatFilters()
-    });
+    // avoid fetching data when the dialog is first rendered (hidden)
+    if (open) {
+      // reset pagination when filters are applied/changed
+      setPage(1);
+      refetch({
+        sortField,
+        sortDirection,
+        filters: formatFilters()
+      });
+    }
   }, [filters]);
   const headers = [{
     field: 'displayName',

package/build/es/components/OpenFileDialog/OpenFileDialog.styles.js

@@ -1,3 +1,3 @@
 import { colors, spacers } from '@dhis2/ui';
-export const styles = [".data-table-body.jsx-2890213967{min-height:465px;}", ".pagination-controls.jsx-2890213967{width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end;}", ".search-and-filter-bar.jsx-2890213967{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;margin-bottom:".concat(spacers.dp8, ";}"), ".search-field-container.jsx-2890213967{min-width:220px;}", ".type-field-container.jsx-2890213967,.created-by-field-container.jsx-2890213967{min-width:180px;}", ".info-cell.jsx-2890213967{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-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;margin:".concat(spacers.dp32, " 0;}"), ".info-container.jsx-2890213967{max-width:400px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-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;}", ".info-text.jsx-2890213967{text-align:center;font-size:14px;line-height:19px;color:".concat(colors.grey700, ";}"), ".info-button.jsx-2890213967{margin-top:".concat(spacers.dp12, ";}")];
-styles.__hash = "2890213967";
+export const styles = [".data-table-body.jsx-1047699013{min-height:465px;}", ".pagination-controls.jsx-1047699013{width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end;}", ".search-and-filter-bar.jsx-1047699013{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:".concat(spacers.dp4, ";-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:").concat(spacers.dp8, ";}"), ".search-field-container.jsx-1047699013{min-width:220px;}", ".type-field-container.jsx-1047699013,.created-by-field-container.jsx-1047699013{min-width:180px;}", ".info-cell.jsx-1047699013{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-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;margin:".concat(spacers.dp32, " 0;}"), ".info-container.jsx-1047699013{max-width:400px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-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;}", ".info-text.jsx-1047699013{text-align:center;font-size:14px;line-height:19px;color:".concat(colors.grey700, ";}"), ".info-button.jsx-1047699013{margin-top:".concat(spacers.dp12, ";}")];
+styles.__hash = "1047699013";

package/build/es/index.js

@@ -13,7 +13,8 @@ export { default as PivotTable } from './components/PivotTable/PivotTable.js';
 export { default as FileMenu } from './components/FileMenu/FileMenu.js';
 export { default as VisTypeIcon } from './components/VisTypeIcon.js';
 export { default as LegendKey } from './components/LegendKey/LegendKey.js';
-export { default as AboutAOUnit } from './components/AboutAOUnit/AboutAOUnit.js'; // Api
+export { default as AboutAOUnit } from './components/AboutAOUnit/AboutAOUnit.js';
+export { CachedDataQueryProvider, useCachedDataQuery } from './components/CachedDataQueryProvider.js'; // Api
 
 export { default as Analytics } from './api/analytics/Analytics.js';
 export { apiFetchDimensions, apiFetchRecommendedIds } from './api/dimensions.js';

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

@@ -16,6 +16,8 @@
     "Unsubscribe": "Unsubscribe",
     "Subscribe to get updates about new interpretations.": "Subscribe to get updates about new interpretations.",
     "Subscribe": "Subscribe",
+    "This app could not retrieve required data.": "This app could not retrieve required data.",
+    "Network error": "Network error",
     "Data Type": "Data Type",
     "All types": "All types",
     "Totals only": "Totals only",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "21.5.1",
+    "version": "22.0.0",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -35,7 +35,7 @@
         "@dhis2/cli-app-scripts": "^6.2.0",
         "@dhis2/cli-style": "^10.1.1",
         "@dhis2/d2-i18n": "^1.1.0",
-        "@dhis2/ui": "^7.7.3",
+        "@dhis2/ui": "^7.14.3",
         "@sambego/storybook-state": "^2.0.1",
         "@storybook/addons": "^6.1.14",
         "@storybook/preset-create-react-app": "^3.1.7",