Skip to content

Commit debe85e

Browse files
committed
fix: display of the card
1 parent 39492c9 commit debe85e

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/components/sections/feedbacks/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ export default function Feedback(): ReactElement {
3939
const dispatch = useDispatch();
4040
const route = useRouter();
4141

42-
const { feedbacks, isAuthenticated, submission } = useMultiSelector<unknown, FeedbackMultiSelector>({
42+
const { feedbacks, isAuthenticated, submission, challenge } = useMultiSelector<unknown, FeedbackMultiSelector>({
4343
feedbacks: (state: IRootState) => state.feedback.list,
4444
isAuthenticated: (state: IRootState) => authCheck(state),
4545
submission: (state: IRootState) => state.submissions.current,
46+
challenge: (state: IRootState) => state.challenges.current,
4647
});
4748

4849
const [isFetching, setIsFetching] = useState(false);
@@ -60,7 +61,7 @@ export default function Feedback(): ReactElement {
6061
return (
6162
<div className="relative">
6263
{isFetching ? <Loader loading={isFetching} /> : feedbacks.map((feedback, index) => <FeedbackCard key={feedback.id} value={feedback} last={index === feedbacks.length - 1} />)}
63-
{isAuthenticated && (
64+
{isAuthenticated && challenge?.feedbackInfo && (
6465
<Section>
6566
<Criteria />
6667
<Form onSave={fetchList} />

src/pages/communities/[slug]/challenges/[challenge_id]/submissions/[submission_id].tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ import { useRouter } from "next/router";
1717
import Loader from "@/components/ui/Loader";
1818
import Section from "@/components/ui/Section";
1919
import { useSelector } from "@/hooks/useTypedSelector";
20+
import { fetchChallenge } from "@/store/services/communities/challenges";
2021

2122
export default function SubmissionPage() {
2223
const dispatch = useDispatch();
2324
const { t } = useTranslation();
2425
const navigation = useNavigation();
2526
const router = useRouter();
26-
const { slug, locale, submission_id } = router.query;
27+
const { slug, locale, submission_id, challenge_id } = router.query;
2728
const [loading, setLoading] = useState(true);
2829
const { current } = useSelector((state) => state.submissions);
2930

@@ -33,7 +34,11 @@ export default function SubmissionPage() {
3334
locale: locale as string,
3435
};
3536
setLoading(true);
36-
await Promise.all([dispatch(fetchCurrentCommunity(fetchCurrentCommunityPayload)), dispatch(findSubmssionById({ id: submission_id as string }))]);
37+
await Promise.all([
38+
dispatch(fetchChallenge({ id: challenge_id as string, relations: ["rubric"] })),
39+
dispatch(fetchCurrentCommunity(fetchCurrentCommunityPayload)),
40+
dispatch(findSubmssionById({ id: submission_id as string })),
41+
]);
3742
dispatch(initChallengeNavigationMenu(navigation.community));
3843
setLoading(false);
3944
}, [slug, submission_id]);

0 commit comments

Comments
 (0)