Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CRDCDH-715 Admin Submit justification, CRDCDH-728 Updates #274

Merged
merged 4 commits into from
Feb 1, 2024
Merged

CRDCDH-715 Admin Submit justification, CRDCDH-728 Updates #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
470fcbe
CRDCDH-715 Admin Submit justification
amattu2 Jan 30, 2024
4a54b49
fix: Review comment text persisting through cancel
amattu2 Jan 30, 2024
79b0e5d
Update per new requirements
amattu2 Feb 1, 2024
5d98111
Merge branch 'mvp-2.1.0' into CRDCDH-715
amattu2 Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 42 additions & 6 deletions src/content/dataSubmissions/DataSubmissionActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ const actionConfig: Record<ActionKey, ActionConfig> = {
};

type SubmitActionButton = {
label: string;
label: "Submit" | "Admin Submit";
disable: boolean;
};

Expand Down Expand Up @@ -258,6 +258,7 @@ const DataSubmissionActions = ({ submission, submitActionButton, onAction, onErr
await onAction(action, reviewComment || null);
}
setAction(null);
setReviewComment("");
};

const onOpenDialog = (dialog: ActiveDialog) => {
Expand All @@ -266,6 +267,7 @@ const DataSubmissionActions = ({ submission, submitActionButton, onAction, onErr

const onCloseDialog = () => {
setCurrentDialog(null);
setReviewComment("");
};

const returnToSubmissionList = () => {
Expand Down Expand Up @@ -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={(
Expand All @@ -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"}
Expand Down Expand Up @@ -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>
Expand All @@ -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
Expand Down
11 changes: 1 addition & 10 deletions src/graphql/submissionAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">;
};
Loading