Merge pull request Sage-Bionetworks#327 from jay-hodgson/challenge-su…

…bmission-followup move away from onSettled fixes lifecycle issue
jay-hodgson · Jun 21, 2023 · 9889fb0 · 9889fb0
2 parents fc3059c + 7377c4f
commit 9889fb0
Showing 1 changed file with 19 additions and 27 deletions.
diff --git a/packages/synapse-react-client/src/components/ChallengeSubmission/ChallengeSubmission.tsx b/packages/synapse-react-client/src/components/ChallengeSubmission/ChallengeSubmission.tsx
@@ -14,7 +14,6 @@ import {
   AccessControlList,
   Challenge,
   EntityId,
-  PaginatedIds,
   Project,
   ResourceAccess,
   Team,
@@ -91,36 +90,29 @@ export function ChallengeSubmission({
   })
 
   // Determine whether or not the given user belongs to any submission teams
-  useGetUserSubmissionTeamsInfinite(challenge?.id ?? EMPTY_ID, 2, {
-    enabled: isLoggedIn && !!challenge,
-    onSettled: (
-      data: PaginatedIds | undefined,
-      error: SynapseClientError | null,
-    ) => {
-      if (data) {
-        const isReg = data.results.length > 0
-        if (!isReg) {
-          setErrorMessage(
-            'Error: Please join a Submission Team before continuing.',
-          )
-          return setLoading(false)
-        }
-        if (data.results.length > 1) {
-          setErrorMessage(
-            'Error: You are a member of more than one Submission Team. You may only belong to one Submission Team per Challenge.',
-          )
-          return setLoading(false)
-        }
-        setSubmissionTeamId(data.results[0])
+  const { data: userSubmissionTeams } = useGetUserSubmissionTeamsInfinite(
+    challenge?.id ?? EMPTY_ID,
+    2,
+  )
+
+  useEffect(() => {
+    if (isLoggedIn && !!challenge && userSubmissionTeams) {
+      const isReg = userSubmissionTeams.results.length > 0
+      if (!isReg) {
+        setErrorMessage(
+          'Error: Please join a Submission Team before continuing.',
+        )
+        return setLoading(false)
       }
-      if (error) {
+      if (userSubmissionTeams.results.length > 1) {
         setErrorMessage(
-          `Error: Could not determine if you are already registered for this Challenge.`,
+          'Error: You are a member of more than one Submission Team. You may only belong to one Submission Team per Challenge.',
         )
-        setLoading(false)
+        return setLoading(false)
       }
-    },
-  })
+      setSubmissionTeamId(userSubmissionTeams.results[0])
+    }
+  }, [challenge, isLoggedIn, userSubmissionTeams])
 
   const { data: submissionTeam } = useGetTeam(submissionTeamId!, {
     enabled: !!submissionTeamId,