Skip to content

Commit

Permalink
Merge branch '3.1.0' into CRDCDH-1501
Browse files Browse the repository at this point in the history
  • Loading branch information
amattu2 authored Oct 3, 2024
2 parents 6377457 + 3571bd3 commit 257ec81
Show file tree
Hide file tree
Showing 43 changed files with 1,171 additions and 48 deletions.
22 changes: 13 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"graphql-tag": "^2.12.6",
"jest-axe": "^8.0.0",
"jest-fail-on-console": "^3.3.0",
"jspdf": "^2.5.2",
"lodash": "^4.17.21",
"notistack": "^3.0.1",
"papaparse": "^5.4.1",
Expand Down
4 changes: 2 additions & 2 deletions src/assets/icons/download_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/Contexts/SubmissionContext.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const baseSubmission: Submission = {
intention: "New/Update",
dataType: "Metadata Only",
otherSubmissions: "",
nodeCount: 0,
createdAt: "",
updatedAt: "",
studyID: "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const baseSubmission: Omit<
validationType: ["metadata", "file"],
studyID: "",
deletingData: false,
nodeCount: 0,
};

const baseAuthCtx: AuthCtxState = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const baseSubmission: Submission = {
intention: "New/Update",
dataType: "Metadata Only",
otherSubmissions: "",
nodeCount: 0,
createdAt: "",
updatedAt: "",
};
Expand Down
1 change: 1 addition & 0 deletions src/components/DataSubmissions/DataUpload.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const baseSubmission: Omit<Submission, "_id"> = {
validationType: ["metadata", "file"],
studyID: "",
deletingData: false,
nodeCount: 0,
};

const baseUser: User = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const baseSubmission: Submission = {
validationType: ["metadata", "file"],
studyID: "",
deletingData: false,
nodeCount: 0,
};

const baseContext: ContextState = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const BaseSubmission: Submission = {
validationScope: "New",
validationType: [],
deletingData: false,
nodeCount: 0,
};

const baseAuthCtx: AuthContextState = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const baseSubmission: Submission = {
validationType: ["metadata", "file"],
studyID: "",
deletingData: false,
nodeCount: 0,
};

const baseContext: ContextState = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const baseSubmission: Submission = {
crossSubmissionStatus: null,
studyID: "",
deletingData: false,
nodeCount: 0,
};

const baseCrossValidationResult: CrossValidationResult = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ describe("ExportValidationButton cases", () => {
validationType: ["metadata", "file"],
studyID: "",
deletingData: false,
nodeCount: 0,
};

const baseQCResult: Omit<QCResult, "submissionID"> = {
Expand Down
1 change: 1 addition & 0 deletions src/components/DataSubmissions/MetadataUpload.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const baseSubmission: Omit<
validationType: ["metadata", "file"],
studyID: "",
deletingData: false,
nodeCount: 0,
};

const baseContext: ContextState = {
Expand Down
1 change: 1 addition & 0 deletions src/components/DataSubmissions/ValidationControls.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const baseSubmission: Omit<
validationType: ["metadata", "file"],
studyID: "",
deletingData: false,
nodeCount: 0,
};

const baseAuthCtx: AuthCtxState = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const baseSubmission: Omit<Submission, "_id"> = {
validationType: ["metadata", "file"],
studyID: "",
deletingData: false,
nodeCount: 0,
};

describe("Accessibility", () => {
Expand Down
1 change: 1 addition & 0 deletions src/components/DataSubmissions/ValidationStatus.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const BaseSubmission: Omit<
updatedAt: "",
studyID: "",
deletingData: false,
nodeCount: 0,
};

type TestParentProps = {
Expand Down
Loading

0 comments on commit 257ec81

Please sign in to comment.