fix(api): Implement and use Accept FULL for comments (#405)

gitpoint · Oct 1, 2017 · fede55a · fede55a
1 parent 101eb54
commit fede55a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 8 deletions.
diff --git a/src/api/index.js b/src/api/index.js
@@ -11,6 +11,7 @@ const ACCEPT = {
   HTML: 'application/vnd.github.v3.html+json',
   DIFF: 'application/vnd.github.v3.diff+json',
   RAW: 'application/vnd.github.v3.raw+json',
+  FULL: 'application/vnd.github.v3.full+json',
 };
 
 const METHOD = {
@@ -107,6 +108,14 @@ export const v3 = {
 
     return response.text();
   },
+  getFull: async (url, accessToken) => {
+    const response = await v3.call(
+      url,
+      v3.parameters(accessToken, METHOD.GET, ACCEPT.FULL)
+    );
+
+    return response.json();
+  },
   getJson: async (url, accessToken) => {
     const response = await v3.call(url, v3.parameters(accessToken));
 
@@ -136,6 +145,14 @@ export const v3 = {
 
     return response;
   },
+  patchFull: async (url, accessToken, body = {}) => {
+    const response = await v3.call(
+      url,
+      v3.parameters(accessToken, METHOD.PATCH, ACCEPT.FULL, body)
+    );
+
+    return response.json();
+  },
   postJson: async (url, accessToken, body = {}) => {
     const response = await v3.call(
       url,
@@ -152,6 +169,14 @@ export const v3 = {
 
     return response.text();
   },
+  postFull: async (url, accessToken, body = {}) => {
+    const response = await v3.call(
+      url,
+      v3.parameters(accessToken, METHOD.POST, ACCEPT.FULL, body)
+    );
+
+    return response.json();
+  },
   post: async (url, accessToken, body = {}) => {
     const response = await v3.call(
       url,
@@ -200,7 +225,7 @@ export const fetchPostIssueComment = (
   issueNum,
   accessToken
 ) =>
-  v3.postHtml(
+  v3.postFull(
     `/repos/${owner}/${repoName}/issues/${issueNum}/comments`,
     accessToken,
     { body }
@@ -224,7 +249,7 @@ export const fetchEditIssueComment = (
   editParams: any,
   accessToken: string
 ) =>
-  v3.patch(
+  v3.patchFull(
     `/repos/${owner}/${repoName}/issues/comments/${issueCommentId}`,
     accessToken,
     editParams

diff --git a/src/issue/issue.action.js b/src/issue/issue.action.js
@@ -84,7 +84,7 @@ export const getIssueComments = issueCommentsURL => {
     dispatch({ type: GET_ISSUE_COMMENTS.PENDING });
 
     return v3
-      .getHtml(`${issueCommentsURL}?per_page=100`, accessToken)
+      .getFull(`${issueCommentsURL}?per_page=100`, accessToken)
       .then(data => {
         dispatch({
           type: GET_ISSUE_COMMENTS.SUCCESS,
@@ -110,7 +110,7 @@ export const postIssueComment = (body, owner, repoName, issueNum) => {
       .then(data => {
         dispatch({
           type: POST_ISSUE_COMMENT.SUCCESS,
-          payload: JSON.parse(data),
+          payload: data,
         });
       })
       .catch(error => {
@@ -157,10 +157,10 @@ export const editIssueComment = (issueCommentId, owner, repoName, body) => {
       { body },
       accessToken
     )
-      .then(() => {
+      .then(data => {
         dispatch({
           type: EDIT_ISSUE_COMMENT.SUCCESS,
-          payload: { id: issueCommentId, body },
+          payload: data,
         });
       })
       .catch(error => {

diff --git a/src/issue/issue.reducer.js b/src/issue/issue.reducer.js
@@ -41,7 +41,7 @@ export const issueReducer = (state = initialState, action = {}) => {
     case GET_ISSUE_COMMENTS.SUCCESS:
       return {
         ...state,
-        comments: JSON.parse(action.payload),
+        comments: action.payload,
         isPendingComments: false,
       };
     case GET_ISSUE_COMMENTS.ERROR:
@@ -97,7 +97,11 @@ export const issueReducer = (state = initialState, action = {}) => {
         comments: state.comments.map(
           comment =>
             comment.id === action.payload.id
-              ? { ...comment, body: action.payload.body }
+              ? {
+                  ...comment,
+                  body: action.payload.body,
+                  body_html: action.payload.body_html,
+                }
               : comment
         ),
         isEditingComment: false,