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

Sync 3.0.0 (PMVP-M1) with 2.1.0 (MVP2-M3) #320

Merged
merged 3 commits into from
Mar 21, 2024
Merged

Sync 3.0.0 (PMVP-M1) with 2.1.0 (MVP2-M3) #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eded331
Updated submission.fileErrors type and updated unit tests
Alejandro-Vega Mar 21, 2024
a7bca8d
Update getSubmission query to reflect fileErrors type change
Alejandro-Vega Mar 21, 2024
5ba680c
Merge pull request #319 from CBIIT/CRDCDH-852-Schema-Update
amattu2 Mar 21, 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
19 changes: 17 additions & 2 deletions src/graphql/getSubmission.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,23 @@ export const query = gql`
metadataValidationStatus
fileValidationStatus
fileErrors {
title
description
submissionID
type
validationType
batchID
displayID
submittedID
severity
uploadedDate
validatedDate
errors {
title
description
}
warnings {
title
description
}
}
history {
status
Expand Down
2 changes: 1 addition & 1 deletion src/types/Submissions.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type Submission = {
status: SubmissionStatus; // [New, In Progress, Submitted, Released, Canceled, Transferred, Completed, Archived]
metadataValidationStatus: ValidationStatus; // [New, Validating, Passed, Error, Warning]
fileValidationStatus: ValidationStatus; // [New, Validating, Passed, Error, Warning]
fileErrors: ErrorMessage[]; // holds submission level file errors, e.g., extra files in S3 folder
fileErrors: QCResult[]; // holds submission level file errors, e.g., extra files in S3 folder
history: SubmissionHistoryEvent[];
conciergeName: string; // Concierge name
conciergeEmail: string; // Concierge email
Expand Down
32 changes: 30 additions & 2 deletions src/utils/dataSubmissionUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,21 @@ describe("Admin Submit", () => {
...baseSubmission,
metadataValidationStatus: null,
fileValidationStatus: "Error",
fileErrors: [{ title: "", description: "" }]
fileErrors: [
{
submissionID: "123",
type: "",
validationType: "data file",
uploadedDate: "",
batchID: "",
displayID: 1,
errors: [],
warnings: [],
severity: "Error",
submittedID: "123",
validatedDate: "",
},
],
};
const result: SubmitInfo = utils.shouldDisableSubmit(submission, "Admin");
expect(result.disable).toBe(true);
Expand All @@ -394,7 +408,21 @@ describe("Admin Submit", () => {
...baseSubmission,
metadataValidationStatus: "Passed",
fileValidationStatus: "Passed",
fileErrors: [{ title: "", description: "" }]
fileErrors: [
{
submissionID: "123",
type: "",
validationType: "data file",
uploadedDate: "",
batchID: "",
displayID: 1,
errors: [],
warnings: [],
severity: "Error",
submittedID: "123",
validatedDate: "",
},
],
};
const result: SubmitInfo = utils.shouldDisableSubmit(submission, "Submitter");
expect(result.disable).toBe(true);
Expand Down
Loading