Merge pull request #483 from CBIIT/CRDCDH-1606

CRDCDH-1606 Add nodeCount column to Data Submission List table
CBIIT · Oct 3, 2024 · 3571bd3 · 3571bd3
2 parents ac9b515 + 86a8659
commit 3571bd3
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 1 deletion.
diff --git a/src/components/Contexts/SubmissionContext.test.tsx b/src/components/Contexts/SubmissionContext.test.tsx
@@ -49,6 +49,7 @@ const baseSubmission: Submission = {
   intention: "New/Update",
   dataType: "Metadata Only",
   otherSubmissions: "",
+  nodeCount: 0,
   createdAt: "",
   updatedAt: "",
   studyID: "",

diff --git a/src/components/DataSubmissions/CrossValidationButton.test.tsx b/src/components/DataSubmissions/CrossValidationButton.test.tsx
@@ -53,6 +53,7 @@ const baseSubmission: Omit<
   validationType: ["metadata", "file"],
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 const baseAuthCtx: AuthCtxState = {

diff --git a/src/components/DataSubmissions/CrossValidationFilters.test.tsx b/src/components/DataSubmissions/CrossValidationFilters.test.tsx
@@ -49,6 +49,7 @@ const baseSubmission: Submission = {
   intention: "New/Update",
   dataType: "Metadata Only",
   otherSubmissions: "",
+  nodeCount: 0,
   createdAt: "",
   updatedAt: "",
 };

diff --git a/src/components/DataSubmissions/DataUpload.test.tsx b/src/components/DataSubmissions/DataUpload.test.tsx
@@ -55,6 +55,7 @@ const baseSubmission: Omit<Submission, "_id"> = {
   validationType: ["metadata", "file"],
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 const baseUser: User = {

diff --git a/src/components/DataSubmissions/DeleteAllOrphanFilesButton.test.tsx b/src/components/DataSubmissions/DeleteAllOrphanFilesButton.test.tsx
@@ -53,6 +53,7 @@ const baseSubmission: Submission = {
   validationType: ["metadata", "file"],
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 const baseContext: ContextState = {

diff --git a/src/components/DataSubmissions/DeleteNodeDataButton.test.tsx b/src/components/DataSubmissions/DeleteNodeDataButton.test.tsx
@@ -49,6 +49,7 @@ const BaseSubmission: Submission = {
   validationScope: "New",
   validationType: [],
   deletingData: false,
+  nodeCount: 0,
 };
 
 const baseAuthCtx: AuthContextState = {

diff --git a/src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx b/src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx
@@ -53,6 +53,7 @@ const baseSubmission: Submission = {
   validationType: ["metadata", "file"],
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 const baseContext: ContextState = {

diff --git a/src/components/DataSubmissions/ExportCrossValidationButton.test.tsx b/src/components/DataSubmissions/ExportCrossValidationButton.test.tsx
@@ -48,6 +48,7 @@ const baseSubmission: Submission = {
   crossSubmissionStatus: null,
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 const baseCrossValidationResult: CrossValidationResult = {

diff --git a/src/components/DataSubmissions/ExportValidationButton.test.tsx b/src/components/DataSubmissions/ExportValidationButton.test.tsx
@@ -57,6 +57,7 @@ describe("ExportValidationButton cases", () => {
     validationType: ["metadata", "file"],
     studyID: "",
     deletingData: false,
+    nodeCount: 0,
   };
 
   const baseQCResult: Omit<QCResult, "submissionID"> = {

diff --git a/src/components/DataSubmissions/MetadataUpload.test.tsx b/src/components/DataSubmissions/MetadataUpload.test.tsx
@@ -40,6 +40,7 @@ const baseSubmission: Omit<
   validationType: ["metadata", "file"],
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 const baseContext: ContextState = {

diff --git a/src/components/DataSubmissions/ValidationControls.test.tsx b/src/components/DataSubmissions/ValidationControls.test.tsx
@@ -53,6 +53,7 @@ const baseSubmission: Omit<
   validationType: ["metadata", "file"],
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 const baseAuthCtx: AuthCtxState = {

diff --git a/src/components/DataSubmissions/ValidationStatistics.test.tsx b/src/components/DataSubmissions/ValidationStatistics.test.tsx
@@ -33,6 +33,7 @@ const baseSubmission: Omit<Submission, "_id"> = {
   validationType: ["metadata", "file"],
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 describe("Accessibility", () => {

diff --git a/src/components/DataSubmissions/ValidationStatus.test.tsx b/src/components/DataSubmissions/ValidationStatus.test.tsx
@@ -40,6 +40,7 @@ const BaseSubmission: Omit<
   updatedAt: "",
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 type TestParentProps = {

diff --git a/src/content/dataSubmissions/CrossValidation.test.tsx b/src/content/dataSubmissions/CrossValidation.test.tsx
@@ -57,6 +57,7 @@ const baseSubmission: Submission = {
   crossSubmissionStatus: null,
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 const baseCrossValidationResult: CrossValidationResult = {

diff --git a/src/content/dataSubmissions/DataActivity.test.tsx b/src/content/dataSubmissions/DataActivity.test.tsx
@@ -42,6 +42,7 @@ const baseSubmission: Omit<Submission, "_id"> = {
   fileValidationStatus: "New",
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 type ParentProps = {

diff --git a/src/content/dataSubmissions/DataSubmissionsListView.tsx b/src/content/dataSubmissions/DataSubmissionsListView.tsx
@@ -79,7 +79,7 @@ const StyledTableCell = styled(TableCell)({
   fontSize: "14px",
   color: "#083A50 !important",
   "&.MuiTableCell-root": {
-    padding: "14px 8px 12px",
+    padding: "14px 4px 12px",
     overflowWrap: "anywhere",
     whiteSpace: "nowrap",
   },
@@ -213,6 +213,12 @@ const columns: Column<T>[] = [
     renderValue: (a) => <TruncatedText text={a.conciergeName} />,
     field: "conciergeName",
   },
+  {
+    label: "Node Count",
+    renderValue: (a) =>
+      Intl.NumberFormat("en-US", { maximumFractionDigits: 0 }).format(a.nodeCount || 0),
+    field: "nodeCount",
+  },
   {
     label: "Created Date",
     renderValue: (a) =>

diff --git a/src/content/dataSubmissions/QualityControl.test.tsx b/src/content/dataSubmissions/QualityControl.test.tsx
@@ -55,6 +55,7 @@ const baseSubmission: Submission = {
   crossSubmissionStatus: null,
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 const baseQCResult: QCResult = {

diff --git a/src/graphql/getSubmission.ts b/src/graphql/getSubmission.ts
@@ -57,6 +57,7 @@ export const query = gql`
       intention
       dataType
       otherSubmissions
+      nodeCount
       createdAt
       updatedAt
     }

diff --git a/src/graphql/listSubmissions.ts b/src/graphql/listSubmissions.ts
@@ -33,6 +33,7 @@ export const query = gql`
         status
         archived
         conciergeName
+        nodeCount
         createdAt
         updatedAt
         intention

diff --git a/src/types/Submissions.d.ts b/src/types/Submissions.d.ts
@@ -59,6 +59,10 @@ type Submission = {
    * @see OtherSubmissions
    */
   otherSubmissions: string;
+  /**
+   * The total number of nodes in the Submission
+   */
+  nodeCount: number;
   createdAt: string; // ISO 8601 date time format with UTC or offset e.g., 2023-05-01T09:23:30Z
   updatedAt: string; // ISO 8601 date time format with UTC or offset e.g., 2023-05-01T09:23:30Z
 };

diff --git a/src/utils/dataSubmissionUtils.test.ts b/src/utils/dataSubmissionUtils.test.ts
@@ -34,6 +34,7 @@ const baseSubmission: Submission = {
   validationType: ["metadata", "file"],
   studyID: "",
   deletingData: false,
+  nodeCount: 0,
 };
 
 describe("General Submit", () => {