From cd4b1adebbb009caba47b7dc4f543c4d951841f2 Mon Sep 17 00:00:00 2001
From: Sascha <GlancingMind@outlook.com>
Date: Wed, 17 Mar 2021 12:28:45 +0100
Subject: [PATCH] Pass BugFragment as prop to EditComment

---
 webui/src/pages/bug/.Bug.tsx.swp           | Bin 0 -> 12288 bytes
 webui/src/pages/bug/.TimelineQuery.tsx.swp | Bin 0 -> 12288 bytes
 webui/src/pages/bug/Bug.tsx                |   2 +-
 webui/src/pages/bug/Message.tsx            |  13 ++++++++++++-
 webui/src/pages/bug/Timeline.tsx           |   8 +++++---
 webui/src/pages/bug/TimelineQuery.tsx      |   9 +++++----
 6 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 webui/src/pages/bug/.Bug.tsx.swp
 create mode 100644 webui/src/pages/bug/.TimelineQuery.tsx.swp

diff --git a/webui/src/pages/bug/.Bug.tsx.swp b/webui/src/pages/bug/.Bug.tsx.swp
new file mode 100644
index 0000000000000000000000000000000000000000..4a312e0daab61c565eabd8c7b582a50e81add559
GIT binary patch
literal 12288
zcmeI2&x;#n7{}j=sIAsY6+MXXZiP*<+L`RONXbqXZA)Qg`@6OWMV(~cOr|?C?=bUD
zHz7p5i3ckPDqiZv_GCR-5kx4I1-*!15j}WOD<b#@C|LZyGm~T{n{0bje8YZ{%*^vX
z@AH12d7f;@+o+yiK1}y%3j~h`2)Xp@@t0rw@FDWe3?Y#jHQT1Vu=zu@9e*`2t<9|n
zc_nqIukmm-3d|<c;h%F?XKT$U(u0tnWvjvr8_W^9?TFot*w)urBX;yCZ0dn&vq+cc
z_Q$p+qRy@6Q`eOON`Xv)ShRNU+fMc@%va@^$9K)p2X{WF<WUMJ1(X6x0i}RaKq;UU
zPzopo{znRkU<-K_>%Ajevzxtc8GFqR)r(R<DWDWk3Md7X0!jg;fKosypcGIFC<T-P
z|3L-hulDcUNr-tDg2(UwgYW-0b`bIlxC}l5HYkIe_Y?9r_!?XU9k2!>@Dg|)RKYCR
z32tsD<VUa$u7Xd%o8T;9;52v!JO=){kC5-dw_qK72Hpb#nBWC)6lmZPuoDpQ+r5PR
z46cJOz-4d&ybsO;4=jTk*aaR14}-1X_icpS0N24)@HzMtTmhHB+u$v59&m6B90dmf
z1%GZO<U8;c_!3+I5jYH<0yE%`dkDD(J_a9v*Fgsy0Xx7?cVn%f0~~M=Yy&?aC+pw}
zxCq__Z-74NfO8-QGIuWm^-u~Z1(X8+9tBt@z#k6<wOGrHT|u#RYY`ocP+D2U6Qzdk
znU24dyq8Cob8c|3;ZUB4-O*(^zEY9S@()9IouZArYOI(I=2BNa*L!ZCuCgv(HQ)4D
zpX%cS4A-Ge*NmbgxL)riZ&{=z!;52!BYW7NmRd!cX9nf6TcPzOS|<4jH-?PuaQ>wE
ze4d2eUpm5lM!QTHx-^|Wr^|d>v}wIwr&T&TTbS60-AQvKYg%z4(a*azriBza7HgQ{
zDMz@hzm$X*jYnl5i<73x#^xp(OSsJNa%+X#HnWz;mbp>2;>|Kp*f_vFkNM&d4?T)>
z)MZX4rFcq^&C&2&pwfG<ydjy!<Y<jkj>lZbXUAg}b|*(MO(c;G9Zo*Yu*rRa+F>Cq
zNxJ$mISrIslBj7~Omp34rj_`WZVg$XlhP^ACsBq>#G#Ly4PhXvNTk**qIDWa?4;<r
zEGnboTe0614)<jrDEFi;v|ppgLLNjF+CyWIO#x?X(%?{N+A@)gM05j|TEU?-t0di{
z|0Jv_^~}(A{1w&`HM)17JeNyh4fd2~mYSxCHuIPUhujX$pxxCP-0CjKL0PR824v$X
zwVWt$&2EjB8ZK|HmeQF^vvi5hmC_-DK=yMXxL2d;Omd^E<J;x=N<P?AJeX{d6k{QT
zbagdaO~+%Otp$I>V;6;+=!?*NG>Ig#VM!M}wQ#?jVUFE~PNfESt;9B8&qZ^WbzoRU
zBUz|cgHE>QG@c0ySV&fwxhr_`9RG}Ci8j(x&6bgRIgtiaR4Vl|P;=@;l(v!p=cO)#
znki13yDv7I;x?k#Jg1|ZLxz;-G_1`D5#7do>CIdWdQXKu0RiQ5)AB61=I2=0a`_rE
z)^;q5`L{~f-og!uVP-7&a8M^p*nBn3m@IWUUs~P6nnpQ#=IWrp%Spg#k3`kY>3|-H
zB8v9$>`9uo0iw^%;d_pk{990LldX_@w4~{Uv!%s>alWq)OmpW(hP{0EpnW<pMo-af
zhK6YhX2E>mIQbCEtmIB}w2uI#<cmm8E{!~oy8UGH(e>QN*l0Kc7`5Xxs<HX<7IL5a
r&^#AzFQ@r%bx(U(ROp!QZfuut@(`QrldhW^cY>Ksk;NU#_qg^CKTt{x

literal 0
HcmV?d00001

diff --git a/webui/src/pages/bug/.TimelineQuery.tsx.swp b/webui/src/pages/bug/.TimelineQuery.tsx.swp
new file mode 100644
index 0000000000000000000000000000000000000000..0ad00f67d95d7c71c00c040dcd1cfd134b06d80a
GIT binary patch
literal 12288
zcmeI2%Wl&^6o#j)DXjpB?I|qUNUfcgO_ekaqJRVvh$1d45EFainmV?b8PislVaE~{
z>{x-|5fCdLf`<SBq7T7uJLy#_TTqXsKaOY4<v*X7o?i3*^_#TlEC^haLcIO4`gr{F
zS@CsB2qTTRCd-YZFS{1T>#6jQjuPT|UC`Y~^twr<r(D!elE_sXo-uB!lP7B3O5IbT
zb%W5(^|HX-P`xa4jrQDB2FkeQ+TC!VqA*sgnbKR1HJg9y%==8>m=nlse{OMHTwIuM
zmLx8mpQ1CT?;Ud}JU$a(0!)AjFaajO1egF5I9>#7IwoFV<P*cOX?Pzya34PMjR`OT
zCcp%k025#WOn?b60Vco%m;e*_4+)fC?LV9pqB{=r`2J7B8NN>l@eO(py@Q@Yx1dRA
z0us>nDItDAKcO$sODKapXcf8vU4d4hbI>+={DwY3AE7tUYv>gup-0d|sPysx;)@9|
z0Vco%m;e)C0!)AjFaaj;4-rtCX`(IpsxPz1(!PVqZ6S)bAkxZaI;N%3CMBuq<Z<FF
zQxJ|bcXIp`<SrwDsDO5I;w*~F5@DZarmBnv<#_gz*jTC-s6)QAvg>G-CML9r-s(Ci
z*mdmil(bXDRmICXO6x>7c3h>)SIdPK<<&;9<fbrEw~P|$hjFkQyb@|Ji=@7-lRztD
zc1$<Q6qui_Zbbc18{4A!W^=R>`mJ(UC-m!;XHti<7b%0zNUA5wY1nd>DmSy$Y*b*#
z%%~B->e%;8F6x|ps|cLQ%RW@J2rg68pw2Qn)UN^?ExMcq*R%`<Dz<H5w^CIHA{Alb
zpn9SCp?)yY*U5mUodd_u0~ISRt@5YaqwJBTLm9gv`Cc1)YQvnfx8kVeA@a4EO9ONU
c$Y>6S<h?{I_h2Aej%wUd(z8QPy8Ms5KY>*+wEzGB

literal 0
HcmV?d00001

diff --git a/webui/src/pages/bug/Bug.tsx b/webui/src/pages/bug/Bug.tsx
index d85c52966139658fe79ef1d1d9ac7fcdc6a06401..46a443d5649b4604653488980af86d08beb0ca4f 100644
--- a/webui/src/pages/bug/Bug.tsx
+++ b/webui/src/pages/bug/Bug.tsx
@@ -78,7 +78,7 @@ function Bug({ bug }: Props) {
 
       <div className={classes.container}>
         <div className={classes.timeline}>
-          <TimelineQuery id={bug.id} />
+          <TimelineQuery bug={bug} />
           <IfLoggedIn>
             {() => (
               <div className={classes.commentForm}>
diff --git a/webui/src/pages/bug/Message.tsx b/webui/src/pages/bug/Message.tsx
index 390f369e5829ec5a41c7a6dfb8aef670344b1299..3993b5f71d64ee2e53f32901fc6a803a04638fee 100644
--- a/webui/src/pages/bug/Message.tsx
+++ b/webui/src/pages/bug/Message.tsx
@@ -9,7 +9,10 @@ import EditIcon from '@material-ui/icons/Edit';
 import Author, { Avatar } from 'src/components/Author';
 import Content from 'src/components/Content';
 import Date from 'src/components/Date';
+import IfLoggedIn from 'src/components/IfLoggedIn/IfLoggedIn';
 
+import { BugFragment } from './Bug.generated';
+import CommentForm from './CommentForm';
 import { AddCommentFragment } from './MessageCommentFragment.generated';
 import { CreateFragment } from './MessageCreateFragment.generated';
 
@@ -65,10 +68,11 @@ const useStyles = makeStyles((theme) => ({
 }));
 
 type Props = {
+  bug: BugFragment;
   op: AddCommentFragment | CreateFragment;
 };
 
-function Message({ op }: Props) {
+function Message({ bug, op }: Props) {
   const classes = useStyles();
 
   const editComment = (id: String) => {
@@ -101,6 +105,13 @@ function Message({ op }: Props) {
           <Content markdown={op.message} />
         </section>
       </Paper>
+      <IfLoggedIn>
+        {() => (
+          <div>
+            <CommentForm bug={bug} />
+          </div>
+        )}
+      </IfLoggedIn>
     </article>
   );
 }
diff --git a/webui/src/pages/bug/Timeline.tsx b/webui/src/pages/bug/Timeline.tsx
index 6e1d242e074f6abdd4608029300ccd82c2956e90..60459a532505375c8d8a50a6b8e84dbc165beb39 100644
--- a/webui/src/pages/bug/Timeline.tsx
+++ b/webui/src/pages/bug/Timeline.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 
 import { makeStyles } from '@material-ui/core/styles';
 
+import { BugFragment } from './Bug.generated';
 import LabelChange from './LabelChange';
 import Message from './Message';
 import SetStatus from './SetStatus';
@@ -18,9 +19,10 @@ const useStyles = makeStyles((theme) => ({
 
 type Props = {
   ops: Array<TimelineItemFragment>;
+  bug: BugFragment;
 };
 
-function Timeline({ ops }: Props) {
+function Timeline({ bug, ops }: Props) {
   const classes = useStyles();
 
   return (
@@ -28,9 +30,9 @@ function Timeline({ ops }: Props) {
       {ops.map((op, index) => {
         switch (op.__typename) {
           case 'CreateTimelineItem':
-            return <Message key={index} op={op} />;
+            return <Message key={index} op={op} bug={bug} />;
           case 'AddCommentTimelineItem':
-            return <Message key={index} op={op} />;
+            return <Message key={index} op={op} bug={bug} />;
           case 'LabelChangeTimelineItem':
             return <LabelChange key={index} op={op} />;
           case 'SetTitleTimelineItem':
diff --git a/webui/src/pages/bug/TimelineQuery.tsx b/webui/src/pages/bug/TimelineQuery.tsx
index 74eed52b213d12c7166515f2b6b7408a0fdaff8b..d66c665b83b2f019fcbe8c58df781d3fd7e63ad3 100644
--- a/webui/src/pages/bug/TimelineQuery.tsx
+++ b/webui/src/pages/bug/TimelineQuery.tsx
@@ -2,17 +2,18 @@ import React from 'react';
 
 import CircularProgress from '@material-ui/core/CircularProgress';
 
+import { BugFragment } from './Bug.generated';
 import Timeline from './Timeline';
 import { useTimelineQuery } from './TimelineQuery.generated';
 
 type Props = {
-  id: string;
+  bug: BugFragment;
 };
 
-const TimelineQuery = ({ id }: Props) => {
+const TimelineQuery = ({ bug }: Props) => {
   const { loading, error, data } = useTimelineQuery({
     variables: {
-      id,
+      id: bug.id,
       first: 100,
     },
   });
@@ -25,7 +26,7 @@ const TimelineQuery = ({ id }: Props) => {
     return null;
   }
 
-  return <Timeline ops={nodes} />;
+  return <Timeline ops={nodes} bug={bug} />;
 };
 
 export default TimelineQuery;