add additional error handling while fetching data, remove infinite lo…

…ading spinner
astronomer · May 23, 2024 · 192a95a · 192a95a
1 parent d2853db
commit 192a95a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/astronomer_starship/src/State.jsx b/astronomer_starship/src/State.jsx
@@ -155,6 +155,7 @@ export const reducer = (state, action) => {
       return action.error.response.status === 401 ? {
         ...state,
         variablesError: action.error,
+        variablesLoading: false,
         isSetupComplete: false,
         isTokenTouched: false,
         token: null,
@@ -183,6 +184,7 @@ export const reducer = (state, action) => {
       return action.error.response.status === 401 ? {
         ...state,
         connectionsError: action.error,
+        connectionsLoading: false,
         isSetupComplete: false,
         isTokenTouched: false,
         token: null,
@@ -211,6 +213,7 @@ export const reducer = (state, action) => {
       return action.error.response.status === 401 ? {
         ...state,
         poolsError: action.error,
+        poolsLoading: false,
         isSetupComplete: false,
         isTokenTouched: false,
         token: null,
@@ -241,6 +244,7 @@ export const reducer = (state, action) => {
       return action.error.response.status === 401 ? {
         ...state,
         envError: action.error,
+        envLoading: false,
         isSetupComplete: false,
         isTokenTouched: false,
         token: null,
@@ -267,6 +271,7 @@ export const reducer = (state, action) => {
       return action.error.response.status === 401 ? {
         ...state,
         dagsError: action.error,
+        dagsLoading: false,
         isSetupComplete: false,
         isTokenTouched: false,
         token: null,

diff --git a/astronomer_starship/src/util.js b/astronomer_starship/src/util.js
@@ -101,7 +101,16 @@ export function fetchData(
     .then((res) => {
       axios
         .get(proxyUrl(remoteRouteUrl), { headers: proxyHeaders(token) })
-        .then((rRes) => dataDispatch(res, rRes)) // , dispatch))
+        .then((rRes) => {
+          if (
+            res.status === 200 && res.headers['content-type'] === 'application/json' &&
+            rRes.status === 200 && res.headers['content-type'] === 'application/json'
+          ){
+            dataDispatch(res, rRes)
+          } else {
+            errorDispatch('Invalid response');
+          }
+        }) // , dispatch))
         .catch((err) => errorDispatch(err)); // , dispatch));
     })
     .catch((err) => errorDispatch(err)); // , dispatch));