Selections sent to API after changing ontology filters

NIH-NCPI · Jan 8, 2025 · 65b8756 · 65b8756
1 parent a2a1779
commit 65b8756
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 40 deletions.
diff --git a/src/components/Manager/MappingsFunctions/MappingSearch.jsx b/src/components/Manager/MappingsFunctions/MappingSearch.jsx
@@ -54,6 +54,7 @@ export const MappingSearch = ({
     setDisplaySelectedMappings,
     selectedBoxes,
     setSelectedBoxes,
+    existingMappings,
   } = useContext(MappingContext);
 
   let ref = useRef();
@@ -253,7 +254,8 @@ export const MappingSearch = ({
   };
 
   const onExistingChange = checkedValues => {
-    setExistingMappings(checkedValues);
+    const parsedValues = checkedValues.map(cv => JSON.parse(cv));
+    setExistingMappings(parsedValues);
   };
 
   // If the checkbox is checked, it adds the object to the selectedBoxes array
@@ -410,8 +412,12 @@ export const MappingSearch = ({
     );
   };
 
+  // Sets existingMappings to the mappings that have already been mapped to pass them to the body of the PUT call on save.
+  useEffect(() => {
+    setExistingMappings(mappingsForSearch);
+  }, []);
   // Iterates through the array of previously selected mappings. Returns a JSON stringified object to use as default checked values separate from the search results.
-  const initialChecked = mappingsForSearch.map(m =>
+  const initialChecked = existingMappings.map(m =>
     JSON.stringify({
       code: m?.code,
       display: m?.display,
@@ -420,11 +426,6 @@ export const MappingSearch = ({
     })
   );
 
-  // Sets existingMappings to the mappings that have already been mapped to pass them to the body of the PUT call on save.
-  useEffect(() => {
-    setExistingMappings(mappingsForSearch);
-  }, []);
-
   // Creates a Set that excludes the mappings that have already been selected.
   // Then filteres the existing mappings out of the results to only display results that have not yet been selected.
   const getFilteredResults = () => {

diff --git a/src/components/Projects/Tables/EditMappingsTableModal.jsx b/src/components/Projects/Tables/EditMappingsTableModal.jsx
@@ -30,6 +30,8 @@ export const EditMappingsTableModal = ({
     setDisplaySelectedMappings,
     setShowOptions,
     idsForSelect,
+    existingMappings,
+    selectedBoxes,
   } = useContext(MappingContext);
   const {
     apiPreferencesCode,
@@ -179,27 +181,25 @@ export const EditMappingsTableModal = ({
   // The existing and new mappings are JSON.parsed and combined into one mappings array to be passed into the body of the PUT call.
   const editUpdatedMappings = values => {
     setLoading(true);
-    const selectedMappings = values?.selected_mappings?.map(item => ({
+
+    const selectedMappings = selectedBoxes?.map(item => ({
       code: item.code,
       display: item.display,
       description: item.description,
-      system:
-        item.system || systemsMatch(item.code.split(':')[0], ontologyApis),
+      system: systemsMatch(item.code.split(':')[0], ontologyApis),
       mapping_relationship: idsForSelect[item.code],
     }));
-    const mappingsDTO = {
-      mappings: [
-        ...(values.existing_mappings?.map(v => {
-          const parsedMapping = JSON.parse(v);
-          if (idsForSelect[parsedMapping.code]) {
-            parsedMapping.mapping_relationship =
-              idsForSelect[parsedMapping.code];
-          }
 
-          return parsedMapping;
-        }) ?? []),
-        ...(selectedMappings ?? []),
-      ],
+    const preexistingMappings = existingMappings?.map(item => ({
+      code: item.code,
+      display: item.display,
+      description: item.description,
+      system: systemsMatch(item?.code?.split(':')[0], ontologyApis),
+      mapping_relationship: idsForSelect[item.code],
+    }));
+
+    const mappingsDTO = {
+      mappings: [...(preexistingMappings ?? []), ...(selectedMappings ?? [])],
       editor: user.email,
     };
 

diff --git a/src/components/Projects/Terminologies/EditMappingModal.jsx b/src/components/Projects/Terminologies/EditMappingModal.jsx
@@ -31,7 +31,8 @@ export const EditMappingsModal = ({
   const [termMappings, setTermMappings] = useState([]);
   const [options, setOptions] = useState([]);
   const { vocabUrl, setSelectedKey, user } = useContext(myContext);
-  const { setShowOptions, idsForSelect } = useContext(MappingContext);
+  const { setShowOptions, idsForSelect, selectedBoxes, existingMappings } =
+    useContext(MappingContext);
   const {
     apiPreferencesCode,
     setApiPreferencesCode,
@@ -182,27 +183,24 @@ export const EditMappingsModal = ({
   // The existing and new mappings are JSON.parsed combined into one mappings array to be passed into the body of the PUT call.
   const editUpdatedMappings = values => {
     setLoading(true);
-    const selectedMappings = values?.selected_mappings?.map(item => ({
+    const selectedMappings = selectedBoxes?.map(item => ({
       code: item.code,
       display: item.display,
       description: item.description,
-      system:
-        item.system || systemsMatch(item.code.split(':')[0], ontologyApis),
+      system: systemsMatch(item.code.split(':')[0], ontologyApis),
       mapping_relationship: idsForSelect[item.code],
     }));
-    const mappingsDTO = {
-      mappings: [
-        ...(values.existing_mappings?.map(v => {
-          const parsedMapping = JSON.parse(v);
-          if (idsForSelect[parsedMapping.code]) {
-            parsedMapping.mapping_relationship =
-              idsForSelect[parsedMapping.code];
-          }
 
-          return parsedMapping;
-        }) ?? []),
-        ...(selectedMappings ?? []),
-      ],
+    const preexistingMappings = existingMappings?.map(item => ({
+      code: item.code,
+      display: item.display,
+      description: item.description,
+      system: systemsMatch(item?.code?.split(':')[0], ontologyApis),
+      mapping_relationship: idsForSelect[item.code],
+    }));
+
+    const mappingsDTO = {
+      mappings: [...(preexistingMappings ?? []), ...(selectedMappings ?? [])],
       editor: user.email,
     };
 

diff --git a/src/components/Search/SearchResults.jsx b/src/components/Search/SearchResults.jsx
@@ -27,7 +27,7 @@ export const SearchResults = () => {
   const { query } = useParams();
   const navigate = useNavigate();
   const ref = useRef();
-  const pageref = useRef;
+  const pageref = useRef();
   const pageStart = page * entriesPerPage;
 
   useEffect(() => {
@@ -158,7 +158,9 @@ The user is then redirected to the search page, which completes the search for t
                       <>
                         <div
                           key={index}
-                          pageref={index === lastCount + 1 ? ref : undefined}
+                          pageref={
+                            index === lastCount + 1 ? pageref : undefined
+                          }
                           className="search_result"
                         >
                           <div className="term_ontology">