From 99dff3802b8ba8ccf687ac467533b0e3ca57c1e9 Mon Sep 17 00:00:00 2001 From: Alejandro-Vega Date: Wed, 29 May 2024 14:10:16 -0400 Subject: [PATCH 1/5] Added accessedAt property to Submission type and query --- src/graphql/getSubmission.ts | 1 + src/types/Submissions.d.ts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/graphql/getSubmission.ts b/src/graphql/getSubmission.ts index f98ef3f46..25cb1c291 100644 --- a/src/graphql/getSubmission.ts +++ b/src/graphql/getSubmission.ts @@ -51,6 +51,7 @@ export const query = gql` intention dataType otherSubmissions + accessedAt createdAt updatedAt } diff --git a/src/types/Submissions.d.ts b/src/types/Submissions.d.ts index e8eac8e36..8f4a894f8 100644 --- a/src/types/Submissions.d.ts +++ b/src/types/Submissions.d.ts @@ -26,6 +26,7 @@ type Submission = { * @see OtherSubmissions */ otherSubmissions: string; + accessedAt: string; // ISO 8601 date time format with UTC or offset e.g., 2023-05-01T09:23:30Z 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 }; @@ -63,7 +64,8 @@ type SubmissionStatus = | "Rejected" | "Completed" | "Archived" - | "Canceled"; + | "Canceled" + | "Deleted"; type SubmissionAction = | "Submit" From 87830dc95c5cabf7fe9c6f95af0834eda50f0500 Mon Sep 17 00:00:00 2001 From: Alejandro-Vega Date: Wed, 29 May 2024 14:11:09 -0400 Subject: [PATCH 2/5] Added accessedAt property to baseSubmissions in tests --- src/components/DataSubmissions/CrossValidationButton.test.tsx | 1 + src/components/DataSubmissions/DataUpload.test.tsx | 1 + .../DataSubmissions/DeleteAllOrphanFilesButton.test.tsx | 1 + src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx | 1 + src/components/DataSubmissions/ExportValidationButton.test.tsx | 1 + src/components/DataSubmissions/MetadataUpload.test.tsx | 1 + src/components/DataSubmissions/ValidationControls.test.tsx | 1 + src/components/DataSubmissions/ValidationStatistics.test.tsx | 1 + src/utils/dataSubmissionUtils.test.ts | 1 + 9 files changed, 9 insertions(+) diff --git a/src/components/DataSubmissions/CrossValidationButton.test.tsx b/src/components/DataSubmissions/CrossValidationButton.test.tsx index 5652a8b4a..6fd496234 100644 --- a/src/components/DataSubmissions/CrossValidationButton.test.tsx +++ b/src/components/DataSubmissions/CrossValidationButton.test.tsx @@ -31,6 +31,7 @@ const baseSubmission: Omit< conciergeEmail: "", createdAt: "", updatedAt: "", + accessedAt: "", intention: "New/Update", dataType: "Metadata and Data Files", }; diff --git a/src/components/DataSubmissions/DataUpload.test.tsx b/src/components/DataSubmissions/DataUpload.test.tsx index 5eb6d2f77..33f284398 100644 --- a/src/components/DataSubmissions/DataUpload.test.tsx +++ b/src/components/DataSubmissions/DataUpload.test.tsx @@ -41,6 +41,7 @@ const baseSubmission: Omit = { dataType: "Metadata and Data Files", createdAt: "", updatedAt: "", + accessedAt: "", crossSubmissionStatus: null, otherSubmissions: null, }; diff --git a/src/components/DataSubmissions/DeleteAllOrphanFilesButton.test.tsx b/src/components/DataSubmissions/DeleteAllOrphanFilesButton.test.tsx index b3ceced89..4673ec5b4 100644 --- a/src/components/DataSubmissions/DeleteAllOrphanFilesButton.test.tsx +++ b/src/components/DataSubmissions/DeleteAllOrphanFilesButton.test.tsx @@ -41,6 +41,7 @@ const baseSubmission: Submission = { conciergeEmail: "", createdAt: "", updatedAt: "", + accessedAt: "", intention: "New/Update", dataType: "Metadata and Data Files", status: "In Progress", diff --git a/src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx b/src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx index fac957a50..ac8f40e06 100644 --- a/src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx +++ b/src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx @@ -41,6 +41,7 @@ const baseSubmission: Submission = { conciergeEmail: "", createdAt: "", updatedAt: "", + accessedAt: "", intention: "New/Update", dataType: "Metadata and Data Files", status: "In Progress", diff --git a/src/components/DataSubmissions/ExportValidationButton.test.tsx b/src/components/DataSubmissions/ExportValidationButton.test.tsx index 28abb148b..ba64d77dd 100644 --- a/src/components/DataSubmissions/ExportValidationButton.test.tsx +++ b/src/components/DataSubmissions/ExportValidationButton.test.tsx @@ -48,6 +48,7 @@ describe("ExportValidationButton cases", () => { conciergeEmail: "", createdAt: "", updatedAt: "", + accessedAt: "", intention: "New/Update", dataType: "Metadata and Data Files", }; diff --git a/src/components/DataSubmissions/MetadataUpload.test.tsx b/src/components/DataSubmissions/MetadataUpload.test.tsx index c249fd4b9..75fa72209 100644 --- a/src/components/DataSubmissions/MetadataUpload.test.tsx +++ b/src/components/DataSubmissions/MetadataUpload.test.tsx @@ -30,6 +30,7 @@ const baseSubmission: Omit< conciergeEmail: "", createdAt: "", updatedAt: "", + accessedAt: "", intention: "New/Update", dataType: "Metadata and Data Files", status: "New", diff --git a/src/components/DataSubmissions/ValidationControls.test.tsx b/src/components/DataSubmissions/ValidationControls.test.tsx index 357a7dc22..8db34113f 100644 --- a/src/components/DataSubmissions/ValidationControls.test.tsx +++ b/src/components/DataSubmissions/ValidationControls.test.tsx @@ -31,6 +31,7 @@ const baseSubmission: Omit< conciergeEmail: "", createdAt: "", updatedAt: "", + accessedAt: "", intention: "New/Update", dataType: "Metadata and Data Files", }; diff --git a/src/components/DataSubmissions/ValidationStatistics.test.tsx b/src/components/DataSubmissions/ValidationStatistics.test.tsx index b0d5ea14e..75201a5e5 100644 --- a/src/components/DataSubmissions/ValidationStatistics.test.tsx +++ b/src/components/DataSubmissions/ValidationStatistics.test.tsx @@ -24,6 +24,7 @@ const baseSubmission: Omit = { dataType: "Metadata and Data Files", createdAt: "", updatedAt: "", + accessedAt: "", crossSubmissionStatus: "New", otherSubmissions: null, }; diff --git a/src/utils/dataSubmissionUtils.test.ts b/src/utils/dataSubmissionUtils.test.ts index 977ea2448..c9f0690df 100644 --- a/src/utils/dataSubmissionUtils.test.ts +++ b/src/utils/dataSubmissionUtils.test.ts @@ -26,6 +26,7 @@ const baseSubmission: Submission = { dataType: "Metadata and Data Files", createdAt: "", updatedAt: "", + accessedAt: "", }; describe("General Submit", () => { From 1439d92014657e0ffd70649f1be061269e1129c9 Mon Sep 17 00:00:00 2001 From: Alejandro-Vega Date: Wed, 29 May 2024 14:13:35 -0400 Subject: [PATCH 3/5] Remove link from Submission Name when submission has a Deleted status --- src/content/dataSubmissions/DataSubmissionsListView.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/content/dataSubmissions/DataSubmissionsListView.tsx b/src/content/dataSubmissions/DataSubmissionsListView.tsx index cf5863f1a..77aa19024 100644 --- a/src/content/dataSubmissions/DataSubmissionsListView.tsx +++ b/src/content/dataSubmissions/DataSubmissionsListView.tsx @@ -148,7 +148,12 @@ const StyledSelect = styled(Select)(baseTextFieldStyles); const columns: Column[] = [ { label: "Submission Name", - value: (a) => {a.name}, + value: (a) => + a.status === "Deleted" ? ( + a.name + ) : ( + {a.name} + ), field: "name", }, { @@ -220,6 +225,7 @@ const statusValues: string[] = [ "Completed", "Archived", "Canceled", + "Deleted", ]; const statusOptionArray: SelectOption[] = statusValues.map((v) => ({ label: v, From 47be9f52073ca35f3ba7e619fedf57c27bc39adf Mon Sep 17 00:00:00 2001 From: Alejandro-Vega Date: Thu, 30 May 2024 10:58:05 -0400 Subject: [PATCH 4/5] Gray out deleted Submission Name text --- src/content/dataSubmissions/DataSubmissionsListView.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/content/dataSubmissions/DataSubmissionsListView.tsx b/src/content/dataSubmissions/DataSubmissionsListView.tsx index 77aa19024..7967f7a50 100644 --- a/src/content/dataSubmissions/DataSubmissionsListView.tsx +++ b/src/content/dataSubmissions/DataSubmissionsListView.tsx @@ -17,6 +17,7 @@ import { FormControl, Select, MenuItem, + Box, } from "@mui/material"; import { useSnackbar } from "notistack"; import { useQuery } from "@apollo/client"; @@ -145,12 +146,16 @@ const baseTextFieldStyles = { const StyledSelect = styled(Select)(baseTextFieldStyles); +const StyledDeletedText = styled(Box)(({ theme }) => ({ + color: theme.palette.text.disabled, +})); + const columns: Column[] = [ { label: "Submission Name", value: (a) => a.status === "Deleted" ? ( - a.name + {a.name} ) : ( {a.name} ), From bd184eab99072f83f7ae8c5a6ffc48ba22899d00 Mon Sep 17 00:00:00 2001 From: Alejandro-Vega Date: Fri, 7 Jun 2024 00:47:27 -0400 Subject: [PATCH 5/5] Removed accessedAt as it is not used anywhere --- src/components/DataSubmissions/CrossValidationButton.test.tsx | 1 - src/components/DataSubmissions/DataUpload.test.tsx | 1 - .../DataSubmissions/DeleteAllOrphanFilesButton.test.tsx | 1 - src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx | 1 - src/components/DataSubmissions/ExportValidationButton.test.tsx | 1 - src/components/DataSubmissions/MetadataUpload.test.tsx | 1 - src/components/DataSubmissions/ValidationControls.test.tsx | 1 - src/components/DataSubmissions/ValidationStatistics.test.tsx | 1 - src/graphql/getSubmission.ts | 1 - src/types/Submissions.d.ts | 1 - src/utils/dataSubmissionUtils.test.ts | 1 - 11 files changed, 11 deletions(-) diff --git a/src/components/DataSubmissions/CrossValidationButton.test.tsx b/src/components/DataSubmissions/CrossValidationButton.test.tsx index 6fd496234..5652a8b4a 100644 --- a/src/components/DataSubmissions/CrossValidationButton.test.tsx +++ b/src/components/DataSubmissions/CrossValidationButton.test.tsx @@ -31,7 +31,6 @@ const baseSubmission: Omit< conciergeEmail: "", createdAt: "", updatedAt: "", - accessedAt: "", intention: "New/Update", dataType: "Metadata and Data Files", }; diff --git a/src/components/DataSubmissions/DataUpload.test.tsx b/src/components/DataSubmissions/DataUpload.test.tsx index 33f284398..5eb6d2f77 100644 --- a/src/components/DataSubmissions/DataUpload.test.tsx +++ b/src/components/DataSubmissions/DataUpload.test.tsx @@ -41,7 +41,6 @@ const baseSubmission: Omit = { dataType: "Metadata and Data Files", createdAt: "", updatedAt: "", - accessedAt: "", crossSubmissionStatus: null, otherSubmissions: null, }; diff --git a/src/components/DataSubmissions/DeleteAllOrphanFilesButton.test.tsx b/src/components/DataSubmissions/DeleteAllOrphanFilesButton.test.tsx index 4673ec5b4..b3ceced89 100644 --- a/src/components/DataSubmissions/DeleteAllOrphanFilesButton.test.tsx +++ b/src/components/DataSubmissions/DeleteAllOrphanFilesButton.test.tsx @@ -41,7 +41,6 @@ const baseSubmission: Submission = { conciergeEmail: "", createdAt: "", updatedAt: "", - accessedAt: "", intention: "New/Update", dataType: "Metadata and Data Files", status: "In Progress", diff --git a/src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx b/src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx index ac8f40e06..fac957a50 100644 --- a/src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx +++ b/src/components/DataSubmissions/DeleteOrphanFileChip.test.tsx @@ -41,7 +41,6 @@ const baseSubmission: Submission = { conciergeEmail: "", createdAt: "", updatedAt: "", - accessedAt: "", intention: "New/Update", dataType: "Metadata and Data Files", status: "In Progress", diff --git a/src/components/DataSubmissions/ExportValidationButton.test.tsx b/src/components/DataSubmissions/ExportValidationButton.test.tsx index ba64d77dd..28abb148b 100644 --- a/src/components/DataSubmissions/ExportValidationButton.test.tsx +++ b/src/components/DataSubmissions/ExportValidationButton.test.tsx @@ -48,7 +48,6 @@ describe("ExportValidationButton cases", () => { conciergeEmail: "", createdAt: "", updatedAt: "", - accessedAt: "", intention: "New/Update", dataType: "Metadata and Data Files", }; diff --git a/src/components/DataSubmissions/MetadataUpload.test.tsx b/src/components/DataSubmissions/MetadataUpload.test.tsx index 75fa72209..c249fd4b9 100644 --- a/src/components/DataSubmissions/MetadataUpload.test.tsx +++ b/src/components/DataSubmissions/MetadataUpload.test.tsx @@ -30,7 +30,6 @@ const baseSubmission: Omit< conciergeEmail: "", createdAt: "", updatedAt: "", - accessedAt: "", intention: "New/Update", dataType: "Metadata and Data Files", status: "New", diff --git a/src/components/DataSubmissions/ValidationControls.test.tsx b/src/components/DataSubmissions/ValidationControls.test.tsx index 8db34113f..357a7dc22 100644 --- a/src/components/DataSubmissions/ValidationControls.test.tsx +++ b/src/components/DataSubmissions/ValidationControls.test.tsx @@ -31,7 +31,6 @@ const baseSubmission: Omit< conciergeEmail: "", createdAt: "", updatedAt: "", - accessedAt: "", intention: "New/Update", dataType: "Metadata and Data Files", }; diff --git a/src/components/DataSubmissions/ValidationStatistics.test.tsx b/src/components/DataSubmissions/ValidationStatistics.test.tsx index 75201a5e5..b0d5ea14e 100644 --- a/src/components/DataSubmissions/ValidationStatistics.test.tsx +++ b/src/components/DataSubmissions/ValidationStatistics.test.tsx @@ -24,7 +24,6 @@ const baseSubmission: Omit = { dataType: "Metadata and Data Files", createdAt: "", updatedAt: "", - accessedAt: "", crossSubmissionStatus: "New", otherSubmissions: null, }; diff --git a/src/graphql/getSubmission.ts b/src/graphql/getSubmission.ts index 25cb1c291..f98ef3f46 100644 --- a/src/graphql/getSubmission.ts +++ b/src/graphql/getSubmission.ts @@ -51,7 +51,6 @@ export const query = gql` intention dataType otherSubmissions - accessedAt createdAt updatedAt } diff --git a/src/types/Submissions.d.ts b/src/types/Submissions.d.ts index 8f4a894f8..0bdcb3304 100644 --- a/src/types/Submissions.d.ts +++ b/src/types/Submissions.d.ts @@ -26,7 +26,6 @@ type Submission = { * @see OtherSubmissions */ otherSubmissions: string; - accessedAt: string; // ISO 8601 date time format with UTC or offset e.g., 2023-05-01T09:23:30Z 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 index c9f0690df..977ea2448 100644 --- a/src/utils/dataSubmissionUtils.test.ts +++ b/src/utils/dataSubmissionUtils.test.ts @@ -26,7 +26,6 @@ const baseSubmission: Submission = { dataType: "Metadata and Data Files", createdAt: "", updatedAt: "", - accessedAt: "", }; describe("General Submit", () => {