Merge pull request #320 from CBIIT/mvp-2.1.0

Sync 3.0.0 (PMVP-M1) with 2.1.0 (MVP2-M3)
CBIIT · Mar 21, 2024 · 152d41b · 152d41b
2 parents c38c024 + 5ba680c
commit 152d41b
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 5 deletions.
diff --git a/src/graphql/getSubmission.ts b/src/graphql/getSubmission.ts
@@ -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

diff --git a/src/types/Submissions.d.ts b/src/types/Submissions.d.ts
@@ -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

diff --git a/src/utils/dataSubmissionUtils.test.ts b/src/utils/dataSubmissionUtils.test.ts
@@ -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);
@@ -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);