Merge pull request #156 from NIH-NCPI/cors-bug

Removed credentials from headers causing CORS error
NIH-NCPI · Dec 13, 2024 · 863696a · 863696a
2 parents 7cc6c19 + ebe3223
commit 863696a
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 50 deletions.
diff --git a/src/components/Manager/FetchManager.jsx b/src/components/Manager/FetchManager.jsx
@@ -4,7 +4,6 @@ import { ontologyReducer } from './Utilitiy';
 export const getAll = (vocabUrl, name, navigate) => {
   return fetch(`${vocabUrl}/${name}`, {
     method: 'GET',
-    credentials: 'include',
     headers: {
       'Content-Type': 'application/json',
     },

diff --git a/src/components/Projects/Tables/TableDetails.jsx b/src/components/Projects/Tables/TableDetails.jsx
@@ -132,65 +132,61 @@ export const TableDetails = () => {
     setLoading(true);
     getById(vocabUrl, 'Table', tableId)
       .then(data => {
-        if (data === null) {
-          navigate('/404');
-        } else {
-          setTable(data);
-          if (data) {
-            getById(vocabUrl, 'Table', `${tableId}/mapping`)
-              .then(data => setMapping(data.codes))
-              .catch(error => {
-                if (error) {
-                  console.log(error, 'error');
-
-                  notification.error({
-                    message: 'Error',
-                    description: 'An error occurred loading mappings.',
-                  });
-                }
-                return error;
-              })
-              .then(() =>
-                getById(
-                  vocabUrl,
-                  'Terminology',
-                  'ftd-concept-map-relationship'
-                ).then(data => setRelationshipOptions(data.codes))
-              )
-              .then(() =>
-                fetch(`${vocabUrl}/Table/${tableId}/filter/self`, {
-                  method: 'GET',
-                  headers: {
-                    'Content-Type': 'application/json',
-                  },
-                })
-              )
-              .then(res => {
-                if (res.ok) {
-                  return res.json();
-                } else {
-                  throw new Error('An unknown error occurred.');
-                }
-              })
-              .then(data => {
-                setApiPreferences(data);
+        setTable(data);
+        if (data) {
+          getById(vocabUrl, 'Table', `${tableId}/mapping`)
+            .then(data => setMapping(data.codes))
+            .catch(error => {
+              if (error) {
+                console.log(error, 'error');
+
+                notification.error({
+                  message: 'Error',
+                  description: 'An error occurred loading mappings.',
+                });
+              }
+              return error;
+            })
+            .then(() =>
+              getById(
+                vocabUrl,
+                'Terminology',
+                'ftd-concept-map-relationship'
+              ).then(data => setRelationshipOptions(data.codes))
+            )
+            .then(() =>
+              fetch(`${vocabUrl}/Table/${tableId}/filter/self`, {
+                method: 'GET',
+                headers: {
+                  'Content-Type': 'application/json',
+                },
               })
-              .finally(() => setLoading(false));
-          } else {
-            setLoading(false);
-          }
+            )
+            .then(res => {
+              if (res.ok) {
+                return res.json();
+              } else {
+                throw new Error('An unknown error occurred.');
+              }
+            })
+            .then(data => {
+              setApiPreferences(data);
+            })
+            .finally(() => setLoading(false));
+        } else {
+          setLoading(false);
         }
       })
       .catch(error => {
         if (error) {
           notification.error({
             message: 'Error',
-            description: 'An error occurred loading table details.',
+            description: 'An error occurred loading the table.',
           });
+          setLoading(false);
         }
         return error;
-      })
-      .finally(() => setLoading(false));
+      });
   };
 
   useEffect(() => {