@manuscripts/article-editor 3.1.9-LEAN-3713 → 3.1.9-LEAN-3858

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 (37) hide show
  1. package/dist/cjs/EditorApp.js +2 -9
  2. package/dist/cjs/EditorApp.js.map +1 -1
  3. package/dist/cjs/components/Page.js +1 -1
  4. package/dist/cjs/components/Page.js.map +1 -1
  5. package/dist/cjs/components/comments/CommentActions.js +4 -4
  6. package/dist/cjs/components/comments/CommentActions.js.map +1 -1
  7. package/dist/cjs/components/comments/CommentBody.js +3 -3
  8. package/dist/cjs/components/comments/CommentBody.js.map +1 -1
  9. package/dist/cjs/components/comments/CommentThread.js +10 -2
  10. package/dist/cjs/components/comments/CommentThread.js.map +1 -1
  11. package/dist/cjs/quarterback/QuarterbackStepsExchanger.js +10 -20
  12. package/dist/cjs/quarterback/QuarterbackStepsExchanger.js.map +1 -1
  13. package/dist/cjs/store/StoreContext.js +3 -0
  14. package/dist/cjs/store/StoreContext.js.map +1 -1
  15. package/dist/cjs/store/useStore.js +1 -7
  16. package/dist/cjs/store/useStore.js.map +1 -1
  17. package/dist/es/EditorApp.js +3 -10
  18. package/dist/es/EditorApp.js.map +1 -1
  19. package/dist/es/components/Page.js +1 -1
  20. package/dist/es/components/Page.js.map +1 -1
  21. package/dist/es/components/comments/CommentActions.js +4 -4
  22. package/dist/es/components/comments/CommentActions.js.map +1 -1
  23. package/dist/es/components/comments/CommentBody.js +3 -3
  24. package/dist/es/components/comments/CommentBody.js.map +1 -1
  25. package/dist/es/components/comments/CommentThread.js +11 -3
  26. package/dist/es/components/comments/CommentThread.js.map +1 -1
  27. package/dist/es/quarterback/QuarterbackStepsExchanger.js +10 -20
  28. package/dist/es/quarterback/QuarterbackStepsExchanger.js.map +1 -1
  29. package/dist/es/store/StoreContext.js +4 -1
  30. package/dist/es/store/StoreContext.js.map +1 -1
  31. package/dist/es/store/useStore.js +0 -5
  32. package/dist/es/store/useStore.js.map +1 -1
  33. package/dist/types/quarterback/QuarterbackStepsExchanger.d.ts +0 -2
  34. package/dist/types/quarterback/api/document.d.ts +42 -7
  35. package/dist/types/quarterback/api/methods.d.ts +1 -1
  36. package/dist/types/store/useStore.d.ts +0 -1
  37. package/package.json +4 -4
@@ -57,15 +57,9 @@ const EditorApp = ({ manuscriptID, projectID, permittedActions, fileManagement,
57
57
  const userID = (0, user_1.getCurrentUserId)();
58
58
  const [store, setStore] = (0, react_1.useState)();
59
59
  const loadDoc = (0, useLoadDoc_1.useLoadDoc)(authToken);
60
- const loadedRef = (0, react_1.useRef)(false);
61
- const observerSubscribed = (0, react_1.useRef)(false);
60
+ const quarterBackSource = new QuarterBackDataSource_1.default(loadDoc);
62
61
  (0, react_1.useEffect)(() => {
63
- const quarterBackSource = new QuarterBackDataSource_1.default(loadDoc);
64
62
  // implement remount for the store if component is retriggered
65
- if (loadedRef.current) {
66
- return;
67
- }
68
- loadedRef.current = true;
69
63
  const basicSource = new store_1.BasicSource(fileManagement, projectID, manuscriptID, files, permittedActions, userID || '', authToken || '');
70
64
  const mainSource = new PsSource_1.default(files);
71
65
  (0, store_1.createStore)([basicSource, mainSource, quarterBackSource])
@@ -81,10 +75,9 @@ const EditorApp = ({ manuscriptID, projectID, permittedActions, fileManagement,
81
75
  // eslint-disable-next-line react-hooks/exhaustive-deps
82
76
  }, [manuscriptID, projectID]);
83
77
  (0, react_1.useEffect)(() => {
84
- if (!observer || observerSubscribed.current || !store) {
78
+ if (!observer) {
85
79
  return;
86
80
  }
87
- observerSubscribed.current = true;
88
81
  store?.subscribe((s) => observer.onUpdate(s));
89
82
  observer.state.current = {
90
83
  get: () => store?.getState(),
@@ -1 +1 @@
1
- {"version":3,"file":"EditorApp.js","sourceRoot":"","sources":["../../src/EditorApp.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"EditorApp.js","sourceRoot":"","sources":["../../src/EditorApp.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,+CAAoE;AACpE,0EAAsC;AAEtC,4CAAwC;AACxC,4GAAmF;AACnF,uFAAmF;AACnF,qCAA6C;AAC7C,wEAA+C;AAC/C,gGAAuE;AACvE,yDAAqD;AACrD,mCAMgB;AAuBhB,MAAM,OAAO,GAAG,2BAAM,CAAC,GAAG,CAAA;;;;;;;;CAQzB,CAAA;AAED,MAAM,kBAAkB,GAAG,2BAAM,CAAC,GAAG,CAAA;;;;;;;CAOpC,CAAA;AAED,MAAM,SAAS,GAA6B,CAAC,EAC3C,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,KAAK,EACL,SAAS,EACT,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAA,uBAAgB,GAAE,CAAA;IAEjC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAgB,CAAA;IAElD,MAAM,OAAO,GAAG,IAAA,uBAAU,EAAC,SAAS,CAAC,CAAA;IACrC,MAAM,iBAAiB,GAAG,IAAI,+BAAqB,CAAC,OAAO,CAAC,CAAA;IAE5D,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,8DAA8D;QAC9D,MAAM,WAAW,GAAG,IAAI,mBAAW,CACjC,cAAc,EACd,SAAS,EACT,YAAY,EACZ,KAAK,EACL,gBAAgB,EAChB,MAAM,IAAI,EAAE,EACZ,SAAS,IAAI,EAAE,CAChB,CAAA;QACD,MAAM,UAAU,GAAG,IAAI,kBAAQ,CAAC,KAAK,CAAC,CAAA;QACtC,IAAA,mBAAW,EAAC,CAAC,WAAW,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC;aACtD,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACd,QAAQ,CAAC,KAAK,CAAC,CAAA;QACjB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,CAAC,CAAA;QACJ,OAAO,GAAG,EAAE;YACV,KAAK,EAAE,OAAO,EAAE,CAAA;QAClB,CAAC,CAAA;QACD,uDAAuD;IACzD,CAAC,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAA;IAE7B,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,QAAQ,EAAE;YACb,OAAM;SACP;QACD,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7C,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG;YACvB,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE;YAC5B,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAc,CAAC;SACnD,CAAA;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAA;IAErB,OAAO,KAAK,CAAC,CAAC,CAAC,CACb,8BAAC,4BAAoB,IAAC,KAAK,EAAE,KAAK;QAChC,8BAAC,WAAI;YACH,8BAAC,OAAO;gBACN,8BAAC,iCAAuB,OAAG,CACnB,CACL,CACc,CACxB,CAAC,CAAC,CAAC,CACF,8BAAC,kBAAkB;QACjB,8BAAC,6CAAqB,OAAG,CACN,CACtB,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,SAAS,CAAA"}
@@ -53,7 +53,7 @@ const Page = ({ children, project: directProject }) => {
53
53
  tokenData: store.tokenData,
54
54
  }));
55
55
  if (!tokenData) {
56
- throw new Error('TokenData not found. User is not loggged in!');
56
+ return null;
57
57
  }
58
58
  return react_1.default.createElement(PageContainer, null, children);
59
59
  };
@@ -1 +1 @@
1
- {"version":3,"file":"Page.js","sourceRoot":"","sources":["../../../src/components/Page.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAGH,kDAAyB;AACzB,0EAAsC;AAEtC,oCAAmC;AAEtB,QAAA,IAAI,GAAG,2BAAM,CAAC,IAAI,CAAA;;;;;sBAKT,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO;;;;;;;;CAQrE,CAAA;AAEY,QAAA,QAAQ,GAAG,IAAA,2BAAM,EAAC,YAAI,CAAC,CAAA;;;;;CAKnC,CAAA;AAED,MAAM,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;;;;;;WAMrB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;iBACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;CACvD,CAAA;AAEM,MAAM,IAAI,GAGZ,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE;IAC5C,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3C,YAAY,EAAE,KAAK,CAAC,OAAO;QAC3B,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC,CAAA;IAEH,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;KAChE;IAED,OAAO,8BAAC,aAAa,QAAE,QAAQ,CAAiB,CAAA;AAClD,CAAC,CAAA;AAdY,QAAA,IAAI,QAchB"}
1
+ {"version":3,"file":"Page.js","sourceRoot":"","sources":["../../../src/components/Page.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAGH,kDAAyB;AACzB,0EAAsC;AAEtC,oCAAmC;AAEtB,QAAA,IAAI,GAAG,2BAAM,CAAC,IAAI,CAAA;;;;;sBAKT,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO;;;;;;;;CAQrE,CAAA;AAEY,QAAA,QAAQ,GAAG,IAAA,2BAAM,EAAC,YAAI,CAAC,CAAA;;;;;CAKnC,CAAA;AAED,MAAM,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;;;;;;WAMrB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;iBACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;CACvD,CAAA;AAEM,MAAM,IAAI,GAGZ,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE;IAC5C,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3C,YAAY,EAAE,KAAK,CAAC,OAAO;QAC3B,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC,CAAA;IAEH,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,8BAAC,aAAa,QAAE,QAAQ,CAAiB,CAAA;AAClD,CAAC,CAAA;AAdY,QAAA,IAAI,QAchB"}
@@ -49,11 +49,11 @@ const CommentActions = ({ comment, isResolveEnabled, isActionsEnabled, onEdit, o
49
49
  return (react_1.default.createElement(react_1.default.Fragment, null,
50
50
  isResolveEnabled && (react_1.default.createElement(CommentResolveButton_1.CommentResolveButton, { comment: comment, onClick: toggleResolve })),
51
51
  isActionsEnabled && (react_1.default.createElement(style_guide_1.DropdownContainer, { ref: wrapperRef },
52
- react_1.default.createElement(exports.ActionsIcon, { "data-cy": "comment-dropdown-trigger", onClick: toggleOpen },
52
+ react_1.default.createElement(exports.ActionsIcon, { onClick: toggleOpen },
53
53
  react_1.default.createElement(style_guide_1.DotsIcon, null)),
54
- isOpen && (react_1.default.createElement(style_guide_1.DropdownList, { "data-cy": "comment-dropdown", direction: 'right', width: 125, onClick: toggleOpen },
55
- react_1.default.createElement(exports.CommentAction, { "data-cy": "comment-edit", onClick: onEdit }, "Edit"),
56
- react_1.default.createElement(exports.CommentAction, { "data-cy": "comment-delete", onClick: onDelete }, "Delete")))))));
54
+ isOpen && (react_1.default.createElement(style_guide_1.DropdownList, { direction: 'right', width: 125, onClick: toggleOpen },
55
+ react_1.default.createElement(exports.CommentAction, { onClick: onEdit }, "Edit"),
56
+ react_1.default.createElement(exports.CommentAction, { onClick: onDelete }, "Delete")))))));
57
57
  };
58
58
  exports.CommentActions = CommentActions;
59
59
  //# sourceMappingURL=CommentActions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAGH,0DAKiC;AACjC,kDAAyB;AACzB,0EAAsC;AAEtC,iEAA6D;AAEhD,QAAA,WAAW,GAAG,2BAAM,CAAC,MAAM,CAAA;;;;;;;;;;;;CAYvC,CAAA;AAEY,QAAA,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;iBACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;;WAI7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAWM,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAA,yBAAW,GAAE,CAAA;IAExD,OAAO,CACL;QACG,gBAAgB,IAAI,CACnB,8BAAC,2CAAoB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAI,CACnE;QACA,gBAAgB,IAAI,CACnB,8BAAC,+BAAiB,IAAC,GAAG,EAAE,UAAU;YAChC,8BAAC,mBAAW,eAAS,0BAA0B,EAAC,OAAO,EAAE,UAAU;gBACjE,8BAAC,sBAAQ,OAAG,CACA;YACb,MAAM,IAAI,CACT,8BAAC,0BAAY,eACH,kBAAkB,EAC1B,SAAS,EAAE,OAAO,EAClB,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,UAAU;gBAEnB,8BAAC,qBAAa,eAAS,cAAc,EAAC,OAAO,EAAE,MAAM,WAErC;gBAChB,8BAAC,qBAAa,eAAS,gBAAgB,EAAC,OAAO,EAAE,QAAQ,aAEzC,CACH,CAChB,CACiB,CACrB,CACA,CACJ,CAAA;AACH,CAAC,CAAA;AAvCY,QAAA,cAAc,kBAuC1B"}
1
+ {"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAGH,0DAKiC;AACjC,kDAAyB;AACzB,0EAAsC;AAEtC,iEAA6D;AAEhD,QAAA,WAAW,GAAG,2BAAM,CAAC,MAAM,CAAA;;;;;;;;;;;;CAYvC,CAAA;AAEY,QAAA,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;iBACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;;WAI7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAWM,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAA,yBAAW,GAAE,CAAA;IAExD,OAAO,CACL;QACG,gBAAgB,IAAI,CACnB,8BAAC,2CAAoB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAI,CACnE;QACA,gBAAgB,IAAI,CACnB,8BAAC,+BAAiB,IAAC,GAAG,EAAE,UAAU;YAChC,8BAAC,mBAAW,IAAC,OAAO,EAAE,UAAU;gBAC9B,8BAAC,sBAAQ,OAAG,CACA;YACb,MAAM,IAAI,CACT,8BAAC,0BAAY,IAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU;gBAC/D,8BAAC,qBAAa,IAAC,OAAO,EAAE,MAAM,WAAsB;gBACpD,8BAAC,qBAAa,IAAC,OAAO,EAAE,QAAQ,aAAwB,CAC3C,CAChB,CACiB,CACrB,CACA,CACJ,CAAA;AACH,CAAC,CAAA;AA9BY,QAAA,cAAc,kBA8B1B"}
@@ -86,12 +86,12 @@ const CommentBody = ({ comment, isEditing, onSave, onCancel, onSelect, }) => {
86
86
  editor.current = e;
87
87
  }, []);
88
88
  return (react_1.default.createElement(react_1.default.Fragment, null, isEditing ? (react_1.default.createElement(react_1.default.Fragment, null,
89
- react_1.default.createElement(CommentEditor, { "data-cy": "comment-editor", ref: ref, defaultValue: comment.node.attrs.contents }),
90
- react_1.default.createElement(EditorActions, { "data-cy": "comment-actions" },
89
+ react_1.default.createElement(CommentEditor, { ref: ref, defaultValue: comment.node.attrs.contents }),
90
+ react_1.default.createElement(EditorActions, null,
91
91
  react_1.default.createElement(style_guide_1.SecondaryButton, { onClick: onCancel }, "Cancel"),
92
92
  react_1.default.createElement(style_guide_1.PrimaryButton, { onClick: handleSave }, "Save")))) : (react_1.default.createElement(react_1.default.Fragment, null,
93
93
  react_1.default.createElement(CommentContent, { onClick: onSelect },
94
- react_1.default.createElement(CommentViewer, { "data-cy": "comment-text" }, comment.node.attrs.contents))))));
94
+ react_1.default.createElement(CommentViewer, null, comment.node.attrs.contents))))));
95
95
  };
96
96
  exports.CommentBody = CommentBody;
97
97
  //# sourceMappingURL=CommentBody.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"CommentBody.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentBody.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,0DAIiC;AACjC,+CAAkD;AAClD,0EAAsC;AAEtC,MAAM,cAAc,GAAG,2BAAM,CAAC,GAAG,CAAA;;CAEhC,CAAA;AAED,MAAM,aAAa,GAAG,2BAAM,CAAC,QAAQ,CAAA;;iBAEpB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;WAC7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;CAoB/C,CAAA;AAED,MAAM,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;;;iBAGf,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;WAG7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;CAC/C,CAAA;AAED,MAAM,aAAa,GAAG,IAAA,2BAAM,EAAC,yBAAW,CAAC,CAAA;;;;CAIxC,CAAA;AAUM,MAAM,WAAW,GAA+B,CAAC,EACtD,OAAO,EACP,SAAS,EACT,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAA,cAAM,EAA6B,IAAI,CAAC,CAAA;IAEvD,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SAC7B;IACH,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,IAAA,mBAAW,EAAC,CAAC,CAA6B,EAAE,EAAE;QACxD,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE;YAC7B,CAAC,CAAC,KAAK,EAAE,CAAA;SACV;QACD,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;IACpB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,8DACG,SAAS,CAAC,CAAC,CAAC,CACX;QACE,8BAAC,aAAa,eACJ,gBAAgB,EACxB,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAC1B;QACjB,8BAAC,aAAa,eAAS,iBAAiB;YACtC,8BAAC,6BAAe,IAAC,OAAO,EAAE,QAAQ,aAA0B;YAC5D,8BAAC,2BAAa,IAAC,OAAO,EAAE,UAAU,WAAsB,CAC1C,CACf,CACJ,CAAC,CAAC,CAAC,CACF;QACE,8BAAC,cAAc,IAAC,OAAO,EAAE,QAAQ;YAC/B,8BAAC,aAAa,eAAS,cAAc,IAClC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CACd,CACD,CAChB,CACJ,CACA,CACJ,CAAA;AACH,CAAC,CAAA;AA/CY,QAAA,WAAW,eA+CvB"}
1
+ {"version":3,"file":"CommentBody.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentBody.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,0DAIiC;AACjC,+CAAkD;AAClD,0EAAsC;AAEtC,MAAM,cAAc,GAAG,2BAAM,CAAC,GAAG,CAAA;;CAEhC,CAAA;AAED,MAAM,aAAa,GAAG,2BAAM,CAAC,QAAQ,CAAA;;iBAEpB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;WAC7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;CAoB/C,CAAA;AAED,MAAM,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;;;iBAGf,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;WAG7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;CAC/C,CAAA;AAED,MAAM,aAAa,GAAG,IAAA,2BAAM,EAAC,yBAAW,CAAC,CAAA;;;;CAIxC,CAAA;AAUM,MAAM,WAAW,GAA+B,CAAC,EACtD,OAAO,EACP,SAAS,EACT,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAA,cAAM,EAA6B,IAAI,CAAC,CAAA;IAEvD,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SAC7B;IACH,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,IAAA,mBAAW,EAAC,CAAC,CAA6B,EAAE,EAAE;QACxD,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE;YAC7B,CAAC,CAAC,KAAK,EAAE,CAAA;SACV;QACD,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;IACpB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,8DACG,SAAS,CAAC,CAAC,CAAC,CACX;QACE,8BAAC,aAAa,IACZ,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAC1B;QACjB,8BAAC,aAAa;YACZ,8BAAC,6BAAe,IAAC,OAAO,EAAE,QAAQ,aAA0B;YAC5D,8BAAC,2BAAa,IAAC,OAAO,EAAE,UAAU,WAAsB,CAC1C,CACf,CACJ,CAAC,CAAC,CAAC,CACF;QACE,8BAAC,cAAc,IAAC,OAAO,EAAE,QAAQ;YAC/B,8BAAC,aAAa,QAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAiB,CAC7C,CAChB,CACJ,CACA,CACJ,CAAA;AACH,CAAC,CAAA;AA5CY,QAAA,WAAW,eA4CvB"}
@@ -51,12 +51,17 @@ const CommentMetadata = styled_components_1.default.div `
51
51
  padding-right: 8px;
52
52
  `;
53
53
  const CommentAuthor = styled_components_1.default.div `
54
+ display: flex;
54
55
  color: #353535;
55
56
  font-weight: 400;
56
57
  max-width: 200px;
57
58
  white-space: nowrap;
58
59
  overflow: hidden;
59
60
  text-overflow: ellipsis;
61
+
62
+ svg {
63
+ padding-right: 10px;
64
+ }
60
65
  `;
61
66
  const CommentTarget = styled_components_1.default.div `
62
67
  font-size: 14px;
@@ -111,9 +116,12 @@ exports.CommentThread = (0, react_1.forwardRef)((props, ref) => {
111
116
  };
112
117
  return (react_1.default.createElement(Container, { "data-cy": "comment", isSelected: isSelected, ref: ref },
113
118
  react_1.default.createElement(CommentHeader, { "data-cy": "comment-header" },
114
- authorName && react_1.default.createElement(style_guide_1.AvatarIcon, { width: 20, height: 20 }),
115
119
  react_1.default.createElement(CommentMetadata, null,
116
- react_1.default.createElement(CommentAuthor, null, authorName),
120
+ react_1.default.createElement(CommentAuthor, null, authorName ? (react_1.default.createElement(react_1.default.Fragment, null,
121
+ react_1.default.createElement(style_guide_1.AvatarIcon, { width: 20, height: 20 }),
122
+ react_1.default.createElement(CommentAuthor, null, authorName))) : (react_1.default.createElement(react_1.default.Fragment, null,
123
+ react_1.default.createElement(style_guide_1.SystemUserAvatarIcon, { width: 20, height: 20 }),
124
+ react_1.default.createElement(CommentAuthor, null, "System")))),
117
125
  timestamp && react_1.default.createElement(Timestamp, { date: timestamp * 1000 })),
118
126
  react_1.default.createElement(CommentActions_1.CommentActions, { comment: tree.comment, isResolveEnabled: isResolveEnabled, isActionsEnabled: isActionsEnabled, onDelete: () => onDelete(tree.comment.node.attrs.id), onEdit: handleEdit, toggleResolve: handleToggleResolve })),
119
127
  tree.comment.node.attrs.originalText && (react_1.default.createElement(CommentTarget, null, tree.comment.node.attrs.originalText)),
@@ -1 +1 @@
1
- {"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":"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"}
@@ -46,8 +46,6 @@ class QuarterbackStepsExchanger extends body_editor_1.CollabProvider {
46
46
  return QuarterbackStepsExchanger._instance;
47
47
  }
48
48
  super();
49
- this.reconcileAttempts = 0;
50
- this.reconcileAttemptsMax = 20;
51
49
  QuarterbackStepsExchanger._instance = this;
52
50
  this.applySteps = applySteps;
53
51
  this.docId = docId;
@@ -64,7 +62,7 @@ class QuarterbackStepsExchanger extends body_editor_1.CollabProvider {
64
62
  }
65
63
  const steps = this.hydrateSteps(jsonSteps);
66
64
  if (steps.length) {
67
- this.newStepsListener();
65
+ this.newStepsListener(version, steps, clientIDs);
68
66
  }
69
67
  });
70
68
  }
@@ -81,26 +79,13 @@ class QuarterbackStepsExchanger extends body_editor_1.CollabProvider {
81
79
  stepsJSON.push(step.toJSON());
82
80
  });
83
81
  this.currentVersion = version;
84
- this.flushImmediate = this.debounce(async () => {
85
- const result = await this.applySteps(this.projectId, this.docId, {
82
+ this.flushImmediate = this.debounce(() => {
83
+ this.applySteps(this.projectId, this.docId, {
86
84
  steps: stepsJSON,
87
85
  version,
88
86
  clientID,
89
87
  });
90
- if (result &&
91
- 'err' in result &&
92
- 'code' in result &&
93
- result.code === 409 &&
94
- this.reconcileAttempts < this.reconcileAttemptsMax) {
95
- // debugger
96
- console.warn('Attempting Reconciliation');
97
- this.newStepsListener();
98
- this.reconcileAttempts++;
99
- }
100
- else {
101
- this.reconcileAttempts = 0;
102
- }
103
- }, 1200, flush, () => {
88
+ }, 1000, flush, () => {
104
89
  this.throttlingControl(false);
105
90
  });
106
91
  if (!flush) {
@@ -131,7 +116,12 @@ const stepsExchanger = (docId, projectId, lastVersion, authToken, throttlingCont
131
116
  if (!isAuthed) {
132
117
  return;
133
118
  }
134
- const applySteps = async (projectId, docId, payload) => docApi.applySteps(projectId, docId, authToken, payload);
119
+ const applySteps = async (projectId, docId, payload) => {
120
+ const resp = await docApi.applySteps(projectId, docId, authToken, payload);
121
+ if ('data' in resp) {
122
+ return resp.data;
123
+ }
124
+ };
135
125
  const getStepsSince = async (projectId, docId, version) => {
136
126
  const resp = await docApi.stepsSince(projectId, docId, version, authToken);
137
127
  if ('data' in resp) {
@@ -1 +1 @@
1
- {"version":3,"file":"QuarterbackStepsExchanger.js","sourceRoot":"","sources":["../../../src/quarterback/QuarterbackStepsExchanger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QuarterbackStepsExchanger.js","sourceRoot":"","sources":["../../../src/quarterback/QuarterbackStepsExchanger.ts"],"names":[],"mappings":"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"}
@@ -45,6 +45,9 @@ const createStore = async (sources) => {
45
45
  };
46
46
  exports.createStore = createStore;
47
47
  const GenericStoreProvider = ({ children, store }) => {
48
+ (0, react_1.useEffect)(() => {
49
+ return () => store.unmount();
50
+ }, [store]);
48
51
  if (store) {
49
52
  return (react_1.default.createElement(GenericStoreContext.Provider, { value: store }, store.state?.project ? children : react_1.default.createElement("p", null, "Project was not found")));
50
53
  }
@@ -1 +1 @@
1
- {"version":3,"file":"StoreContext.js","sourceRoot":"","sources":["../../../src/store/StoreContext.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;GAUG;AACH,+CAAwD;AAExD,wBAAyD;AAEzD,MAAM,mBAAmB,GAAG,IAAA,qBAAa,EAAe,IAAI,eAAY,EAAE,CAAC,CAAA;AAEpE,MAAM,WAAW,GAAG,KAAK,EAAE,OAAkC,EAAE,EAAE;IACtE,MAAM,KAAK,GAAG,IAAI,eAAY,EAAE,CAAA;IAChC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACzB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAJY,QAAA,WAAW,eAIvB;AAOM,MAAM,oBAAoB,GAAoB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;IAC3E,IAAI,KAAK,EAAE;QACT,OAAO,CACL,8BAAC,mBAAmB,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,IACvC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,iEAA4B,CAClC,CAChC,CAAA;KACF;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AATY,QAAA,oBAAoB,wBAShC;AAEM,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,IAAA,kBAAU,EAAC,mBAAmB,CAAC,CAAA;AAAvD,QAAA,eAAe,mBAAwC"}
1
+ {"version":3,"file":"StoreContext.js","sourceRoot":"","sources":["../../../src/store/StoreContext.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;GAUG;AACH,+CAAmE;AAEnE,wBAAyD;AAEzD,MAAM,mBAAmB,GAAG,IAAA,qBAAa,EAAe,IAAI,eAAY,EAAE,CAAC,CAAA;AAEpE,MAAM,WAAW,GAAG,KAAK,EAAE,OAAkC,EAAE,EAAE;IACtE,MAAM,KAAK,GAAG,IAAI,eAAY,EAAE,CAAA;IAChC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACzB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAJY,QAAA,WAAW,eAIvB;AAOM,MAAM,oBAAoB,GAAoB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;IAC3E,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAA;IAC9B,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAEX,IAAI,KAAK,EAAE;QACT,OAAO,CACL,8BAAC,mBAAmB,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,IACvC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,iEAA4B,CAClC,CAChC,CAAA;KACF;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAbY,QAAA,oBAAoB,wBAahC;AAEM,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,IAAA,kBAAU,EAAC,mBAAmB,CAAC,CAAA;AAAvD,QAAA,eAAe,mBAAwC"}
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  return (mod && mod.__esModule) ? mod : { "default": mod };
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.useGetState = exports.useStore = void 0;
17
+ exports.useStore = void 0;
18
18
  const with_selector_1 = require("use-sync-external-store/with-selector");
19
19
  const deeper_equal_1 = __importDefault(require("../lib/deeper-equal"));
20
20
  const StoreContext_1 = require("./StoreContext");
@@ -25,10 +25,4 @@ const useStore = (selector) => {
25
25
  return [state, store.dispatchAction, store.getState, store.subscribe];
26
26
  };
27
27
  exports.useStore = useStore;
28
- // Allows to get store's state on demand rather than subscribing to it
29
- const useGetState = () => {
30
- const store = (0, StoreContext_1.useGenericStore)();
31
- return store.getState;
32
- };
33
- exports.useGetState = useGetState;
34
28
  //# sourceMappingURL=useStore.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useStore.js","sourceRoot":"","sources":["../../../src/store/useStore.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAEH,yEAAwF;AAExF,uEAA6C;AAE7C,iDAAgD;AAIzC,MAAM,QAAQ,GAAG,CACtB,QAAsB,EACiC,EAAE;IACzD,MAAM,KAAK,GAAG,IAAA,8BAAe,GAAE,CAAA;IAC/B,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAA;IACxE,MAAM,KAAK,GAAG,IAAA,gDAAgC,EAC5C,KAAK,CAAC,SAAS,EACf,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,EACtB,SAAS,EACT,IAAI,EACJ,sBAAW,CACZ,CAAA;IAED,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;AACvE,CAAC,CAAA;AAdY,QAAA,QAAQ,YAcpB;AAED,sEAAsE;AAC/D,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,MAAM,KAAK,GAAG,IAAA,8BAAe,GAAE,CAAA;IAC/B,OAAO,KAAK,CAAC,QAAQ,CAAA;AACvB,CAAC,CAAA;AAHY,QAAA,WAAW,eAGvB"}
1
+ {"version":3,"file":"useStore.js","sourceRoot":"","sources":["../../../src/store/useStore.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAEH,yEAAwF;AAExF,uEAA6C;AAE7C,iDAAgD;AAIzC,MAAM,QAAQ,GAAG,CACtB,QAAsB,EACiC,EAAE;IACzD,MAAM,KAAK,GAAG,IAAA,8BAAe,GAAE,CAAA;IAC/B,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAA;IACxE,MAAM,KAAK,GAAG,IAAA,gDAAgC,EAC5C,KAAK,CAAC,SAAS,EACf,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,EACtB,SAAS,EACT,IAAI,EACJ,sBAAW,CACZ,CAAA;IAED,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;AACvE,CAAC,CAAA;AAdY,QAAA,QAAQ,YAcpB"}
@@ -1,4 +1,4 @@
1
- import React, { useEffect, useRef, useState } from 'react';
1
+ import React, { useEffect, useState } from 'react';
2
2
  import styled from 'styled-components';
3
3
  import { Page } from './components/Page';
4
4
  import ManuscriptPageContainer from './components/projects/ManuscriptPageContainer';
@@ -29,15 +29,9 @@ const EditorApp = ({ manuscriptID, projectID, permittedActions, fileManagement,
29
29
  const userID = getCurrentUserId();
30
30
  const [store, setStore] = useState();
31
31
  const loadDoc = useLoadDoc(authToken);
32
- const loadedRef = useRef(false);
33
- const observerSubscribed = useRef(false);
32
+ const quarterBackSource = new QuarterbackDataSource(loadDoc);
34
33
  useEffect(() => {
35
- const quarterBackSource = new QuarterbackDataSource(loadDoc);
36
34
  // implement remount for the store if component is retriggered
37
- if (loadedRef.current) {
38
- return;
39
- }
40
- loadedRef.current = true;
41
35
  const basicSource = new BasicSource(fileManagement, projectID, manuscriptID, files, permittedActions, userID || '', authToken || '');
42
36
  const mainSource = new PsSource(files);
43
37
  createStore([basicSource, mainSource, quarterBackSource])
@@ -53,10 +47,9 @@ const EditorApp = ({ manuscriptID, projectID, permittedActions, fileManagement,
53
47
  // eslint-disable-next-line react-hooks/exhaustive-deps
54
48
  }, [manuscriptID, projectID]);
55
49
  useEffect(() => {
56
- if (!observer || observerSubscribed.current || !store) {
50
+ if (!observer) {
57
51
  return;
58
52
  }
59
- observerSubscribed.current = true;
60
53
  store?.subscribe((s) => observer.onUpdate(s));
61
54
  observer.state.current = {
62
55
  get: () => store?.getState(),
@@ -1 +1 @@
1
- {"version":3,"file":"EditorApp.js","sourceRoot":"","sources":["../../src/EditorApp.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,EAAoB,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC5E,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACxC,OAAO,uBAAuB,MAAM,+CAA+C,CAAA;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAA;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,QAAQ,MAAM,0BAA0B,CAAA;AAC/C,OAAO,qBAAqB,MAAM,qCAAqC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AACrD,OAAO,EACL,WAAW,EACX,WAAW,EAEX,oBAAoB,GAErB,MAAM,SAAS,CAAA;AAuBhB,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;;CAQzB,CAAA;AAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;CAOpC,CAAA;AAED,MAAM,SAAS,GAA6B,CAAC,EAC3C,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,KAAK,EACL,SAAS,EACT,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAA;IAEjC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAgB,CAAA;IAElD,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IAErC,MAAM,SAAS,GAAG,MAAM,CAAU,KAAK,CAAC,CAAA;IACxC,MAAM,kBAAkB,GAAG,MAAM,CAAU,KAAK,CAAC,CAAA;IAEjD,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,iBAAiB,GAAG,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAA;QAC5D,8DAA8D;QAC9D,IAAI,SAAS,CAAC,OAAO,EAAE;YACrB,OAAM;SACP;QACD,SAAS,CAAC,OAAO,GAAG,IAAI,CAAA;QACxB,MAAM,WAAW,GAAG,IAAI,WAAW,CACjC,cAAc,EACd,SAAS,EACT,YAAY,EACZ,KAAK,EACL,gBAAgB,EAChB,MAAM,IAAI,EAAE,EACZ,SAAS,IAAI,EAAE,CAChB,CAAA;QACD,MAAM,UAAU,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAA;QACtC,WAAW,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC;aACtD,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACd,QAAQ,CAAC,KAAK,CAAC,CAAA;QACjB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,CAAC,CAAA;QACJ,OAAO,GAAG,EAAE;YACV,KAAK,EAAE,OAAO,EAAE,CAAA;QAClB,CAAC,CAAA;QACD,uDAAuD;IACzD,CAAC,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAA;IAE7B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,QAAQ,IAAI,kBAAkB,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE;YACrD,OAAM;SACP;QACD,kBAAkB,CAAC,OAAO,GAAG,IAAI,CAAA;QACjC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7C,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG;YACvB,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE;YAC5B,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAc,CAAC;SACnD,CAAA;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAA;IAErB,OAAO,KAAK,CAAC,CAAC,CAAC,CACb,oBAAC,oBAAoB,IAAC,KAAK,EAAE,KAAK;QAChC,oBAAC,IAAI;YACH,oBAAC,OAAO;gBACN,oBAAC,uBAAuB,OAAG,CACnB,CACL,CACc,CACxB,CAAC,CAAC,CAAC,CACF,oBAAC,kBAAkB;QACjB,oBAAC,qBAAqB,OAAG,CACN,CACtB,CAAA;AACH,CAAC,CAAA;AAED,eAAe,SAAS,CAAA"}
1
+ {"version":3,"file":"EditorApp.js","sourceRoot":"","sources":["../../src/EditorApp.tsx"],"names":[],"mappings":"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"}
@@ -47,7 +47,7 @@ export const Page = ({ children, project: directProject }) => {
47
47
  tokenData: store.tokenData,
48
48
  }));
49
49
  if (!tokenData) {
50
- throw new Error('TokenData not found. User is not loggged in!');
50
+ return null;
51
51
  }
52
52
  return React.createElement(PageContainer, null, children);
53
53
  };
@@ -1 +1 @@
1
- {"version":3,"file":"Page.js","sourceRoot":"","sources":["../../../src/components/Page.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;;;;;sBAKT,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO;;;;;;;;CAQrE,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;;;;;CAKnC,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;WAMrB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;iBACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;CACvD,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAGZ,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE;IAC5C,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3C,YAAY,EAAE,KAAK,CAAC,OAAO;QAC3B,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC,CAAA;IAEH,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;KAChE;IAED,OAAO,oBAAC,aAAa,QAAE,QAAQ,CAAiB,CAAA;AAClD,CAAC,CAAA"}
1
+ {"version":3,"file":"Page.js","sourceRoot":"","sources":["../../../src/components/Page.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;;;;;sBAKT,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO;;;;;;;;CAQrE,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;;;;;CAKnC,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;WAMrB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;iBACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;CACvD,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAGZ,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE;IAC5C,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3C,YAAY,EAAE,KAAK,CAAC,OAAO;QAC3B,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC,CAAA;IAEH,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,oBAAC,aAAa,QAAE,QAAQ,CAAiB,CAAA;AAClD,CAAC,CAAA"}
@@ -43,10 +43,10 @@ export const CommentActions = ({ comment, isResolveEnabled, isActionsEnabled, on
43
43
  return (React.createElement(React.Fragment, null,
44
44
  isResolveEnabled && (React.createElement(CommentResolveButton, { comment: comment, onClick: toggleResolve })),
45
45
  isActionsEnabled && (React.createElement(DropdownContainer, { ref: wrapperRef },
46
- React.createElement(ActionsIcon, { "data-cy": "comment-dropdown-trigger", onClick: toggleOpen },
46
+ React.createElement(ActionsIcon, { onClick: toggleOpen },
47
47
  React.createElement(DotsIcon, null)),
48
- isOpen && (React.createElement(DropdownList, { "data-cy": "comment-dropdown", direction: 'right', width: 125, onClick: toggleOpen },
49
- React.createElement(CommentAction, { "data-cy": "comment-edit", onClick: onEdit }, "Edit"),
50
- React.createElement(CommentAction, { "data-cy": "comment-delete", onClick: onDelete }, "Delete")))))));
48
+ isOpen && (React.createElement(DropdownList, { direction: 'right', width: 125, onClick: toggleOpen },
49
+ React.createElement(CommentAction, { onClick: onEdit }, "Edit"),
50
+ React.createElement(CommentAction, { onClick: onDelete }, "Delete")))))));
51
51
  };
52
52
  //# sourceMappingURL=CommentActions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,WAAW,GACZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAA;;;;;;;;;;;;CAYvC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;iBACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;;WAI7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAWD,MAAM,CAAC,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,WAAW,EAAE,CAAA;IAExD,OAAO,CACL;QACG,gBAAgB,IAAI,CACnB,oBAAC,oBAAoB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAI,CACnE;QACA,gBAAgB,IAAI,CACnB,oBAAC,iBAAiB,IAAC,GAAG,EAAE,UAAU;YAChC,oBAAC,WAAW,eAAS,0BAA0B,EAAC,OAAO,EAAE,UAAU;gBACjE,oBAAC,QAAQ,OAAG,CACA;YACb,MAAM,IAAI,CACT,oBAAC,YAAY,eACH,kBAAkB,EAC1B,SAAS,EAAE,OAAO,EAClB,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,UAAU;gBAEnB,oBAAC,aAAa,eAAS,cAAc,EAAC,OAAO,EAAE,MAAM,WAErC;gBAChB,oBAAC,aAAa,eAAS,gBAAgB,EAAC,OAAO,EAAE,QAAQ,aAEzC,CACH,CAChB,CACiB,CACrB,CACA,CACJ,CAAA;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,WAAW,GACZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAA;;;;;;;;;;;;CAYvC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;iBACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;;WAI7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAWD,MAAM,CAAC,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,WAAW,EAAE,CAAA;IAExD,OAAO,CACL;QACG,gBAAgB,IAAI,CACnB,oBAAC,oBAAoB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAI,CACnE;QACA,gBAAgB,IAAI,CACnB,oBAAC,iBAAiB,IAAC,GAAG,EAAE,UAAU;YAChC,oBAAC,WAAW,IAAC,OAAO,EAAE,UAAU;gBAC9B,oBAAC,QAAQ,OAAG,CACA;YACb,MAAM,IAAI,CACT,oBAAC,YAAY,IAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU;gBAC/D,oBAAC,aAAa,IAAC,OAAO,EAAE,MAAM,WAAsB;gBACpD,oBAAC,aAAa,IAAC,OAAO,EAAE,QAAQ,aAAwB,CAC3C,CAChB,CACiB,CACrB,CACA,CACJ,CAAA;AACH,CAAC,CAAA"}
@@ -57,11 +57,11 @@ export const CommentBody = ({ comment, isEditing, onSave, onCancel, onSelect, })
57
57
  editor.current = e;
58
58
  }, []);
59
59
  return (React.createElement(React.Fragment, null, isEditing ? (React.createElement(React.Fragment, null,
60
- React.createElement(CommentEditor, { "data-cy": "comment-editor", ref: ref, defaultValue: comment.node.attrs.contents }),
61
- React.createElement(EditorActions, { "data-cy": "comment-actions" },
60
+ React.createElement(CommentEditor, { ref: ref, defaultValue: comment.node.attrs.contents }),
61
+ React.createElement(EditorActions, null,
62
62
  React.createElement(SecondaryButton, { onClick: onCancel }, "Cancel"),
63
63
  React.createElement(PrimaryButton, { onClick: handleSave }, "Save")))) : (React.createElement(React.Fragment, null,
64
64
  React.createElement(CommentContent, { onClick: onSelect },
65
- React.createElement(CommentViewer, { "data-cy": "comment-text" }, comment.node.attrs.contents))))));
65
+ React.createElement(CommentViewer, null, comment.node.attrs.contents))))));
66
66
  };
67
67
  //# sourceMappingURL=CommentBody.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"CommentBody.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentBody.tsx"],"names":[],"mappings":"AAYA,OAAO,EACL,WAAW,EACX,aAAa,EACb,eAAe,GAChB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAClD,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAA;;CAEhC,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAA;;iBAEpB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;WAC7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;CAoB/C,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;iBAGf,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;WAG7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;CAC/C,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,CAAA;;;;CAIxC,CAAA;AAUD,MAAM,CAAC,MAAM,WAAW,GAA+B,CAAC,EACtD,OAAO,EACP,SAAS,EACT,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,MAAM,CAA6B,IAAI,CAAC,CAAA;IAEvD,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SAC7B;IACH,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAA6B,EAAE,EAAE;QACxD,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE;YAC7B,CAAC,CAAC,KAAK,EAAE,CAAA;SACV;QACD,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;IACpB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,0CACG,SAAS,CAAC,CAAC,CAAC,CACX;QACE,oBAAC,aAAa,eACJ,gBAAgB,EACxB,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAC1B;QACjB,oBAAC,aAAa,eAAS,iBAAiB;YACtC,oBAAC,eAAe,IAAC,OAAO,EAAE,QAAQ,aAA0B;YAC5D,oBAAC,aAAa,IAAC,OAAO,EAAE,UAAU,WAAsB,CAC1C,CACf,CACJ,CAAC,CAAC,CAAC,CACF;QACE,oBAAC,cAAc,IAAC,OAAO,EAAE,QAAQ;YAC/B,oBAAC,aAAa,eAAS,cAAc,IAClC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CACd,CACD,CAChB,CACJ,CACA,CACJ,CAAA;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"CommentBody.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentBody.tsx"],"names":[],"mappings":"AAYA,OAAO,EACL,WAAW,EACX,aAAa,EACb,eAAe,GAChB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAClD,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAA;;CAEhC,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAA;;iBAEpB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;WAC7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;CAoB/C,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;iBAGf,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;WAG7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;CAC/C,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,CAAA;;;;CAIxC,CAAA;AAUD,MAAM,CAAC,MAAM,WAAW,GAA+B,CAAC,EACtD,OAAO,EACP,SAAS,EACT,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,MAAM,CAA6B,IAAI,CAAC,CAAA;IAEvD,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SAC7B;IACH,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAA6B,EAAE,EAAE;QACxD,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE;YAC7B,CAAC,CAAC,KAAK,EAAE,CAAA;SACV;QACD,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;IACpB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,0CACG,SAAS,CAAC,CAAC,CAAC,CACX;QACE,oBAAC,aAAa,IACZ,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAC1B;QACjB,oBAAC,aAAa;YACZ,oBAAC,eAAe,IAAC,OAAO,EAAE,QAAQ,aAA0B;YAC5D,oBAAC,aAAa,IAAC,OAAO,EAAE,UAAU,WAAsB,CAC1C,CACf,CACJ,CAAC,CAAC,CAAC,CACF;QACE,oBAAC,cAAc,IAAC,OAAO,EAAE,QAAQ;YAC/B,oBAAC,aAAa,QAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAiB,CAC7C,CAChB,CACJ,CACA,CACJ,CAAA;AACH,CAAC,CAAA"}
@@ -1,4 +1,4 @@
1
- import { AvatarIcon, RelativeDate, usePermissions, } from '@manuscripts/style-guide';
1
+ import { AvatarIcon, RelativeDate, SystemUserAvatarIcon, usePermissions, } from '@manuscripts/style-guide';
2
2
  import React, { forwardRef, useState } from 'react';
3
3
  import styled from 'styled-components';
4
4
  import { buildAuthorName, getAuthorID } from '../../lib/comments';
@@ -22,12 +22,17 @@ const CommentMetadata = styled.div `
22
22
  padding-right: 8px;
23
23
  `;
24
24
  const CommentAuthor = styled.div `
25
+ display: flex;
25
26
  color: #353535;
26
27
  font-weight: 400;
27
28
  max-width: 200px;
28
29
  white-space: nowrap;
29
30
  overflow: hidden;
30
31
  text-overflow: ellipsis;
32
+
33
+ svg {
34
+ padding-right: 10px;
35
+ }
31
36
  `;
32
37
  const CommentTarget = styled.div `
33
38
  font-size: 14px;
@@ -82,9 +87,12 @@ export const CommentThread = forwardRef((props, ref) => {
82
87
  };
83
88
  return (React.createElement(Container, { "data-cy": "comment", isSelected: isSelected, ref: ref },
84
89
  React.createElement(CommentHeader, { "data-cy": "comment-header" },
85
- authorName && React.createElement(AvatarIcon, { width: 20, height: 20 }),
86
90
  React.createElement(CommentMetadata, null,
87
- React.createElement(CommentAuthor, null, authorName),
91
+ React.createElement(CommentAuthor, null, authorName ? (React.createElement(React.Fragment, null,
92
+ React.createElement(AvatarIcon, { width: 20, height: 20 }),
93
+ React.createElement(CommentAuthor, null, authorName))) : (React.createElement(React.Fragment, null,
94
+ React.createElement(SystemUserAvatarIcon, { width: 20, height: 20 }),
95
+ React.createElement(CommentAuthor, null, "System")))),
88
96
  timestamp && React.createElement(Timestamp, { date: timestamp * 1000 })),
89
97
  React.createElement(CommentActions, { comment: tree.comment, isResolveEnabled: isResolveEnabled, isActionsEnabled: isActionsEnabled, onDelete: () => onDelete(tree.comment.node.attrs.id), onEdit: handleEdit, toggleResolve: handleToggleResolve })),
90
98
  tree.comment.node.attrs.originalText && (React.createElement(CommentTarget, null, tree.comment.node.attrs.originalText)),
@@ -1 +1 @@
1
- {"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":"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"}
@@ -20,8 +20,6 @@ class QuarterbackStepsExchanger extends CollabProvider {
20
20
  return QuarterbackStepsExchanger._instance;
21
21
  }
22
22
  super();
23
- this.reconcileAttempts = 0;
24
- this.reconcileAttemptsMax = 20;
25
23
  QuarterbackStepsExchanger._instance = this;
26
24
  this.applySteps = applySteps;
27
25
  this.docId = docId;
@@ -38,7 +36,7 @@ class QuarterbackStepsExchanger extends CollabProvider {
38
36
  }
39
37
  const steps = this.hydrateSteps(jsonSteps);
40
38
  if (steps.length) {
41
- this.newStepsListener();
39
+ this.newStepsListener(version, steps, clientIDs);
42
40
  }
43
41
  });
44
42
  }
@@ -55,26 +53,13 @@ class QuarterbackStepsExchanger extends CollabProvider {
55
53
  stepsJSON.push(step.toJSON());
56
54
  });
57
55
  this.currentVersion = version;
58
- this.flushImmediate = this.debounce(async () => {
59
- const result = await this.applySteps(this.projectId, this.docId, {
56
+ this.flushImmediate = this.debounce(() => {
57
+ this.applySteps(this.projectId, this.docId, {
60
58
  steps: stepsJSON,
61
59
  version,
62
60
  clientID,
63
61
  });
64
- if (result &&
65
- 'err' in result &&
66
- 'code' in result &&
67
- result.code === 409 &&
68
- this.reconcileAttempts < this.reconcileAttemptsMax) {
69
- // debugger
70
- console.warn('Attempting Reconciliation');
71
- this.newStepsListener();
72
- this.reconcileAttempts++;
73
- }
74
- else {
75
- this.reconcileAttempts = 0;
76
- }
77
- }, 1200, flush, () => {
62
+ }, 1000, flush, () => {
78
63
  this.throttlingControl(false);
79
64
  });
80
65
  if (!flush) {
@@ -105,7 +90,12 @@ export const stepsExchanger = (docId, projectId, lastVersion, authToken, throttl
105
90
  if (!isAuthed) {
106
91
  return;
107
92
  }
108
- const applySteps = async (projectId, docId, payload) => docApi.applySteps(projectId, docId, authToken, payload);
93
+ const applySteps = async (projectId, docId, payload) => {
94
+ const resp = await docApi.applySteps(projectId, docId, authToken, payload);
95
+ if ('data' in resp) {
96
+ return resp.data;
97
+ }
98
+ };
109
99
  const getStepsSince = async (projectId, docId, version) => {
110
100
  const resp = await docApi.stepsSince(projectId, docId, version, authToken);
111
101
  if ('data' in resp) {
@@ -1 +1 @@
1
- {"version":3,"file":"QuarterbackStepsExchanger.js","sourceRoot":"","sources":["../../../src/quarterback/QuarterbackStepsExchanger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QuarterbackStepsExchanger.js","sourceRoot":"","sources":["../../../src/quarterback/QuarterbackStepsExchanger.ts"],"names":[],"mappings":"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"}
@@ -9,7 +9,7 @@
9
9
  *
10
10
  * All portions of the code written by Atypon Systems LLC are Copyright (c) 2019 Atypon Systems LLC. All Rights Reserved.
11
11
  */
12
- import React, { createContext, useContext } from 'react';
12
+ import React, { createContext, useContext, useEffect } from 'react';
13
13
  import { GenericStore } from '.';
14
14
  const GenericStoreContext = createContext(new GenericStore());
15
15
  export const createStore = async (sources) => {
@@ -18,6 +18,9 @@ export const createStore = async (sources) => {
18
18
  return store;
19
19
  };
20
20
  export const GenericStoreProvider = ({ children, store }) => {
21
+ useEffect(() => {
22
+ return () => store.unmount();
23
+ }, [store]);
21
24
  if (store) {
22
25
  return (React.createElement(GenericStoreContext.Provider, { value: store }, store.state?.project ? children : React.createElement("p", null, "Project was not found")));
23
26
  }
@@ -1 +1 @@
1
- {"version":3,"file":"StoreContext.js","sourceRoot":"","sources":["../../../src/store/StoreContext.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAExD,OAAO,EAAE,YAAY,EAA2B,MAAM,GAAG,CAAA;AAEzD,MAAM,mBAAmB,GAAG,aAAa,CAAe,IAAI,YAAY,EAAE,CAAC,CAAA;AAE3E,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,OAAkC,EAAE,EAAE;IACtE,MAAM,KAAK,GAAG,IAAI,YAAY,EAAE,CAAA;IAChC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACzB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAOD,MAAM,CAAC,MAAM,oBAAoB,GAAoB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;IAC3E,IAAI,KAAK,EAAE;QACT,OAAO,CACL,oBAAC,mBAAmB,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,IACvC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,uDAA4B,CAClC,CAChC,CAAA;KACF;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAA"}
1
+ {"version":3,"file":"StoreContext.js","sourceRoot":"","sources":["../../../src/store/StoreContext.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEnE,OAAO,EAAE,YAAY,EAA2B,MAAM,GAAG,CAAA;AAEzD,MAAM,mBAAmB,GAAG,aAAa,CAAe,IAAI,YAAY,EAAE,CAAC,CAAA;AAE3E,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,OAAkC,EAAE,EAAE;IACtE,MAAM,KAAK,GAAG,IAAI,YAAY,EAAE,CAAA;IAChC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACzB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAOD,MAAM,CAAC,MAAM,oBAAoB,GAAoB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;IAC3E,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAA;IAC9B,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAEX,IAAI,KAAK,EAAE;QACT,OAAO,CACL,oBAAC,mBAAmB,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,IACvC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,uDAA4B,CAClC,CAChC,CAAA;KACF;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAA"}
@@ -18,9 +18,4 @@ export const useStore = (selector) => {
18
18
  const state = useSyncExternalStoreWithSelector(store.subscribe, () => store.getState(), undefined, init, deeperEqual);
19
19
  return [state, store.dispatchAction, store.getState, store.subscribe];
20
20
  };
21
- // Allows to get store's state on demand rather than subscribing to it
22
- export const useGetState = () => {
23
- const store = useGenericStore();
24
- return store.getState;
25
- };
26
21
  //# sourceMappingURL=useStore.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useStore.js","sourceRoot":"","sources":["../../../src/store/useStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAA;AAExF,OAAO,WAAW,MAAM,qBAAqB,CAAA;AAE7C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAIhD,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,QAAsB,EACiC,EAAE;IACzD,MAAM,KAAK,GAAG,eAAe,EAAE,CAAA;IAC/B,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAA;IACxE,MAAM,KAAK,GAAG,gCAAgC,CAC5C,KAAK,CAAC,SAAS,EACf,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,EACtB,SAAS,EACT,IAAI,EACJ,WAAW,CACZ,CAAA;IAED,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;AACvE,CAAC,CAAA;AAED,sEAAsE;AACtE,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,MAAM,KAAK,GAAG,eAAe,EAAE,CAAA;IAC/B,OAAO,KAAK,CAAC,QAAQ,CAAA;AACvB,CAAC,CAAA"}
1
+ {"version":3,"file":"useStore.js","sourceRoot":"","sources":["../../../src/store/useStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAA;AAExF,OAAO,WAAW,MAAM,qBAAqB,CAAA;AAE7C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAIhD,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,QAAsB,EACiC,EAAE;IACzD,MAAM,KAAK,GAAG,eAAe,EAAE,CAAA;IAC/B,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAA;IACxE,MAAM,KAAK,GAAG,gCAAgC,CAC5C,KAAK,CAAC,SAAS,EACf,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,EACtB,SAAS,EACT,IAAI,EACJ,WAAW,CACZ,CAAA;IAED,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;AACvE,CAAC,CAAA"}
@@ -26,8 +26,6 @@ declare class QuarterbackStepsExchanger extends CollabProvider {
26
26
  throttlingControl: ThrottlingControl;
27
27
  debounce: ReturnType<typeof saveWithDebounce>;
28
28
  throttleState: boolean;
29
- reconcileAttempts: number;
30
- reconcileAttemptsMax: number;
31
29
  constructor(docId: string, projectId: string, startingVersion: number, applySteps: QuarterbackStepsExchanger['applySteps'], getStepsSince: QuarterbackStepsExchanger['getStepsSince'], listenToSteps: (projectId: string, docId: string, listener: (version: number, steps: unknown[], clientIDs: number[]) => void) => void, authToken: string, throttlingControl: ThrottlingControl);
32
30
  destroy(): void;
33
31
  hydrateSteps(jsonSteps: unknown[]): Step[];
@@ -10,11 +10,46 @@
10
10
  * All portions of the code written by Atypon Systems LLC are Copyright (c) 2022 Atypon Systems LLC. All Rights Reserved.
11
11
  */
12
12
  import { AppliedStepsResponse, ICreateDocRequest, IUpdateDocumentRequest, ManuscriptDocWithSnapshots, StepsPayload, StepsSinceResponse, TransformerVersion } from '../types';
13
- export declare const getDocument: (projectID: string, manuscriptID: string, authToken: string) => Promise<import("./methods").Maybe<ManuscriptDocWithSnapshots>>;
14
- export declare const createDocument: (payload: ICreateDocRequest, authToken: string) => Promise<import("./methods").Maybe<ManuscriptDocWithSnapshots>>;
15
- export declare const getTransformVersion: (authToken: string) => Promise<import("./methods").Maybe<TransformerVersion>>;
16
- export declare const updateDocument: (projectID: string, manuscriptID: string, authToken: string, payload: IUpdateDocumentRequest) => Promise<import("./methods").Maybe<boolean>>;
17
- export declare const deleteDocument: (projectID: string, manuscriptID: string, authToken: string) => Promise<import("./methods").Maybe<boolean>>;
18
- export declare const applySteps: (projectId: string, docId: string, authToken: string, payload: StepsPayload) => Promise<import("./methods").Maybe<AppliedStepsResponse>>;
19
- export declare const stepsSince: (projectId: string, docId: string, version: number, authToken: string) => Promise<import("./methods").Maybe<StepsSinceResponse>>;
13
+ export declare const getDocument: (projectID: string, manuscriptID: string, authToken: string) => Promise<{
14
+ err: string;
15
+ code: number;
16
+ } | {
17
+ data: ManuscriptDocWithSnapshots;
18
+ }>;
19
+ export declare const createDocument: (payload: ICreateDocRequest, authToken: string) => Promise<{
20
+ err: string;
21
+ code: number;
22
+ } | {
23
+ data: ManuscriptDocWithSnapshots;
24
+ }>;
25
+ export declare const getTransformVersion: (authToken: string) => Promise<{
26
+ err: string;
27
+ code: number;
28
+ } | {
29
+ data: TransformerVersion;
30
+ }>;
31
+ export declare const updateDocument: (projectID: string, manuscriptID: string, authToken: string, payload: IUpdateDocumentRequest) => Promise<{
32
+ err: string;
33
+ code: number;
34
+ } | {
35
+ data: boolean;
36
+ }>;
37
+ export declare const deleteDocument: (projectID: string, manuscriptID: string, authToken: string) => Promise<{
38
+ err: string;
39
+ code: number;
40
+ } | {
41
+ data: boolean;
42
+ }>;
43
+ export declare const applySteps: (projectId: string, docId: string, authToken: string, payload: StepsPayload) => Promise<{
44
+ err: string;
45
+ code: number;
46
+ } | {
47
+ data: AppliedStepsResponse;
48
+ }>;
49
+ export declare const stepsSince: (projectId: string, docId: string, version: number, authToken: string) => Promise<{
50
+ err: string;
51
+ code: number;
52
+ } | {
53
+ data: StepsSinceResponse;
54
+ }>;
20
55
  export declare const listenStepUpdates: (projectID: string, manuscriptID: string, dataListener: (version: number, steps: unknown[], clientIDs: number[]) => void) => void;
@@ -16,7 +16,7 @@ type Error = {
16
16
  err: string;
17
17
  code: number;
18
18
  };
19
- export type Maybe<T> = Ok<T> | Error;
19
+ type Maybe<T> = Ok<T> | Error;
20
20
  type FetchOptions = {
21
21
  method: string;
22
22
  headers: Record<string, string>;
@@ -12,5 +12,4 @@
12
12
  import { dispatch, GenericStore, state } from './Store';
13
13
  type Selector<T> = (r: state) => state | T;
14
14
  export declare const useStore: <T>(selector?: Selector<T> | undefined) => [T, dispatch, () => state, (fn: (state: state, prev: state) => void) => () => void];
15
- export declare const useGetState: () => () => state;
16
15
  export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@manuscripts/article-editor",
3
- "version": "3.1.9-LEAN-3713",
3
+ "version": "3.1.9-LEAN-3858",
4
4
  "license": "CPAL-1.0",
5
5
  "description": "React components for editing and viewing manuscripts",
6
6
  "repository": "github:Atypon-OpenSource/manuscripts-article-editor",
@@ -35,10 +35,10 @@
35
35
  "@fontsource/lato": "^4.5.10",
36
36
  "@fontsource/pt-sans": "^4.5.11",
37
37
  "@fontsource/pt-serif": "^4.5.11",
38
- "@manuscripts/body-editor": "2.0.15-LEAN-3713.0",
38
+ "@manuscripts/body-editor": "2.0.15-LEAN-3858",
39
39
  "@manuscripts/json-schema": "2.2.10",
40
40
  "@manuscripts/library": "1.3.10",
41
- "@manuscripts/style-guide": "2.0.3",
41
+ "@manuscripts/style-guide": "2.0.3-LEAN-3858",
42
42
  "@manuscripts/track-changes-plugin": "1.7.17",
43
43
  "@manuscripts/transform": "2.3.22",
44
44
  "prosemirror-utils": "^0.9.6",
@@ -108,4 +108,4 @@
108
108
  "resolutions": {
109
109
  "@types/react": "^18.3.1"
110
110
  }
111
- }
111
+ }