feat: add comment when submitting CR (#3489)

Unleash · Apr 11, 2023 · ac04f43 · ac04f43
1 parent 8f659b0
commit ac04f43
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/frontend/src/component/changeRequest/ChangeRequestSidebar/ChangeRequestSidebar.tsx b/frontend/src/component/changeRequest/ChangeRequestSidebar/ChangeRequestSidebar.tsx
@@ -95,9 +95,12 @@ export const ChangeRequestSidebar: VFC<IChangeRequestSidebarProps> = ({
     const { changeState, discardDraft } = useChangeRequestApi();
     const { setToastApiError } = useToast();
 
-    const onReview = async (draftId: number) => {
+    const onReview = async (draftId: number, comment?: string) => {
         try {
-            await changeState(project, draftId, { state: 'In review' });
+            await changeState(project, draftId, {
+                state: 'In review',
+                comment,
+            });
             refetchChangeRequest();
         } catch (error: unknown) {
             setToastApiError(formatUnknownError(error));

diff --git a/.../changeRequest/ChangeRequestSidebar/EnvironmentChangeRequest/EnvironmentChangeRequest.tsx b/.../changeRequest/ChangeRequestSidebar/EnvironmentChangeRequest/EnvironmentChangeRequest.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react';
+import { FC, useState } from 'react';
 import { Box, Button, Divider, Typography, useTheme } from '@mui/material';
 import { IChangeRequest } from '../../changeRequest.types';
 import { useNavigate } from 'react-router-dom';
@@ -12,6 +12,8 @@ import {
     UpdateCount,
 } from '../ChangeRequestSidebar';
 import { CloudCircle } from '@mui/icons-material';
+import { AddCommentField } from '../../ChangeRequestOverview/ChangeRequestComments/AddCommentField';
+import { useAuthUser } from 'hooks/api/getters/useAuth/useAuthUser';
 
 const SubmitChangeRequestButton: FC<{ onClick: () => void; count: number }> = ({
     onClick,
@@ -25,11 +27,13 @@ const SubmitChangeRequestButton: FC<{ onClick: () => void; count: number }> = ({
 export const EnvironmentChangeRequest: FC<{
     environmentChangeRequest: IChangeRequest;
     onClose: () => void;
-    onReview: (id: number) => void;
+    onReview: (id: number, comment?: string) => void;
     onDiscard: (id: number) => void;
 }> = ({ environmentChangeRequest, onClose, onReview, onDiscard, children }) => {
     const theme = useTheme();
     const navigate = useNavigate();
+    const [commentText, setCommentText] = useState('');
+    const { user } = useAuthUser();
 
     return (
         <Box
@@ -74,14 +78,27 @@ export const EnvironmentChangeRequest: FC<{
                 You request changes for these feature toggles:
             </Typography>
             {children}
+            <ConditionallyRender
+                condition={environmentChangeRequest?.state === 'Draft'}
+                show={
+                    <AddCommentField
+                        user={user}
+                        commentText={commentText}
+                        onTypeComment={setCommentText}
+                    ></AddCommentField>
+                }
+            ></ConditionallyRender>
             <Box sx={{ display: 'flex', mt: 3 }}>
                 <ConditionallyRender
                     condition={environmentChangeRequest?.state === 'Draft'}
                     show={
                         <>
                             <SubmitChangeRequestButton
                                 onClick={() =>
-                                    onReview(environmentChangeRequest.id)
+                                    onReview(
+                                        environmentChangeRequest.id,
+                                        commentText
+                                    )
                                 }
                                 count={changesCount(environmentChangeRequest)}
                             />

diff --git a/frontend/src/hooks/api/actions/useChangeRequestApi/useChangeRequestApi.ts b/frontend/src/hooks/api/actions/useChangeRequestApi/useChangeRequestApi.ts
@@ -52,7 +52,10 @@ export const useChangeRequestApi = () => {
     const changeState = async (
         project: string,
         changeRequestId: number,
-        payload: { state: 'Approved' | 'Applied' | 'Cancelled' | 'In review' }
+        payload: {
+            state: 'Approved' | 'Applied' | 'Cancelled' | 'In review';
+            comment?: string;
+        }
     ) => {
         trackEvent('change_request', {
             props: {