fix(mr): add comment.

cangzhang · cangzhang · commit afed00cba758 · 2020-12-11T19:23:21.000+08:00
diff --git a/src/codingServer.ts b/src/codingServer.ts
@@ -16,6 +16,7 @@ import {
   IBranchListResp,
   IMemberListResp,
   IMRContentResp,
+  ICreateCommentResp,
 } from 'src/typings/respResult';
 import { PromiseAdapter, promiseFromEvent, parseQuery, parseCloneUrl } from 'src/common/utils';
 import { GitService } from 'src/common/gitService';
@@ -511,7 +512,7 @@ export class CodingServer {
   public async commentMR(mrId: number, comment: string) {
     try {
       const { repoApiPrefix } = await this.getApiPrefix();
-      const result: CodingResponse = await got
+      const result: ICreateCommentResp = await got
         .post(`${repoApiPrefix}/line_notes`, {
           searchParams: {
             access_token: this._session?.accessToken,
diff --git a/src/panel.ts b/src/panel.ts
@@ -116,7 +116,7 @@ export class Panel {
               break;
             case 'mr.add.comment':
               const commentRes = await this._codingSrv.commentMR(args.id, args.comment);
-              this.replyMessage(message, commentRes.data);
+              this.broadcast(command, commentRes.data);
               break;
             case 'mr.get.activities':
               const getActivitiesRes = await this._codingSrv.getMRActivities(args);
diff --git a/src/typings/respResult.ts b/src/typings/respResult.ts
@@ -238,3 +238,7 @@ export interface IMRContent {
 export interface IMRContentResp extends CodingResponse {
   data: IMRContent;
 }
+
+export interface ICreateCommentResp extends CodingResponse {
+  data: IComment;
+}
diff --git a/webviews/App.tsx b/webviews/App.tsx
@@ -144,7 +144,7 @@ function App() {
               onChange={onChangeDesc}
             />
           )}
-          <h3>Activities</h3>
+          <SectionTitle>Activities</SectionTitle>
           <Activities />
         </Body>
         <Sidebar>
diff --git a/webviews/components/Activities.tsx b/webviews/components/Activities.tsx
@@ -12,7 +12,7 @@ function Activities() {
 
   const renderActivity = (activity: [IActivity]) => {
     return (
-      <div key={activity[0].id}>
+      <div key={activity[0]?.id}>
         <Activity
           activity={activity[0]}
           srcBranch={currentMR.data.merge_request.srcBranch}
@@ -31,16 +31,16 @@ function Activities() {
   };
 
   const allActivities = [...activities.map((i) => [i]), ...comments].sort(
-    (a, b) => a[0].created_at - b[0].created_at,
+    (a, b) => a[0]?.created_at - b[0]?.created_at,
   );
 
   return (
     <div>
       <div>
         {allActivities.map((activity: any) => {
-          if (activity[0].action) {
+          if (activity[0]?.action) {
             return renderActivity(activity as [IActivity]);
-          } else if (!activity[0].action) {
+          } else if (!activity[0]?.action) {
             return renderComment(activity as [IComment]);
           }
           return null;
diff --git a/webviews/components/Comment.tsx b/webviews/components/Comment.tsx
@@ -40,7 +40,7 @@ const ChildCommentContent = styled.div`
 
 function Comment({ comment }: IProps) {
   const renderChildComments = () => {
-    return comment.childComments?.map((c) => {
+    return comment?.childComments?.map((c) => {
       return (
         <ChildComment key={c.id}>
           <AuthorLink for={c.author} />
@@ -55,14 +55,14 @@ function Comment({ comment }: IProps) {
   return (
     <Root>
       <Header>
-        <Avatar for={comment.author} />{' '}
+        <Avatar for={comment?.author} />{' '}
         <AuthorLinkWrap>
-          <AuthorLink for={comment.author} />
+          <AuthorLink for={comment?.author} />
         </AuthorLinkWrap>
-        <Time>commented at {getTime(comment.created_at)}</Time>
+        <Time>commented at {getTime(comment?.created_at)}</Time>
       </Header>
       <Body>
-        <div dangerouslySetInnerHTML={{ __html: comment.content }} />
+        <div dangerouslySetInnerHTML={{ __html: comment?.content }} />
         {renderChildComments()}
       </Body>
     </Root>
diff --git a/webviews/components/User.tsx b/webviews/components/User.tsx
@@ -12,12 +12,12 @@ const AvatarImg = styled.img`
   border-radius: 50%;
 `;
 
-export const Avatar = ({ for: author }: { for: Partial<IMRDetailMR['author']> }) => (
-  <Link href={author.avatar}>
-    <AvatarImg src={author.avatar} alt='' />
+export const Avatar = ({ for: author = {} }: { for: Partial<IMRDetailMR['author']> }) => (
+  <Link href={author?.avatar}>
+    <AvatarImg src={author?.avatar} alt='' />
   </Link>
 );
 
 export const AuthorLink = ({ for: author }: { for: IMRDetailMR['author'] }) => (
-  <a href={author.path}>{author.name}</a>
+  <a href={author?.path}>{author?.name}</a>
 );
diff --git a/webviews/hooks/messageTransferHook.tsx b/webviews/hooks/messageTransferHook.tsx
@@ -44,6 +44,8 @@ export default function messageTransferHook() {
           toggleUpdatingDesc();
           break;
         }
+        case actions.MR_ADD_COMMENT: {
+        }
         default:
           break;
       }
diff --git a/webviews/store/appStore.ts b/webviews/store/appStore.ts
@@ -131,6 +131,9 @@ const appStore = store({
     appStore.currentMR.data.merge_request.body = resp.body;
     appStore.currentMR.data.merge_request.body_plan = resp.body_plan;
   },
+  addComment(comment: IComment) {
+    appStore.comments.push(comment);
+  },
 });
 
 export const persistData = () =>

Original file line number	Diff line number	Diff line change
`@@ -238,3 +238,7 @@ export interface IMRContent {`
`238`	`238`	`export interface IMRContentResp extends CodingResponse {`
`239`	`239`	`data: IMRContent;`
`240`	`240`	`}`
	`241`	`+`
	`242`	`+export interface ICreateCommentResp extends CodingResponse {`
	`243`	`+ data: IComment;`
	`244`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ export default function messageTransferHook() {`
`44`	`44`	`toggleUpdatingDesc();`
`45`	`45`	`break;`
`46`	`46`	`}`
	`47`	`+ case actions.MR_ADD_COMMENT: {`
	`48`	`+ }`
`47`	`49`	`default:`
`48`	`50`	`break;`
`49`	`51`	`}`