Merge branch 'mvp-2.1.0' into CRDCDH-685

CBIIT · Feb 2, 2024 · 2ce3c49 · 2ce3c49
2 parents 1a40d15 + 35fd63b
commit 2ce3c49
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 16 deletions.
diff --git 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) => {
@@ -266,6 +267,7 @@ const DataSubmissionActions = ({ submission, submitActionButton, onAction, onErr
 
   const onCloseDialog = () => {
     setCurrentDialog(null);
+    setReviewComment("");
   };
 
   const returnToSubmissionList = () => {
@@ -392,7 +394,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 +417,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}>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="Enter comments here. Max of 500 characters"
+          inputProps={{ "aria-label": "Admin override justification" }}
+          slotProps={{ input: { minLength: 1, maxLength: 500 } }}
+          minRows={4}
+          maxRows={4}
+          multiline
+          fullWidth
+          required
+        />
+      </StyledDialog>
+
       {/* Release Dialog */}
       <StyledDialog
         open={currentDialog === "Release"}
@@ -494,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>
@@ -513,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

diff --git 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">;
 };