Update submissionQCResults and getSubmission queries and types

CBIIT · Mar 13, 2024 · 016cf1c · 016cf1c
1 parent 76277d8
commit 016cf1c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/src/content/dataSubmissions/QualityControl.tsx b/src/content/dataSubmissions/QualityControl.tsx
@@ -110,13 +110,13 @@ const columns: Column<QCResult>[] = [
   },
   {
     label: "Node Type",
-    renderValue: (data) => <StyledNodeType>{data?.nodeType}</StyledNodeType>,
-    field: "nodeType",
+    renderValue: (data) => <StyledNodeType>{data?.type}</StyledNodeType>,
+    field: "type",
   },
   {
     label: "Submitted Identifier",
-    renderValue: (data) => <StyledBreakAll>{data?.nodeID}</StyledBreakAll>,
-    field: "nodeID",
+    renderValue: (data) => <StyledBreakAll>{data?.submittedID}</StyledBreakAll>,
+    field: "submittedID",
   },
   {
     label: "Severity",
@@ -331,15 +331,15 @@ const QualityControl: FC = () => {
           loading={loading}
           defaultRowsPerPage={20}
           defaultOrder="desc"
-          setItemKey={(item, idx) => `${idx}_${item.batchID}_${item.nodeID}`}
+          setItemKey={(item, idx) => `${idx}_${item.batchID}_${item.submittedID}`}
           onFetchData={handleFetchQCResults}
         />
       </QCResultsContext.Provider>
       <ErrorDialog
         open={openErrorDialog}
         onClose={() => setOpenErrorDialog(false)}
         header={null}
-        title={`Validation Issues for ${capitalizeFirstLetter(selectedRow?.nodeType)} Node ID ${selectedRow?.nodeID}.`}
+        title={`Validation Issues for ${capitalizeFirstLetter(selectedRow?.type)} Node ID ${selectedRow?.submittedID}.`}
         errors={allDescriptions}
         errorCount={`${allDescriptions?.length || 0} ${allDescriptions?.length === 1 ? "ISSUE" : "ISSUES"}`}
       />

diff --git a/src/graphql/getSubmission.ts b/src/graphql/getSubmission.ts
@@ -20,11 +20,15 @@ export const query = gql`
       status
       metadataValidationStatus
       fileValidationStatus
+      fileErrors {
+        title
+        description
+      }
       history {
-          status
-          reviewComment
-          dateTime
-          userID
+        status
+        reviewComment
+        dateTime
+        userID
       }
       conciergeName
       conciergeEmail

diff --git a/src/graphql/submissionQCResults.ts b/src/graphql/submissionQCResults.ts
@@ -24,11 +24,11 @@ export const query = gql`
       total
       results {
         submissionID
-        nodeType
+        type
         validationType
         batchID
         displayID
-        nodeID
+        submittedID
         severity
         uploadedDate
         validatedDate

diff --git a/src/types/Submissions.d.ts b/src/types/Submissions.d.ts
@@ -13,6 +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
   history: SubmissionHistoryEvent[];
   conciergeName: string; // Concierge name
   conciergeEmail: string; // Concierge email
@@ -174,11 +175,11 @@ type QCResults = {
 
 type QCResult = {
   submissionID: string;
-  nodeType: string;
+  type: string;
   validationType: UploadType;
   batchID: string;
   displayID: number;
-  nodeID: string;
+  submittedID: string;
   severity: "Error" | "Warning"; // [Error, Warning]
   uploadedDate: string; // batch.updatedAt
   validatedDate: string;