Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

CRDCDH-594 Submit Using Validation Status #253

Closed
wants to merge 6 commits into from
Closed

CRDCDH-594 Submit Using Validation Status #253

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae4fa04
Use metadataValidationStatus and fileValidationStatus to check valida…
Alejandro-Vega Jan 2, 2024
5636b75
Merge branch 'mvp-2.1.0' into CRDCDH-594-validation-status
Alejandro-Vega Jan 4, 2024
ff7eb8c
Merge branch 'mvp-2.1.0' into CRDCDH-594-validation-status
Alejandro-Vega Jan 8, 2024
09de9f0
Merge branch 'mvp-2.1.0' into CRDCDH-594-validation-status
Alejandro-Vega Jan 9, 2024
90398c5
Disable submit if metadata is missing
Alejandro-Vega Jan 9, 2024
108c661
Merge branch 'CRDCDH-594-validation-status' of https://github.com/CBI…
Alejandro-Vega Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/content/dataSubmissions/DataSubmission.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,17 @@ const DataSubmission = () => {
const tableRef = useRef<TableMethods>(null);
const isValidTab = tab && Object.values(URLTabs).includes(tab);
const disableSubmit = useMemo(
() => !data?.submissionStats?.stats?.length || data?.submissionStats?.stats.some((stat) => stat.new > 0 || (user.role !== "Admin" && stat.error > 0)),
[data?.submissionStats, user]
() => {
if (!data?.getSubmission?._id) {
return true;
}
const isMissingMetadata = !data.getSubmission.metadataValidationStatus;
const isValidating = data.getSubmission.metadataValidationStatus === "Validating" || data.getSubmission.fileValidationStatus === "Validating";
const hasNew = data.getSubmission.metadataValidationStatus === "New" || data.getSubmission.fileValidationStatus === "New";
const hasError = data.getSubmission.metadataValidationStatus === "Error" || data.getSubmission.fileValidationStatus === "Error";
return isValidating || isMissingMetadata || hasNew || (user?.role !== "Admin" && hasError);
},
[data?.getSubmission, user]
);

const [listBatches] = useLazyQuery<ListBatchesResp>(LIST_BATCHES, {
Expand Down Expand Up @@ -401,9 +410,8 @@ const DataSubmission = () => {
setChangesAlert({ message, severity });
setTimeout(() => setChangesAlert(null), 10000);

const preInProgressStatuses: SubmissionStatus[] = ["New", "Withdrawn", "Rejected"];
// createBatch will update the status to 'In Progress'
if (preInProgressStatuses.includes(data?.getSubmission?.status)) {
const refreshStatuses: SubmissionStatus[] = ["New", "Withdrawn", "Rejected", "In Progress"];
if (refreshStatuses.includes(data?.getSubmission?.status)) {
await getSubmission();
}
};
Expand Down