resolve merge conflicts

CS3219-AY2425S1 · Nov 13, 2024 · e23725b · e23725b
2 parents 542f9bb + e5642a7
commit e23725b
Showing 1 changed file with 24 additions and 11 deletions.
diff --git a/apps/frontend/src/app/collaboration/[id]/page.tsx b/apps/frontend/src/app/collaboration/[id]/page.tsx
@@ -217,15 +217,19 @@ export default function CollaborationPage(props: CollaborationProps) {
   };
 
   const updateSubmissionResults = (data: SubmissionResults) => {
-    setSubmissionHiddenTestResultsAndStatus({
+    const submissionHiddenTestResultsAndStatus: SubmissionHiddenTestResultsAndStatus = {
       hiddenTestResults: data.hiddenTestResults,
       status: data.status,
-    });
+    }
+    setSubmissionHiddenTestResultsAndStatus(submissionHiddenTestResultsAndStatus);
+    localStorage.setItem("submissionHiddenTestResultsAndStatus", JSON.stringify(submissionHiddenTestResultsAndStatus));
     setVisibleTestCases(data.visibleTestResults);
+    localStorage.setItem("visibleTestResults", JSON.stringify(data.visibleTestResults));
   };
 
   const updateExecutionResults = (data: ExecutionResults) => {
     setVisibleTestCases(data.visibleTestResults);
+    localStorage.setItem("visibleTestResults", JSON.stringify(data.visibleTestResults));
   };
 
   const updateLangauge = (data: string) => {
@@ -244,7 +248,7 @@ export default function CollaborationPage(props: CollaborationProps) {
         language: selectedLanguage,
         customTestCases: "",
       });
-      setVisibleTestCases(data.visibleTestResults);
+      updateExecutionResults(data);
       infoMessage("Test cases executed. Review the results below.");
       sendExecutionResultsToMatchedUser(data);
     } finally {
@@ -270,11 +274,11 @@ export default function CollaborationPage(props: CollaborationProps) {
         questionDifficulty: complexity ?? "",
         questionTopics: categories,
       });
-      setVisibleTestCases(data.visibleTestResults);
-      setSubmissionHiddenTestResultsAndStatus({
-        hiddenTestResults: data.hiddenTestResults,
-        status: data.status,
+      updateExecutionResults({
+        visibleTestResults: data.visibleTestResults,
+        customTestResults: [],
       });
+      updateSubmissionResults(data);
       sendSubmissionResultsToMatchedUser(data);
       successMessage("Code saved successfully!");
     } finally {
@@ -301,13 +305,20 @@ export default function CollaborationPage(props: CollaborationProps) {
     const currentUser: string = localStorage.getItem("user") ?? "";
     const matchedTopics: string[] =
       localStorage.getItem("matchedTopics")?.split(",") ?? [];
+      const submissionHiddenTestResultsAndStatus: SubmissionHiddenTestResultsAndStatus | undefined = 
+      localStorage.getItem("submissionHiddenTestResultsAndStatus")
+        ? JSON.parse(localStorage.getItem("submissionHiddenTestResultsAndStatus") as string)
+        : undefined;
+    const visibleTestCases: Test[] = JSON.parse(localStorage.getItem("visibleTestResults") ?? "[]") ?? [];
 
     // Set states from localstorage
     setCollaborationId(collabId);
     setMatchedUser(matchedUser);
     setCurrentUser(currentUser);
     setMatchedTopics(matchedTopics);
     setQuestionDocRefId(questionDocRefId);
+    setSubmissionHiddenTestResultsAndStatus(submissionHiddenTestResultsAndStatus);
+    setVisibleTestCases(visibleTestCases);
 
     GetSingleQuestion(questionDocRefId).then((data: Question) => {
       setQuestionTitle(`${data.id}. ${data.title}`);
@@ -316,13 +327,13 @@ export default function CollaborationPage(props: CollaborationProps) {
       setDescription(data.description);
     });
 
-    GetVisibleTests(questionDocRefId)
-      .then((data: Test[]) => {
+    if (visibleTestCases.length == 0) {
+      GetVisibleTests(questionDocRefId).then((data: Test[]) => {
         setVisibleTestCases(data);
-      })
-      .catch((e) => {
+      }).catch((e) => {
         errorMessage(e.message);
       });
+    }
 
     // Start stopwatch
     startStopwatch();
@@ -406,6 +417,8 @@ export default function CollaborationPage(props: CollaborationProps) {
     localStorage.removeItem("collabId");
     localStorage.removeItem("questionDocRefId");
     localStorage.removeItem("matchedTopics");
+    localStorage.removeItem("submissionHiddenTestResultsAndStatus");
+    localStorage.removeItem("visibleTestResults");
     localStorage.removeItem("editor-language"); // Remove editor language type when session closed
   };