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
46 changes: 38 additions & 8 deletions src/components/org/OrgAdmin/AboutSection/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import type {
AddAdminActivityScheduleRequestDto,
AddAdminMemberRequestDto,
} from '@/__generated__/org-types/data-contracts';
import { uploadToS3 } from '@/components/org/OrgAdmin/HomeSection/api';
import {
extractFileNameFromUrl,
uploadToS3,
} from '@/components/org/OrgAdmin/HomeSection/api';
import { ACTIVITY_GENERATION } from '@/utils/generation';

import { soptFetcher } from '../api';
Expand Down Expand Up @@ -51,25 +54,36 @@ type MemberInput = AddAdminMemberRequestDto & {

export const buildCoreValuesFromForm = (
values: FieldValues,
existingCoreValues?: { image?: string }[],
): CoreValueInput[] =>
[1, 2, 3].map((index) => {
const coreValue = values[`coreValue${index}`] ?? {};
const imageFileName = coreValue.imageFileName as ImageField;
const existingImage = existingCoreValues?.[index - 1]?.image;

return {
value: coreValue.value ?? '',
description: coreValue.description ?? '',
detailDescription: coreValue.detailDescription ?? '',
imageFileName: imageFileName?.fileName,
// 이미지를 새로 올리지 않았다면(=폼 값이 비어있으면) 기존 이미지 URL에서 파일명을 재사용한다.
imageFileName:
imageFileName?.fileName ??
(existingImage ? extractFileNameFromUrl(existingImage) : undefined),
file: imageFileName?.file,
};
});

export const buildMembersFromForm = (values: FieldValues): MemberInput[] =>
export const buildMembersFromForm = (
values: FieldValues,
existingMembers?: { role: string; profileImage?: string }[],
): MemberInput[] =>
EXEC_ROLE_LIST.map((role) => {
const member = values.member?.[role];
const apiRole = toMemberRole(role);
const profileImageFileName = member?.profileImageFileName as ImageField;
const existingImage = existingMembers?.find(
(item) => item.role === apiRole,
)?.profileImage;

return {
role: apiRole,
Expand All @@ -82,7 +96,9 @@ export const buildMembersFromForm = (values: FieldValues): MemberInput[] =>
github: member?.sns?.github ?? '',
behance: member?.sns?.behance ?? '',
},
profileImageFileName: profileImageFileName?.fileName,
profileImageFileName:
profileImageFileName?.fileName ??
(existingImage ? extractFileNameFromUrl(existingImage) : undefined),
file: profileImageFileName?.file,
};
// 이름이 없으면 실존 인물이 아니라 빈 슬롯이다(이미지만 우연히 붙어도 마찬가지).
Expand Down Expand Up @@ -184,14 +200,28 @@ export const deployAboutTab = async ({
return postAboutTabConfirm();
};

export const deployAboutTabFromForm = async (values: FieldValues) => {
export type ExistingAboutData = {
headerImage?: string;
coreValue?: { image?: string }[];
member?: { role: string; profileImage?: string }[];
};

export const deployAboutTabFromForm = async (
values: FieldValues,
existingData?: ExistingAboutData,
) => {
const headerImageFileName = values.headerImageFileName as ImageField;
const existingHeaderImage = existingData?.headerImage;

return deployAboutTab({
headerImageFileName: headerImageFileName?.fileName,
headerImageFileName:
headerImageFileName?.fileName ??
(existingHeaderImage
? extractFileNameFromUrl(existingHeaderImage)
: undefined),
headerImageFile: headerImageFileName?.file,
coreValues: buildCoreValuesFromForm(values),
members: buildMembersFromForm(values),
coreValues: buildCoreValuesFromForm(values, existingData?.coreValue),
members: buildMembersFromForm(values, existingData?.member),
activitySchedule: buildActivityScheduleFromForm(values),
});
};
9 changes: 8 additions & 1 deletion src/components/org/OrgAdmin/AboutSection/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,14 @@ const AboutSectionContent = ({

const handleDeploy = () => {
deployAbout(
{ values: getValues() },
{
values: getValues(),
existingData: {
headerImage: data?.headerImage,
coreValue: data?.coreValue,
member: data?.member,
},
},
{
onSuccess: () => setEditStep(EDIT_STEP.VIEW),
},
Expand Down
7 changes: 4 additions & 3 deletions src/components/org/OrgAdmin/AboutSection/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@ import { useMutation, useQueryClient } from 'react-query';

import { DEPLOY_TOAST_OPTION } from '@/components/org/OrgAdmin/HomeSection/_constants/constants';

import { deployAboutTabFromForm } from './api';
import { deployAboutTabFromForm, type ExistingAboutData } from './api';

type DeployAboutTabFromFormInput = {
values: FieldValues;
existingData?: ExistingAboutData;
};

export const useDeployAboutMutation = () => {
const queryClient = useQueryClient();
const { open } = useToast();

return useMutation({
mutationFn: ({ values }: DeployAboutTabFromFormInput) =>
deployAboutTabFromForm(values),
mutationFn: ({ values, existingData }: DeployAboutTabFromFormInput) =>
deployAboutTabFromForm(values, existingData),
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['admin'] });
open(DEPLOY_TOAST_OPTION.success);
Expand Down
Loading