fix multiple code saved messages and submission or test case running …

…forever on error
CS3219-AY2425S1 · Nov 14, 2024 · 559af68 · 559af68
1 parent e5642a7
commit 559af68
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 30 deletions.
diff --git a/apps/frontend/src/app/collaboration/[id]/page.tsx b/apps/frontend/src/app/collaboration/[id]/page.tsx
@@ -238,16 +238,19 @@ export default function CollaborationPage(props: CollaborationProps) {
     }
     setIsLoadingTestCase(true);
     sendExecutingStateToMatchedUser(true);
-    const data = await ExecuteVisibleAndCustomTests(questionDocRefId, {
-      code: code,
-      language: selectedLanguage,
-      customTestCases: "",
-    });
-    updateExecutionResults(data);
-    infoMessage("Test cases executed. Review the results below.");
-    sendExecutionResultsToMatchedUser(data);
-    setIsLoadingTestCase(false);
-    sendExecutingStateToMatchedUser(false);
+    try {
+      const data = await ExecuteVisibleAndCustomTests(questionDocRefId, {
+        code: code,
+        language: selectedLanguage,
+        customTestCases: "",
+      });
+      updateExecutionResults(data);
+      successMessage("Test cases executed. Review the results below.");
+      sendExecutionResultsToMatchedUser(data);
+    } finally {
+      setIsLoadingTestCase(false);
+      sendExecutingStateToMatchedUser(false);
+    }
   };
 
   const handleSubmitCode = async () => {
@@ -256,25 +259,28 @@ export default function CollaborationPage(props: CollaborationProps) {
     }
     setIsLoadingSubmission(true);
     sendSubmittingStateToMatchedUser(true);
-    const data = await ExecuteVisibleAndHiddenTestsAndSubmit(questionDocRefId, {
-      code: code,
-      language: selectedLanguage,
-      user: currentUser ?? "",
-      matchedUser: matchedUser ?? "",
-      matchedTopics: matchedTopics ?? [],
-      title: questionTitle ?? "",
-      questionDifficulty: complexity ?? "",
-      questionTopics: categories,
-    });
-    updateExecutionResults({
-      visibleTestResults: data.visibleTestResults,
-      customTestResults: [],
-    });
-    updateSubmissionResults(data);
-    sendSubmissionResultsToMatchedUser(data);
-    successMessage("Code saved successfully!");
-    setIsLoadingSubmission(false);
-    sendSubmittingStateToMatchedUser(false);
+    try {
+      const data = await ExecuteVisibleAndHiddenTestsAndSubmit(questionDocRefId, {
+        code: code,
+        language: selectedLanguage,
+        user: currentUser ?? "",
+        matchedUser: matchedUser ?? "",
+        matchedTopics: matchedTopics ?? [],
+        title: questionTitle ?? "",
+        questionDifficulty: complexity ?? "",
+        questionTopics: categories,
+      });
+      updateExecutionResults({
+        visibleTestResults: data.visibleTestResults,
+        customTestResults: [],
+      });
+      updateSubmissionResults(data);
+      sendSubmissionResultsToMatchedUser(data);
+      successMessage("Code saved successfully!");
+    } finally {
+      setIsLoadingSubmission(false);
+      sendSubmittingStateToMatchedUser(false);
+    }
   };
 
   const handleCodeChange = (code: string) => {

diff --git a/apps/frontend/src/components/CollaborativeEditor/CollaborativeEditor.tsx b/apps/frontend/src/components/CollaborativeEditor/CollaborativeEditor.tsx
@@ -303,7 +303,7 @@ const CollaborativeEditor = forwardRef(
               state.editorState &&
               state.editorState.id !== latestLanguageChangeId
             ) {
-              latestSubmissionId = state.editorState.id;
+              latestLanguageChangeId = state.editorState.id;
               setSelectedLanguage(state.editorState.language);
               // if (props.user === state.user.name) {
               //   console.log("ownself update ownself");