@dhis2/analytics 28.1.2 → 29.0.0

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

@@ -2,38 +2,29 @@ import i18n from '@dhis2/d2-i18n';
 import { Button, SharingDialog, IconReply16, IconShare16, IconThumbUp16, IconEdit16, IconLaunch16, IconView16 } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
-import { Message, MessageStatsBar, MessageIconButton, getInterpretationAccess } from '../index.js';
+import { useInterpretation, useInterpretationAccess, useLike } from '../../InterpretationsProvider/hooks.js';
+import { Message, MessageStatsBar, MessageIconButton } from '../index.js';
 import { InterpretationDeleteButton } from './InterpretationDeleteButton.js';
 import { InterpretationUpdateForm } from './InterpretationUpdateForm.js';
-import { useLike } from './useLike.js';
 export const Interpretation = ({
-  interpretation,
-  currentUser,
-  onClick,
-  onUpdated,
-  onDeleted,
-  disabled,
+  id,
   onReplyIconClick,
   dashboardRedirectUrl,
+  disabled,
   isInThread,
-  onLikeToggled
+  onClick,
+  onDeleted
 }) => {
+  const interpretation = useInterpretation(id);
+  const interpretationAccess = useInterpretationAccess(interpretation);
   const [isUpdateMode, setIsUpdateMode] = useState(false);
   const [showSharingDialog, setShowSharingDialog] = useState(false);
   const {
     toggleLike,
     isLikedByCurrentUser,
     toggleLikeInProgress
-  } = useLike({
-    interpretation,
-    currentUser,
-    onComplete: likedBy => onLikeToggled({
-      id: interpretation.id,
-      likedBy
-    })
-  });
+  } = useLike(id);
   const shouldShowButton = Boolean(!!onClick && !disabled & !dashboardRedirectUrl);
-  const interpretationAccess = getInterpretationAccess(interpretation, currentUser);
   let tooltip = i18n.t('Reply');
   if (!interpretationAccess.comment) {
     if (isInThread) {
@@ -48,14 +39,12 @@ export const Interpretation = ({
   }
 
   // Maps still uses old url style /?id= instead of hash
-  const getAppInterpretationUrl = () => dashboardRedirectUrl.includes('?') ? `${dashboardRedirectUrl}&interpretationId=${interpretation.id}` : `${dashboardRedirectUrl}?interpretationId=${interpretation.id}`;
+  const getAppInterpretationUrl = () => dashboardRedirectUrl.includes('?') ? `${dashboardRedirectUrl}&interpretationId=${id}` : `${dashboardRedirectUrl}?interpretationId=${id}`;
   return isUpdateMode ? /*#__PURE__*/React.createElement(InterpretationUpdateForm, {
-    close: () => setIsUpdateMode(false),
-    id: interpretation.id,
+    onComplete: () => setIsUpdateMode(false),
+    id: id,
     showSharingLink: interpretationAccess.share,
-    onComplete: onUpdated,
-    text: interpretation.text,
-    currentUser: currentUser
+    text: interpretation.text
   }) : /*#__PURE__*/React.createElement(Message, {
     text: interpretation.text,
     created: interpretation.created,
@@ -71,14 +60,14 @@ export const Interpretation = ({
   }), /*#__PURE__*/React.createElement(MessageIconButton, {
     tooltipContent: tooltip,
     iconComponent: IconReply16,
-    onClick: () => onReplyIconClick && onReplyIconClick(interpretation.id),
+    onClick: () => onReplyIconClick === null || onReplyIconClick === void 0 ? void 0 : onReplyIconClick(id),
     count: interpretation.comments.length,
     dataTest: "interpretation-reply-button",
     viewOnly: isInThread && !interpretationAccess.comment
   }), dashboardRedirectUrl && !isInThread && /*#__PURE__*/React.createElement(MessageIconButton, {
     tooltipContent: i18n.t('See interpretation'),
     iconComponent: IconView16,
-    onClick: () => onClick(interpretation.id),
+    onClick: () => onClick(id),
     dataTest: "interpretation-view-button"
   }), dashboardRedirectUrl && /*#__PURE__*/React.createElement(MessageIconButton, {
     tooltipContent: i18n.t('Open in app'),
@@ -93,7 +82,7 @@ export const Interpretation = ({
   }), showSharingDialog && /*#__PURE__*/React.createElement(SharingDialog, {
     open: true,
     type: 'interpretation',
-    id: interpretation.id,
+    id: id,
     onClose: () => setShowSharingDialog(false)
   }), /*#__PURE__*/React.createElement(React.Fragment, null, interpretationAccess.edit && /*#__PURE__*/React.createElement(MessageIconButton, {
     iconComponent: IconEdit16,
@@ -101,26 +90,23 @@ export const Interpretation = ({
     onClick: () => setIsUpdateMode(true),
     dataTest: "interpretation-edit-button"
   }), interpretationAccess.delete && /*#__PURE__*/React.createElement(InterpretationDeleteButton, {
-    id: interpretation.id,
+    id: id,
     onComplete: onDeleted
   }))), shouldShowButton && /*#__PURE__*/React.createElement(Button, {
     secondary: true,
     small: true,
     onClick: (_, event) => {
       event.stopPropagation();
-      onClick(interpretation.id);
+      onClick(id);
     }
   }, i18n.t('See interpretation')));
 };
 Interpretation.propTypes = {
-  currentUser: PropTypes.object.isRequired,
-  interpretation: PropTypes.object.isRequired,
-  onDeleted: PropTypes.func.isRequired,
-  onLikeToggled: PropTypes.func.isRequired,
+  id: PropTypes.string.isRequired,
   onReplyIconClick: PropTypes.func.isRequired,
-  onUpdated: PropTypes.func.isRequired,
   dashboardRedirectUrl: PropTypes.string,
   disabled: PropTypes.bool,
   isInThread: PropTypes.bool,
-  onClick: PropTypes.func
+  onClick: PropTypes.func,
+  onDeleted: PropTypes.func
 };

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

@@ -1,27 +1,25 @@
-import { useDataMutation } from '@dhis2/app-runtime';
+import { useAlert } from '@dhis2/app-runtime';
 import i18n from '@dhis2/d2-i18n';
 import { IconDelete16 } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React from 'react';
+import { useDeleteInterpretation } from '../../InterpretationsProvider/hooks.js';
 import { MessageIconButton } from '../index.js';
-const mutation = {
-  resource: 'interpretations',
-  id: ({
-    id
-  }) => id,
-  type: 'delete'
-};
 const InterpretationDeleteButton = ({
   id,
   onComplete
 }) => {
+  const {
+    show: showErrorAlert
+  } = useAlert(i18n.t('Could not delete interpretation'), {
+    critical: true
+  });
   const [remove, {
     loading
-  }] = useDataMutation(mutation, {
+  }] = useDeleteInterpretation({
+    id,
     onComplete,
-    variables: {
-      id
-    }
+    showErrorAlert
   });
   return /*#__PURE__*/React.createElement(MessageIconButton, {
     tooltipContent: i18n.t('Delete'),
@@ -33,6 +31,6 @@ const InterpretationDeleteButton = ({
 };
 InterpretationDeleteButton.propTypes = {
   id: PropTypes.string.isRequired,
-  onComplete: PropTypes.func.isRequired
+  onComplete: PropTypes.func
 };
 export { InterpretationDeleteButton };

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

@@ -1,48 +1,39 @@
 import _JSXStyle from "styled-jsx/style";
-import { useDataMutation } from '@dhis2/app-runtime';
+import { useAlert } from '@dhis2/app-runtime';
 import i18n from '@dhis2/d2-i18n';
 import { Button, spacers, colors } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import { RichTextEditor } from '../../../RichText/index.js';
+import { useUpdateInterpretationText, useInterpretationsCurrentUser } from '../../InterpretationsProvider/hooks.js';
 import { MessageEditorContainer, MessageButtonStrip, InterpretationSharingLink } from '../index.js';
-const mutation = {
-  resource: 'interpretations',
-  type: 'update',
-  partial: false,
-  id: ({
-    id
-  }) => id,
-  data: ({
-    interpretationText
-  }) => interpretationText
-};
 export const InterpretationUpdateForm = ({
-  close,
-  currentUser,
   id,
   onComplete,
   showSharingLink,
   text
 }) => {
+  const currentUser = useInterpretationsCurrentUser();
   const [interpretationText, setInterpretationText] = useState(text || '');
+  const {
+    show: showErrorAlert
+  } = useAlert(i18n.t('Could not update interpretation text'), {
+    critical: true
+  });
   const [update, {
     loading,
     error
-  }] = useDataMutation(mutation, {
-    onComplete: () => {
-      onComplete();
-      close();
-    },
-    variables: {
-      id
-    }
+  }] = useUpdateInterpretationText({
+    id,
+    text: interpretationText,
+    onComplete,
+    onError: showErrorAlert
   });
   const errorText = error ? error.message || i18n.t('Could not update interpretation') : '';
   return /*#__PURE__*/React.createElement("div", {
     className: _JSXStyle.dynamic([["2690082310", [spacers.dp8, spacers.dp8, colors.grey100]]]) + " " + "message"
   }, /*#__PURE__*/React.createElement(MessageEditorContainer, {
-    currentUser: currentUser
+    currentUserName: currentUser.name
   }, /*#__PURE__*/React.createElement(RichTextEditor, {
     inputPlaceholder: i18n.t('Enter interpretation text'),
     onChange: setInterpretationText,
@@ -70,8 +61,6 @@ export const InterpretationUpdateForm = ({
   }, [`.message.__jsx-style-dynamic-selector{padding:0 ${spacers.dp8} ${spacers.dp8};background-color:${colors.grey100};border-radius:5px;}`]));
 };
 InterpretationUpdateForm.propTypes = {
-  close: PropTypes.func.isRequired,
-  currentUser: PropTypes.object.isRequired,
   id: PropTypes.string.isRequired,
   onComplete: PropTypes.func.isRequired,
   showSharingLink: PropTypes.bool,

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

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 const MessageEditorContainer = ({
   children,
-  currentUser,
+  currentUserName,
   dataTest
 }) => /*#__PURE__*/React.createElement("div", {
   "data-test": dataTest,
@@ -12,7 +12,7 @@ const MessageEditorContainer = ({
 }, /*#__PURE__*/React.createElement("div", {
   className: _JSXStyle.dynamic([["969803715", [spacers.dp8, spacers.dp12]]]) + " " + "avatar"
 }, /*#__PURE__*/React.createElement(UserAvatar, {
-  name: currentUser.name,
+  name: currentUserName,
   medium: true
 })), /*#__PURE__*/React.createElement("div", {
   className: _JSXStyle.dynamic([["969803715", [spacers.dp8, spacers.dp12]]]) + " " + "editor"
@@ -21,7 +21,7 @@ const MessageEditorContainer = ({
   dynamic: [spacers.dp8, spacers.dp12]
 }, [`.container.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:${spacers.dp8};margin-top:${spacers.dp12};}`, ".avatar.__jsx-style-dynamic-selector{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;}", ".editor.__jsx-style-dynamic-selector{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;height:100%;}"]));
 MessageEditorContainer.propTypes = {
-  currentUser: PropTypes.object.isRequired,
+  currentUserName: PropTypes.string.isRequired,
   children: PropTypes.node,
   dataTest: PropTypes.string
 };

package/build/es/index.js

@@ -16,8 +16,10 @@ export { preparePayloadForSaveAs, preparePayloadForSave } from './components/Fil
 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';
+export { DashboardItemInterpretations } from './components/Interpretations/DashboardItemInterpretations/index.js';
 export { InterpretationsUnit } from './components/Interpretations/InterpretationsUnit/index.js';
-export { InterpretationModal, InterpretationThread } from './components/Interpretations/InterpretationModal/index.js';
+export { InterpretationsProvider } from './components/Interpretations/InterpretationsProvider/index.js';
+export { InterpretationModal } from './components/Interpretations/InterpretationModal/index.js';
 export * from './components/Toolbar/index.js';
 export { TranslationDialog } from './components/TranslationDialog/index.js';
 export { OfflineTooltip } from './components/OfflineTooltip.js';

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

@@ -164,10 +164,14 @@
     "map": "map",
     "visualization": "visualization",
     "Untitled {{visualizationType}}, {{date}}": "Untitled {{visualizationType}}, {{date}}",
+    "Back to all interpretations": "Back to all interpretations",
+    "Could not load interpretation details": "Could not load interpretation details",
+    "The request to fetch interpretation comments failed": "The request to fetch interpretation comments failed",
     "Edit": "Edit",
     "Write a reply": "Write a reply",
+    "Could not post reply": "Could not post reply",
     "Post reply": "Post reply",
-    "Delete failed": "Delete failed",
+    "Could not delete comment": "Could not delete comment",
     "Could not update comment": "Could not update comment",
     "Enter comment text": "Enter comment text",
     "Update": "Update",
@@ -176,9 +180,12 @@
     "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",
+    "Could not post interpretation": "Could not post 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",
+    "Error loading interpretations": "Error loading interpretations",
+    "Could not load interpretations": "Could not load interpretations",
     "Reply": "Reply",
     "{{count}} replies": "{{count}} reply",
     "{{count}} replies_plural": "{{count}} replies",
@@ -188,7 +195,9 @@
     "See interpretation": "See interpretation",
     "Open in app": "Open in app",
     "Share": "Share",
+    "Could not delete interpretation": "Could not delete interpretation",
     "Manage sharing": "Manage sharing",
+    "Could not update interpretation text": "Could not update interpretation text",
     "Could not update interpretation": "Could not update interpretation",
     "Enter interpretation text": "Enter interpretation text",
     "Not available offline": "Not available offline",

package/build/es/modules/pivotTable/getHeaderForDisplay.js

@@ -33,7 +33,7 @@ export const getHeaderForDisplay = ({
     span,
     label,
     includesHierarchy,
-    ...(currentHeader.style ? {
+    ...(currentHeader !== null && currentHeader !== void 0 && currentHeader.style ? {
       style: currentHeader.style
     } : {})
   };

package/package.json

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

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

@@ -1,56 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useLike = void 0;
-var _appRuntime = require("@dhis2/app-runtime");
-var _react = require("react");
-const useLike = ({
-  interpretation,
-  currentUser,
-  onComplete
-}) => {
-  const resource = `interpretations/${interpretation.id}/like`;
-  const likeMutationRef = (0, _react.useRef)({
-    resource,
-    type: 'create'
-  });
-  const unlikeMutationRef = (0, _react.useRef)({
-    resource,
-    type: 'delete'
-  });
-  const [like, {
-    loading: likeLoading
-  }] = (0, _appRuntime.useDataMutation)(likeMutationRef.current, {
-    onComplete: () => {
-      const newLikedBy = interpretation.likedBy.concat({
-        id: currentUser.id
-      });
-      setIsLikedByCurrentUser(true);
-      onComplete(newLikedBy);
-    }
-  });
-  const [unlike, {
-    loading: unlikeLoading
-  }] = (0, _appRuntime.useDataMutation)(unlikeMutationRef.current, {
-    onComplete: () => {
-      const newLikedBy = interpretation.likedBy.filter(lb => lb.id !== currentUser.id);
-      setIsLikedByCurrentUser(false);
-      onComplete(newLikedBy);
-    }
-  });
-  const [isLikedByCurrentUser, setIsLikedByCurrentUser] = (0, _react.useState)(false);
-  const toggleLike = () => {
-    isLikedByCurrentUser ? unlike() : like();
-  };
-  (0, _react.useEffect)(() => {
-    setIsLikedByCurrentUser(interpretation.likedBy.some(likedBy => likedBy.id === currentUser.id));
-  }, [currentUser, interpretation]);
-  return {
-    isLikedByCurrentUser,
-    toggleLike,
-    toggleLikeInProgress: likeLoading || unlikeLoading
-  };
-};
-exports.useLike = useLike;

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

@@ -1,50 +0,0 @@
-import { useDataMutation } from '@dhis2/app-runtime';
-import { useEffect, useRef, useState } from 'react';
-const useLike = ({
-  interpretation,
-  currentUser,
-  onComplete
-}) => {
-  const resource = `interpretations/${interpretation.id}/like`;
-  const likeMutationRef = useRef({
-    resource,
-    type: 'create'
-  });
-  const unlikeMutationRef = useRef({
-    resource,
-    type: 'delete'
-  });
-  const [like, {
-    loading: likeLoading
-  }] = useDataMutation(likeMutationRef.current, {
-    onComplete: () => {
-      const newLikedBy = interpretation.likedBy.concat({
-        id: currentUser.id
-      });
-      setIsLikedByCurrentUser(true);
-      onComplete(newLikedBy);
-    }
-  });
-  const [unlike, {
-    loading: unlikeLoading
-  }] = useDataMutation(unlikeMutationRef.current, {
-    onComplete: () => {
-      const newLikedBy = interpretation.likedBy.filter(lb => lb.id !== currentUser.id);
-      setIsLikedByCurrentUser(false);
-      onComplete(newLikedBy);
-    }
-  });
-  const [isLikedByCurrentUser, setIsLikedByCurrentUser] = useState(false);
-  const toggleLike = () => {
-    isLikedByCurrentUser ? unlike() : like();
-  };
-  useEffect(() => {
-    setIsLikedByCurrentUser(interpretation.likedBy.some(likedBy => likedBy.id === currentUser.id));
-  }, [currentUser, interpretation]);
-  return {
-    isLikedByCurrentUser,
-    toggleLike,
-    toggleLikeInProgress: likeLoading || unlikeLoading
-  };
-};
-export { useLike };