Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

CRDCDH-133 Updating Program/Study #42

Merged
merged 11 commits into from
Jul 14, 2023
Merged

CRDCDH-133 Updating Program/Study #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
78ecc2e
Merge branch 'CRDCDH-36-data-deidentified' of https://github.com/CBII…
Alejandro-Vega Jul 11, 2023
59c297a
Modified AutocompleteInput to accept generic types as values and opti…
Alejandro-Vega Jul 12, 2023
11d9fdc
Merge branch 'mvp-1.0.0' of https://github.com/CBIIT/crdc-datahub-ui …
Alejandro-Vega Jul 12, 2023
0533c5a
Fixed initialValues and applicationData not doing a deep merge. Also …
Alejandro-Vega Jul 12, 2023
1e9ee57
Updated names and abbreviations for studies
Alejandro-Vega Jul 12, 2023
9d80c04
Conditionally adding required field to hidden input as it causes the …
Alejandro-Vega Jul 13, 2023
ae83112
Updated logic for Program/Study in section B. Fixed unit tests, valid…
Alejandro-Vega Jul 13, 2023
86cbfdd
Fixed toggleContent having required + hidden field error. Also, the t…
Alejandro-Vega Jul 14, 2023
2cfe33b
Small validation update for autocomplete input
Alejandro-Vega Jul 14, 2023
c8a7b08
Added Study Description tooltip
Alejandro-Vega Jul 14, 2023
3e2f4b6
Deep copied initialValues to avoid lodash from changing the initialVa…
Alejandro-Vega Jul 14, 2023
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: 11 additions & 7 deletions src/components/Contexts/FormContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import React, {
useState,
} from "react";
import { useLazyQuery, useMutation } from '@apollo/client';
import { merge, cloneDeep } from "lodash";
import { GET_APP, SAVE_APP, SUBMIT_APP } from './graphql';
import initialValues from "../../config/InitialValues";
import { FormatDate } from "../../utils";
Expand Down Expand Up @@ -124,15 +125,18 @@ export const FormProvider: FC<ProviderProps> = (props) => {
// Update the state when the lazy query response changes
if (data) {
const applicationData = data?.getApplication;
const initialValuesData = cloneDeep(initialValues);

const newData: Application = {
...merge(initialValuesData, applicationData),
// To avoid false positive form changes
targetedReleaseDate: FormatDate(applicationData?.targetedReleaseDate, "MM/DD/YYYY"),
targetedSubmissionDate: FormatDate(applicationData?.targetedSubmissionDate, "MM/DD/YYYY"),
};

setState({
status: Status.LOADED,
data: {
...initialValues,
...applicationData,
// To avoid false positive form changes
targetedReleaseDate: FormatDate(applicationData?.targetedReleaseDate, "MM/DD/YYYY"),
targetedSubmissionDate: FormatDate(applicationData?.targetedSubmissionDate, "MM/DD/YYYY"),
}
data: newData,
});
}

Expand Down
Loading