Skip to content

Sync master into dev #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mayne0213 merged 4 commits into from
Mar 14, 2026
Merged

Sync master into dev #154

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91bbdfd
Merge pull request #148 from PoolC/dev
jinhodotchoi Jul 30, 2025
4d11c17
Merge pull request #152 from PoolC/dev
jinhodotchoi Sep 30, 2025
ff73cb7
FIX(mypage): handle kubernetes API failure gracefully
Mayne0213 Mar 13, 2026
ec44809
Merge pull request #153 from PoolC/fix/mypage-kubernetes-error-handling
Mayne0213 Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions websites/poolc.org/src/components/my-page/MyPageContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
import { ArrowRightOutlined, EditTwoTone, MessageTwoTone, QuestionCircleFilled, StarTwoTone, UserOutlined } from '@ant-design/icons';
import { createStyles } from 'antd-style';
import { useEffect, useRef } from 'react';
import { BadgeControllerService, BaekjoonControllerService, KubernetesControllerService, MemberControllerService, queryKey, useAppMutation, useAppSuspenseQueries } from '~/lib/api-v2';
import { BadgeControllerService, BaekjoonControllerService, KubernetesControllerService, MemberControllerService, queryKey, useAppMutation, useAppQuery, useAppSuspenseQueries } from '~/lib/api-v2';
import { MENU } from '~/constants/menus';
import MyPageGrassSection from '~/components/my-page/MyPageGrassSection';
import { queryClient } from '~/lib/utils/queryClient';
Expand Down Expand Up @@ -42,7 +42,7 @@ export default function MyPageContainer({ locationHash }: { locationHash: string
},
];

const [{ data: myHour }, { data: me }, { data: badge }, { data: baekjoon }, { data: kubernetes }] = useAppSuspenseQueries({
const [{ data: myHour }, { data: me }, { data: badge }, { data: baekjoon }] = useAppSuspenseQueries({
queries: [
{
queryKey: queryKey.member.hour,
Expand All @@ -60,13 +60,15 @@ export default function MyPageContainer({ locationHash }: { locationHash: string
queryKey: queryKey.baekjoon.baekjoon,
queryFn: BaekjoonControllerService.getMyBaekjoonUsingGet,
},
{
queryKey: queryKey.kubernetes.me,
queryFn: KubernetesControllerService.getMyKeyUsingGet,
},
],
});

const { data: kubernetes, isError: isKubernetesError } = useAppQuery({
queryKey: queryKey.kubernetes.me,
queryFn: KubernetesControllerService.getMyKeyUsingGet,
retry: false,
});

const { mutate: selectBadge } = useAppMutation({
mutationFn: BadgeControllerService.selectBadgeUsingPost,
});
Expand Down Expand Up @@ -199,7 +201,11 @@ export default function MyPageContainer({ locationHash }: { locationHash: string
</Space>
<Space direction="vertical" size={0} className={styles.wrapper} ref={pksRef}>
<Typography.Title level={5}>PKS (PoolC Kubernetes Service)</Typography.Title>
<MyPagePKSSection jwtToken={kubernetes.key ?? ''} />
{isKubernetesError ? (
<Typography.Text type="secondary">쿠버네티스 키가 아직 발급되지 않았습니다. 관리자에게 문의해주세요.</Typography.Text>
) : kubernetes?.key ? (
<MyPagePKSSection jwtToken={kubernetes.key} />
) : null}
</Space>
</Space>
);
Expand Down
Loading