For picked posts and comments to them, fetch body source from the ori…

…ginal node.
MoeraOrg · Apr 1, 2021 · 7239b21 · 7239b21
1 parent 69bb600
commit 7239b21
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/src/state/detailedposting/selectors.js b/src/state/detailedposting/selectors.js
@@ -39,6 +39,10 @@ export function getCommentsState(state) {
     return state.detailedPosting.comments;
 }
 
+export function getCommentsReceiverName(state) {
+    return getCommentsState(state).receiverName;
+}
+
 export function getCommentsReceiverPostingId(state) {
     return getCommentsState(state).receiverPostingId;
 }

diff --git a/src/state/sourcedialog/actions.js b/src/state/sourcedialog/actions.js
@@ -1,7 +1,7 @@
 export const OPEN_SOURCE_DIALOG = "OPEN_SOURCE_DIALOG";
-export const openSourceDialog = (postingId, commentId) => ({
+export const openSourceDialog = (nodeName, postingId, commentId) => ({
     type: OPEN_SOURCE_DIALOG,
-    payload: {postingId, commentId}
+    payload: {nodeName, postingId, commentId}
 });
 
 export const CLOSE_SOURCE_DIALOG = "CLOSE_SOURCE_DIALOG";

diff --git a/src/state/sourcedialog/sagas.js b/src/state/sourcedialog/sagas.js
@@ -10,16 +10,16 @@ export default [
 ];
 
 function* openSourceDialogSaga(action) {
-    const {postingId, commentId} = action.payload;
+    const {nodeName, postingId, commentId} = action.payload;
 
     try {
         let entry;
         if (commentId == null) {
-            entry = yield call(Node.getPosting, "", postingId, true);
+            entry = yield call(Node.getPosting, nodeName, postingId, true);
         } else {
-            entry = yield call(Node.getComment, "", postingId, commentId, true);
+            entry = yield call(Node.getComment, nodeName, postingId, commentId, true);
         }
-        yield put(sourceDialogLoaded(entry.bodySrc.text));
+        yield put(sourceDialogLoaded(entry.bodySrc ? entry.bodySrc.text : ""));
     } catch (e) {
         yield put(sourceDialogLoadFailed());
         yield put(errorThrown(e));

diff --git a/src/ui/comment/CommentMenu.js b/src/ui/comment/CommentMenu.js
@@ -6,6 +6,7 @@ import { commentCopyLink, commentDelete, openCommentDialog } from "state/detaile
 import { openSourceDialog } from "state/sourcedialog/actions";
 import { confirmBox } from "state/confirmbox/actions";
 import { getNodeRootLocation } from "state/node/selectors";
+import { getCommentsReceiverName, getCommentsReceiverPostingId } from "state/detailedposting/selectors";
 
 class CommentMenu extends React.PureComponent {
 
@@ -29,9 +30,9 @@ class CommentMenu extends React.PureComponent {
     };
 
     onViewSource = () => {
-        const {postingId, comment, openSourceDialog} = this.props;
+        const {receiverName, receiverPostingId, comment, openSourceDialog} = this.props;
 
-        openSourceDialog(postingId, comment.id);
+        openSourceDialog(receiverName, receiverPostingId, comment.id);
     };
 
     render() {
@@ -75,6 +76,8 @@ class CommentMenu extends React.PureComponent {
 export default connect(
     state => ({
         rootLocation: getNodeRootLocation(state),
+        receiverName: getCommentsReceiverName(state),
+        receiverPostingId: getCommentsReceiverPostingId(state)
     }),
     { commentCopyLink, openCommentDialog, openSourceDialog, confirmBox }
 )(CommentMenu);
diff --git a/src/ui/posting/PostingMenu.js b/src/ui/posting/PostingMenu.js
@@ -72,7 +72,11 @@ class PostingMenu extends React.PureComponent {
     onViewSource = () => {
         const {posting, openSourceDialog} = this.props;
 
-        openSourceDialog(posting.id);
+        if (posting.receiverName == null) {
+            openSourceDialog("", posting.id);
+        } else {
+            openSourceDialog(posting.receiverName, posting.receiverPostingId);
+        }
     };
 
     render() {