Merge pull request #251 from CBIIT/CRDCDH-660

CRDCDH-660 Shorter Batch IDs
CBIIT · Jan 4, 2024 · 03be7f5 · 03be7f5
2 parents a57ce08 + ecc9623
commit 03be7f5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/src/content/dataSubmissions/DataSubmission.tsx b/src/content/dataSubmissions/DataSubmission.tsx
@@ -224,6 +224,11 @@ const StyledErrorDetailsButton = styled(Button)(() => ({
 }));
 
 const columns: Column<Batch>[] = [
+  {
+    label: "Batch ID",
+    renderValue: (data) => data.displayID,
+    field: "displayID",
+  },
   {
     label: "Upload Type",
     renderValue: (data) => (data?.type === "file" ? "-" : data?.metadataIntention),

diff --git a/src/content/dataSubmissions/QualityControl.tsx b/src/content/dataSubmissions/QualityControl.tsx
@@ -38,6 +38,10 @@ const StyledSeverity = styled(Box)({
   alignItems: "center",
 });
 
+const StyledBreakAll = styled(Box)({
+  wordBreak: "break-all"
+});
+
 const columns: Column<QCResult>[] = [
   {
     label: "Type",
@@ -46,17 +50,17 @@ const columns: Column<QCResult>[] = [
   },
   {
     label: "Batch ID",
-    renderValue: (data) => data?.batchID,
-    field: "batchID",
+    renderValue: (data) => <StyledBreakAll>{data?.displayID}</StyledBreakAll>,
+    field: "displayID",
   },
   {
     label: "Node ID",
-    renderValue: (data) => data?.nodeID,
+    renderValue: (data) => <StyledBreakAll>{data?.nodeID}</StyledBreakAll>,
     field: "nodeID",
   },
   {
     label: "CRDC ID",
-    renderValue: (data) => data?.CRDC_ID,
+    renderValue: (data) => <StyledBreakAll>{data?.CRDC_ID}</StyledBreakAll>,
     field: "CRDC_ID",
   },
   {
@@ -93,9 +97,6 @@ const columns: Column<QCResult>[] = [
     ),
     field: "description",
     sortDisabled: true,
-    sx: {
-      minWidth: "260px",
-    }
   },
 ];
 

diff --git a/src/graphql/listBatches.ts b/src/graphql/listBatches.ts
@@ -18,6 +18,7 @@ export const query = gql`
       total
       batches {
         _id
+        displayID
         submissionID
         type
         metadataIntention

diff --git a/src/graphql/submissionQCResults.ts b/src/graphql/submissionQCResults.ts
@@ -20,6 +20,7 @@ export const query = gql`
         submissionID
         nodeType
         batchID
+        displayID
         nodeID
         CRDC_ID
         severity

diff --git a/src/types/Submissions.d.ts b/src/types/Submissions.d.ts
@@ -87,6 +87,7 @@ type UploadType = "metadata" | "file";
 
 type Batch = {
   _id: string;
+  displayID: number;
   submissionID: string; // parent
   type: UploadType; // [metadata, file]
   metadataIntention: MetadataIntention; // [New, Update, Delete], Update is meant for "Update or insert", metadata only! file batches are always treated as Update
@@ -163,6 +164,7 @@ type QCResult = {
   submissionID: string;
   nodeType: string;
   batchID: string;
+  displayID: number;
   nodeID: string;
   CRDC_ID: string;
   severity: "Error" | "Warning"; // [Error, Warning]