Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/apis/dashboards/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,6 @@ export const getDashboardInvitations = async (params: GetDashboardInvitationsReq
* https://sp-taskify-api.vercel.app/docs/#/Dashboards/DeleteInvitation
*/
export const cancelDashboardInvitation = async (params: CancelInviteDashboardRequest) => {
const { dashboardId, invitationId } = params;
await axiosClientHelper.delete<void>(`/dashboards/${dashboardId}/invitations/${invitationId}`);
const { id, invitationId } = params;
await axiosClientHelper.delete<void>(`/dashboards/${id}/invitations/${invitationId}`);
};
12 changes: 5 additions & 7 deletions src/apis/dashboards/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ import {
} from '@/apis/dashboards/types';

export const useDashboardsQuery = (params: GetDashboardsRequest) => {
const { page, size, navigationMethod, cursorId } = params;
return useQuery({
queryKey: ['dashboards', page, size, navigationMethod, cursorId],
queryKey: ['dashboards', params],
queryFn: () => getDashboards(params),
});
};
Expand All @@ -28,9 +27,8 @@ export const useDashboardQuery = (id: Dashboard['id']) => {
};

export const useDashboardInvitationsQuery = (params: GetDashboardInvitationsRequest) => {
const { id, ...rest } = params;
return useQuery({
queryKey: ['invitations', id, rest],
queryKey: ['invitations', params],
queryFn: () => getDashboardInvitations(params),
});
};
Expand Down Expand Up @@ -84,7 +82,7 @@ export const useInviteDashboard = () => {
},
onSuccess: (_, { id }) => {
queryClient.invalidateQueries({ queryKey: ['myInvitations'] });
queryClient.invalidateQueries({ queryKey: ['invitations', id] });
queryClient.invalidateQueries({ queryKey: ['invitations', { id }] });
},
});
};
Expand All @@ -96,8 +94,8 @@ export const useCancelInviteDashboard = () => {
mutationFn: (params: CancelInviteDashboardRequest) => {
return cancelDashboardInvitation(params);
},
onSuccess: (_, { dashboardId }) => {
queryClient.invalidateQueries({ queryKey: ['invitations', dashboardId] });
onSuccess: (_, { id }) => {
queryClient.invalidateQueries({ queryKey: ['invitations', { id }] });
},
});
};
2 changes: 1 addition & 1 deletion src/apis/dashboards/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ export const inviteDashboardFormSchema = z.object({
export type InviteDashboardFormType = z.infer<typeof inviteDashboardFormSchema>;
export type InviteDashboardRequest = InviteDashboardFormType & { id: Dashboard['id'] };
export type CancelInviteDashboardRequest = {
dashboardId: Dashboard['id'];
id: Dashboard['id'];
invitationId: DashboardInvitation['id'];
};
3 changes: 1 addition & 2 deletions src/apis/invitations/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import { getMyInvitations, respondToInvitation } from '@/apis/invitations/';
import { GetMyInvitationsRequest, RespondToInvitationRequest } from '@/apis/invitations/types';

export const useMyInvitationsQuery = (params: GetMyInvitationsRequest) => {
const { size, cursorId, title } = params;
return useInfiniteQuery({
queryKey: ['myInvitations', size, cursorId, title],
queryKey: ['myInvitations', params],
queryFn: ({ pageParam }) =>
getMyInvitations({
...params,
Expand Down
3 changes: 1 addition & 2 deletions src/apis/members/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ import { deleteMember, getMembers } from '@/apis/members/';
import { DeleteMemberRequest, GetMembersRequest } from '@/apis/members/types';

export const useMembersQuery = (params: GetMembersRequest) => {
const { page, size, dashboardId } = params;
return useQuery({
queryKey: ['members', page, size, dashboardId],
queryKey: ['members', params],
queryFn: () => getMembers(params),
});
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/dashboard/DetailInvited.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function DetailInvited() {
if (!result) return;

try {
await cancel({ dashboardId: Number(id), invitationId });
await cancel({ id: Number(id), invitationId });
alert('초대를 취소했습니다.');
} catch (error) {
const message = getErrorMessage(error);
Expand Down