@dhis2/analytics 26.0.11 → 26.0.12

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

@@ -19,9 +19,11 @@ const Comment = _ref => {
     comment,
     currentUser,
     interpretationId,
-    onThreadUpdated
+    onThreadUpdated,
+    canComment
   } = _ref;
   const [isUpdateMode, setIsUpdateMode] = (0, _react.useState)(false);
+  const commentAccess = (0, _index.getCommentAccess)(comment, canComment, currentUser);
   return isUpdateMode ? /*#__PURE__*/_react.default.createElement(_CommentUpdateForm.CommentUpdateForm, {
     close: () => setIsUpdateMode(false),
     commentId: comment.id,
@@ -33,11 +35,11 @@ const Comment = _ref => {
     text: comment.text,
     created: comment.created,
     username: comment.createdBy.displayName
-  }, /*#__PURE__*/_react.default.createElement(_index.MessageStatsBar, null, comment.access.update && /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
+  }, commentAccess.edit && /*#__PURE__*/_react.default.createElement(_index.MessageStatsBar, null, /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
     iconComponent: _ui.IconEdit16,
     tooltipContent: _d2I18n.default.t('Edit'),
     onClick: () => setIsUpdateMode(true)
-  }), comment.access.delete && /*#__PURE__*/_react.default.createElement(_CommentDeleteButton.CommentDeleteButton, {
+  }), commentAccess.delete && /*#__PURE__*/_react.default.createElement(_CommentDeleteButton.CommentDeleteButton, {
     commentId: comment.id,
     interpretationId: interpretationId,
     onComplete: () => onThreadUpdated(true)
@@ -48,5 +50,6 @@ Comment.propTypes = {
   comment: _propTypes.default.object.isRequired,
   currentUser: _propTypes.default.object.isRequired,
   interpretationId: _propTypes.default.string.isRequired,
-  onThreadUpdated: _propTypes.default.func.isRequired
+  onThreadUpdated: _propTypes.default.func.isRequired,
+  canComment: _propTypes.default.bool
 };

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

@@ -4,12 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CommentDeleteButton = void 0;
+var _style = _interopRequireDefault(require("styled-jsx/style"));
 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 = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _index = require("../common/index.js");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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 mutation = {
   resource: 'interpretations',
@@ -28,21 +31,37 @@ const CommentDeleteButton = _ref2 => {
     interpretationId,
     onComplete
   } = _ref2;
+  const [deleteError, setDeleteError] = (0, _react.useState)(null);
   const [remove, {
     loading
   }] = (0, _appRuntime.useDataMutation)(mutation, {
-    onComplete,
+    onComplete: () => {
+      setDeleteError(null);
+      onComplete();
+    },
+    onError: () => setDeleteError(_d2I18n.default.t('Delete failed')),
     variables: {
       commentId,
       interpretationId
     }
   });
-  return /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
+  const onDelete = () => {
+    setDeleteError(null);
+    remove();
+  };
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: _style.default.dynamic([["945681082", [_ui.colors.red500]]]) + " " + "delete-button-container"
+  }, /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
     tooltipContent: _d2I18n.default.t('Delete'),
     iconComponent: _ui.IconDelete16,
-    onClick: remove,
+    onClick: onDelete,
     disabled: loading
-  });
+  }), deleteError && /*#__PURE__*/_react.default.createElement("span", {
+    className: _style.default.dynamic([["945681082", [_ui.colors.red500]]]) + " " + "delete-error"
+  }, deleteError), /*#__PURE__*/_react.default.createElement(_style.default, {
+    id: "945681082",
+    dynamic: [_ui.colors.red500]
+  }, [".delete-button-container.__jsx-style-dynamic-selector{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:4px;}", `.delete-error.__jsx-style-dynamic-selector{color:${_ui.colors.red500};font-size:12px;line-height:12px;}`]));
 };
 exports.CommentDeleteButton = CommentDeleteButton;
 CommentDeleteButton.propTypes = {

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

@@ -44,7 +44,7 @@ const CommentUpdateForm = _ref => {
       close();
     }
   });
-  const errorText = error ? error.message || _d2I18n.default.t('Could not update comment') : '';
+  const errorText = error ? _d2I18n.default.t('Could not update comment') : '';
   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(_index.MessageEditorContainer, {

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

@@ -41,7 +41,7 @@ const query = {
       return id;
     },
     params: {
-      fields: ['access', 'id', 'text', 'created', 'user[id,displayName]', 'likes', 'likedBy', 'comments[access,id,text,created,createdBy[id,displayName]]']
+      fields: ['access[write,manage]', 'id', 'text', 'created', 'createdBy[id,displayName]', 'likes', 'likedBy', 'comments[id,text,created,createdBy[id,displayName]]']
     }
   }
 };

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

@@ -34,6 +34,7 @@ const InterpretationThread = _ref => {
       });
     }
   }, [initialFocus]);
+  const interpretationAccess = (0, _index.getInterpretationAccess)(interpretation, currentUser);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-615306698" + " " + ((0, _classnames.default)('container', {
       fetching
@@ -52,12 +53,13 @@ const InterpretationThread = _ref => {
   }, /*#__PURE__*/_react.default.createElement(_index.Interpretation, {
     currentUser: currentUser,
     interpretation: interpretation,
-    onReplyIconClick: () => {
+    onReplyIconClick: interpretationAccess.comment ? () => {
       var _focusRef$current;
       return (_focusRef$current = focusRef.current) === null || _focusRef$current === void 0 ? void 0 : _focusRef$current.focus();
-    },
+    } : null,
     onUpdated: () => onThreadUpdated(true),
-    onDeleted: onInterpretationDeleted
+    onDeleted: onInterpretationDeleted,
+    isInThread: true
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-615306698" + " " + 'comments'
   }, interpretation.comments.map(comment => /*#__PURE__*/_react.default.createElement(_Comment.Comment, {
@@ -65,8 +67,9 @@ const InterpretationThread = _ref => {
     comment: comment,
     currentUser: currentUser,
     interpretationId: interpretation.id,
-    onThreadUpdated: onThreadUpdated
-  }))), /*#__PURE__*/_react.default.createElement(_CommentAddForm.CommentAddForm, {
+    onThreadUpdated: onThreadUpdated,
+    canComment: interpretationAccess.comment
+  }))), interpretationAccess.comment && /*#__PURE__*/_react.default.createElement(_CommentAddForm.CommentAddForm, {
     currentUser: currentUser,
     interpretationId: interpretation.id,
     onSave: () => onThreadUpdated(true),

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

@@ -25,7 +25,7 @@ const interpretationsQuery = {
         id
       } = _ref;
       return {
-        fields: ['access', 'id', 'user[displayName]', 'created', 'text', 'comments[id]', 'likes', 'likedBy[id]'],
+        fields: ['access[write,manage]', 'id', 'createdBy[id,displayName]', 'created', 'text', 'comments[id]', 'likes', 'likedBy[id]'],
         filter: `${type}.id:eq:${id}`
       };
     }

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

@@ -23,7 +23,8 @@ const Interpretation = _ref => {
     onUpdated,
     onDeleted,
     disabled,
-    onReplyIconClick
+    onReplyIconClick,
+    isInThread
   } = _ref;
   const [isUpdateMode, setIsUpdateMode] = (0, _react.useState)(false);
   const [showSharingDialog, setShowSharingDialog] = (0, _react.useState)(false);
@@ -37,17 +38,30 @@ const Interpretation = _ref => {
     onComplete: onUpdated
   });
   const shouldShowButton = !!onClick && !disabled;
+  const interpretationAccess = (0, _index.getInterpretationAccess)(interpretation, currentUser);
+  let tooltip = _d2I18n.default.t('Reply');
+  if (!interpretationAccess.comment) {
+    if (isInThread) {
+      tooltip = _d2I18n.default.t('{{count}} replies', {
+        count: interpretation.comments.length,
+        defaultValue: '{{count}} reply',
+        defaultValue_plural: '{{count}} replies'
+      });
+    } else {
+      tooltip = _d2I18n.default.t('View replies');
+    }
+  }
   return isUpdateMode ? /*#__PURE__*/_react.default.createElement(_InterpretationUpdateForm.InterpretationUpdateForm, {
     close: () => setIsUpdateMode(false),
     id: interpretation.id,
-    showSharingLink: interpretation.access.manage,
+    showSharingLink: interpretationAccess.share,
     onComplete: onUpdated,
     text: interpretation.text,
     currentUser: currentUser
   }) : /*#__PURE__*/_react.default.createElement(_index.Message, {
     text: interpretation.text,
     created: interpretation.created,
-    username: interpretation.user.displayName
+    username: interpretation.createdBy.displayName
   }, !disabled && /*#__PURE__*/_react.default.createElement(_index.MessageStatsBar, null, /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
     tooltipContent: isLikedByCurrentUser ? _d2I18n.default.t('Unlike') : _d2I18n.default.t('Like'),
     iconComponent: _ui.IconThumbUp16,
@@ -57,12 +71,13 @@ const Interpretation = _ref => {
     disabled: toggleLikeInProgress,
     dataTest: "interpretation-like-unlike-button"
   }), /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
-    tooltipContent: _d2I18n.default.t('Reply'),
+    tooltipContent: tooltip,
     iconComponent: _ui.IconReply16,
-    onClick: () => onReplyIconClick(interpretation.id),
+    onClick: () => onReplyIconClick && onReplyIconClick(interpretation.id),
     count: interpretation.comments.length,
-    dataTest: "interpretation-reply-button"
-  }), interpretation.access.manage && /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
+    dataTest: "interpretation-reply-button",
+    viewOnly: isInThread && !interpretationAccess.comment
+  }), interpretationAccess.share && /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
     iconComponent: _ui.IconShare16,
     tooltipContent: _d2I18n.default.t('Share'),
     onClick: () => setShowSharingDialog(true),
@@ -72,15 +87,15 @@ const Interpretation = _ref => {
     type: 'interpretation',
     id: interpretation.id,
     onClose: () => setShowSharingDialog(false)
-  }), interpretation.access.update && /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
+  }), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, interpretationAccess.edit && /*#__PURE__*/_react.default.createElement(_index.MessageIconButton, {
     iconComponent: _ui.IconEdit16,
     tooltipContent: _d2I18n.default.t('Edit'),
     onClick: () => setIsUpdateMode(true),
     dataTest: "interpretation-edit-button"
-  }), interpretation.access.delete && /*#__PURE__*/_react.default.createElement(_InterpretationDeleteButton.InterpretationDeleteButton, {
+  }), interpretationAccess.delete && /*#__PURE__*/_react.default.createElement(_InterpretationDeleteButton.InterpretationDeleteButton, {
     id: interpretation.id,
     onComplete: onDeleted
-  })), shouldShowButton && /*#__PURE__*/_react.default.createElement(_ui.Button, {
+  }))), shouldShowButton && /*#__PURE__*/_react.default.createElement(_ui.Button, {
     secondary: true,
     small: true,
     onClick: (_, event) => {
@@ -97,5 +112,6 @@ Interpretation.propTypes = {
   onReplyIconClick: _propTypes.default.func.isRequired,
   onUpdated: _propTypes.default.func.isRequired,
   disabled: _propTypes.default.bool,
+  isInThread: _propTypes.default.bool,
   onClick: _propTypes.default.func
 };

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

@@ -18,7 +18,8 @@ const MessageIconButton = _ref => {
     selected,
     count,
     iconComponent: Icon,
-    dataTest
+    dataTest,
+    viewOnly
   } = _ref;
   return /*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
     closeDelay: 200,
@@ -33,7 +34,7 @@ const MessageIconButton = _ref => {
       ref: ref,
       onMouseOver: onMouseOver,
       onMouseOut: onMouseOut,
-      className: _style.default.dynamic([["250657028", [_ui.spacers.dp4, _ui.colors.grey700, _ui.colors.teal600, _ui.colors.grey900, _ui.colors.teal800, _ui.colors.teal500, _ui.colors.teal700, _ui.theme.disabled, _ui.theme.disabled]]]) + " " + "wrapper"
+      className: _style.default.dynamic([["163818318", [_ui.spacers.dp4, _ui.colors.grey700, _ui.colors.teal600, _ui.colors.grey900, _ui.colors.teal800, _ui.colors.teal500, _ui.colors.teal700, _ui.theme.disabled, _ui.theme.disabled]]]) + " " + "wrapper"
     }, /*#__PURE__*/_react.default.createElement("button", {
       onClick: event => {
         event.stopPropagation();
@@ -41,13 +42,14 @@ const MessageIconButton = _ref => {
       },
       disabled: disabled,
       "data-test": dataTest,
-      className: _style.default.dynamic([["250657028", [_ui.spacers.dp4, _ui.colors.grey700, _ui.colors.teal600, _ui.colors.grey900, _ui.colors.teal800, _ui.colors.teal500, _ui.colors.teal700, _ui.theme.disabled, _ui.theme.disabled]]]) + " " + ((0, _classnames.default)('button', {
-        selected
+      className: _style.default.dynamic([["163818318", [_ui.spacers.dp4, _ui.colors.grey700, _ui.colors.teal600, _ui.colors.grey900, _ui.colors.teal800, _ui.colors.teal500, _ui.colors.teal700, _ui.theme.disabled, _ui.theme.disabled]]]) + " " + ((0, _classnames.default)('button', {
+        selected,
+        viewOnly
       }) || "")
     }, count && count, /*#__PURE__*/_react.default.createElement(Icon, null)), /*#__PURE__*/_react.default.createElement(_style.default, {
-      id: "250657028",
+      id: "163818318",
       dynamic: [_ui.spacers.dp4, _ui.colors.grey700, _ui.colors.teal600, _ui.colors.grey900, _ui.colors.teal800, _ui.colors.teal500, _ui.colors.teal700, _ui.theme.disabled, _ui.theme.disabled]
-    }, [".wrapper.__jsx-style-dynamic-selector{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;}", `.button.__jsx-style-dynamic-selector{all:unset;cursor:pointer;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;gap:${_ui.spacers.dp4};-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:12px;line-height:14px;color:${_ui.colors.grey700};}`, `.button.selected.__jsx-style-dynamic-selector{color:${_ui.colors.teal600};font-weight:500;}`, `.button.__jsx-style-dynamic-selector:hover{color:${_ui.colors.grey900};}`, `.button.selected.__jsx-style-dynamic-selector:hover{color:${_ui.colors.teal800};}`, `.button.selected.__jsx-style-dynamic-selector svg{color:${_ui.colors.teal500};}`, `.button.selected.__jsx-style-dynamic-selector:hover svg{color:${_ui.colors.teal700};}`, `.button.__jsx-style-dynamic-selector:disabled{color:${_ui.theme.disabled};cursor:not-allowed;}`, `.button.__jsx-style-dynamic-selector:disabled svg{color:${_ui.theme.disabled};}`]));
+    }, [".wrapper.__jsx-style-dynamic-selector{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;}", `.button.__jsx-style-dynamic-selector{all:unset;cursor:pointer;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;gap:${_ui.spacers.dp4};-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:12px;line-height:14px;color:${_ui.colors.grey700};}`, ".viewOnly.__jsx-style-dynamic-selector{cursor:default;}", `.button.selected.__jsx-style-dynamic-selector{color:${_ui.colors.teal600};font-weight:500;}`, `.button.__jsx-style-dynamic-selector:hover{color:${_ui.colors.grey900};}`, `.button.selected.__jsx-style-dynamic-selector:hover{color:${_ui.colors.teal800};}`, `.button.selected.__jsx-style-dynamic-selector svg{color:${_ui.colors.teal500};}`, `.button.selected.__jsx-style-dynamic-selector:hover svg{color:${_ui.colors.teal700};}`, `.button.__jsx-style-dynamic-selector:disabled{color:${_ui.theme.disabled};cursor:not-allowed;}`, `.button.__jsx-style-dynamic-selector:disabled svg{color:${_ui.theme.disabled};}`]));
   });
 };
 exports.MessageIconButton = MessageIconButton;
@@ -58,5 +60,6 @@ MessageIconButton.propTypes = {
   dataTest: _propTypes.default.string,
   disabled: _propTypes.default.bool,
   selected: _propTypes.default.bool,
+  viewOnly: _propTypes.default.bool,
   onClick: _propTypes.default.func
 };

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

@@ -0,0 +1,152 @@
+"use strict";
+
+var _getInterpretationAccess = require("../getInterpretationAccess.js");
+const superuser = {
+  id: 'iamsuper',
+  authorities: new Set(['ALL'])
+};
+const userJoe = {
+  id: 'johndoe',
+  authorities: new Set(['Some'])
+};
+const userJane = {
+  id: 'jane',
+  authorities: new Set(['Some'])
+};
+describe('interpretation and comment access', () => {
+  describe('getInterpretationAccess', () => {
+    it('returns true for all accesses for superuser', () => {
+      const interpretation = {
+        access: {
+          write: true,
+          manage: true
+        },
+        createdBy: userJoe
+      };
+      expect((0, _getInterpretationAccess.getInterpretationAccess)(interpretation, superuser)).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: userJoe
+      };
+      expect((0, _getInterpretationAccess.getInterpretationAccess)(interpretation, userJoe)).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: userJane
+      };
+      expect((0, _getInterpretationAccess.getInterpretationAccess)(interpretation, userJoe)).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: userJane
+      };
+      expect((0, _getInterpretationAccess.getInterpretationAccess)(interpretation, userJoe)).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: userJane
+      };
+      expect((0, _getInterpretationAccess.getInterpretationAccess)(interpretation, userJoe)).toMatchObject({
+        share: false,
+        comment: false,
+        edit: false,
+        delete: false
+      });
+    });
+  });
+  describe('getCommentAccess', () => {
+    it('returns true for all accesses for superuser', () => {
+      const interpretation = {
+        access: {
+          write: true
+        }
+      };
+      const comment = {
+        createdBy: userJoe
+      };
+      expect((0, _getInterpretationAccess.getCommentAccess)(comment, interpretation.access.write, superuser)).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: userJoe
+      };
+      expect((0, _getInterpretationAccess.getCommentAccess)(comment, interpretation.access.write, userJoe)).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: userJoe
+      };
+      expect((0, _getInterpretationAccess.getCommentAccess)(comment, interpretation.access.write, userJoe)).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: userJane
+      };
+      expect((0, _getInterpretationAccess.getCommentAccess)(comment, interpretation.access.write, userJoe)).toMatchObject({
+        edit: false,
+        delete: false
+      });
+    });
+  });
+});

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

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getInterpretationAccess = exports.getCommentAccess = void 0;
+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'));
+const getInterpretationAccess = (interpretation, currentUser) => {
+  const canEditDelete = isCreatorOrSuperuser(interpretation, currentUser);
+  return {
+    share: interpretation.access.manage,
+    comment: interpretation.access.write,
+    edit: canEditDelete,
+    delete: canEditDelete
+  };
+};
+exports.getInterpretationAccess = getInterpretationAccess;
+const getCommentAccess = (comment, hasInterpretationReplyAccess, currentUser) => {
+  const canEditDelete = isCreatorOrSuperuser(comment, currentUser);
+  return {
+    edit: canEditDelete,
+    delete: canEditDelete && hasInterpretationReplyAccess
+  };
+};
+exports.getCommentAccess = getCommentAccess;

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

@@ -35,4 +35,15 @@ Object.keys(_index3).forEach(function (key) {
       return _index3[key];
     }
   });
+});
+var _getInterpretationAccess = require("./getInterpretationAccess.js");
+Object.keys(_getInterpretationAccess).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _getInterpretationAccess[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _getInterpretationAccess[key];
+    }
+  });
 });

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

@@ -107,6 +107,7 @@
     "Edit": "Edit",
     "Write a reply": "Write a reply",
     "Post reply": "Post reply",
+    "Delete failed": "Delete failed",
     "Could not update comment": "Could not update comment",
     "Enter comment text": "Enter comment text",
     "Update": "Update",
@@ -117,9 +118,12 @@
     "Write an interpretation": "Write an interpretation",
     "Post interpretation": "Post interpretation",
     "Interpretations": "Interpretations",
+    "Reply": "Reply",
+    "{{count}} replies": "{{count}} reply",
+    "{{count}} replies_plural": "{{count}} replies",
+    "View replies": "View replies",
     "Unlike": "Unlike",
     "Like": "Like",
-    "Reply": "Reply",
     "Share": "Share",
     "See interpretation": "See interpretation",
     "Manage sharing": "Manage sharing",

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

@@ -2,7 +2,7 @@ import i18n from '@dhis2/d2-i18n';
 import { IconEdit16 } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
-import { Message, MessageIconButton, MessageStatsBar } from '../common/index.js';
+import { Message, MessageIconButton, MessageStatsBar, getCommentAccess } from '../common/index.js';
 import { CommentDeleteButton } from './CommentDeleteButton.js';
 import { CommentUpdateForm } from './CommentUpdateForm.js';
 const Comment = _ref => {
@@ -10,9 +10,11 @@ const Comment = _ref => {
     comment,
     currentUser,
     interpretationId,
-    onThreadUpdated
+    onThreadUpdated,
+    canComment
   } = _ref;
   const [isUpdateMode, setIsUpdateMode] = useState(false);
+  const commentAccess = getCommentAccess(comment, canComment, currentUser);
   return isUpdateMode ? /*#__PURE__*/React.createElement(CommentUpdateForm, {
     close: () => setIsUpdateMode(false),
     commentId: comment.id,
@@ -24,11 +26,11 @@ const Comment = _ref => {
     text: comment.text,
     created: comment.created,
     username: comment.createdBy.displayName
-  }, /*#__PURE__*/React.createElement(MessageStatsBar, null, comment.access.update && /*#__PURE__*/React.createElement(MessageIconButton, {
+  }, commentAccess.edit && /*#__PURE__*/React.createElement(MessageStatsBar, null, /*#__PURE__*/React.createElement(MessageIconButton, {
     iconComponent: IconEdit16,
     tooltipContent: i18n.t('Edit'),
     onClick: () => setIsUpdateMode(true)
-  }), comment.access.delete && /*#__PURE__*/React.createElement(CommentDeleteButton, {
+  }), commentAccess.delete && /*#__PURE__*/React.createElement(CommentDeleteButton, {
     commentId: comment.id,
     interpretationId: interpretationId,
     onComplete: () => onThreadUpdated(true)
@@ -38,6 +40,7 @@ Comment.propTypes = {
   comment: PropTypes.object.isRequired,
   currentUser: PropTypes.object.isRequired,
   interpretationId: PropTypes.string.isRequired,
-  onThreadUpdated: PropTypes.func.isRequired
+  onThreadUpdated: PropTypes.func.isRequired,
+  canComment: PropTypes.bool
 };
 export { Comment };

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

@@ -1,8 +1,9 @@
+import _JSXStyle from "styled-jsx/style";
 import { useDataMutation } from '@dhis2/app-runtime';
 import i18n from '@dhis2/d2-i18n';
-import { IconDelete16 } from '@dhis2/ui';
+import { IconDelete16, colors } from '@dhis2/ui';
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, { useState } from 'react';
 import { MessageIconButton } from '../common/index.js';
 const mutation = {
   resource: 'interpretations',
@@ -21,21 +22,37 @@ const CommentDeleteButton = _ref2 => {
     interpretationId,
     onComplete
   } = _ref2;
+  const [deleteError, setDeleteError] = useState(null);
   const [remove, {
     loading
   }] = useDataMutation(mutation, {
-    onComplete,
+    onComplete: () => {
+      setDeleteError(null);
+      onComplete();
+    },
+    onError: () => setDeleteError(i18n.t('Delete failed')),
     variables: {
       commentId,
       interpretationId
     }
   });
-  return /*#__PURE__*/React.createElement(MessageIconButton, {
+  const onDelete = () => {
+    setDeleteError(null);
+    remove();
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: _JSXStyle.dynamic([["945681082", [colors.red500]]]) + " " + "delete-button-container"
+  }, /*#__PURE__*/React.createElement(MessageIconButton, {
     tooltipContent: i18n.t('Delete'),
     iconComponent: IconDelete16,
-    onClick: remove,
+    onClick: onDelete,
     disabled: loading
-  });
+  }), deleteError && /*#__PURE__*/React.createElement("span", {
+    className: _JSXStyle.dynamic([["945681082", [colors.red500]]]) + " " + "delete-error"
+  }, deleteError), /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: "945681082",
+    dynamic: [colors.red500]
+  }, [".delete-button-container.__jsx-style-dynamic-selector{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:4px;}", `.delete-error.__jsx-style-dynamic-selector{color:${colors.red500};font-size:12px;line-height:12px;}`]));
 };
 CommentDeleteButton.propTypes = {
   commentId: PropTypes.string.isRequired,

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

@@ -35,7 +35,7 @@ export const CommentUpdateForm = _ref => {
       close();
     }
   });
-  const errorText = error ? error.message || i18n.t('Could not update comment') : '';
+  const errorText = error ? i18n.t('Could not update comment') : '';
   return /*#__PURE__*/React.createElement("div", {
     className: _JSXStyle.dynamic([["2690082310", [spacers.dp8, spacers.dp8, colors.grey100]]]) + " " + "message"
   }, /*#__PURE__*/React.createElement(MessageEditorContainer, {

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

@@ -32,7 +32,7 @@ const query = {
       return id;
     },
     params: {
-      fields: ['access', 'id', 'text', 'created', 'user[id,displayName]', 'likes', 'likedBy', 'comments[access,id,text,created,createdBy[id,displayName]]']
+      fields: ['access[write,manage]', 'id', 'text', 'created', 'createdBy[id,displayName]', 'likes', 'likedBy', 'comments[id,text,created,createdBy[id,displayName]]']
     }
   }
 };

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

@@ -4,7 +4,7 @@ import cx from 'classnames';
 import moment from 'moment';
 import PropTypes from 'prop-types';
 import React, { useRef, useEffect } from 'react';
-import { Interpretation } from '../common/index.js';
+import { Interpretation, getInterpretationAccess } from '../common/index.js';
 import { Comment } from './Comment.js';
 import { CommentAddForm } from './CommentAddForm.js';
 const InterpretationThread = _ref => {
@@ -25,6 +25,7 @@ const InterpretationThread = _ref => {
       });
     }
   }, [initialFocus]);
+  const interpretationAccess = getInterpretationAccess(interpretation, currentUser);
   return /*#__PURE__*/React.createElement("div", {
     className: "jsx-615306698" + " " + (cx('container', {
       fetching
@@ -43,12 +44,13 @@ const InterpretationThread = _ref => {
   }, /*#__PURE__*/React.createElement(Interpretation, {
     currentUser: currentUser,
     interpretation: interpretation,
-    onReplyIconClick: () => {
+    onReplyIconClick: interpretationAccess.comment ? () => {
       var _focusRef$current;
       return (_focusRef$current = focusRef.current) === null || _focusRef$current === void 0 ? void 0 : _focusRef$current.focus();
-    },
+    } : null,
     onUpdated: () => onThreadUpdated(true),
-    onDeleted: onInterpretationDeleted
+    onDeleted: onInterpretationDeleted,
+    isInThread: true
   }), /*#__PURE__*/React.createElement("div", {
     className: "jsx-615306698" + " " + 'comments'
   }, interpretation.comments.map(comment => /*#__PURE__*/React.createElement(Comment, {
@@ -56,8 +58,9 @@ const InterpretationThread = _ref => {
     comment: comment,
     currentUser: currentUser,
     interpretationId: interpretation.id,
-    onThreadUpdated: onThreadUpdated
-  }))), /*#__PURE__*/React.createElement(CommentAddForm, {
+    onThreadUpdated: onThreadUpdated,
+    canComment: interpretationAccess.comment
+  }))), interpretationAccess.comment && /*#__PURE__*/React.createElement(CommentAddForm, {
     currentUser: currentUser,
     interpretationId: interpretation.id,
     onSave: () => onThreadUpdated(true),

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

@@ -16,7 +16,7 @@ const interpretationsQuery = {
         id
       } = _ref;
       return {
-        fields: ['access', 'id', 'user[displayName]', 'created', 'text', 'comments[id]', 'likes', 'likedBy[id]'],
+        fields: ['access[write,manage]', 'id', 'createdBy[id,displayName]', 'created', 'text', 'comments[id]', 'likes', 'likedBy[id]'],
         filter: `${type}.id:eq:${id}`
       };
     }

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

@@ -2,7 +2,7 @@ import i18n from '@dhis2/d2-i18n';
 import { Button, SharingDialog, IconReply16, IconShare16, IconThumbUp16, IconEdit16 } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
-import { Message, MessageStatsBar, MessageIconButton } from '../index.js';
+import { Message, MessageStatsBar, MessageIconButton, getInterpretationAccess } from '../index.js';
 import { InterpretationDeleteButton } from './InterpretationDeleteButton.js';
 import { InterpretationUpdateForm } from './InterpretationUpdateForm.js';
 import { useLike } from './useLike.js';
@@ -14,7 +14,8 @@ export const Interpretation = _ref => {
     onUpdated,
     onDeleted,
     disabled,
-    onReplyIconClick
+    onReplyIconClick,
+    isInThread
   } = _ref;
   const [isUpdateMode, setIsUpdateMode] = useState(false);
   const [showSharingDialog, setShowSharingDialog] = useState(false);
@@ -28,17 +29,30 @@ export const Interpretation = _ref => {
     onComplete: onUpdated
   });
   const shouldShowButton = !!onClick && !disabled;
+  const interpretationAccess = getInterpretationAccess(interpretation, currentUser);
+  let tooltip = i18n.t('Reply');
+  if (!interpretationAccess.comment) {
+    if (isInThread) {
+      tooltip = i18n.t('{{count}} replies', {
+        count: interpretation.comments.length,
+        defaultValue: '{{count}} reply',
+        defaultValue_plural: '{{count}} replies'
+      });
+    } else {
+      tooltip = i18n.t('View replies');
+    }
+  }
   return isUpdateMode ? /*#__PURE__*/React.createElement(InterpretationUpdateForm, {
     close: () => setIsUpdateMode(false),
     id: interpretation.id,
-    showSharingLink: interpretation.access.manage,
+    showSharingLink: interpretationAccess.share,
     onComplete: onUpdated,
     text: interpretation.text,
     currentUser: currentUser
   }) : /*#__PURE__*/React.createElement(Message, {
     text: interpretation.text,
     created: interpretation.created,
-    username: interpretation.user.displayName
+    username: interpretation.createdBy.displayName
   }, !disabled && /*#__PURE__*/React.createElement(MessageStatsBar, null, /*#__PURE__*/React.createElement(MessageIconButton, {
     tooltipContent: isLikedByCurrentUser ? i18n.t('Unlike') : i18n.t('Like'),
     iconComponent: IconThumbUp16,
@@ -48,12 +62,13 @@ export const Interpretation = _ref => {
     disabled: toggleLikeInProgress,
     dataTest: "interpretation-like-unlike-button"
   }), /*#__PURE__*/React.createElement(MessageIconButton, {
-    tooltipContent: i18n.t('Reply'),
+    tooltipContent: tooltip,
     iconComponent: IconReply16,
-    onClick: () => onReplyIconClick(interpretation.id),
+    onClick: () => onReplyIconClick && onReplyIconClick(interpretation.id),
     count: interpretation.comments.length,
-    dataTest: "interpretation-reply-button"
-  }), interpretation.access.manage && /*#__PURE__*/React.createElement(MessageIconButton, {
+    dataTest: "interpretation-reply-button",
+    viewOnly: isInThread && !interpretationAccess.comment
+  }), interpretationAccess.share && /*#__PURE__*/React.createElement(MessageIconButton, {
     iconComponent: IconShare16,
     tooltipContent: i18n.t('Share'),
     onClick: () => setShowSharingDialog(true),
@@ -63,15 +78,15 @@ export const Interpretation = _ref => {
     type: 'interpretation',
     id: interpretation.id,
     onClose: () => setShowSharingDialog(false)
-  }), interpretation.access.update && /*#__PURE__*/React.createElement(MessageIconButton, {
+  }), /*#__PURE__*/React.createElement(React.Fragment, null, interpretationAccess.edit && /*#__PURE__*/React.createElement(MessageIconButton, {
     iconComponent: IconEdit16,
     tooltipContent: i18n.t('Edit'),
     onClick: () => setIsUpdateMode(true),
     dataTest: "interpretation-edit-button"
-  }), interpretation.access.delete && /*#__PURE__*/React.createElement(InterpretationDeleteButton, {
+  }), interpretationAccess.delete && /*#__PURE__*/React.createElement(InterpretationDeleteButton, {
     id: interpretation.id,
     onComplete: onDeleted
-  })), shouldShowButton && /*#__PURE__*/React.createElement(Button, {
+  }))), shouldShowButton && /*#__PURE__*/React.createElement(Button, {
     secondary: true,
     small: true,
     onClick: (_, event) => {
@@ -87,5 +102,6 @@ Interpretation.propTypes = {
   onReplyIconClick: PropTypes.func.isRequired,
   onUpdated: PropTypes.func.isRequired,
   disabled: PropTypes.bool,
+  isInThread: PropTypes.bool,
   onClick: PropTypes.func
 };

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

@@ -11,7 +11,8 @@ const MessageIconButton = _ref => {
     selected,
     count,
     iconComponent: Icon,
-    dataTest
+    dataTest,
+    viewOnly
   } = _ref;
   return /*#__PURE__*/React.createElement(Tooltip, {
     closeDelay: 200,
@@ -26,7 +27,7 @@ const MessageIconButton = _ref => {
       ref: ref,
       onMouseOver: onMouseOver,
       onMouseOut: onMouseOut,
-      className: _JSXStyle.dynamic([["250657028", [spacers.dp4, colors.grey700, colors.teal600, colors.grey900, colors.teal800, colors.teal500, colors.teal700, theme.disabled, theme.disabled]]]) + " " + "wrapper"
+      className: _JSXStyle.dynamic([["163818318", [spacers.dp4, colors.grey700, colors.teal600, colors.grey900, colors.teal800, colors.teal500, colors.teal700, theme.disabled, theme.disabled]]]) + " " + "wrapper"
     }, /*#__PURE__*/React.createElement("button", {
       onClick: event => {
         event.stopPropagation();
@@ -34,13 +35,14 @@ const MessageIconButton = _ref => {
       },
       disabled: disabled,
       "data-test": dataTest,
-      className: _JSXStyle.dynamic([["250657028", [spacers.dp4, colors.grey700, colors.teal600, colors.grey900, colors.teal800, colors.teal500, colors.teal700, theme.disabled, theme.disabled]]]) + " " + (cx('button', {
-        selected
+      className: _JSXStyle.dynamic([["163818318", [spacers.dp4, colors.grey700, colors.teal600, colors.grey900, colors.teal800, colors.teal500, colors.teal700, theme.disabled, theme.disabled]]]) + " " + (cx('button', {
+        selected,
+        viewOnly
       }) || "")
     }, count && count, /*#__PURE__*/React.createElement(Icon, null)), /*#__PURE__*/React.createElement(_JSXStyle, {
-      id: "250657028",
+      id: "163818318",
       dynamic: [spacers.dp4, colors.grey700, colors.teal600, colors.grey900, colors.teal800, colors.teal500, colors.teal700, theme.disabled, theme.disabled]
-    }, [".wrapper.__jsx-style-dynamic-selector{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;}", `.button.__jsx-style-dynamic-selector{all:unset;cursor:pointer;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;gap:${spacers.dp4};-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:12px;line-height:14px;color:${colors.grey700};}`, `.button.selected.__jsx-style-dynamic-selector{color:${colors.teal600};font-weight:500;}`, `.button.__jsx-style-dynamic-selector:hover{color:${colors.grey900};}`, `.button.selected.__jsx-style-dynamic-selector:hover{color:${colors.teal800};}`, `.button.selected.__jsx-style-dynamic-selector svg{color:${colors.teal500};}`, `.button.selected.__jsx-style-dynamic-selector:hover svg{color:${colors.teal700};}`, `.button.__jsx-style-dynamic-selector:disabled{color:${theme.disabled};cursor:not-allowed;}`, `.button.__jsx-style-dynamic-selector:disabled svg{color:${theme.disabled};}`]));
+    }, [".wrapper.__jsx-style-dynamic-selector{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;}", `.button.__jsx-style-dynamic-selector{all:unset;cursor:pointer;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;gap:${spacers.dp4};-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:12px;line-height:14px;color:${colors.grey700};}`, ".viewOnly.__jsx-style-dynamic-selector{cursor:default;}", `.button.selected.__jsx-style-dynamic-selector{color:${colors.teal600};font-weight:500;}`, `.button.__jsx-style-dynamic-selector:hover{color:${colors.grey900};}`, `.button.selected.__jsx-style-dynamic-selector:hover{color:${colors.teal800};}`, `.button.selected.__jsx-style-dynamic-selector svg{color:${colors.teal500};}`, `.button.selected.__jsx-style-dynamic-selector:hover svg{color:${colors.teal700};}`, `.button.__jsx-style-dynamic-selector:disabled{color:${theme.disabled};cursor:not-allowed;}`, `.button.__jsx-style-dynamic-selector:disabled svg{color:${theme.disabled};}`]));
   });
 };
 MessageIconButton.propTypes = {
@@ -50,6 +52,7 @@ MessageIconButton.propTypes = {
   dataTest: PropTypes.string,
   disabled: PropTypes.bool,
   selected: PropTypes.bool,
+  viewOnly: PropTypes.bool,
   onClick: PropTypes.func
 };
 export { MessageIconButton };

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

@@ -0,0 +1,150 @@
+import { getInterpretationAccess, getCommentAccess } from '../getInterpretationAccess.js';
+const superuser = {
+  id: 'iamsuper',
+  authorities: new Set(['ALL'])
+};
+const userJoe = {
+  id: 'johndoe',
+  authorities: new Set(['Some'])
+};
+const userJane = {
+  id: 'jane',
+  authorities: new Set(['Some'])
+};
+describe('interpretation and comment access', () => {
+  describe('getInterpretationAccess', () => {
+    it('returns true for all accesses for superuser', () => {
+      const interpretation = {
+        access: {
+          write: true,
+          manage: true
+        },
+        createdBy: userJoe
+      };
+      expect(getInterpretationAccess(interpretation, superuser)).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: userJoe
+      };
+      expect(getInterpretationAccess(interpretation, userJoe)).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: userJane
+      };
+      expect(getInterpretationAccess(interpretation, userJoe)).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: userJane
+      };
+      expect(getInterpretationAccess(interpretation, userJoe)).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: userJane
+      };
+      expect(getInterpretationAccess(interpretation, userJoe)).toMatchObject({
+        share: false,
+        comment: false,
+        edit: false,
+        delete: false
+      });
+    });
+  });
+  describe('getCommentAccess', () => {
+    it('returns true for all accesses for superuser', () => {
+      const interpretation = {
+        access: {
+          write: true
+        }
+      };
+      const comment = {
+        createdBy: userJoe
+      };
+      expect(getCommentAccess(comment, interpretation.access.write, superuser)).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: userJoe
+      };
+      expect(getCommentAccess(comment, interpretation.access.write, userJoe)).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: userJoe
+      };
+      expect(getCommentAccess(comment, interpretation.access.write, userJoe)).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: userJane
+      };
+      expect(getCommentAccess(comment, interpretation.access.write, userJoe)).toMatchObject({
+        edit: false,
+        delete: false
+      });
+    });
+  });
+});

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

@@ -0,0 +1,17 @@
+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'));
+export const getInterpretationAccess = (interpretation, currentUser) => {
+  const canEditDelete = isCreatorOrSuperuser(interpretation, currentUser);
+  return {
+    share: interpretation.access.manage,
+    comment: interpretation.access.write,
+    edit: canEditDelete,
+    delete: canEditDelete
+  };
+};
+export const getCommentAccess = (comment, hasInterpretationReplyAccess, currentUser) => {
+  const canEditDelete = isCreatorOrSuperuser(comment, currentUser);
+  return {
+    edit: canEditDelete,
+    delete: canEditDelete && hasInterpretationReplyAccess
+  };
+};

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

@@ -1,3 +1,4 @@
 export * from './Interpretation/index.js';
 export * from './Message/index.js';
-export * from './RichTextEditor/index.js';
+export * from './RichTextEditor/index.js';
+export * from './getInterpretationAccess.js';

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

@@ -107,6 +107,7 @@
     "Edit": "Edit",
     "Write a reply": "Write a reply",
     "Post reply": "Post reply",
+    "Delete failed": "Delete failed",
     "Could not update comment": "Could not update comment",
     "Enter comment text": "Enter comment text",
     "Update": "Update",
@@ -117,9 +118,12 @@
     "Write an interpretation": "Write an interpretation",
     "Post interpretation": "Post interpretation",
     "Interpretations": "Interpretations",
+    "Reply": "Reply",
+    "{{count}} replies": "{{count}} reply",
+    "{{count}} replies_plural": "{{count}} replies",
+    "View replies": "View replies",
     "Unlike": "Unlike",
     "Like": "Like",
-    "Reply": "Reply",
     "Share": "Share",
     "See interpretation": "See interpretation",
     "Manage sharing": "Manage sharing",

package/package.json

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