From 470fcbe49106c3de9ed9fcb7bb7039d15af3fcae Mon Sep 17 00:00:00 2001
From: Alec M <alec.mattu@nih.gov>
Date: Tue, 30 Jan 2024 09:28:03 -0500
Subject: [PATCH 1/3] CRDCDH-715 Admin Submit justification

---
 .../dataSubmissions/DataSubmissionActions.tsx | 38 ++++++++++++++++++-
 src/graphql/submissionAction.ts               | 11 +-----
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/content/dataSubmissions/DataSubmissionActions.tsx b/src/content/dataSubmissions/DataSubmissionActions.tsx
index f2b0537c..8f4c8008 100644
--- a/src/content/dataSubmissions/DataSubmissionActions.tsx
+++ b/src/content/dataSubmissions/DataSubmissionActions.tsx
@@ -196,7 +196,7 @@ const actionConfig: Record<ActionKey, ActionConfig> = {
 };
 
 type SubmitActionButton = {
-  label: string;
+  label: "Submit" | "Admin Submit";
   disable: boolean;
 };
 
@@ -258,6 +258,7 @@ const DataSubmissionActions = ({ submission, submitActionButton, onAction, onErr
       await onAction(action, reviewComment || null);
     }
     setAction(null);
+    setReviewComment("");
   };
 
   const onOpenDialog = (dialog: ActiveDialog) => {
@@ -392,7 +393,7 @@ const DataSubmissionActions = ({ submission, submitActionButton, onAction, onErr
 
       {/* Submit Dialog */}
       <StyledDialog
-        open={currentDialog === "Submit"}
+        open={currentDialog === "Submit" && submitActionButton.label === "Submit"}
         onClose={onCloseDialog}
         title="Submit Data Submission"
         actions={(
@@ -415,6 +416,39 @@ const DataSubmissionActions = ({ submission, submitActionButton, onAction, onErr
         </StyledDialogText>
       </StyledDialog>
 
+      {/* Admin Submit Dialog */}
+      <StyledDialog
+        open={currentDialog === "Submit" && submitActionButton.label === "Admin Submit"}
+        onClose={onCloseDialog}
+        title="Admin Submit Data Submission"
+        actions={(
+          <Stack direction="row" marginTop="24px">
+            <Button onClick={onCloseDialog} disabled={!!action} color="error">Cancel</Button>
+            <LoadingButton
+              onClick={() => handleOnAction("Submit")}
+              loading={!!action}
+              disabled={reviewComment?.trim()?.length <= 0}
+              autoFocus
+            >
+              Confirm to Submit
+            </LoadingButton>
+          </Stack>
+        )}
+      >
+        <StyledOutlinedInput
+          value={reviewComment}
+          onChange={handleCommentChange}
+          placeholder="500 characters allowed*"
+          inputProps={{ "aria-label": "Admin override justification" }}
+          slotProps={{ input: { minLength: 1, maxLength: 500 } }}
+          minRows={2}
+          maxRows={2}
+          multiline
+          fullWidth
+          required
+        />
+      </StyledDialog>
+
       {/* Release Dialog */}
       <StyledDialog
         open={currentDialog === "Release"}
diff --git a/src/graphql/submissionAction.ts b/src/graphql/submissionAction.ts
index 4e773b13..59784d57 100644
--- a/src/graphql/submissionAction.ts
+++ b/src/graphql/submissionAction.ts
@@ -4,19 +4,10 @@ export const mutation = gql`
   mutation submissionAction($submissionID: ID!, $action: String!, $comment: String) {
     submissionAction(submissionID: $submissionID, action: $action, comment: $comment) {
       _id
-      status
-      history {
-        status
-        reviewComment
-        dateTime
-        userID
-      }
-      createdAt
-      updatedAt
     }
   }
 `;
 
 export type Response = {
-  submissionAction: Submission;
+  submissionAction: Pick<Submission, "_id">;
 };

From 4a54b498460d607c1ed2c56e0ef155c879ff0ea7 Mon Sep 17 00:00:00 2001
From: Alec M <alec.mattu@nih.gov>
Date: Tue, 30 Jan 2024 09:30:58 -0500
Subject: [PATCH 2/3] fix: Review comment text persisting through cancel

---
 src/content/dataSubmissions/DataSubmissionActions.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/content/dataSubmissions/DataSubmissionActions.tsx b/src/content/dataSubmissions/DataSubmissionActions.tsx
index 8f4c8008..a8aa43b4 100644
--- a/src/content/dataSubmissions/DataSubmissionActions.tsx
+++ b/src/content/dataSubmissions/DataSubmissionActions.tsx
@@ -267,6 +267,7 @@ const DataSubmissionActions = ({ submission, submitActionButton, onAction, onErr
 
   const onCloseDialog = () => {
     setCurrentDialog(null);
+    setReviewComment("");
   };
 
   const returnToSubmissionList = () => {

From 79b0e5dd495fc5e6e379c1f26d5f23cfd272a748 Mon Sep 17 00:00:00 2001
From: Alec M <alec.mattu@nih.gov>
Date: Thu, 1 Feb 2024 11:37:25 -0500
Subject: [PATCH 3/3] Update per new requirements

---
 .../dataSubmissions/DataSubmissionActions.tsx   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/content/dataSubmissions/DataSubmissionActions.tsx b/src/content/dataSubmissions/DataSubmissionActions.tsx
index a8aa43b4..ed606171 100644
--- a/src/content/dataSubmissions/DataSubmissionActions.tsx
+++ b/src/content/dataSubmissions/DataSubmissionActions.tsx
@@ -424,7 +424,7 @@ const DataSubmissionActions = ({ submission, submitActionButton, onAction, onErr
         title="Admin Submit Data Submission"
         actions={(
           <Stack direction="row" marginTop="24px">
-            <Button onClick={onCloseDialog} disabled={!!action} color="error">Cancel</Button>
+            <Button onClick={onCloseDialog} disabled={!!action}>Cancel</Button>
             <LoadingButton
               onClick={() => handleOnAction("Submit")}
               loading={!!action}
@@ -439,11 +439,11 @@ const DataSubmissionActions = ({ submission, submitActionButton, onAction, onErr
         <StyledOutlinedInput
           value={reviewComment}
           onChange={handleCommentChange}
-          placeholder="500 characters allowed*"
+          placeholder="Enter comments here. Max of 500 characters"
           inputProps={{ "aria-label": "Admin override justification" }}
           slotProps={{ input: { minLength: 1, maxLength: 500 } }}
-          minRows={2}
-          maxRows={2}
+          minRows={4}
+          maxRows={4}
           multiline
           fullWidth
           required
@@ -529,7 +529,7 @@ const DataSubmissionActions = ({ submission, submitActionButton, onAction, onErr
       <StyledDialog
         open={currentDialog === "Reject"}
         onClose={onCloseDialog}
-        title="Reject Data Submission *"
+        title="Reject Data Submission"
         actions={(
           <Stack direction="row" marginTop="24px">
             <Button onClick={onCloseDialog} disabled={!!action}>Cancel</Button>
@@ -548,10 +548,11 @@ const DataSubmissionActions = ({ submission, submitActionButton, onAction, onErr
         <StyledOutlinedInput
           value={reviewComment}
           onChange={handleCommentChange}
-          placeholder="500 characters allowed"
-          minRows={2}
-          maxRows={2}
+          placeholder="Enter comments here. Max of 500 characters"
+          inputProps={{ "aria-label": "Reject justification" }}
           slotProps={{ input: { minLength: 1, maxLength: 500 } }}
+          minRows={4}
+          maxRows={4}
           multiline
           fullWidth
           required