@dhis2/analytics 26.4.0 → 26.4.1

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

@@ -73,7 +73,7 @@ const InterpretationModal = _ref2 => {
   });
   const interpretation = data === null || data === void 0 ? void 0 : data.interpretation;
   const shouldRenderModalContent = !error && interpretation;
-  const shouldCssHideModal = loading || isVisualizationLoading;
+  const loadingInProgress = loading || isVisualizationLoading;
   const handleClose = () => {
     if (isDirty) {
       onInterpretationUpdate();
@@ -89,6 +89,14 @@ const InterpretationModal = _ref2 => {
       id: interpretationId
     });
   };
+  const onLikeToggled = _ref3 => {
+    let {
+      likedBy
+    } = _ref3;
+    setIsDirty(true);
+    interpretation.likedBy = likedBy;
+    interpretation.likes = likedBy.length;
+  };
   const onInterpretationDeleted = () => {
     setIsDirty(false);
     onInterpretationUpdate();
@@ -101,11 +109,11 @@ const InterpretationModal = _ref2 => {
       });
     }
   }, [interpretationId, refetch]);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, shouldCssHideModal && /*#__PURE__*/_react.default.createElement(_ui.Layer, null, /*#__PURE__*/_react.default.createElement(_ui.CenteredContent, null, /*#__PURE__*/_react.default.createElement(_ui.CircularLoader, null))), /*#__PURE__*/_react.default.createElement(_ui.Modal, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, loadingInProgress && /*#__PURE__*/_react.default.createElement(_ui.Layer, null, /*#__PURE__*/_react.default.createElement(_ui.CenteredContent, null, /*#__PURE__*/_react.default.createElement(_ui.CircularLoader, null))), /*#__PURE__*/_react.default.createElement(_ui.Modal, {
     fluid: true,
     onClose: handleClose,
     className: (0, _classnames.default)(modalCSS.className, {
-      hidden: shouldCssHideModal
+      hidden: loadingInProgress
     }),
     dataTest: "interpretation-modal"
   }, /*#__PURE__*/_react.default.createElement("h1", {
@@ -143,7 +151,8 @@ const InterpretationModal = _ref2 => {
     onInterpretationDeleted: onInterpretationDeleted,
     onThreadUpdated: onThreadUpdated,
     initialFocus: initialFocus,
-    downloadMenuComponent: downloadMenuComponent
+    downloadMenuComponent: downloadMenuComponent,
+    onLikeToggled: onLikeToggled
   }))))), /*#__PURE__*/_react.default.createElement(_ui.ModalActions, null, /*#__PURE__*/_react.default.createElement(_ui.Button, {
     disabled: fetching,
     onClick: handleClose

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

@@ -23,6 +23,7 @@ const InterpretationThread = _ref => {
     fetching,
     interpretation,
     onInterpretationDeleted,
+    onLikeToggled,
     initialFocus,
     onThreadUpdated,
     downloadMenuComponent: DownloadMenu,
@@ -57,6 +58,7 @@ const InterpretationThread = _ref => {
   }, /*#__PURE__*/_react.default.createElement(_index.Interpretation, {
     currentUser: currentUser,
     interpretation: interpretation,
+    onLikeToggled: onLikeToggled,
     onReplyIconClick: interpretationAccess.comment ? () => {
       var _focusRef$current;
       return (_focusRef$current = focusRef.current) === null || _focusRef$current === void 0 ? void 0 : _focusRef$current.focus();
@@ -89,6 +91,7 @@ InterpretationThread.propTypes = {
   fetching: _propTypes.default.bool.isRequired,
   interpretation: _propTypes.default.object.isRequired,
   onInterpretationDeleted: _propTypes.default.func.isRequired,
+  onLikeToggled: _propTypes.default.func.isRequired,
   dashboardRedirectUrl: _propTypes.default.string,
   downloadMenuComponent: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.func]),
   initialFocus: _propTypes.default.bool,

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

@@ -28,6 +28,7 @@ const InterpretationList = _ref => {
     currentUser,
     interpretations,
     onInterpretationClick,
+    onLikeToggled,
     onReplyIconClick,
     refresh,
     disabled,
@@ -65,6 +66,7 @@ const InterpretationList = _ref => {
     interpretation: interpretation,
     currentUser: currentUser,
     onClick: onInterpretationClick,
+    onLikeToggled: onLikeToggled,
     onReplyIconClick: onReplyIconClick,
     onDeleted: refresh,
     onUpdated: refresh,
@@ -81,6 +83,7 @@ InterpretationList.propTypes = {
   interpretations: _propTypes.default.array.isRequired,
   refresh: _propTypes.default.func.isRequired,
   onInterpretationClick: _propTypes.default.func.isRequired,
+  onLikeToggled: _propTypes.default.func.isRequired,
   onReplyIconClick: _propTypes.default.func.isRequired,
   dashboardRedirectUrl: _propTypes.default.string,
   disabled: _propTypes.default.bool

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

@@ -44,14 +44,15 @@ const InterpretationsUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
     dashboardRedirectUrl
   } = _ref2;
   const [isExpanded, setIsExpanded] = (0, _react.useState)(true);
+  const [interpretations, setInterpretations] = (0, _react.useState)([]);
   const showNoTimeDimensionHelpText = type === 'eventVisualization' && !visualizationHasTimeDimension;
   const {
-    data,
     loading,
     fetching,
     refetch
   } = (0, _appRuntime.useDataQuery)(interpretationsQuery, {
-    lazy: true
+    lazy: true,
+    onComplete: data => setInterpretations(data.interpretations.interpretations)
   });
   const onCompleteAction = (0, _react.useCallback)(() => {
     refetch({
@@ -70,6 +71,15 @@ const InterpretationsUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
       });
     }
   }, [type, id, renderId, refetch]);
+  const onLikeToggled = _ref3 => {
+    let {
+      id,
+      likedBy
+    } = _ref3;
+    const interpretation = interpretations.find(interp => interp.id === id);
+    interpretation.likedBy = likedBy;
+    interpretation.likes = likedBy.length;
+  };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: _style.default.dynamic([["4120713286", [_ui.spacers.dp16, _ui.colors.grey400, _ui.colors.white, _ui.spacers.dp32, _ui.colors.grey900]]]) + " " + ((0, _classnames.default)('container', {
       expanded: isExpanded
@@ -91,7 +101,7 @@ const InterpretationsUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
     className: _style.default.dynamic([["4120713286", [_ui.spacers.dp16, _ui.colors.grey400, _ui.colors.white, _ui.spacers.dp32, _ui.colors.grey900]]]) + " " + "loader"
   }, /*#__PURE__*/_react.default.createElement(_ui.CircularLoader, {
     small: true
-  })), data && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_InterpretationForm.InterpretationForm, {
+  })), interpretations && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_InterpretationForm.InterpretationForm, {
     currentUser: currentUser,
     type: type,
     id: id,
@@ -100,8 +110,9 @@ const InterpretationsUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
     showNoTimeDimensionHelpText: showNoTimeDimensionHelpText
   }), /*#__PURE__*/_react.default.createElement(_InterpretationList.InterpretationList, {
     currentUser: currentUser,
-    interpretations: data.interpretations.interpretations,
+    interpretations: interpretations,
     onInterpretationClick: onInterpretationClick,
+    onLikeToggled: onLikeToggled,
     onReplyIconClick: onReplyIconClick,
     refresh: onCompleteAction,
     disabled: disabled,

package/build/cjs/components/Interpretations/common/Interpretation/Interpretation.js

@@ -25,7 +25,8 @@ const Interpretation = _ref => {
     disabled,
     onReplyIconClick,
     dashboardRedirectUrl,
-    isInThread
+    isInThread,
+    onLikeToggled
   } = _ref;
   const [isUpdateMode, setIsUpdateMode] = (0, _react.useState)(false);
   const [showSharingDialog, setShowSharingDialog] = (0, _react.useState)(false);
@@ -36,7 +37,10 @@ const Interpretation = _ref => {
   } = (0, _useLike.useLike)({
     interpretation,
     currentUser,
-    onComplete: onUpdated
+    onComplete: likedBy => onLikeToggled({
+      id: interpretation.id,
+      likedBy
+    })
   });
   const shouldShowButton = Boolean(!!onClick && !disabled & !dashboardRedirectUrl);
   const interpretationAccess = (0, _index.getInterpretationAccess)(interpretation, currentUser);
@@ -123,6 +127,7 @@ Interpretation.propTypes = {
   currentUser: _propTypes.default.object.isRequired,
   interpretation: _propTypes.default.object.isRequired,
   onDeleted: _propTypes.default.func.isRequired,
+  onLikeToggled: _propTypes.default.func.isRequired,
   onReplyIconClick: _propTypes.default.func.isRequired,
   onUpdated: _propTypes.default.func.isRequired,
   dashboardRedirectUrl: _propTypes.default.string,

package/build/cjs/components/Interpretations/common/Interpretation/useLike.js

@@ -24,12 +24,22 @@ const useLike = _ref => {
   const [like, {
     loading: likeLoading
   }] = (0, _appRuntime.useDataMutation)(likeMutationRef.current, {
-    onComplete
+    onComplete: () => {
+      const newLikedBy = interpretation.likedBy.concat({
+        id: currentUser.id
+      });
+      setIsLikedByCurrentUser(true);
+      onComplete(newLikedBy);
+    }
   });
   const [unlike, {
     loading: unlikeLoading
   }] = (0, _appRuntime.useDataMutation)(unlikeMutationRef.current, {
-    onComplete
+    onComplete: () => {
+      const newLikedBy = interpretation.likedBy.filter(lb => lb.id !== currentUser.id);
+      setIsLikedByCurrentUser(false);
+      onComplete(newLikedBy);
+    }
   });
   const [isLikedByCurrentUser, setIsLikedByCurrentUser] = (0, _react.useState)(false);
   const toggleLike = () => {

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

@@ -37,8 +37,9 @@ function _default(series, layout, metaData, dashboard) {
   }
 
   // DHIS2-578: allow for optional custom subtitle
-  if ((0, _isString.default)(layout.subtitle)) {
-    subtitle.text = layout.subtitle;
+  const customSubtitle = layout.subtitle && layout.displaySubtitle || layout.subtitle;
+  if ((0, _isString.default)(customSubtitle) && customSubtitle.length) {
+    subtitle.text = customSubtitle;
   } else {
     const filterTitle = (0, _getFilterText.default)(layout.filters, metaData);
     switch (layout.type) {

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

@@ -38,8 +38,9 @@ function _default(layout, metaData, dashboard) {
   if (layout.hideTitle) {
     return title;
   }
-  if ((0, _isString.default)(layout.title) && layout.title.length) {
-    title.text = layout.title;
+  const customTitle = layout.title && layout.displayTitle || layout.title;
+  if ((0, _isString.default)(customTitle) && customTitle.length) {
+    title.text = customTitle;
   } else {
     switch (layout.type) {
       case _visTypes.VIS_TYPE_GAUGE:

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

@@ -64,7 +64,7 @@ const InterpretationModal = _ref2 => {
   });
   const interpretation = data === null || data === void 0 ? void 0 : data.interpretation;
   const shouldRenderModalContent = !error && interpretation;
-  const shouldCssHideModal = loading || isVisualizationLoading;
+  const loadingInProgress = loading || isVisualizationLoading;
   const handleClose = () => {
     if (isDirty) {
       onInterpretationUpdate();
@@ -80,6 +80,14 @@ const InterpretationModal = _ref2 => {
       id: interpretationId
     });
   };
+  const onLikeToggled = _ref3 => {
+    let {
+      likedBy
+    } = _ref3;
+    setIsDirty(true);
+    interpretation.likedBy = likedBy;
+    interpretation.likes = likedBy.length;
+  };
   const onInterpretationDeleted = () => {
     setIsDirty(false);
     onInterpretationUpdate();
@@ -92,11 +100,11 @@ const InterpretationModal = _ref2 => {
       });
     }
   }, [interpretationId, refetch]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, shouldCssHideModal && /*#__PURE__*/React.createElement(Layer, null, /*#__PURE__*/React.createElement(CenteredContent, null, /*#__PURE__*/React.createElement(CircularLoader, null))), /*#__PURE__*/React.createElement(Modal, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, loadingInProgress && /*#__PURE__*/React.createElement(Layer, null, /*#__PURE__*/React.createElement(CenteredContent, null, /*#__PURE__*/React.createElement(CircularLoader, null))), /*#__PURE__*/React.createElement(Modal, {
     fluid: true,
     onClose: handleClose,
     className: cx(modalCSS.className, {
-      hidden: shouldCssHideModal
+      hidden: loadingInProgress
     }),
     dataTest: "interpretation-modal"
   }, /*#__PURE__*/React.createElement("h1", {
@@ -134,7 +142,8 @@ const InterpretationModal = _ref2 => {
     onInterpretationDeleted: onInterpretationDeleted,
     onThreadUpdated: onThreadUpdated,
     initialFocus: initialFocus,
-    downloadMenuComponent: downloadMenuComponent
+    downloadMenuComponent: downloadMenuComponent,
+    onLikeToggled: onLikeToggled
   }))))), /*#__PURE__*/React.createElement(ModalActions, null, /*#__PURE__*/React.createElement(Button, {
     disabled: fetching,
     onClick: handleClose

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

@@ -14,6 +14,7 @@ const InterpretationThread = _ref => {
     fetching,
     interpretation,
     onInterpretationDeleted,
+    onLikeToggled,
     initialFocus,
     onThreadUpdated,
     downloadMenuComponent: DownloadMenu,
@@ -48,6 +49,7 @@ const InterpretationThread = _ref => {
   }, /*#__PURE__*/React.createElement(Interpretation, {
     currentUser: currentUser,
     interpretation: interpretation,
+    onLikeToggled: onLikeToggled,
     onReplyIconClick: interpretationAccess.comment ? () => {
       var _focusRef$current;
       return (_focusRef$current = focusRef.current) === null || _focusRef$current === void 0 ? void 0 : _focusRef$current.focus();
@@ -79,6 +81,7 @@ InterpretationThread.propTypes = {
   fetching: PropTypes.bool.isRequired,
   interpretation: PropTypes.object.isRequired,
   onInterpretationDeleted: PropTypes.func.isRequired,
+  onLikeToggled: PropTypes.func.isRequired,
   dashboardRedirectUrl: PropTypes.string,
   downloadMenuComponent: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
   initialFocus: PropTypes.bool,

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

@@ -21,6 +21,7 @@ export const InterpretationList = _ref => {
     currentUser,
     interpretations,
     onInterpretationClick,
+    onLikeToggled,
     onReplyIconClick,
     refresh,
     disabled,
@@ -58,6 +59,7 @@ export const InterpretationList = _ref => {
     interpretation: interpretation,
     currentUser: currentUser,
     onClick: onInterpretationClick,
+    onLikeToggled: onLikeToggled,
     onReplyIconClick: onReplyIconClick,
     onDeleted: refresh,
     onUpdated: refresh,
@@ -73,6 +75,7 @@ InterpretationList.propTypes = {
   interpretations: PropTypes.array.isRequired,
   refresh: PropTypes.func.isRequired,
   onInterpretationClick: PropTypes.func.isRequired,
+  onLikeToggled: PropTypes.func.isRequired,
   onReplyIconClick: PropTypes.func.isRequired,
   dashboardRedirectUrl: PropTypes.string,
   disabled: PropTypes.bool

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

@@ -35,14 +35,15 @@ export const InterpretationsUnit = /*#__PURE__*/forwardRef((_ref2, ref) => {
     dashboardRedirectUrl
   } = _ref2;
   const [isExpanded, setIsExpanded] = useState(true);
+  const [interpretations, setInterpretations] = useState([]);
   const showNoTimeDimensionHelpText = type === 'eventVisualization' && !visualizationHasTimeDimension;
   const {
-    data,
     loading,
     fetching,
     refetch
   } = useDataQuery(interpretationsQuery, {
-    lazy: true
+    lazy: true,
+    onComplete: data => setInterpretations(data.interpretations.interpretations)
   });
   const onCompleteAction = useCallback(() => {
     refetch({
@@ -61,6 +62,15 @@ export const InterpretationsUnit = /*#__PURE__*/forwardRef((_ref2, ref) => {
       });
     }
   }, [type, id, renderId, refetch]);
+  const onLikeToggled = _ref3 => {
+    let {
+      id,
+      likedBy
+    } = _ref3;
+    const interpretation = interpretations.find(interp => interp.id === id);
+    interpretation.likedBy = likedBy;
+    interpretation.likes = likedBy.length;
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: _JSXStyle.dynamic([["4120713286", [spacers.dp16, colors.grey400, colors.white, spacers.dp32, colors.grey900]]]) + " " + (cx('container', {
       expanded: isExpanded
@@ -82,7 +92,7 @@ export const InterpretationsUnit = /*#__PURE__*/forwardRef((_ref2, ref) => {
     className: _JSXStyle.dynamic([["4120713286", [spacers.dp16, colors.grey400, colors.white, spacers.dp32, colors.grey900]]]) + " " + "loader"
   }, /*#__PURE__*/React.createElement(CircularLoader, {
     small: true
-  })), data && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(InterpretationForm, {
+  })), interpretations && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(InterpretationForm, {
     currentUser: currentUser,
     type: type,
     id: id,
@@ -91,8 +101,9 @@ export const InterpretationsUnit = /*#__PURE__*/forwardRef((_ref2, ref) => {
     showNoTimeDimensionHelpText: showNoTimeDimensionHelpText
   }), /*#__PURE__*/React.createElement(InterpretationList, {
     currentUser: currentUser,
-    interpretations: data.interpretations.interpretations,
+    interpretations: interpretations,
     onInterpretationClick: onInterpretationClick,
+    onLikeToggled: onLikeToggled,
     onReplyIconClick: onReplyIconClick,
     refresh: onCompleteAction,
     disabled: disabled,

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

@@ -16,7 +16,8 @@ export const Interpretation = _ref => {
     disabled,
     onReplyIconClick,
     dashboardRedirectUrl,
-    isInThread
+    isInThread,
+    onLikeToggled
   } = _ref;
   const [isUpdateMode, setIsUpdateMode] = useState(false);
   const [showSharingDialog, setShowSharingDialog] = useState(false);
@@ -27,7 +28,10 @@ export const Interpretation = _ref => {
   } = useLike({
     interpretation,
     currentUser,
-    onComplete: onUpdated
+    onComplete: likedBy => onLikeToggled({
+      id: interpretation.id,
+      likedBy
+    })
   });
   const shouldShowButton = Boolean(!!onClick && !disabled & !dashboardRedirectUrl);
   const interpretationAccess = getInterpretationAccess(interpretation, currentUser);
@@ -113,6 +117,7 @@ Interpretation.propTypes = {
   currentUser: PropTypes.object.isRequired,
   interpretation: PropTypes.object.isRequired,
   onDeleted: PropTypes.func.isRequired,
+  onLikeToggled: PropTypes.func.isRequired,
   onReplyIconClick: PropTypes.func.isRequired,
   onUpdated: PropTypes.func.isRequired,
   dashboardRedirectUrl: PropTypes.string,

package/build/es/components/Interpretations/common/Interpretation/useLike.js

@@ -18,12 +18,22 @@ const useLike = _ref => {
   const [like, {
     loading: likeLoading
   }] = useDataMutation(likeMutationRef.current, {
-    onComplete
+    onComplete: () => {
+      const newLikedBy = interpretation.likedBy.concat({
+        id: currentUser.id
+      });
+      setIsLikedByCurrentUser(true);
+      onComplete(newLikedBy);
+    }
   });
   const [unlike, {
     loading: unlikeLoading
   }] = useDataMutation(unlikeMutationRef.current, {
-    onComplete
+    onComplete: () => {
+      const newLikedBy = interpretation.likedBy.filter(lb => lb.id !== currentUser.id);
+      setIsLikedByCurrentUser(false);
+      onComplete(newLikedBy);
+    }
   });
   const [isLikedByCurrentUser, setIsLikedByCurrentUser] = useState(false);
   const toggleLike = () => {

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

@@ -30,8 +30,9 @@ export default function (series, layout, metaData, dashboard) {
   }
 
   // DHIS2-578: allow for optional custom subtitle
-  if (isString(layout.subtitle)) {
-    subtitle.text = layout.subtitle;
+  const customSubtitle = layout.subtitle && layout.displaySubtitle || layout.subtitle;
+  if (isString(customSubtitle) && customSubtitle.length) {
+    subtitle.text = customSubtitle;
   } else {
     const filterTitle = getFilterText(layout.filters, metaData);
     switch (layout.type) {

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

@@ -31,8 +31,9 @@ export default function (layout, metaData, dashboard) {
   if (layout.hideTitle) {
     return title;
   }
-  if (isString(layout.title) && layout.title.length) {
-    title.text = layout.title;
+  const customTitle = layout.title && layout.displayTitle || layout.title;
+  if (isString(customTitle) && customTitle.length) {
+    title.text = customTitle;
   } else {
     switch (layout.type) {
       case VIS_TYPE_GAUGE:

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.4.0",
+    "version": "26.4.1",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {