Merge branch '3.0.0' into storybook

CBIIT · Aug 20, 2024 · b74ad28 · b74ad28
2 parents 915a52a + 8af2b7c
commit b74ad28
Show file tree

Hide file tree

Showing 63 changed files with 5,256 additions and 554 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -47,7 +47,7 @@ const config = {
       },
     ],
     "max-len": "off",
-    "no-console": "warn",
+    "no-console": ["warn", { allow: ["error"] }],
     "no-param-reassign": "off",
     "object-curly-newline": "off",
     "no-underscore-dangle": ["off"],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -110,6 +110,7 @@
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-storybook": "^0.8.0",
     "husky": "^8.0.3",
+    "jest-canvas-mock": "^2.5.2",
     "prettier": "^3.1.1",
     "storybook": "^8.1.5",
     "storybook-addon-apollo-client": "^7.3.0",

diff --git a/src/assets/pdf/API_Instructions_Documentation.pdf b/src/assets/pdf/API_Instructions_Documentation.pdf
diff --git a/src/assets/pdf/CRDC_Data_Submission_API_Instructions.pdf b/src/assets/pdf/CRDC_Data_Submission_API_Instructions.pdf
diff --git a/src/components/Contexts/OrganizationListContext.tsx b/src/components/Contexts/OrganizationListContext.tsx
@@ -88,10 +88,10 @@ export const OrganizationProvider: FC<ProviderProps> = ({ preload, children }: P
 
     const sortedOrganizations = data?.listOrganizations?.sort(
       (a, b) => a.name?.localeCompare(b.name)
-    );
+    ) as Partial<Organization>[];
 
     const activeOrganizations = sortedOrganizations?.filter(
-      (org: Organization) => org.status === "Active"
+      (org: Partial<Organization>) => org.status === "Active"
     );
 
     setState({

diff --git a/src/components/Contexts/SubmissionContext.test.tsx b/src/components/Contexts/SubmissionContext.test.tsx
@@ -91,7 +91,7 @@ describe("useSubmissionContext", () => {
           data: {
             getSubmission: null,
             submissionStats: null,
-            listBatches: null,
+            batchStatusList: null,
           },
         },
       },
@@ -151,7 +151,7 @@ describe("SubmissionProvider", () => {
           data: {
             getSubmission: null,
             submissionStats: null,
-            listBatches: null,
+            batchStatusList: null,
           },
         },
       },
@@ -178,7 +178,7 @@ describe("SubmissionProvider", () => {
             submissionStats: {
               stats: [],
             },
-            listBatches: {
+            batchStatusList: {
               batches: [],
             },
           },
@@ -213,7 +213,7 @@ describe("SubmissionProvider", () => {
             submissionStats: {
               stats: [],
             },
-            listBatches: {
+            batchStatusList: {
               batches: [],
             },
           },
@@ -249,7 +249,7 @@ describe("SubmissionProvider", () => {
             submissionStats: {
               stats: [],
             },
-            listBatches: {
+            batchStatusList: {
               batches: [],
             },
           },
@@ -280,9 +280,10 @@ describe("SubmissionProvider", () => {
             submissionStats: {
               stats: [],
             },
-            listBatches: {
+            batchStatusList: {
               batches: [
                 {
+                  _id: "batch-0001",
                   status: "Uploading",
                 },
               ],
@@ -315,9 +316,10 @@ describe("SubmissionProvider", () => {
             submissionStats: {
               stats: [],
             },
-            listBatches: {
+            batchStatusList: {
               batches: [
                 {
+                  _id: "batch-0001",
                   status: "Uploaded",
                 },
               ],
@@ -351,7 +353,7 @@ describe("SubmissionProvider", () => {
             submissionStats: {
               stats: [],
             },
-            listBatches: {
+            batchStatusList: {
               batches: [],
             },
           },
@@ -383,7 +385,7 @@ describe("SubmissionProvider", () => {
             submissionStats: {
               stats: [],
             },
-            listBatches: {
+            batchStatusList: {
               batches: [],
             },
           },
@@ -413,9 +415,10 @@ describe("SubmissionProvider", () => {
             submissionStats: {
               stats: [],
             },
-            listBatches: {
+            batchStatusList: {
               batches: [
                 {
+                  _id: "batch-0001",
                   status: "Uploaded",
                 },
               ],
@@ -466,7 +469,7 @@ describe("SubmissionProvider", () => {
             submissionStats: {
               stats: [],
             },
-            listBatches: {
+            batchStatusList: {
               batches: [],
             },
           },

diff --git a/src/components/Contexts/SubmissionContext.tsx b/src/components/Contexts/SubmissionContext.tsx
@@ -120,7 +120,9 @@ export const SubmissionProvider: FC<ProviderProps> = ({ _id, children }: Provide
         d?.getSubmission?.metadataValidationStatus === "Validating" ||
         d?.getSubmission?.crossSubmissionStatus === "Validating";
       const isDeleting = d?.getSubmission?.deletingData === true;
-      const hasUploadingBatches = d?.listBatches?.batches?.some((b) => b.status === "Uploading");
+      const hasUploadingBatches = d?.batchStatusList?.batches?.some(
+        (b) => b.status === "Uploading"
+      );
 
       if (!isValidating && !hasUploadingBatches && !isDeleting) {
         stopApolloPolling();
@@ -159,7 +161,7 @@ export const SubmissionProvider: FC<ProviderProps> = ({ _id, children }: Provide
     return {
       getSubmission: data?.getSubmission,
       submissionStats: { stats: sortedStats },
-      listBatches: data?.listBatches,
+      batchStatusList: data?.batchStatusList,
     };
   }, [data]);