@dhis2/analytics 28.1.3 → 29.0.0

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

@@ -8,40 +8,31 @@ var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
 var _ui = require("@dhis2/ui");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
+var _hooks = require("../../InterpretationsProvider/hooks.js");
 var _index = require("../index.js");
 var _InterpretationDeleteButton = require("./InterpretationDeleteButton.js");
 var _InterpretationUpdateForm = require("./InterpretationUpdateForm.js");
-var _useLike = require("./useLike.js");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const Interpretation = ({
-  interpretation,
-  currentUser,
-  onClick,
-  onUpdated,
-  onDeleted,
-  disabled,
+  id,
   onReplyIconClick,
   dashboardRedirectUrl,
+  disabled,
   isInThread,
-  onLikeToggled
+  onClick,
+  onDeleted
 }) => {
+  const interpretation = (0, _hooks.useInterpretation)(id);
+  const interpretationAccess = (0, _hooks.useInterpretationAccess)(interpretation);
   const [isUpdateMode, setIsUpdateMode] = (0, _react.useState)(false);
   const [showSharingDialog, setShowSharingDialog] = (0, _react.useState)(false);
   const {
     toggleLike,
     isLikedByCurrentUser,
     toggleLikeInProgress
-  } = (0, _useLike.useLike)({
-    interpretation,
-    currentUser,
-    onComplete: likedBy => onLikeToggled({
-      id: interpretation.id,
-      likedBy
-    })
-  });
+  } = (0, _hooks.useLike)(id);
   const shouldShowButton = Boolean(!!onClick && !disabled & !dashboardRedirectUrl);
-  const interpretationAccess = (0, _index.getInterpretationAccess)(interpretation, currentUser);
   let tooltip = _d2I18n.default.t('Reply');
   if (!interpretationAccess.comment) {
     if (isInThread) {
@@ -56,14 +47,12 @@ 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.default.createElement(_InterpretationUpdateForm.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.default.createElement(_index.Message, {
     text: interpretation.text,
     created: interpretation.created,
@@ -79,14 +68,14 @@ const Interpretation = ({
   }), /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
     tooltipContent: tooltip,
     iconComponent: _ui.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.default.createElement(_index.MessageIconButton, {
     tooltipContent: _d2I18n.default.t('See interpretation'),
     iconComponent: _ui.IconView16,
-    onClick: () => onClick(interpretation.id),
+    onClick: () => onClick(id),
     dataTest: "interpretation-view-button"
   }), dashboardRedirectUrl && /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
     tooltipContent: _d2I18n.default.t('Open in app'),
@@ -101,7 +90,7 @@ const Interpretation = ({
   }), showSharingDialog && /*#__PURE__*/_react.default.createElement(_ui.SharingDialog, {
     open: true,
     type: 'interpretation',
-    id: interpretation.id,
+    id: id,
     onClose: () => setShowSharingDialog(false)
   }), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, interpretationAccess.edit && /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
     iconComponent: _ui.IconEdit16,
@@ -109,27 +98,24 @@ const Interpretation = ({
     onClick: () => setIsUpdateMode(true),
     dataTest: "interpretation-edit-button"
   }), interpretationAccess.delete && /*#__PURE__*/_react.default.createElement(_InterpretationDeleteButton.InterpretationDeleteButton, {
-    id: interpretation.id,
+    id: id,
     onComplete: onDeleted
   }))), shouldShowButton && /*#__PURE__*/_react.default.createElement(_ui.Button, {
     secondary: true,
     small: true,
     onClick: (_, event) => {
       event.stopPropagation();
-      onClick(interpretation.id);
+      onClick(id);
     }
   }, _d2I18n.default.t('See interpretation')));
 };
 exports.Interpretation = Interpretation;
 Interpretation.propTypes = {
-  currentUser: _propTypes.default.object.isRequired,
-  interpretation: _propTypes.default.object.isRequired,
-  onDeleted: _propTypes.default.func.isRequired,
-  onLikeToggled: _propTypes.default.func.isRequired,
+  id: _propTypes.default.string.isRequired,
   onReplyIconClick: _propTypes.default.func.isRequired,
-  onUpdated: _propTypes.default.func.isRequired,
   dashboardRedirectUrl: _propTypes.default.string,
   disabled: _propTypes.default.bool,
   isInThread: _propTypes.default.bool,
-  onClick: _propTypes.default.func
+  onClick: _propTypes.default.func,
+  onDeleted: _propTypes.default.func
 };

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

@@ -9,26 +9,24 @@ var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
 var _ui = require("@dhis2/ui");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireDefault(require("react"));
+var _hooks = require("../../InterpretationsProvider/hooks.js");
 var _index = require("../index.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const mutation = {
-  resource: 'interpretations',
-  id: ({
-    id
-  }) => id,
-  type: 'delete'
-};
 const InterpretationDeleteButton = ({
   id,
   onComplete
 }) => {
+  const {
+    show: showErrorAlert
+  } = (0, _appRuntime.useAlert)(_d2I18n.default.t('Could not delete interpretation'), {
+    critical: true
+  });
   const [remove, {
     loading
-  }] = (0, _appRuntime.useDataMutation)(mutation, {
+  }] = (0, _hooks.useDeleteInterpretation)({
+    id,
     onComplete,
-    variables: {
-      id
-    }
+    showErrorAlert
   });
   return /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
     tooltipContent: _d2I18n.default.t('Delete'),
@@ -41,5 +39,5 @@ const InterpretationDeleteButton = ({
 exports.InterpretationDeleteButton = InterpretationDeleteButton;
 InterpretationDeleteButton.propTypes = {
   id: _propTypes.default.string.isRequired,
-  onComplete: _propTypes.default.func.isRequired
+  onComplete: _propTypes.default.func
 };

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

@@ -11,46 +11,37 @@ var _ui = require("@dhis2/ui");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _index = require("../../../RichText/index.js");
+var _hooks = require("../../InterpretationsProvider/hooks.js");
 var _index2 = require("../index.js");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const mutation = {
-  resource: 'interpretations',
-  type: 'update',
-  partial: false,
-  id: ({
-    id
-  }) => id,
-  data: ({
-    interpretationText
-  }) => interpretationText
-};
 const InterpretationUpdateForm = ({
-  close,
-  currentUser,
   id,
   onComplete,
   showSharingLink,
   text
 }) => {
+  const currentUser = (0, _hooks.useInterpretationsCurrentUser)();
   const [interpretationText, setInterpretationText] = (0, _react.useState)(text || '');
+  const {
+    show: showErrorAlert
+  } = (0, _appRuntime.useAlert)(_d2I18n.default.t('Could not update interpretation text'), {
+    critical: true
+  });
   const [update, {
     loading,
     error
-  }] = (0, _appRuntime.useDataMutation)(mutation, {
-    onComplete: () => {
-      onComplete();
-      close();
-    },
-    variables: {
-      id
-    }
+  }] = (0, _hooks.useUpdateInterpretationText)({
+    id,
+    text: interpretationText,
+    onComplete,
+    onError: showErrorAlert
   });
   const errorText = error ? error.message || _d2I18n.default.t('Could not update interpretation') : '';
   return /*#__PURE__*/_react.default.createElement("div", {
     className: _style.default.dynamic([["2690082310", [_ui.spacers.dp8, _ui.spacers.dp8, _ui.colors.grey100]]]) + " " + "message"
   }, /*#__PURE__*/_react.default.createElement(_index2.MessageEditorContainer, {
-    currentUser: currentUser
+    currentUserName: currentUser.name
   }, /*#__PURE__*/_react.default.createElement(_index.RichTextEditor, {
     inputPlaceholder: _d2I18n.default.t('Enter interpretation text'),
     onChange: setInterpretationText,
@@ -79,8 +70,6 @@ const InterpretationUpdateForm = ({
 };
 exports.InterpretationUpdateForm = InterpretationUpdateForm;
 InterpretationUpdateForm.propTypes = {
-  close: _propTypes.default.func.isRequired,
-  currentUser: _propTypes.default.object.isRequired,
   id: _propTypes.default.string.isRequired,
   onComplete: _propTypes.default.func.isRequired,
   showSharingLink: _propTypes.default.bool,

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

@@ -11,7 +11,7 @@ var _react = _interopRequireDefault(require("react"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const MessageEditorContainer = ({
   children,
-  currentUser,
+  currentUserName,
   dataTest
 }) => /*#__PURE__*/_react.default.createElement("div", {
   "data-test": dataTest,
@@ -19,7 +19,7 @@ const MessageEditorContainer = ({
 }, /*#__PURE__*/_react.default.createElement("div", {
   className: _style.default.dynamic([["969803715", [_ui.spacers.dp8, _ui.spacers.dp12]]]) + " " + "avatar"
 }, /*#__PURE__*/_react.default.createElement(_ui.UserAvatar, {
-  name: currentUser.name,
+  name: currentUserName,
   medium: true
 })), /*#__PURE__*/_react.default.createElement("div", {
   className: _style.default.dynamic([["969803715", [_ui.spacers.dp8, _ui.spacers.dp12]]]) + " " + "editor"
@@ -29,7 +29,7 @@ const MessageEditorContainer = ({
 }, [`.container.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:${_ui.spacers.dp8};margin-top:${_ui.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%;}"]));
 exports.MessageEditorContainer = MessageEditorContainer;
 MessageEditorContainer.propTypes = {
-  currentUser: _propTypes.default.object.isRequired,
+  currentUserName: _propTypes.default.string.isRequired,
   children: _propTypes.default.node,
   dataTest: _propTypes.default.string
 };