@reltio/components 1.4.1508 → 1.4.1510

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/cjs/components/AttributesFiltersButton/AttributesFiltersButton.d.ts +2 -1
  2. package/cjs/components/AttributesFiltersButton/AttributesFiltersButton.js +2 -2
  3. package/cjs/components/CollaborationItem/Comment/Comment.js +23 -13
  4. package/cjs/components/CollaborationItem/RepliedComment/RepliedComment.js +1 -1
  5. package/esm/components/AttributesFiltersButton/AttributesFiltersButton.d.ts +2 -1
  6. package/esm/components/AttributesFiltersButton/AttributesFiltersButton.js +2 -2
  7. package/esm/components/CollaborationItem/Comment/Comment.js +23 -13
  8. package/esm/components/CollaborationItem/RepliedComment/RepliedComment.js +1 -1
  9. package/package.json +3 -3
package/cjs/components/AttributesFiltersButton/AttributesFiltersButton.d.ts CHANGED
@@ -11,6 +11,7 @@ declare type Props = {
11
11
  children?: React.ReactNode;
12
12
  onTogglePopup?: (open: boolean) => void;
13
13
  isFiltersApplied?: boolean;
14
+ dataReltioId?: string;
14
15
  };
15
- declare const _default: React.MemoExoticComponent<({ filters: filtersProp, attributeTypes, onChange, components, children, onTogglePopup, isFiltersApplied: isFiltersAppliedProp }: Props) => JSX.Element>;
16
+ declare const _default: React.MemoExoticComponent<({ filters: filtersProp, attributeTypes, onChange, components, children, onTogglePopup, isFiltersApplied: isFiltersAppliedProp, dataReltioId }: Props) => JSX.Element>;
16
17
  export default _default;
package/cjs/components/AttributesFiltersButton/AttributesFiltersButton.js CHANGED
@@ -38,7 +38,7 @@ var AttributesFiltersBuilder_1 = __importDefault(require("../AttributesFiltersBu
38
38
  var ActionButtons_1 = __importDefault(require("./ActionButtons/ActionButtons"));
39
39
  var styles_1 = require("./styles");
40
40
  var AttributesFiltersButton = function (_a) {
41
- var filtersProp = _a.filters, attributeTypes = _a.attributeTypes, onChange = _a.onChange, components = _a.components, children = _a.children, onTogglePopup = _a.onTogglePopup, isFiltersAppliedProp = _a.isFiltersApplied;
41
+ var filtersProp = _a.filters, attributeTypes = _a.attributeTypes, onChange = _a.onChange, components = _a.components, children = _a.children, onTogglePopup = _a.onTogglePopup, isFiltersAppliedProp = _a.isFiltersApplied, dataReltioId = _a.dataReltioId;
42
42
  var styles = (0, styles_1.useStyles)();
43
43
  var buttonRef = (0, react_1.useRef)();
44
44
  var _b = (0, react_1.useState)(false), isOpen = _b[0], setIsOpen = _b[1];
@@ -67,7 +67,7 @@ var AttributesFiltersButton = function (_a) {
67
67
  setFilters([]);
68
68
  }, []);
69
69
  return (react_1.default.createElement(react_1.default.Fragment, null,
70
- react_1.default.createElement(Button_1.default, { ref: buttonRef, color: buttonColor, classes: {
70
+ react_1.default.createElement(Button_1.default, { "data-reltio-id": dataReltioId, ref: buttonRef, color: buttonColor, classes: {
71
71
  root: styles.triggerButton,
72
72
  textPrimary: styles.changedFiltersIndicator
73
73
  }, onClick: togglePopup },
package/cjs/components/CollaborationItem/Comment/Comment.js CHANGED
@@ -49,7 +49,8 @@ var Comment = function (_a) {
49
49
  var styles = (0, styles_1.useStyles)();
50
50
  var inputRef = (0, react_1.useRef)();
51
51
  var username = (0, react_redux_1.useSelector)(mdm_module_1.default.selectors.getUserName);
52
- var commentId = comment.commentId, createdBy = comment.createdBy, createdTime = comment.createdTime;
52
+ var commentId = comment.commentId, createdBy = comment.createdBy, createdTime = comment.createdTime, status = comment.status;
53
+ var isResolved = status === 'resolved';
53
54
  var canChangeComment = createdBy === username;
54
55
  var _b = (0, react_1.useContext)(contexts_1.CollaborationContext), resolveThread = _b.resolveThread, reOpenThread = _b.reOpenThread, sending = _b.sending, deleteComment = _b.deleteComment, updateCommentState = _b.updateCommentState, getCommentState = _b.getCommentState;
55
56
  var commentUri = (0, utils_1.createEditedCommentUri)(comment);
@@ -60,16 +61,25 @@ var Comment = function (_a) {
60
61
  inputRef.current.focus();
61
62
  }
62
63
  }, [isEditing]);
63
- var menuItems = (0, react_1.useMemo)(function () { return [
64
- {
65
- text: ui_i18n_1.default.text('Edit'),
66
- onClick: function () { return updateIsEditingComment(true); }
67
- },
68
- {
69
- text: ui_i18n_1.default.text('Delete'),
70
- onClick: function () { return deleteComment({ uri: uri, commentId: commentId }); }
71
- }
72
- ]; }, [deleteComment, uri, commentId, updateIsEditingComment]);
64
+ var menuItems = (0, react_1.useMemo)(function () {
65
+ return isResolved
66
+ ? [
67
+ {
68
+ text: ui_i18n_1.default.text('Delete'),
69
+ onClick: function () { return deleteComment({ uri: uri, commentId: commentId }); }
70
+ }
71
+ ]
72
+ : [
73
+ {
74
+ text: ui_i18n_1.default.text('Edit'),
75
+ onClick: function () { return updateIsEditingComment(true); }
76
+ },
77
+ {
78
+ text: ui_i18n_1.default.text('Delete'),
79
+ onClick: function () { return deleteComment({ uri: uri, commentId: commentId }); }
80
+ }
81
+ ];
82
+ }, [commentId, deleteComment, isResolved, updateIsEditingComment, uri]);
73
83
  var handleResolve = function () {
74
84
  resolveThread({ commentId: commentId, uri: uri });
75
85
  };
@@ -92,7 +102,7 @@ var Comment = function (_a) {
92
102
  isEditing ? sendMessageArea : react_1.default.createElement(CommentContent_1.CommentContent, { comment: comment, className: styles.message }),
93
103
  react_1.default.createElement(Box_1.default, { className: styles.buttons },
94
104
  react_1.default.createElement(Link_1.default, { className: styles.button, onClick: onReply, component: "button" }, ui_i18n_1.default.text('Reply')),
95
- comment.status === 'open' && (react_1.default.createElement(Link_1.default, { disabled: sending, className: styles.button, onClick: handleResolve, component: "button" }, ui_i18n_1.default.text('Resolve'))),
96
- comment.status === 'resolved' && (react_1.default.createElement(Link_1.default, { disabled: sending, className: styles.button, onClick: handleReOpen, component: "button" }, ui_i18n_1.default.text('Re-open')))))));
105
+ !isResolved && (react_1.default.createElement(Link_1.default, { disabled: sending, className: styles.button, onClick: handleResolve, component: "button" }, ui_i18n_1.default.text('Resolve'))),
106
+ isResolved && (react_1.default.createElement(Link_1.default, { disabled: sending, className: styles.button, onClick: handleReOpen, component: "button" }, ui_i18n_1.default.text('Re-open')))))));
97
107
  };
98
108
  exports.Comment = Comment;
package/cjs/components/CollaborationItem/RepliedComment/RepliedComment.js CHANGED
@@ -48,7 +48,7 @@ var RepliedComment = function (_a) {
48
48
  var inputRef = (0, react_1.useRef)();
49
49
  var createdBy = reply.createdBy, action = reply.action, createdTime = reply.createdTime;
50
50
  var username = (0, react_redux_1.useSelector)(mdm_module_1.default.selectors.getUserName);
51
- var canChangeReply = createdBy === username;
51
+ var canChangeReply = createdBy === username && comment.status !== 'resolved';
52
52
  var _b = (0, react_1.useContext)(contexts_1.CollaborationContext), deleteReply = _b.deleteReply, updateCommentState = _b.updateCommentState, getCommentState = _b.getCommentState;
53
53
  var commentUri = (0, utils_1.createEditedReplyUri)(comment, reply);
54
54
  var isEditing = getCommentState(uri, commentUri).isEditing;
package/esm/components/AttributesFiltersButton/AttributesFiltersButton.d.ts CHANGED
@@ -11,6 +11,7 @@ declare type Props = {
11
11
  children?: React.ReactNode;
12
12
  onTogglePopup?: (open: boolean) => void;
13
13
  isFiltersApplied?: boolean;
14
+ dataReltioId?: string;
14
15
  };
15
- declare const _default: React.MemoExoticComponent<({ filters: filtersProp, attributeTypes, onChange, components, children, onTogglePopup, isFiltersApplied: isFiltersAppliedProp }: Props) => JSX.Element>;
16
+ declare const _default: React.MemoExoticComponent<({ filters: filtersProp, attributeTypes, onChange, components, children, onTogglePopup, isFiltersApplied: isFiltersAppliedProp, dataReltioId }: Props) => JSX.Element>;
16
17
  export default _default;
package/esm/components/AttributesFiltersButton/AttributesFiltersButton.js CHANGED
@@ -10,7 +10,7 @@ import AttributesFiltersBuilder from '../AttributesFiltersBuilder/AttributesFilt
10
10
  import ActionButtons from './ActionButtons/ActionButtons';
11
11
  import { useStyles } from './styles';
12
12
  var AttributesFiltersButton = function (_a) {
13
- var filtersProp = _a.filters, attributeTypes = _a.attributeTypes, onChange = _a.onChange, components = _a.components, children = _a.children, onTogglePopup = _a.onTogglePopup, isFiltersAppliedProp = _a.isFiltersApplied;
13
+ var filtersProp = _a.filters, attributeTypes = _a.attributeTypes, onChange = _a.onChange, components = _a.components, children = _a.children, onTogglePopup = _a.onTogglePopup, isFiltersAppliedProp = _a.isFiltersApplied, dataReltioId = _a.dataReltioId;
14
14
  var styles = useStyles();
15
15
  var buttonRef = useRef();
16
16
  var _b = useState(false), isOpen = _b[0], setIsOpen = _b[1];
@@ -39,7 +39,7 @@ var AttributesFiltersButton = function (_a) {
39
39
  setFilters([]);
40
40
  }, []);
41
41
  return (React.createElement(React.Fragment, null,
42
- React.createElement(Button, { ref: buttonRef, color: buttonColor, classes: {
42
+ React.createElement(Button, { "data-reltio-id": dataReltioId, ref: buttonRef, color: buttonColor, classes: {
43
43
  root: styles.triggerButton,
44
44
  textPrimary: styles.changedFiltersIndicator
45
45
  }, onClick: togglePopup },
package/esm/components/CollaborationItem/Comment/Comment.js CHANGED
@@ -20,7 +20,8 @@ export var Comment = function (_a) {
20
20
  var styles = useStyles();
21
21
  var inputRef = useRef();
22
22
  var username = useSelector(mdm.selectors.getUserName);
23
- var commentId = comment.commentId, createdBy = comment.createdBy, createdTime = comment.createdTime;
23
+ var commentId = comment.commentId, createdBy = comment.createdBy, createdTime = comment.createdTime, status = comment.status;
24
+ var isResolved = status === 'resolved';
24
25
  var canChangeComment = createdBy === username;
25
26
  var _b = useContext(CollaborationContext), resolveThread = _b.resolveThread, reOpenThread = _b.reOpenThread, sending = _b.sending, deleteComment = _b.deleteComment, updateCommentState = _b.updateCommentState, getCommentState = _b.getCommentState;
26
27
  var commentUri = createEditedCommentUri(comment);
@@ -31,16 +32,25 @@ export var Comment = function (_a) {
31
32
  inputRef.current.focus();
32
33
  }
33
34
  }, [isEditing]);
34
- var menuItems = useMemo(function () { return [
35
- {
36
- text: i18n.text('Edit'),
37
- onClick: function () { return updateIsEditingComment(true); }
38
- },
39
- {
40
- text: i18n.text('Delete'),
41
- onClick: function () { return deleteComment({ uri: uri, commentId: commentId }); }
42
- }
43
- ]; }, [deleteComment, uri, commentId, updateIsEditingComment]);
35
+ var menuItems = useMemo(function () {
36
+ return isResolved
37
+ ? [
38
+ {
39
+ text: i18n.text('Delete'),
40
+ onClick: function () { return deleteComment({ uri: uri, commentId: commentId }); }
41
+ }
42
+ ]
43
+ : [
44
+ {
45
+ text: i18n.text('Edit'),
46
+ onClick: function () { return updateIsEditingComment(true); }
47
+ },
48
+ {
49
+ text: i18n.text('Delete'),
50
+ onClick: function () { return deleteComment({ uri: uri, commentId: commentId }); }
51
+ }
52
+ ];
53
+ }, [commentId, deleteComment, isResolved, updateIsEditingComment, uri]);
44
54
  var handleResolve = function () {
45
55
  resolveThread({ commentId: commentId, uri: uri });
46
56
  };
@@ -63,6 +73,6 @@ export var Comment = function (_a) {
63
73
  isEditing ? sendMessageArea : React.createElement(CommentContent, { comment: comment, className: styles.message }),
64
74
  React.createElement(Box, { className: styles.buttons },
65
75
  React.createElement(Link, { className: styles.button, onClick: onReply, component: "button" }, i18n.text('Reply')),
66
- comment.status === 'open' && (React.createElement(Link, { disabled: sending, className: styles.button, onClick: handleResolve, component: "button" }, i18n.text('Resolve'))),
67
- comment.status === 'resolved' && (React.createElement(Link, { disabled: sending, className: styles.button, onClick: handleReOpen, component: "button" }, i18n.text('Re-open')))))));
76
+ !isResolved && (React.createElement(Link, { disabled: sending, className: styles.button, onClick: handleResolve, component: "button" }, i18n.text('Resolve'))),
77
+ isResolved && (React.createElement(Link, { disabled: sending, className: styles.button, onClick: handleReOpen, component: "button" }, i18n.text('Re-open')))))));
68
78
  };
package/esm/components/CollaborationItem/RepliedComment/RepliedComment.js CHANGED
@@ -19,7 +19,7 @@ export var RepliedComment = function (_a) {
19
19
  var inputRef = useRef();
20
20
  var createdBy = reply.createdBy, action = reply.action, createdTime = reply.createdTime;
21
21
  var username = useSelector(mdm.selectors.getUserName);
22
- var canChangeReply = createdBy === username;
22
+ var canChangeReply = createdBy === username && comment.status !== 'resolved';
23
23
  var _b = useContext(CollaborationContext), deleteReply = _b.deleteReply, updateCommentState = _b.updateCommentState, getCommentState = _b.getCommentState;
24
24
  var commentUri = createEditedReplyUri(comment, reply);
25
25
  var isEditing = getCommentState(uri, commentUri).isEditing;
package/package.json CHANGED
@@ -1,14 +1,14 @@
1
1
  {
2
2
  "name": "@reltio/components",
3
- "version": "1.4.1508",
3
+ "version": "1.4.1510",
4
4
  "license": "SEE LICENSE IN LICENSE FILE",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
7
7
  "dependencies": {
8
8
  "@date-io/moment": "^1.3.5",
9
9
  "@react-google-maps/api": "2.7.0",
10
- "@reltio/mdm-module": "^1.4.1508",
11
- "@reltio/mdm-sdk": "^1.4.1508",
10
+ "@reltio/mdm-module": "^1.4.1510",
11
+ "@reltio/mdm-sdk": "^1.4.1510",
12
12
  "classnames": "^2.2.5",
13
13
  "d3-cloud": "^1.2.5",
14
14
  "d3-geo": "^2.0.1",