From 3a65b3140dff49cefbaf3a17e467c8c201022f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9F=83=E6=8B=89?= <ElaBosak233@qq.com>
Date: Sun, 2 Jun 2024 13:03:02 +0800
Subject: [PATCH] fix(frontend): challenge modal

---
 web/src/components/modals/ChallengeModal.tsx | 34 +++-----------------
 web/src/components/modals/TeamEditModal.tsx  |  2 +-
 web/src/pages/challenges/index.tsx           |  2 +-
 web/src/pages/games/[id]/challenges.tsx      |  2 +-
 4 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/web/src/components/modals/ChallengeModal.tsx b/web/src/components/modals/ChallengeModal.tsx
index d99ffd58..3ad17069 100644
--- a/web/src/components/modals/ChallengeModal.tsx
+++ b/web/src/components/modals/ChallengeModal.tsx
@@ -17,7 +17,6 @@ import {
 	ActionIcon,
 	ModalProps,
 	Modal,
-	LoadingOverlay,
 } from "@mantine/core";
 import MDIcon from "@/components/ui/MDIcon";
 import FirstBloodIcon from "@/components/icons/hexagons/FirstBloodIcon";
@@ -37,29 +36,23 @@ import {
 } from "@/utils/notification";
 import { useForm } from "@mantine/form";
 import { useTeamStore } from "@/stores/team";
-import { useChallengeApi } from "@/api/challenge";
 
 interface ChallengeModalProps extends ModalProps {
-	challengeID?: number;
+	challenge?: Challenge;
 	gameID?: number;
 	setRefresh: () => void;
 	mode?: "practice" | "game";
 }
 
 export default function ChallengeModal(props: ChallengeModalProps) {
-	const { challengeID, gameID, setRefresh, mode, ...modalProps } = props;
+	const { challenge, gameID, setRefresh, mode, ...modalProps } = props;
 
 	const { colorScheme } = useMantineColorScheme();
 	const podApi = usePodApi();
-	const challengeApi = useChallengeApi();
 	const submissionApi = useSubmissionApi();
 	const authStore = useAuthStore();
 	const teamStore = useTeamStore();
 
-	const [challenge, setChallenge] = useState<Challenge>();
-
-	const [loading, setLoading] = useState<boolean>(true);
-
 	const [pod, setPod] = useState<Pod>();
 	const [podCreateLoading, setPodCreateLoading] = useState(false);
 
@@ -70,25 +63,10 @@ export default function ChallengeModal(props: ChallengeModalProps) {
 		},
 	});
 
-	function getChallenge() {
-		setLoading(true);
-		challengeApi
-			.getChallenges({
-				id: challengeID,
-			})
-			.then((res) => {
-				const r = res.data;
-				setChallenge(r.data?.[0]);
-			})
-			.finally(() => {
-				setLoading(false);
-			});
-	}
-
 	function getPod() {
 		podApi
 			.getPods({
-				challenge_id: challengeID,
+				challenge_id: challenge?.id,
 				user_id: mode === "practice" ? authStore?.user?.id : undefined,
 				team_id:
 					mode === "game" ? teamStore?.selectedTeamID : undefined,
@@ -170,7 +148,7 @@ export default function ChallengeModal(props: ChallengeModalProps) {
 
 		submissionApi
 			.createSubmission({
-				challenge_id: challengeID,
+				challenge_id: challenge?.id,
 				flag: flag,
 				team_id:
 					mode === "game" ? teamStore?.selectedTeamID : undefined,
@@ -226,9 +204,6 @@ export default function ChallengeModal(props: ChallengeModalProps) {
 
 	useEffect(() => {
 		form.reset();
-		if (modalProps.opened) {
-			getChallenge();
-		}
 	}, [modalProps.opened]);
 
 	return (
@@ -254,7 +229,6 @@ export default function ChallengeModal(props: ChallengeModalProps) {
 						justifyContent: "space-between",
 					}}
 				>
-					<LoadingOverlay visible={loading} />
 					<Box>
 						<Box
 							sx={{
diff --git a/web/src/components/modals/TeamEditModal.tsx b/web/src/components/modals/TeamEditModal.tsx
index 9cf95377..ecd12551 100644
--- a/web/src/components/modals/TeamEditModal.tsx
+++ b/web/src/components/modals/TeamEditModal.tsx
@@ -490,7 +490,7 @@ export default function TeamEditModal(props: TeamEditModalProps) {
 									<Flex mt={20} justify={"end"} gap={10}>
 										<Button
 											leftSection={
-												<MDIcon color="red">
+												<MDIcon c={"white"}>
 													swap_horiz
 												</MDIcon>
 											}
diff --git a/web/src/pages/challenges/index.tsx b/web/src/pages/challenges/index.tsx
index f78d55e1..3e213d26 100644
--- a/web/src/pages/challenges/index.tsx
+++ b/web/src/pages/challenges/index.tsx
@@ -255,7 +255,7 @@ export default function Page() {
 				opened={opened}
 				onClose={close}
 				centered
-				challengeID={selectedChallenge?.id}
+				challenge={selectedChallenge}
 				setRefresh={() => setRefresh((prev) => prev + 1)}
 				mode="practice"
 			/>
diff --git a/web/src/pages/games/[id]/challenges.tsx b/web/src/pages/games/[id]/challenges.tsx
index 17efe164..184d8fc6 100644
--- a/web/src/pages/games/[id]/challenges.tsx
+++ b/web/src/pages/games/[id]/challenges.tsx
@@ -290,7 +290,7 @@ function Page() {
 				onClose={close}
 				centered
 				setRefresh={() => setRefresh((prev) => prev + 1)}
-				challengeID={selectedChallenge?.challenge_id}
+				challenge={selectedChallenge?.challenge}
 				gameID={selectedChallenge?.game_id}
 				mode="game"
 			/>