@dhis2/analytics 26.1.0 → 26.1.2

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

@@ -140,7 +140,7 @@
     "Search for a user": "",
     "Searching for \"{{- searchText}}\"": "",
     "No results found": "Ingen resultater funnet",
-    "Not available offline": "",
+    "Not available offline": "Ikke tilgjengelig i frakoblet modus",
     "Created by": "Opprettet av",
     "Anyone": "Hvem som helst",
     "Only you": "Bare deg",

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

@@ -0,0 +1,38 @@
+import { CustomDataProvider } from '@dhis2/app-runtime';
+import { storiesOf } from '@storybook/react';
+import React from 'react';
+import { InterpretationsUnit } from '../components/Interpretations/InterpretationsUnit/index.js';
+storiesOf('IntepretationsUnit', module).add('Default', () => {
+  return /*#__PURE__*/React.createElement(CustomDataProvider, {
+    data: {
+      interpretations: {
+        interpretations: []
+      }
+    }
+  }, /*#__PURE__*/React.createElement(InterpretationsUnit, {
+    currentUser: {
+      name: 'Tom Wakiki'
+    },
+    id: "abcd",
+    onReplyIconClick: Function.prototype,
+    type: "eventVisualization",
+    visualizationHasTimeDimension: true
+  }));
+});
+storiesOf('IntepretationsUnit', module).add('With no time dimensions warning', () => {
+  return /*#__PURE__*/React.createElement(CustomDataProvider, {
+    data: {
+      interpretations: {
+        interpretations: []
+      }
+    }
+  }, /*#__PURE__*/React.createElement(InterpretationsUnit, {
+    currentUser: {
+      name: 'Tom Wakiki'
+    },
+    id: "abcd",
+    onReplyIconClick: Function.prototype,
+    type: "eventVisualization",
+    visualizationHasTimeDimension: false
+  }));
+});

package/build/es/components/AboutAOUnit/AboutAOUnit.js

@@ -1,5 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
-import { useDataQuery, useDataMutation } from '@dhis2/app-runtime';
+import { useDataQuery, useDataMutation, useTimeZoneConversion } from '@dhis2/app-runtime';
 import i18n from '@dhis2/d2-i18n';
 import { Parser as RichTextParser } from '@dhis2/d2-ui-rich-text';
 import { Button, CircularLoader, IconChevronDown24, IconChevronUp24, IconClock16, IconShare16, IconSubscribe24, IconSubscribeOff24, IconUser16, IconView16, colors } from '@dhis2/ui';
@@ -51,6 +51,9 @@ const AboutAOUnit = /*#__PURE__*/forwardRef((_ref3, ref) => {
     renderId
   } = _ref3;
   const [isExpanded, setIsExpanded] = useState(true);
+  const {
+    fromServerDate
+  } = useTimeZoneConversion();
   const queries = useMemo(() => getQueries(type), [type]);
   const {
     data,
@@ -157,16 +160,16 @@ const AboutAOUnit = /*#__PURE__*/forwardRef((_ref3, ref) => {
   }, /*#__PURE__*/React.createElement(IconClock16, {
     color: colors.grey700
   }), i18n.t('Last updated {{time}}', {
-    time: moment(data.ao.lastUpdated).fromNow()
+    time: moment(fromServerDate(data.ao.lastUpdated)).fromNow()
   })), /*#__PURE__*/React.createElement("p", {
     className: `jsx-${styles.__hash}` + " " + "detailLine"
   }, /*#__PURE__*/React.createElement(IconUser16, {
     color: colors.grey700
   }), (_data$ao$createdBy = data.ao.createdBy) !== null && _data$ao$createdBy !== void 0 && _data$ao$createdBy.displayName ? i18n.t('Created {{time}} by {{author}}', {
-    time: moment(data.ao.created).fromNow(),
+    time: moment(fromServerDate(data.ao.created)).fromNow(),
     author: data.ao.createdBy.displayName
   }) : i18n.t('Created {{time}}', {
-    time: moment(data.ao.created).fromNow()
+    time: moment(fromServerDate(data.ao.created)).fromNow()
   })), /*#__PURE__*/React.createElement("p", {
     className: `jsx-${styles.__hash}` + " " + "detailLine"
   }, /*#__PURE__*/React.createElement(IconView16, {

package/build/es/components/Interpretations/InterpretationModal/InterpretationModal.js

@@ -9,17 +9,17 @@ import { InterpretationThread } from './InterpretationThread.js';
 import { useModalContentWidth } from './useModalContentWidth.js';
 const modalCSS = {
   styles: /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "422732072"
-  }, ["aside.jsx-422732072{max-width:calc(100vw - 128px) !important;max-height:calc(100vh - 128px) !important;width:auto !important;height:auto !important;overflow-y:hidden;}", "aside.hidden.jsx-422732072{display:none;}", "aside.jsx-422732072>div>div{max-height:none;}"]),
-  className: "jsx-422732072"
+    id: "2559940363"
+  }, ["aside.jsx-2559940363{max-width:calc(100vw - 128px) !important;max-height:calc(100vh - 128px) !important;width:auto !important;height:calc(100vh - 128px) !important;overflow-y:hidden;}", "aside.hidden.jsx-2559940363{display:none;}", "aside.jsx-2559940363>div>div{height:100%;}"]),
+  className: "jsx-2559940363"
 };
 function getModalContentCSS(width) {
   return {
     styles: /*#__PURE__*/React.createElement(_JSXStyle, {
-      id: "1689110567",
+      id: "2099285089",
       dynamic: [width]
-    }, [`div.__jsx-style-dynamic-selector{width:${width}px;}`]),
-    className: _JSXStyle.dynamic([["1689110567", [width]]])
+    }, [`div.__jsx-style-dynamic-selector{width:${width}px;overflow-y:visible;}`]),
+    className: _JSXStyle.dynamic([["2099285089", [width]]])
   };
 }
 const query = {
@@ -100,23 +100,23 @@ const InterpretationModal = _ref2 => {
     }),
     dataTest: "interpretation-modal"
   }, /*#__PURE__*/React.createElement("h1", {
-    className: _JSXStyle.dynamic([["3175860552", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "title"
+    className: _JSXStyle.dynamic([["2014146191", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "title"
   }, /*#__PURE__*/React.createElement("span", {
-    className: _JSXStyle.dynamic([["3175860552", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "ellipsis"
+    className: _JSXStyle.dynamic([["2014146191", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "ellipsis"
   }, i18n.t('Viewing interpretation: {{- visualisationName}}', {
     visualisationName: visualization.displayName || visualization.name,
     nsSeparator: '^^'
   }))), /*#__PURE__*/React.createElement(ModalContent, {
     className: modalContentCSS.className
   }, /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["3175860552", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "container"
+    className: _JSXStyle.dynamic([["2014146191", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "container"
   }, error && /*#__PURE__*/React.createElement(NoticeBox, {
     error: true,
     title: i18n.t('Could not load interpretation')
   }, error.message || i18n.t('The interpretation couldn’t be displayed. Try again or contact your system administrator.')), shouldRenderModalContent && /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["3175860552", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "row"
+    className: _JSXStyle.dynamic([["2014146191", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "row"
   }, /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["3175860552", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "visualisation-wrap"
+    className: _JSXStyle.dynamic([["2014146191", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "visualisation-wrap"
   }, /*#__PURE__*/React.createElement(VisualizationPlugin, {
     filters: {
       relativePeriodDate: interpretation.created
@@ -124,9 +124,9 @@ const InterpretationModal = _ref2 => {
     visualization: visualization,
     onResponsesReceived: onResponsesReceived,
     displayProperty: (_currentUser$settings = currentUser.settings) === null || _currentUser$settings === void 0 ? void 0 : _currentUser$settings.keyAnalysisDisplayProperty,
-    className: _JSXStyle.dynamic([["3175860552", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]])
+    className: _JSXStyle.dynamic([["2014146191", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]])
   })), /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["3175860552", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "thread-wrap"
+    className: _JSXStyle.dynamic([["2014146191", [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]]]) + " " + "thread-wrap"
   }, /*#__PURE__*/React.createElement(InterpretationThread, {
     currentUser: currentUser,
     fetching: fetching,
@@ -139,9 +139,9 @@ const InterpretationModal = _ref2 => {
     disabled: fetching,
     onClick: handleClose
   }, i18n.t('Hide interpretation'))), modalCSS.styles, modalContentCSS.styles, /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "3175860552",
+    id: "2014146191",
     dynamic: [colors.grey900, spacers.dp24, spacers.dp4, spacers.dp4]
-  }, [`.title.__jsx-style-dynamic-selector{color:${colors.grey900};margin:0px;padding:${spacers.dp24} 0 ${spacers.dp4};}`, ".ellipsis.__jsx-style-dynamic-selector{display:inline-block;font-size:20px;font-weight:500;line-height:24px;white-space:nowrap;width:100%;overflow:hidden;text-overflow:ellipsis;}", ".container.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}", ".row.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;gap:16px;}", ".visualisation-wrap.__jsx-style-dynamic-selector{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;min-width:0;}", `.thread-wrap.__jsx-style-dynamic-selector{padding-right:${spacers.dp4};-webkit-flex-basis:300px;-ms-flex-preferred-size:300px;flex-basis:300px;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;overflow-y:auto;}`])));
+  }, [`.title.__jsx-style-dynamic-selector{color:${colors.grey900};margin:0px;padding:${spacers.dp24} 0 ${spacers.dp4};}`, ".ellipsis.__jsx-style-dynamic-selector{display:inline-block;font-size:20px;font-weight:500;line-height:24px;white-space:nowrap;width:100%;overflow:hidden;text-overflow:ellipsis;}", ".container.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;height:100%;}", ".row.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;gap:16px;height:100%;}", ".visualisation-wrap.__jsx-style-dynamic-selector{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;min-width:0;}", `.thread-wrap.__jsx-style-dynamic-selector{padding-right:${spacers.dp4};-webkit-flex-basis:300px;-ms-flex-preferred-size:300px;flex-basis:300px;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;}`])));
 };
 InterpretationModal.propTypes = {
   currentUser: PropTypes.object.isRequired,

package/build/es/components/Interpretations/InterpretationModal/InterpretationThread.js

@@ -1,4 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
+import { useTimeZoneConversion } from '@dhis2/app-runtime';
 import { IconClock16, colors } from '@dhis2/ui';
 import cx from 'classnames';
 import moment from 'moment';
@@ -17,6 +18,9 @@ const InterpretationThread = _ref => {
     onThreadUpdated,
     downloadMenuComponent: DownloadMenu
   } = _ref;
+  const {
+    fromServerDate
+  } = useTimeZoneConversion();
   const focusRef = useRef();
   useEffect(() => {
     if (initialFocus && focusRef.current) {
@@ -27,20 +31,18 @@ const InterpretationThread = _ref => {
   }, [initialFocus]);
   const interpretationAccess = getInterpretationAccess(interpretation, currentUser);
   return /*#__PURE__*/React.createElement("div", {
-    className: "jsx-615306698" + " " + (cx('container', {
+    className: "jsx-1846557365" + " " + (cx('container', {
       fetching
     }) || "")
   }, /*#__PURE__*/React.createElement("div", {
-    className: "jsx-615306698" + " " + 'scrollbox'
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "jsx-615306698" + " " + 'title'
+    className: "jsx-1846557365" + " " + 'title'
   }, /*#__PURE__*/React.createElement(IconClock16, {
     color: colors.grey700
-  }), moment(interpretation.created).format('LLL')), DownloadMenu && /*#__PURE__*/React.createElement(DownloadMenu, {
+  }), moment(fromServerDate(interpretation.created)).format('LLL')), DownloadMenu && /*#__PURE__*/React.createElement(DownloadMenu, {
     relativePeriodDate: interpretation.created,
-    className: "jsx-615306698"
+    className: "jsx-1846557365"
   }), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-615306698" + " " + 'thread'
+    className: "jsx-1846557365" + " " + 'thread'
   }, /*#__PURE__*/React.createElement(Interpretation, {
     currentUser: currentUser,
     interpretation: interpretation,
@@ -52,7 +54,7 @@ const InterpretationThread = _ref => {
     onDeleted: onInterpretationDeleted,
     isInThread: true
   }), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-615306698" + " " + 'comments'
+    className: "jsx-1846557365" + " " + 'comments'
   }, interpretation.comments.map(comment => /*#__PURE__*/React.createElement(Comment, {
     key: comment.id,
     comment: comment,
@@ -60,14 +62,14 @@ const InterpretationThread = _ref => {
     interpretationId: interpretation.id,
     onThreadUpdated: onThreadUpdated,
     canComment: interpretationAccess.comment
-  }))), interpretationAccess.comment && /*#__PURE__*/React.createElement(CommentAddForm, {
+  })))), interpretationAccess.comment && /*#__PURE__*/React.createElement(CommentAddForm, {
     currentUser: currentUser,
     interpretationId: interpretation.id,
     onSave: () => onThreadUpdated(true),
     focusRef: focusRef
-  }))), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "615306698"
-  }, [".thread.jsx-615306698{margin-top:var(--spacers-dp16);}", ".container.jsx-615306698{position:relative;overflow:hidden;max-height:calc(100vh - 285px);display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}", ".container.fetching.jsx-615306698::before{content:'';position:absolute;inset:0px;background-color:rgba(255,255,255,0.8);}", ".container.fetching.jsx-615306698::after{content:'';position:absolute;top:calc(50% - 12px);left:calc(50% - 12px);width:24px;height:24px;border-width:4px;border-style:solid;border-color:rgba(110,122,138,0.15) rgba(110,122,138,0.15) rgb(20,124,215);border-image:initial;border-radius:50%;-webkit-animation:1s linear 0s infinite normal none running rotation-jsx-615306698;animation:1s linear 0s infinite normal none running rotation-jsx-615306698;}", ".scrollbox.jsx-615306698{overflow-y:auto;-webkit-scroll-behavior:smooth;-moz-scroll-behavior:smooth;-ms-scroll-behavior:smooth;scroll-behavior:smooth;}", ".title.jsx-615306698{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;gap:var(--spacers-dp8);color:var(--colors-grey900);font-size:14px;line-height:18px;}", ".comments.jsx-615306698{padding-left:16px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;padding-top:var(--spacers-dp4);gap:var(--spacers-dp4);}", "@-webkit-keyframes rotation-jsx-615306698{0%{-webkit-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0);}100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg);}}", "@keyframes rotation-jsx-615306698{0%{-webkit-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0);}100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg);}}"]));
+  }), /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: "1846557365"
+  }, [".thread.jsx-1846557365{margin-top:var(--spacers-dp16);overflow-y:auto;-webkit-scroll-behavior:smooth;-moz-scroll-behavior:smooth;-ms-scroll-behavior:smooth;scroll-behavior:smooth;}", ".container.jsx-1846557365{position:relative;overflow:auto;max-height:calc(100vh - 285px);display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}", ".container.fetching.jsx-1846557365::before{content:'';position:absolute;inset:0px;background-color:rgba(255,255,255,0.8);}", ".container.fetching.jsx-1846557365::after{content:'';position:absolute;top:calc(50% - 12px);left:calc(50% - 12px);width:24px;height:24px;border-width:4px;border-style:solid;border-color:rgba(110,122,138,0.15) rgba(110,122,138,0.15) rgb(20,124,215);border-image:initial;border-radius:50%;-webkit-animation:1s linear 0s infinite normal none running rotation-jsx-1846557365;animation:1s linear 0s infinite normal none running rotation-jsx-1846557365;}", ".title.jsx-1846557365{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;gap:var(--spacers-dp8);color:var(--colors-grey900);font-size:14px;line-height:18px;}", ".comments.jsx-1846557365{padding-left:16px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;padding-top:var(--spacers-dp4);gap:var(--spacers-dp4);}", "@-webkit-keyframes rotation-jsx-1846557365{0%{-webkit-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0);}100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg);}}", "@keyframes rotation-jsx-1846557365{0%{-webkit-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0);}100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg);}}"]));
 };
 InterpretationThread.propTypes = {
   currentUser: PropTypes.object.isRequired,

package/build/es/components/Interpretations/InterpretationsUnit/InterpretationForm.js

@@ -10,6 +10,7 @@ export const InterpretationForm = _ref => {
     id,
     currentUser,
     disabled,
+    showNoTimeDimensionHelpText,
     onSave
   } = _ref;
   const [showRichTextEditor, setShowRichTextEditor] = useState(false);
@@ -41,7 +42,8 @@ export const InterpretationForm = _ref => {
     disabled: saveMutationInProgress,
     inputPlaceholder: inputPlaceholder,
     onChange: setInterpretationText,
-    value: interpretationText
+    value: interpretationText,
+    helpText: showNoTimeDimensionHelpText ? i18n.t('Other people viewing this interpretation in the future may see more data.') : undefined
   }), /*#__PURE__*/React.createElement(MessageButtonStrip, null, /*#__PURE__*/React.createElement(Button, {
     primary: true,
     small: true,
@@ -67,6 +69,7 @@ InterpretationForm.propTypes = {
   currentUser: PropTypes.object,
   disabled: PropTypes.bool,
   id: PropTypes.string,
+  showNoTimeDimensionHelpText: PropTypes.bool,
   type: PropTypes.string,
   onSave: PropTypes.func
 };

package/build/es/components/Interpretations/InterpretationsUnit/InterpretationList.js

@@ -1,4 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
+import { useTimeZoneConversion } from '@dhis2/app-runtime';
 import { IconCalendar24, colors, spacers } from '@dhis2/ui';
 import moment from 'moment';
 import PropTypes from 'prop-types';
@@ -24,6 +25,9 @@ export const InterpretationList = _ref => {
     refresh,
     disabled
   } = _ref;
+  const {
+    fromServerDate
+  } = useTimeZoneConversion();
   const interpretationsByDate = interpretations.reduce((groupedInterpretations, interpretation) => {
     const date = interpretation.created.split('T')[0];
     if (date in groupedInterpretations) {
@@ -46,7 +50,7 @@ export const InterpretationList = _ref => {
   }), /*#__PURE__*/React.createElement("time", {
     dateTime: date,
     className: _JSXStyle.dynamic([["4058400613", [spacers.dp8, spacers.dp8, spacers.dp16, colors.grey800, spacers.dp12, spacers.dp12, spacers.dp32, spacers.dp4]]]) + " " + "date-header"
-  }, moment(date).format('ll'))), /*#__PURE__*/React.createElement("ol", {
+  }, moment(fromServerDate(date)).format('ll'))), /*#__PURE__*/React.createElement("ol", {
     className: _JSXStyle.dynamic([["4058400613", [spacers.dp8, spacers.dp8, spacers.dp16, colors.grey800, spacers.dp12, spacers.dp12, spacers.dp32, spacers.dp4]]]) + " " + "interpretation-list"
   }, interpretationsByDate[date].sort(sortByCreatedDateDesc).map(interpretation => /*#__PURE__*/React.createElement(Interpretation, {
     key: interpretation.id,

package/build/es/components/Interpretations/InterpretationsUnit/InterpretationsUnit.js

@@ -27,12 +27,14 @@ export const InterpretationsUnit = /*#__PURE__*/forwardRef((_ref2, ref) => {
     currentUser,
     type,
     id,
+    visualizationHasTimeDimension,
     onInterpretationClick,
     onReplyIconClick,
     disabled,
     renderId
   } = _ref2;
   const [isExpanded, setIsExpanded] = useState(true);
+  const showNoTimeDimensionHelpText = type === 'eventVisualization' && !visualizationHasTimeDimension;
   const {
     data,
     loading,
@@ -84,7 +86,8 @@ export const InterpretationsUnit = /*#__PURE__*/forwardRef((_ref2, ref) => {
     type: type,
     id: id,
     onSave: onCompleteAction,
-    disabled: disabled
+    disabled: disabled,
+    showNoTimeDimensionHelpText: showNoTimeDimensionHelpText
   }), /*#__PURE__*/React.createElement(InterpretationList, {
     currentUser: currentUser,
     interpretations: data.interpretations.interpretations,
@@ -99,7 +102,8 @@ export const InterpretationsUnit = /*#__PURE__*/forwardRef((_ref2, ref) => {
 });
 InterpretationsUnit.displayName = 'InterpretationsUnit';
 InterpretationsUnit.defaultProps = {
-  onInterpretationClick: Function.prototype
+  onInterpretationClick: Function.prototype,
+  visualizationHasTimeDimension: true
 };
 InterpretationsUnit.propTypes = {
   currentUser: PropTypes.object.isRequired,
@@ -107,6 +111,7 @@ InterpretationsUnit.propTypes = {
   type: PropTypes.string.isRequired,
   disabled: PropTypes.bool,
   renderId: PropTypes.number,
+  visualizationHasTimeDimension: PropTypes.bool,
   onInterpretationClick: PropTypes.func,
   onReplyIconClick: PropTypes.func
 };

package/build/es/components/Interpretations/common/Message/Message.js

@@ -1,4 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
+import { useTimeZoneConversion } from '@dhis2/app-runtime';
 import { Parser as RichTextParser } from '@dhis2/d2-ui-rich-text';
 import { UserAvatar, spacers, colors } from '@dhis2/ui';
 import moment from 'moment';
@@ -11,24 +12,27 @@ const Message = _ref => {
     created,
     username
   } = _ref;
+  const {
+    fromServerDate
+  } = useTimeZoneConversion();
   return /*#__PURE__*/React.createElement("li", {
-    className: _JSXStyle.dynamic([["2436588813", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "container"
+    className: _JSXStyle.dynamic([["3500389795", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "container"
   }, /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["2436588813", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "header"
+    className: _JSXStyle.dynamic([["3500389795", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "header"
   }, /*#__PURE__*/React.createElement(UserAvatar, {
     name: username,
     extrasmall: true
   }), username, /*#__PURE__*/React.createElement("time", {
     dateTime: created,
-    className: _JSXStyle.dynamic([["2436588813", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]])
-  }, moment(created).format('lll'))), /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["2436588813", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "content"
+    className: _JSXStyle.dynamic([["3500389795", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]])
+  }, moment(fromServerDate(created)).format('lll'))), /*#__PURE__*/React.createElement("div", {
+    className: _JSXStyle.dynamic([["3500389795", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "content"
   }, /*#__PURE__*/React.createElement(RichTextParser, null, text)), /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["2436588813", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "footer"
+    className: _JSXStyle.dynamic([["3500389795", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "footer"
   }, children), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "2436588813",
+    id: "3500389795",
     dynamic: [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]
-  }, [`.container.__jsx-style-dynamic-selector{padding:${spacers.dp8};background-color:${colors.grey100};border-radius:5px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;gap:${spacers.dp8};}`, `.header.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:6px;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:13px;line-height:16px;color:${colors.grey900};}`, `.header.__jsx-style-dynamic-selector time.__jsx-style-dynamic-selector{font-size:12px;color:${colors.grey600};}`, `.content.__jsx-style-dynamic-selector{font-size:14px;line-height:19px;color:${colors.grey900};}`, ".content.__jsx-style-dynamic-selector p:first-child{margin:0;}", `.footer.__jsx-style-dynamic-selector{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:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;gap:${spacers.dp8};}`]));
+  }, [`.container.__jsx-style-dynamic-selector{padding:${spacers.dp8};background-color:${colors.grey100};border-radius:5px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;gap:${spacers.dp8};}`, `.header.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:6px;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:13px;line-height:16px;color:${colors.grey900};}`, `.header.__jsx-style-dynamic-selector time.__jsx-style-dynamic-selector{font-size:12px;color:${colors.grey600};}`, `.content.__jsx-style-dynamic-selector{font-size:14px;line-height:19px;color:${colors.grey900};word-break:break-word;}`, ".content.__jsx-style-dynamic-selector p:first-child{margin:0;}", `.footer.__jsx-style-dynamic-selector{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:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;gap:${spacers.dp8};}`]));
 };
 Message.propTypes = {
   children: PropTypes.node.isRequired,

package/build/es/components/Interpretations/common/RichTextEditor/RichTextEditor.js

@@ -173,7 +173,8 @@ export const RichTextEditor = /*#__PURE__*/forwardRef((_ref5, externalRef) => {
     disabled,
     inputPlaceholder,
     onChange,
-    errorText
+    errorText,
+    helpText
   } = _ref5;
   const [previewMode, setPreviewMode] = useState(false);
   const internalRef = useRef();
@@ -206,7 +207,8 @@ export const RichTextEditor = /*#__PURE__*/forwardRef((_ref5, externalRef) => {
     className: `jsx-${mainClasses.__hash}` + " " + "preview"
   }, /*#__PURE__*/React.createElement(RichTextParser, null, value)) : /*#__PURE__*/React.createElement(Field, {
     error: !!errorText,
-    validationText: errorText
+    validationText: errorText,
+    helpText: helpText
   }, /*#__PURE__*/React.createElement(UserMentionWrapper, {
     onUserSelect: onChange,
     inputReference: textareaRef
@@ -228,5 +230,6 @@ RichTextEditor.propTypes = {
   onChange: PropTypes.func.isRequired,
   disabled: PropTypes.bool,
   errorText: PropTypes.string,
+  helpText: PropTypes.string,
   inputPlaceholder: PropTypes.string
 };

package/build/es/components/Interpretations/common/__tests__/getInterpretationAccess.spec.js

@@ -1,16 +1,28 @@
 import { getInterpretationAccess, getCommentAccess } from '../getInterpretationAccess.js';
-const superuser = {
+const superuserD2CurrentUser = {
   id: 'iamsuper',
   authorities: new Set(['ALL'])
 };
-const userJoe = {
+const userJoeD2CurrentUser = {
   id: 'johndoe',
   authorities: new Set(['Some'])
 };
-const userJane = {
+const userJaneD2CurrentUser = {
   id: 'jane',
   authorities: new Set(['Some'])
 };
+const superuser = {
+  id: 'iamsuper',
+  authorities: ['ALL']
+};
+const userJoe = {
+  id: 'johndoe',
+  authorities: ['Some']
+};
+const userJane = {
+  id: 'jane',
+  authorities: ['Some']
+};
 describe('interpretation and comment access', () => {
   describe('getInterpretationAccess', () => {
     it('returns true for all accesses for superuser', () => {
@@ -88,6 +100,163 @@ describe('interpretation and comment access', () => {
         delete: false
       });
     });
+    it('throws an error for all accesses when no currentUser provided', () => {
+      const interpretation = {
+        access: {
+          write: false,
+          manage: false
+        },
+        createdBy: userJane
+      };
+      expect(() => getInterpretationAccess(interpretation)).toThrow('"hasAuthority" requires "authorities" to be an array or set of authorities (strings)');
+    });
+    it('throws an error when currentUser is missing authorities', () => {
+      const interpretation = {
+        access: {
+          write: false,
+          manage: false
+        },
+        createdBy: userJane
+      };
+      expect(() => getInterpretationAccess(interpretation, {
+        id: 'usernoauthorties'
+      })).toThrow('"hasAuthority" requires "authorities" to be an array or set of authorities (strings)');
+    });
+  });
+  describe('getInterpretationAccess using D2.currentUser', () => {
+    it('returns true for all accesses for superuser', () => {
+      const interpretation = {
+        access: {
+          write: true,
+          manage: true
+        },
+        createdBy: userJoeD2CurrentUser
+      };
+      expect(getInterpretationAccess(interpretation, superuserD2CurrentUser)).toMatchObject({
+        share: true,
+        comment: true,
+        edit: true,
+        delete: true
+      });
+    });
+    it('returns true for all accesses for creator', () => {
+      const interpretation = {
+        access: {
+          write: true,
+          manage: true
+        },
+        createdBy: userJoeD2CurrentUser
+      };
+      expect(getInterpretationAccess(interpretation, userJoeD2CurrentUser)).toMatchObject({
+        share: true,
+        comment: true,
+        edit: true,
+        delete: true
+      });
+    });
+    it('returns false for edit/delete if user is not creator/superuser', () => {
+      const interpretation = {
+        access: {
+          write: true,
+          manage: true
+        },
+        createdBy: userJaneD2CurrentUser
+      };
+      expect(getInterpretationAccess(interpretation, userJoeD2CurrentUser)).toMatchObject({
+        share: true,
+        comment: true,
+        edit: false,
+        delete: false
+      });
+    });
+    it('returns false for comment/edit/delete if user is not creator/superuser and no write access', () => {
+      const interpretation = {
+        access: {
+          write: false,
+          manage: true
+        },
+        createdBy: userJaneD2CurrentUser
+      };
+      expect(getInterpretationAccess(interpretation, userJoeD2CurrentUser)).toMatchObject({
+        share: true,
+        comment: false,
+        edit: false,
+        delete: false
+      });
+    });
+    it('returns false for share/comment/edit/delete if user is not creator/superuser and no write or manage access', () => {
+      const interpretation = {
+        access: {
+          write: false,
+          manage: false
+        },
+        createdBy: userJaneD2CurrentUser
+      };
+      expect(getInterpretationAccess(interpretation, userJoeD2CurrentUser)).toMatchObject({
+        share: false,
+        comment: false,
+        edit: false,
+        delete: false
+      });
+    });
+  });
+  describe('getCommentAccess using D2.currentUser', () => {
+    it('returns true for all accesses for superuser', () => {
+      const interpretation = {
+        access: {
+          write: true
+        }
+      };
+      const comment = {
+        createdBy: userJoeD2CurrentUser
+      };
+      expect(getCommentAccess(comment, interpretation.access.write, superuserD2CurrentUser)).toMatchObject({
+        edit: true,
+        delete: true
+      });
+    });
+    it('returns true for all accesses for creator when interpretation has write access', () => {
+      const interpretation = {
+        access: {
+          write: true
+        }
+      };
+      const comment = {
+        createdBy: userJoeD2CurrentUser
+      };
+      expect(getCommentAccess(comment, interpretation.access.write, userJoeD2CurrentUser)).toMatchObject({
+        edit: true,
+        delete: true
+      });
+    });
+    it('returns true for edit and false for delete for creator when interpretation does not have write access', () => {
+      const interpretation = {
+        access: {
+          write: false
+        }
+      };
+      const comment = {
+        createdBy: userJoeD2CurrentUser
+      };
+      expect(getCommentAccess(comment, interpretation.access.write, userJoeD2CurrentUser)).toMatchObject({
+        edit: true,
+        delete: false
+      });
+    });
+    it('returns false for edit/delete for user who is not creator or superuser', () => {
+      const interpretation = {
+        access: {
+          write: true
+        }
+      };
+      const comment = {
+        createdBy: userJaneD2CurrentUser
+      };
+      expect(getCommentAccess(comment, interpretation.access.write, userJoeD2CurrentUser)).toMatchObject({
+        edit: false,
+        delete: false
+      });
+    });
   });
   describe('getCommentAccess', () => {
     it('returns true for all accesses for superuser', () => {

package/build/es/components/Interpretations/common/getInterpretationAccess.js

@@ -1,6 +1,18 @@
-const isCreatorOrSuperuser = (object, currentUser) => (object === null || object === void 0 ? void 0 : object.createdBy.id) === (currentUser === null || currentUser === void 0 ? void 0 : currentUser.id) || (currentUser === null || currentUser === void 0 ? void 0 : currentUser.authorities.has('ALL'));
+// For backwards compatibility
+// accept both Set (from the old d2.currentUser object) and array
+const hasAuthority = (authorities, authority) => {
+  if (!authority || typeof authority !== 'string') {
+    throw new Error(`"hasAuthority" requires "authority" to be a populated string but received ${authority}`);
+  }
+  if (!(Array.isArray(authorities) || typeof (authorities === null || authorities === void 0 ? void 0 : authorities.has) === 'function')) {
+    throw new Error(`"hasAuthority" requires "authorities" to be an array or set of authorities (strings)`);
+  }
+  return Array.isArray(authorities) ? authorities.includes(authority) : authorities.has(authority);
+};
+const isSuperuser = authorities => hasAuthority(authorities, 'ALL');
+const isCreator = (object, currentUser) => (object === null || object === void 0 ? void 0 : object.createdBy.id) === (currentUser === null || currentUser === void 0 ? void 0 : currentUser.id);
 export const getInterpretationAccess = (interpretation, currentUser) => {
-  const canEditDelete = isCreatorOrSuperuser(interpretation, currentUser);
+  const canEditDelete = isCreator(interpretation, currentUser) || isSuperuser(currentUser === null || currentUser === void 0 ? void 0 : currentUser.authorities);
   return {
     share: interpretation.access.manage,
     comment: interpretation.access.write,
@@ -9,7 +21,7 @@ export const getInterpretationAccess = (interpretation, currentUser) => {
   };
 };
 export const getCommentAccess = (comment, hasInterpretationReplyAccess, currentUser) => {
-  const canEditDelete = isCreatorOrSuperuser(comment, currentUser);
+  const canEditDelete = isCreator(comment, currentUser) || isSuperuser(currentUser === null || currentUser === void 0 ? void 0 : currentUser.authorities);
   return {
     edit: canEditDelete,
     delete: canEditDelete && hasInterpretationReplyAccess

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

@@ -116,6 +116,7 @@
     "The interpretation couldn’t be displayed. Try again or contact your system administrator.": "The interpretation couldn’t be displayed. Try again or contact your system administrator.",
     "Hide interpretation": "Hide interpretation",
     "Write an interpretation": "Write an interpretation",
+    "Other people viewing this interpretation in the future may see more data.": "Other people viewing this interpretation in the future may see more data.",
     "Post interpretation": "Post interpretation",
     "Interpretations": "Interpretations",
     "Reply": "Reply",