Fix/api changes: refactored error handling and minor fixes (#19)

* Fix(SignalEntryForm): added missing attributes for updating signal * Fix(api_config): automatic localStorage clearing if interceptor fails to refresh token * Refactor(errors): error handling message restructured to fit new response
UNDP-Data · Nov 6, 2024 · e63c821 · e63c821
1 parent 39e6afe
commit e63c821
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 59 deletions.
diff --git a/src/AdminPanel/index.tsx b/src/AdminPanel/index.tsx
@@ -58,7 +58,7 @@ export function AdminPanel() {
             setTotalCount(0);
           } else {
             setError(
-              `Error code ${err.response?.status}: ${err.response?.data}. ${
+              `${err}. ${
                 err.response?.status === 500
                   ? 'Please try again in some time'
                   : ''

diff --git a/src/Components/AddSignalsModal.tsx b/src/Components/AddSignalsModal.tsx
@@ -89,7 +89,7 @@ export function AddSignalsModal(props: Props) {
             setLoading(false);
           } else if (err.response?.status === 500) {
             setError(
-              `Error code ${err.response?.status}: ${err.response?.data}. ${
+              `${err}. ${
                 err.response?.status === 500
                   ? 'Please try again in some time'
                   : ''
@@ -98,7 +98,7 @@ export function AddSignalsModal(props: Props) {
             setLoading(false);
           } else if (err.response?.status === 422) {
             setError(
-              `Error code ${err.response?.status}: ${
+              `${err}. ${
                 err.response?.status === 422
                   ? 'Please check if the input to this field is correct, IDs are numerical and must be separated by commas'
                   : ''
@@ -200,7 +200,7 @@ export function AddSignalsModal(props: Props) {
           setLoading(false);
         } else {
           setError(
-            `Error code ${err.response?.status}: ${err.response?.data}. ${
+            `${err}. ${
               err.response?.status === 500
                 ? 'Please try again in some time'
                 : ''
@@ -289,7 +289,7 @@ export function AddSignalsModal(props: Props) {
           setLoading(false);
         } else {
           setError(
-            `Error code ${err.response?.status}: ${err.response?.data}. ${
+            `${err}. ${
               err.response?.status === 500
                 ? 'Please try again in some time'
                 : ''

diff --git a/src/Components/AddTrendsModal.tsx b/src/Components/AddTrendsModal.tsx
@@ -86,7 +86,7 @@ export function AddTrendsModal(props: Props) {
             setLoading(false);
           } else if (err.response?.status === 500) {
             setError(
-              `Error code ${err.response?.status}: ${err.response?.data}. ${
+              `${err}. ${
                 err.response?.status === 500
                   ? 'Please try again in some time'
                   : ''
@@ -95,7 +95,7 @@ export function AddTrendsModal(props: Props) {
             setLoading(false);
           } else if (err.response?.status === 422) {
             setError(
-              `Error code ${err.response?.status}: ${
+              `${err}. ${
                 err.response?.status === 422
                   ? 'Please check if the input to this field is correct, IDs are numerical and must be separated by commas'
                   : ''
@@ -180,7 +180,7 @@ export function AddTrendsModal(props: Props) {
           setLoading(false);
         } else {
           setError(
-            `Error code ${err.response?.status}: ${err.response?.data}. ${
+            `${err}. ${
               err.response?.status === 500
                 ? 'Please try again in some time'
                 : ''
@@ -210,7 +210,7 @@ export function AddTrendsModal(props: Props) {
           setLoading(false);
         } else {
           setError(
-            `Error code ${err.response?.status}: ${err.response?.data}. ${
+            `${err}. ${
               err.response?.status === 500
                 ? 'Please try again in some time'
                 : ''

diff --git a/src/Components/SignOutButton.tsx b/src/Components/SignOutButton.tsx
@@ -372,9 +372,7 @@ export function SignOutButton(props: Props) {
                   .catch(err => {
                     setButtonDisabled(false);
                     setSubmittingError(
-                      `Error code ${err.response?.status}: ${
-                        err.response?.data
-                      }. ${
+                      `${err}. ${
                         err.response?.status === 500
                           ? 'Please try again in some time'
                           : ''

diff --git a/src/Components/SignalEntryFormEl.tsx b/src/Components/SignalEntryFormEl.tsx
@@ -203,7 +203,7 @@ export function SignalEntryFormEl(props: Props) {
       .catch(err => {
         setButtonDisabled(false);
         setSubmittingError(
-          `Error code ${err.response?.status}: ${err.response?.data}. ${
+          `${err}. ${
             err.response?.status === 500 ? 'Please try again in some time' : ''
           }`,
         );
@@ -224,7 +224,7 @@ export function SignalEntryFormEl(props: Props) {
         })
         .catch(err => {
           setSubmittingError(
-            `Error code ${err.response?.status}: ${err.response?.data}. ${
+            `${err}. ${
               err.response?.status === 500
                 ? 'Please try again in some time'
                 : ''
@@ -989,7 +989,8 @@ export function SignalEntryFormEl(props: Props) {
                       relevance: signalData?.relevance || '',
                       location: signalData?.location || '',
                       created_by: signalData?.created_by || '',
-                      score: signalData?.score || '',
+                      created_for: signalData.created_for,
+                      score: signalData.score,
                       connected_trends: selectedTrendsList,
                       status: 'New',
                       keywords: [keyword1, keyword2, keyword3].filter(
@@ -1006,9 +1007,7 @@ export function SignalEntryFormEl(props: Props) {
                       .catch(err => {
                         setButtonDisabled(false);
                         setSubmittingError(
-                          `Error code ${err.response?.status}: ${
-                            err.response?.data
-                          }. ${
+                          `${err}. ${
                             err.response?.status === 500
                               ? 'Please try again in some time'
                               : ''
@@ -1032,17 +1031,18 @@ export function SignalEntryFormEl(props: Props) {
                       id: signalData.id,
                       headline: signalData?.headline || '',
                       description: signalData?.description || '',
-                      attachment: signalData?.attachment || '',
+                      attachment: signalData?.attachment,
                       steep_primary: signalData?.steep_primary || '',
+                      steep_secondary: signalData?.steep_secondary,
                       signature_primary: signalData?.signature_primary || '',
-                      signature_secondary:
-                        signalData?.signature_secondary || [],
+                      signature_secondary: signalData?.signature_secondary,
                       sdgs: signalData?.sdgs || [],
                       url: signalData?.url || '',
                       relevance: signalData?.relevance || '',
                       location: signalData?.location || '',
-                      score: signalData?.score || '',
+                      score: signalData.score,
                       created_by: signalData?.created_by || '',
+                      created_for: signalData.created_for,
                       connected_trends: selectedTrendsList,
                       keywords: [keyword1, keyword2, keyword3].filter(
                         (d): d is string => d !== null && d !== undefined,
@@ -1059,9 +1059,7 @@ export function SignalEntryFormEl(props: Props) {
                       .catch(err => {
                         setButtonDisabled(false);
                         setSubmittingError(
-                          `Error code ${err.response?.status}: ${
-                            err.response?.data
-                          }. ${
+                          `${err}. ${
                             err.response?.status === 500
                               ? 'Please try again in some time'
                               : ''
@@ -1128,7 +1126,7 @@ export function SignalEntryFormEl(props: Props) {
                     status: signalData?.status || '',
                     created_by: signalData.created_by || '',
                     created_for: signalData?.created_for || '',
-                    score: signalData?.score || '',
+                    score: signalData.score,
                     created_unit: signalData?.created_unit || '',
                     connected_trends: selectedTrendsList,
                     keywords: [keyword1, keyword2, keyword3].filter(
@@ -1143,9 +1141,7 @@ export function SignalEntryFormEl(props: Props) {
                     .catch(err => {
                       setButtonDisabled(false);
                       setSubmittingError(
-                        `Error code ${err.response?.status}: ${
-                          err.response?.data
-                        }. ${
+                        `${err}. ${
                           err.response?.status === 500
                             ? 'Please try again in some time'
                             : ''
@@ -1192,7 +1188,7 @@ export function SignalEntryFormEl(props: Props) {
                   relevance: signalData?.relevance || '',
                   created_for: signalData?.created_for || '',
                   location: signalData?.location || '',
-                  score: signalData?.score || '',
+                  score: signalData.score,
                   connected_trends: selectedTrendsList,
                   status: 'New',
                   keywords: [keyword1, keyword2, keyword3].filter(
@@ -1209,9 +1205,7 @@ export function SignalEntryFormEl(props: Props) {
                   .catch(err => {
                     setButtonDisabled(false);
                     setSubmittingError(
-                      `Error code ${err.response?.status}: ${
-                        err.response?.data
-                      }. ${
+                      `${err}. ${
                         err.response?.status === 500
                           ? 'Please try again in some time'
                           : ''
@@ -1241,7 +1235,7 @@ export function SignalEntryFormEl(props: Props) {
                   url: signalData?.url || '',
                   relevance: signalData?.relevance || '',
                   created_for: signalData?.created_for || '',
-                  score: signalData?.score || '',
+                  score: signalData.score,
                   location: signalData?.location || '',
                   connected_trends: selectedTrendsList,
                   status: 'Draft',
@@ -1259,9 +1253,7 @@ export function SignalEntryFormEl(props: Props) {
                   .catch(err => {
                     setButtonDisabled(false);
                     setSubmittingError(
-                      `Error code ${err.response?.status}: ${
-                        err.response?.data
-                      }. ${
+                      `${err}. ${
                         err.response?.status === 500
                           ? 'Please try again in some time'
                           : ''

diff --git a/src/Components/TrendEntryFormEl.tsx b/src/Components/TrendEntryFormEl.tsx
@@ -143,7 +143,7 @@ export function TrendEntryFormEl(props: Props) {
       .catch(err => {
         setButtonDisabled(false);
         setSubmittingError(
-          `Error code ${err.response?.status}: ${err.response?.data}. ${
+          `${err}. ${
             err.response?.status === 500 ? 'Please try again in some time' : ''
           }`,
         );
@@ -736,9 +736,7 @@ export function TrendEntryFormEl(props: Props) {
                   .catch(err => {
                     setButtonDisabled(false);
                     setSubmittingError(
-                      `Error code ${err.response?.status}: ${
-                        err.response?.data
-                      }. ${
+                      `${err}. ${
                         err.response?.status === 500
                           ? 'Please try again in some time'
                           : ''
@@ -780,9 +778,7 @@ export function TrendEntryFormEl(props: Props) {
                     .catch(err => {
                       setButtonDisabled(false);
                       setSubmittingError(
-                        `Error code ${err.response?.status}: ${
-                          err.response?.data
-                        }. ${
+                        `${err}. ${
                           err.response?.status === 500
                             ? 'Please try again in some time'
                             : ''

diff --git a/src/HomePage/TrendsVis/Viz.tsx b/src/HomePage/TrendsVis/Viz.tsx
@@ -100,7 +100,7 @@ export function Viz(props: Props) {
           setTrendsList([]);
         } else {
           setError(
-            `Error code ${err.response?.status}: ${err.response?.data}. ${
+            `${err}. ${
               err.response?.status === 500
                 ? 'Please try again in some time'
                 : ''

diff --git a/src/MyDrafts/index.tsx b/src/MyDrafts/index.tsx
@@ -36,7 +36,7 @@ export function MyDrafts() {
           updateSignalList([]);
         } else {
           setError(
-            `Error code ${err.response?.status}: ${err.response?.data}. ${
+            `${err}. ${
               err.response?.status === 500
                 ? 'Please try again in some time'
                 : ''
@@ -66,7 +66,7 @@ export function MyDrafts() {
           updateSignalList([]);
         } else {
           setError(
-            `Error code ${err.response?.status}: ${err.response?.data}. ${
+            `${err}. ${
               err.response?.status === 500
                 ? 'Please try again in some time'
                 : ''

diff --git a/src/Signals/AllSignals/index.tsx b/src/Signals/AllSignals/index.tsx
@@ -116,7 +116,7 @@ export function AllSignals(props: Props) {
           setTotalCount(0);
         } else {
           setError(
-            `Error code ${err.response?.status}: ${err.response?.data}. ${
+            `${err}: ${err.response?.data}. ${
               err.response?.status === 500
                 ? 'Please try again in some time'
                 : ''
@@ -142,7 +142,7 @@ export function AllSignals(props: Props) {
           setTotalCount(0);
         } else {
           setError(
-            `Error code ${err.response?.status}: ${err.response?.data}. ${
+            `${err}. ${
               err.response?.status === 500
                 ? 'Please try again in some time'
                 : ''

diff --git a/src/Signals/SignalDetail/index.tsx b/src/Signals/SignalDetail/index.tsx
@@ -367,9 +367,7 @@ export function SignalDetail() {
                                 .catch(err => {
                                   setButtonDisabled(false);
                                   setSubmittingError(
-                                    `Error code ${err.response?.status}: ${
-                                      err.response?.data
-                                    }. ${
+                                    `${err}. ${
                                       err.response?.status === 500
                                         ? 'Please try again in some time'
                                         : ''

diff --git a/src/Trends/AllTrends/index.tsx b/src/Trends/AllTrends/index.tsx
@@ -107,7 +107,7 @@ export function AllTrends(props: Props) {
           setTotalCount(0);
         } else {
           setError(
-            `Error code ${err.response?.status}: ${err.response?.data}. ${
+            `${err}. ${
               err.response?.status === 500
                 ? 'Please try again in some time'
                 : ''
@@ -133,7 +133,7 @@ export function AllTrends(props: Props) {
           setTotalCount(0);
         } else {
           setError(
-            `Error code ${err.response?.status}: ${err.response?.data}. ${
+            `${err}. ${
               err.response?.status === 500
                 ? 'Please try again in some time'
                 : ''

diff --git a/src/Trends/EditTrend/index.tsx b/src/Trends/EditTrend/index.tsx
@@ -29,7 +29,7 @@ export function EditTrend() {
         })
         .catch(err => {
           setError(
-            `Error code ${err.response?.status}: ${
+            `${err}: ${
               err.response?.status === 404
                 ? 'No trend available with the selected ID'
                 : err.response?.data

diff --git a/src/Trends/TrendDetail/index.tsx b/src/Trends/TrendDetail/index.tsx
@@ -63,7 +63,7 @@ export function TrendDetail() {
           })
           .catch(err => {
             setError(
-              `Error code ${err.response?.status}: ${
+              `${err}: ${
                 err.response?.status === 404
                   ? 'No trend available with the selected IDs'
                   : err.response?.data
@@ -357,9 +357,7 @@ export function TrendDetail() {
                                 .catch(err => {
                                   setButtonDisabled(false);
                                   setSubmittingError(
-                                    `Error code ${err.response?.status}: ${
-                                      err.response?.data
-                                    }. ${
+                                    `${err}. ${
                                       err.response?.status === 500
                                         ? 'Please try again in some time'
                                         : ''

diff --git a/src/api/api_config.ts b/src/api/api_config.ts
@@ -38,6 +38,7 @@ axiosInstance.interceptors.request.use(
           throw new Error('Failed to refresh access token');
         }
       } catch (error) {
+        localStorage.clear();
         await signOutClickHandler();
         throw error;
       }