add catches to request calls

maproulette · Jan 7, 2024 · a514580 · a514580
1 parent 0ab7543
commit a514580
Show file tree

Hide file tree

Showing 30 changed files with 767 additions and 559 deletions.
diff --git a/src/components/AdminPane/Manage/VirtualProjects/ChallengeIdResult.js b/src/components/AdminPane/Manage/VirtualProjects/ChallengeIdResult.js
@@ -8,9 +8,13 @@ import _omit from 'lodash/omit'
 import AssociatedChallengeList from './AssociatedChallengeList';
 
 const getChallengeById = async (id) => {
-  const result = await new Endpoint(api.challenge.single, { variables: { id }, schema: challengeSchema() }).execute()
+  try {
+    const result = await new Endpoint(api.challenge.single, { variables: { id }, schema: challengeSchema() }).execute()
 
-  return result
+    return result
+  } catch (error) {
+    console.error('Error fetching challenge by ID:', error)
+  }
 }
 
 const ChallengeIdResult = (props) => {

diff --git a/src/components/HOCs/WithChallenge/WithChallenge.js b/src/components/HOCs/WithChallenge/WithChallenge.js
@@ -120,14 +120,18 @@ export const getChallenge = (challengeId, props, component) => {
 }
 
 const getChallengeFromTask = async (taskId, props) => {
-  const results = await new Endpoint(api.task.single, {
-    schema: taskSchema(),
-    variables: {id: taskId}
-  }).execute();
+  try {
+    const results = await new Endpoint(api.task.single, {
+      schema: taskSchema(),
+      variables: {id: taskId}
+    }).execute();
 
-  const challengeId = results?.entities?.tasks?.[taskId]?.parent;
-  if (challengeId) {
-    props.history.push(`/challenge/${challengeId}/task/${taskId}/review`)
+    const challengeId = results?.entities?.tasks?.[taskId]?.parent;
+    if (challengeId) {
+      props.history.push(`/challenge/${challengeId}/task/${taskId}/review`)
+    }
+  } catch (error) {
+    console.error('Error fetching challenge from task:', error)
   }
 }
 

diff --git a/src/components/SignInButton/SignInButton.js b/src/components/SignInButton/SignInButton.js
@@ -54,7 +54,7 @@ export class SignInButton extends Component {
   }
 
   render() {
-    if (this.props.checkingLoginStatus || this.state.clicked) {
+    if (this.state.clicked) {
       return (
         <BusySpinner
           className={classNames("mr-mx-8", {"mr-mx-20": this.props.longForm})}

diff --git a/src/hooks/UseErrorTagOptions/index.js b/src/hooks/UseErrorTagOptions/index.js
@@ -3,9 +3,13 @@ import { defaultRoutes as api } from "../../services/Server/Server";
 import Endpoint from "../../services/Server/Endpoint";
 
 const useErrorTagOptions = () => {
-  const query = useQuery('errorTags', () =>
-    new Endpoint(api.keywords.find, { params: { tagType: "error", limit: 1000 } }).execute()
-  )
+  const query = useQuery('errorTags', async () => {
+    try {
+      return await new Endpoint(api.keywords.find, { params: { tagType: "error", limit: 1000 } }).execute();
+    } catch (error) {
+      console.error('Error fetching error tags:', error)
+    }
+  })
 
   return query;
 }

diff --git a/src/services/AdminContext/AdminContext.js b/src/services/AdminContext/AdminContext.js
@@ -41,7 +41,7 @@ export const clearManagedChallenge = function() {
 
 // async action creators
 export const manageProject = function(projectId) {
-  return function(dispatch) {
+  return async function(dispatch) {
     dispatch(beginManagingProject(projectId, RequestStatus.inProgress))
 
     return fetchProjectChallenges(projectId)(dispatch)
@@ -50,7 +50,7 @@ export const manageProject = function(projectId) {
 }
 
 export const manageChallenge = function(challengeId) {
-  return function(dispatch) {
+  return async function(dispatch) {
     dispatch(beginManagingChallenge(challengeId, RequestStatus.inProgress))
 
     return fetchChallengeTasks(challengeId)(dispatch)