@@ -111,17 +141,18 @@ export function TastingEventBasicInfoSection({
- 광고노출 시작일
- {!isNullableBasicInfoAllowed && (
- *
- )}
+ {exposureStartDateLabel}
+ {isExposurePeriodRequired && *}
-
+
handleExposureDateChange(
@@ -131,9 +162,7 @@ export function TastingEventBasicInfoSection({
)
}
/>
-
- 광고노출 시작일은 등록 후 변경할 수 없습니다.
-
+
{exposureStartDateHelpMessage}
{form.formState.errors.exposureStartDate?.message && (
{form.formState.errors.exposureStartDate.message}
@@ -144,13 +173,13 @@ export function TastingEventBasicInfoSection({
~
@@ -171,7 +200,7 @@ export function TastingEventBasicInfoSection({
노출 순서와 활성화 상태 변경은 관리자만 할 수 있습니다.
diff --git a/src/pages/curation/tasting-event/components/RecruitmentPeriodTooltip.tsx b/src/pages/curation/components/CurationExposurePeriodTooltip.tsx
similarity index 69%
rename from src/pages/curation/tasting-event/components/RecruitmentPeriodTooltip.tsx
rename to src/pages/curation/components/CurationExposurePeriodTooltip.tsx
index 969c287..9bc1ca1 100644
--- a/src/pages/curation/tasting-event/components/RecruitmentPeriodTooltip.tsx
+++ b/src/pages/curation/components/CurationExposurePeriodTooltip.tsx
@@ -2,21 +2,29 @@ import { Info } from 'lucide-react';
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
-export function RecruitmentPeriodTooltip() {
+interface CurationExposurePeriodTooltipProps {
+ ariaLabel?: string;
+ content?: string;
+}
+
+export function CurationExposurePeriodTooltip({
+ ariaLabel = '모집기간 안내',
+ content = '모집 기간동안 보틀노트 앱에서 노출됩니다.',
+}: CurationExposurePeriodTooltipProps) {
return (
- 모집 기간동안 보틀노트 앱에서 노출됩니다.
+ {content}
diff --git a/src/pages/curation/components/CurationImageSection.tsx b/src/pages/curation/components/CurationImageSection.tsx
new file mode 100644
index 0000000..ae0d40a
--- /dev/null
+++ b/src/pages/curation/components/CurationImageSection.tsx
@@ -0,0 +1,18 @@
+import { CurationImageUploadField } from './CurationImageUploadField';
+import { CurationSectionCard } from './CurationSectionCard';
+
+interface CurationImageSectionProps {
+ onUploadingChange: (isUploading: boolean) => void;
+}
+
+export function CurationImageSection({ onUploadingChange }: CurationImageSectionProps) {
+ return (
+
+
+
+ );
+}
diff --git a/src/pages/curation/tasting-event/components/TastingEventImageUploadField.tsx b/src/pages/curation/components/CurationImageUploadField.tsx
similarity index 97%
rename from src/pages/curation/tasting-event/components/TastingEventImageUploadField.tsx
rename to src/pages/curation/components/CurationImageUploadField.tsx
index d94f473..bff80a5 100644
--- a/src/pages/curation/tasting-event/components/TastingEventImageUploadField.tsx
+++ b/src/pages/curation/components/CurationImageUploadField.tsx
@@ -5,21 +5,23 @@ import { GripVertical, Upload, X } from 'lucide-react';
import { Button } from '@/components/ui/button';
import { S3UploadPath, useImageUpload } from '@/hooks/useImageUpload';
-import type { TastingEventCreateFormState } from '../tasting-event.schema';
-
const MAX_IMAGE_COUNT = 3;
const IMAGE_UPLOAD_ACCEPT = 'image/png,image/jpeg,image/webp';
const SUPPORTED_IMAGE_TYPES = new Set(['image/png', 'image/jpeg', 'image/webp']);
const EMPTY_IMAGE_URLS: string[] = [];
-interface TastingEventImageUploadFieldProps {
+interface CurationImageFormState {
+ imageUrls: string[];
+}
+
+interface CurationImageUploadFieldProps {
onUploadingChange: (isUploading: boolean) => void;
}
-export function TastingEventImageUploadField({
+export function CurationImageUploadField({
onUploadingChange,
-}: TastingEventImageUploadFieldProps) {
- const form = useFormContext();
+}: CurationImageUploadFieldProps) {
+ const form = useFormContext();
const imageUploadInputRef = useRef(null);
const imageUrlsRef = useRef([]);
const localImageUrlsRef = useRef>(new Set());
diff --git a/src/pages/curation/components/CurationWhiskyCardListField.tsx b/src/pages/curation/components/CurationWhiskyCardListField.tsx
index c56fcdf..661d0cd 100644
--- a/src/pages/curation/components/CurationWhiskyCardListField.tsx
+++ b/src/pages/curation/components/CurationWhiskyCardListField.tsx
@@ -108,10 +108,13 @@ export function CurationWhiskyCardListField({
.map((item) => item.alcohol.alcoholId)
.filter((id): id is number => typeof id === 'number');
- const isMaxReached = watchedAlcohols.length >= fieldModel.maxItems;
+ const isMaxLimited = typeof fieldModel.maxItems === 'number';
+ const isMaxReached = isMaxLimited && watchedAlcohols.length >= fieldModel.maxItems!;
const isAddingBottleNoteWhisky = pendingAlcoholId !== null;
const isAddDisabled = isMaxReached || isAddingBottleNoteWhisky;
- const limitDescription = `${fieldModel.minItems}-${fieldModel.maxItems}개까지 등록할 수 있습니다.`;
+ const limitDescription = isMaxLimited
+ ? `${fieldModel.minItems}-${fieldModel.maxItems}개까지 등록할 수 있습니다.`
+ : `${fieldModel.minItems}개 이상 등록할 수 있습니다.`;
const manualCategoryOptions = getCategoryOptions(
categoryReferenceData ?? EMPTY_CATEGORY_REFERENCE_MAP
);
diff --git a/src/pages/curation/curation-whisky-card-list.types.ts b/src/pages/curation/curation-whisky-card-list.types.ts
index 5c11521..6a51eb8 100644
--- a/src/pages/curation/curation-whisky-card-list.types.ts
+++ b/src/pages/curation/curation-whisky-card-list.types.ts
@@ -37,7 +37,7 @@ export interface CurationWhiskyCardListFieldModel {
label: string;
required: boolean;
minItems: number;
- maxItems: number;
+ maxItems?: number;
selectedTags: {
label: string;
required: boolean;
diff --git a/src/pages/curation/tasting-event/CurationTastingEventCreate.tsx b/src/pages/curation/tasting-event/CurationTastingEventCreate.tsx
deleted file mode 100644
index 2390ea9..0000000
--- a/src/pages/curation/tasting-event/CurationTastingEventCreate.tsx
+++ /dev/null
@@ -1,328 +0,0 @@
-import { useState } from 'react';
-import { FormProvider, useForm, type Resolver } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { AlertCircle, Loader2, Save } from 'lucide-react';
-import { useNavigate } from 'react-router';
-
-import { DetailPageHeader } from '@/components/common/DetailPageHeader';
-import { Button } from '@/components/ui/button';
-import { Card, CardContent } from '@/components/ui/card';
-import { useCurationCreate, useCurationUpdate } from '@/hooks/useCurations';
-import { useToast } from '@/hooks/useToast';
-import { useAuthStore } from '@/stores/auth';
-import {
- CurationSpecCode,
- type CurationV2CreateRequest,
- type CurationV2Detail,
- type CurationV2Spec,
- type CurationV2UpdateRequest,
-} from '@/types/api';
-
-import { useCurationSpecFormModel } from '../useCurationSpecFormModel';
-import { TastingEventBasicInfoSection } from './components/TastingEventBasicInfoSection';
-import { TastingEventPreviewPanel } from './components/TastingEventPreviewPanel';
-import {
- createTastingEventFormModel,
- type TastingEventFormModel,
-} from './tasting-event.form-model';
-import {
- buildTastingEventPayload,
- createTastingEventFormStateFromCuration,
-} from './tasting-event.mapper';
-import {
- createCurationTastingEventFormSchema,
- createDefaultTastingEventCreateFormState,
- type TastingEventCreateFormState,
-} from './tasting-event.schema';
-import { CurationFormSection } from '../components/CurationFormSection';
-
-interface BlockingStateProps {
- title: string;
- description: string;
- onRetry?: () => void;
- onBack: () => void;
-}
-
-type CreatePageViewState =
- | 'specs-loading'
- | 'specs-error'
- | 'spec-missing'
- | 'detail-loading'
- | 'detail-error'
- | 'form';
-
-export function CurationTastingEventCreatePage() {
- const navigate = useNavigate();
- const { specsQuery, targetSpec, specDetailQuery, specDetail, formModel } =
- useCurationSpecFormModel({
- specCode: CurationSpecCode.WHISKY_TASTING_EVENT,
- createFormModel: createTastingEventFormModel,
- });
-
- const handleBack = () => {
- navigate('/dashboard/curations');
- };
-
- let viewState: CreatePageViewState = 'form';
- if (specsQuery.isLoading) {
- viewState = 'specs-loading';
- } else if (specsQuery.isError) {
- viewState = 'specs-error';
- } else if (!targetSpec) {
- viewState = 'spec-missing';
- } else if (specDetailQuery.isLoading) {
- viewState = 'detail-loading';
- } else if (specDetailQuery.isError) {
- viewState = 'detail-error';
- } else if (!specDetail || !formModel) {
- viewState = 'detail-loading';
- }
-
- const renderContent = () => {
- switch (viewState) {
- case 'specs-loading':
- return ;
- case 'specs-error':
- return (
- void specsQuery.refetch()}
- onBack={handleBack}
- />
- );
- case 'spec-missing':
- return (
-
- );
- case 'detail-loading':
- return ;
- case 'detail-error':
- return (
- void specDetailQuery.refetch()}
- onBack={handleBack}
- />
- );
- case 'form':
- if (!specDetail || !formModel) {
- return ;
- }
-
- return (
-
- );
- }
- };
-
- if (viewState === 'form') {
- return renderContent();
- }
-
- return (
-
-
- 목록
-
- }
- />
-
- {renderContent()}
-
- );
-}
-
-export function CurationTastingEventEditPage({ curation }: { curation: CurationV2Detail }) {
- const navigate = useNavigate();
- const formModel = createTastingEventFormModel(curation.spec);
-
- return (
- navigate('/dashboard/curations')}
- />
- );
-}
-
-interface TastingEventReadyFormProps {
- specDetail: CurationV2Spec;
- formModel: TastingEventFormModel;
- curation?: CurationV2Detail;
- onBack: () => void;
-}
-
-function TastingEventReadyForm({
- specDetail,
- formModel,
- curation,
- onBack,
-}: TastingEventReadyFormProps) {
- const navigate = useNavigate();
- const isRootAdmin = useAuthStore((state) => state.hasRole('ROOT_ADMIN'));
- const { showToast } = useToast();
- const [isCurationImageUploading, setIsCurationImageUploading] = useState(false);
- const [isWhiskyImageUploading, setIsWhiskyImageUploading] = useState(false);
- const isEditMode = Boolean(curation);
- const isImageUploading = isCurationImageUploading || isWhiskyImageUploading;
- const formSchema = createCurationTastingEventFormSchema(formModel, {
- mode: isEditMode ? 'edit' : 'create',
- });
- const defaultValues = curation
- ? createTastingEventFormStateFromCuration(curation, formModel)
- : createDefaultTastingEventCreateFormState(formModel);
-
- const form = useForm({
- resolver: zodResolver(formSchema as never) as unknown as Resolver,
- defaultValues,
- mode: 'onSubmit',
- });
-
- const createMutation = useCurationCreate({
- successMessage: '시음회 큐레이션이 등록되었습니다.',
- onSuccess: () => {
- navigate('/dashboard/curations');
- },
- });
- const updateMutation = useCurationUpdate({
- onSuccess: () => {
- navigate('/dashboard/curations');
- },
- });
- const isSubmitting = createMutation.isPending || updateMutation.isPending;
-
- const handleSubmit = form.handleSubmit(
- (values) => {
- const request: CurationV2CreateRequest | CurationV2UpdateRequest = {
- specId: specDetail.id,
- name: values.name.trim(),
- description: toNullableTrimmedString(values.description),
- imageUrls: values.imageUrls,
- exposureStartDate: toNullableTrimmedString(values.exposureStartDate),
- exposureEndDate: toNullableTrimmedString(values.exposureEndDate),
- displayOrder: values.displayOrder,
- isActive: values.isActive,
- payload: buildTastingEventPayload(values, formModel),
- };
-
- if (curation) {
- updateMutation.mutate({
- curationId: curation.id,
- data: request,
- });
- return;
- }
-
- createMutation.mutate(request);
- },
- () => {
- showToast({ type: 'warning', message: '입력 정보를 확인해주세요.' });
- }
- );
-
- return (
-
-
-
-
-
- }
- />
-
-
-
-
-
- {formModel.sections.map((section) => (
-
- ))}
-
-
-
-
-
-
-
{title}
-
{description}
-
-
- {onRetry && (
-
- )}
-
-
-
-
- );
-}
-
-function toNullableTrimmedString(value: string): string | null {
- const normalized = value.trim();
- return normalized || null;
-}
diff --git a/src/pages/curation/tasting-event/components/TastingEventImageSection.tsx b/src/pages/curation/tasting-event/components/TastingEventImageSection.tsx
deleted file mode 100644
index 053020b..0000000
--- a/src/pages/curation/tasting-event/components/TastingEventImageSection.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { CurationSectionCard } from '../../components/CurationSectionCard';
-import { TastingEventImageUploadField } from './TastingEventImageUploadField';
-
-interface TastingEventImageSectionProps {
- onUploadingChange: (isUploading: boolean) => void;
-}
-
-export function TastingEventImageSection({ onUploadingChange }: TastingEventImageSectionProps) {
- return (
-
-
-
- );
-}
diff --git a/src/pages/curation/whisky-card/CurationWhiskyCardCreate.tsx b/src/pages/curation/whisky-card/CurationWhiskyCardCreate.tsx
deleted file mode 100644
index 9d13d57..0000000
--- a/src/pages/curation/whisky-card/CurationWhiskyCardCreate.tsx
+++ /dev/null
@@ -1,355 +0,0 @@
-import { useState } from 'react';
-import { FormProvider, useForm, type Resolver } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { AlertCircle, Loader2, Save } from 'lucide-react';
-import { useNavigate } from 'react-router';
-
-import { DetailPageHeader } from '@/components/common/DetailPageHeader';
-import { Button } from '@/components/ui/button';
-import { Card, CardContent } from '@/components/ui/card';
-import { useCurationCreate, useCurationUpdate } from '@/hooks/useCurations';
-import { useToast } from '@/hooks/useToast';
-import { useAuthStore } from '@/stores/auth';
-import {
- CurationSpecCode,
- type CurationV2CreateRequest,
- type CurationV2Detail,
- type CurationV2Spec,
- type CurationV2SpecCode,
- type CurationV2UpdateRequest,
-} from '@/types/api';
-
-import { CurationFormSection } from '../components/CurationFormSection';
-import { TastingEventBasicInfoSection } from '../tasting-event/components/TastingEventBasicInfoSection';
-import { TastingEventImageSection } from '../tasting-event/components/TastingEventImageSection';
-import { useCurationSpecFormModel } from '../useCurationSpecFormModel';
-import { WhiskyCardPreviewPanel } from './components/WhiskyCardPreviewPanel';
-import { WhiskyCardPairingFields } from './components/WhiskyCardPairingFields';
-import {
- buildWhiskyCardCurationPayload,
- createWhiskyCardFormStateFromCuration,
-} from './whisky-card-curation.mapper';
-import {
- createCurationWhiskyCardFormSchema,
- createDefaultPairings,
- createDefaultWhiskyCardCurationFormState,
- createEmptyWhiskyCardCurationItem,
- createWhiskyCardCurationFormModel,
- type WhiskyCardCurationFormModel,
- type WhiskyCardCurationFormState,
-} from './whisky-card-curation.schema';
-
-interface BlockingStateProps {
- title: string;
- description: string;
- onRetry?: () => void;
- onBack: () => void;
-}
-
-type CreatePageViewState =
- | 'specs-loading'
- | 'specs-error'
- | 'spec-missing'
- | 'detail-loading'
- | 'detail-error'
- | 'form';
-
-export function CurationRecommendedWhiskyCreatePage() {
- return ;
-}
-
-export function CurationWhiskyPairingCreatePage() {
- return ;
-}
-
-export function CurationWhiskyCardEditPage({ curation }: { curation: CurationV2Detail }) {
- const navigate = useNavigate();
- const formModel = createWhiskyCardCurationFormModel(curation.spec);
-
- return (
- navigate('/dashboard/curations')}
- />
- );
-}
-
-function CurationWhiskyCardCreatePage({ specCode }: { specCode: CurationV2SpecCode }) {
- const navigate = useNavigate();
- const fallbackTitle =
- specCode === CurationSpecCode.WHISKY_PAIRING ? '위스키 페어링 작성' : '추천 위스키 작성';
- const { specsQuery, targetSpec, specDetailQuery, specDetail, formModel } =
- useCurationSpecFormModel({
- specCode,
- createFormModel: createWhiskyCardCurationFormModel,
- });
-
- const handleBack = () => {
- navigate('/dashboard/curations');
- };
-
- let viewState: CreatePageViewState = 'form';
- if (specsQuery.isLoading) {
- viewState = 'specs-loading';
- } else if (specsQuery.isError) {
- viewState = 'specs-error';
- } else if (!targetSpec) {
- viewState = 'spec-missing';
- } else if (specDetailQuery.isLoading) {
- viewState = 'detail-loading';
- } else if (specDetailQuery.isError) {
- viewState = 'detail-error';
- } else if (!specDetail || !formModel) {
- viewState = 'detail-loading';
- }
-
- const renderContent = () => {
- switch (viewState) {
- case 'specs-loading':
- return ;
- case 'specs-error':
- return (
- void specsQuery.refetch()}
- onBack={handleBack}
- />
- );
- case 'spec-missing':
- return (
-
- );
- case 'detail-loading':
- return ;
- case 'detail-error':
- return (
- void specDetailQuery.refetch()}
- onBack={handleBack}
- />
- );
- case 'form':
- if (!specDetail || !formModel) {
- return ;
- }
-
- return (
-
- );
- }
- };
-
- if (viewState === 'form') {
- return renderContent();
- }
-
- return (
-
-
- 목록
-
- }
- />
-
- {renderContent()}
-
- );
-}
-
-interface WhiskyCardCurationFormProps {
- specDetail: CurationV2Spec;
- formModel: WhiskyCardCurationFormModel;
- curation?: CurationV2Detail;
- onBack: () => void;
-}
-
-function WhiskyCardCurationForm({
- specDetail,
- formModel,
- curation,
- onBack,
-}: WhiskyCardCurationFormProps) {
- const navigate = useNavigate();
- const isRootAdmin = useAuthStore((state) => state.hasRole('ROOT_ADMIN'));
- const { showToast } = useToast();
- const [isCurationImageUploading, setIsCurationImageUploading] = useState(false);
- const [isWhiskyImageUploading, setIsWhiskyImageUploading] = useState(false);
- const isEditMode = Boolean(curation);
- const isImageUploading = isCurationImageUploading || isWhiskyImageUploading;
- const formSchema = createCurationWhiskyCardFormSchema(formModel, {
- mode: isEditMode ? 'edit' : 'create',
- });
- const defaultValues = curation
- ? createWhiskyCardFormStateFromCuration(curation, formModel)
- : createDefaultWhiskyCardCurationFormState(formModel);
-
- const form = useForm({
- resolver: zodResolver(formSchema as never) as unknown as Resolver,
- defaultValues,
- mode: 'onSubmit',
- });
-
- const createMutation = useCurationCreate({
- successMessage: `${specDetail.name} 큐레이션이 등록되었습니다.`,
- onSuccess: () => {
- navigate('/dashboard/curations');
- },
- });
- const updateMutation = useCurationUpdate({
- onSuccess: () => {
- navigate('/dashboard/curations');
- },
- });
- const isSubmitting = createMutation.isPending || updateMutation.isPending;
-
- const handleSubmit = form.handleSubmit(
- (values) => {
- const request: CurationV2CreateRequest | CurationV2UpdateRequest = {
- specId: specDetail.id,
- name: values.name.trim(),
- description: toNullableTrimmedString(values.description),
- imageUrls: values.imageUrls,
- exposureStartDate: toNullableTrimmedString(values.exposureStartDate),
- exposureEndDate: toNullableTrimmedString(values.exposureEndDate),
- displayOrder: values.displayOrder,
- isActive: values.isActive,
- payload: buildWhiskyCardCurationPayload(values, formModel),
- };
-
- if (curation) {
- updateMutation.mutate({
- curationId: curation.id,
- data: request,
- });
- return;
- }
-
- createMutation.mutate(request);
- },
- () => {
- showToast({ type: 'warning', message: '입력 정보를 확인해주세요.' });
- }
- );
-
- return (
-
-
-
-
-
- }
- />
-
-
-
-
-
-
- {formModel.sections.map((section) => (
- createEmptyWhiskyCardCurationItem(formModel),
- transformItem: (item) => ({
- ...item,
- pairings: createDefaultPairings(formModel),
- }),
- showCommentField: !formModel.pairings,
- renderItemExtra: formModel.pairings
- ? ({ index }) => (
-
- )
- : undefined,
- }}
- />
- ))}
-
-
-
-
-
-
-
-
-
{title}
-
{description}
-
-
- {onRetry && (
-
- )}
-
-
-
-
- );
-}
-
-function toNullableTrimmedString(value: string): string | null {
- const normalized = value.trim();
- return normalized || null;
-}
diff --git a/src/pages/curation/whisky-curation/CurationRecommendedWhiskyCreate.tsx b/src/pages/curation/whisky-curation/CurationRecommendedWhiskyCreate.tsx
new file mode 100644
index 0000000..cd4b6ff
--- /dev/null
+++ b/src/pages/curation/whisky-curation/CurationRecommendedWhiskyCreate.tsx
@@ -0,0 +1,24 @@
+import { CurationSpecCode } from '@/types/api';
+
+import { WhiskyCurationCreateGate } from './WhiskyCurationCreateGate';
+import { WhiskyCurationForm } from './WhiskyCurationForm';
+
+export function CurationRecommendedWhiskyCreatePage() {
+ return (
+
+ {({ specDetail, formModel, onBack }) => (
+
+ )}
+
+ );
+}
diff --git a/src/pages/curation/whisky-curation/CurationRecommendedWhiskyEdit.tsx b/src/pages/curation/whisky-curation/CurationRecommendedWhiskyEdit.tsx
new file mode 100644
index 0000000..6e36cda
--- /dev/null
+++ b/src/pages/curation/whisky-curation/CurationRecommendedWhiskyEdit.tsx
@@ -0,0 +1,23 @@
+import { useNavigate } from 'react-router';
+
+import type { CurationV2Detail } from '@/types/api';
+
+import { WhiskyCurationForm } from './WhiskyCurationForm';
+import { createWhiskyCurationFormModel } from './whisky-curation.schema';
+
+export function CurationRecommendedWhiskyEditPage({ curation }: { curation: CurationV2Detail }) {
+ const navigate = useNavigate();
+ const formModel = createWhiskyCurationFormModel(curation.spec);
+
+ return (
+ navigate('/dashboard/curations')}
+ presentation={{
+ showCommentField: true,
+ }}
+ />
+ );
+}
diff --git a/src/pages/curation/whisky-curation/CurationWhiskyPairingCreate.tsx b/src/pages/curation/whisky-curation/CurationWhiskyPairingCreate.tsx
new file mode 100644
index 0000000..e55c4a3
--- /dev/null
+++ b/src/pages/curation/whisky-curation/CurationWhiskyPairingCreate.tsx
@@ -0,0 +1,32 @@
+import { CurationSpecCode } from '@/types/api';
+
+import { WhiskyPairingFields } from './components/WhiskyPairingFields';
+import { WhiskyCurationCreateGate } from './WhiskyCurationCreateGate';
+import { WhiskyCurationForm } from './WhiskyCurationForm';
+
+export function CurationWhiskyPairingCreatePage() {
+ return (
+
+ {({ specDetail, formModel, onBack }) => (
+ (
+
+ ),
+ }}
+ />
+ )}
+
+ );
+}
diff --git a/src/pages/curation/whisky-curation/CurationWhiskyPairingEdit.tsx b/src/pages/curation/whisky-curation/CurationWhiskyPairingEdit.tsx
new file mode 100644
index 0000000..9f2ce60
--- /dev/null
+++ b/src/pages/curation/whisky-curation/CurationWhiskyPairingEdit.tsx
@@ -0,0 +1,31 @@
+import { useNavigate } from 'react-router';
+
+import type { CurationV2Detail } from '@/types/api';
+
+import { WhiskyPairingFields } from './components/WhiskyPairingFields';
+import { WhiskyCurationForm } from './WhiskyCurationForm';
+import { createWhiskyCurationFormModel } from './whisky-curation.schema';
+
+export function CurationWhiskyPairingEditPage({ curation }: { curation: CurationV2Detail }) {
+ const navigate = useNavigate();
+ const formModel = createWhiskyCurationFormModel(curation.spec);
+
+ return (
+ navigate('/dashboard/curations')}
+ presentation={{
+ showCommentField: false,
+ renderItemExtra: ({ index, formModel, onUploadingChange }) => (
+
+ ),
+ }}
+ />
+ );
+}
diff --git a/src/pages/curation/whisky-curation/WhiskyCurationCreateGate.tsx b/src/pages/curation/whisky-curation/WhiskyCurationCreateGate.tsx
new file mode 100644
index 0000000..164f327
--- /dev/null
+++ b/src/pages/curation/whisky-curation/WhiskyCurationCreateGate.tsx
@@ -0,0 +1,172 @@
+import type { ReactNode } from 'react';
+import { AlertCircle, Loader2 } from 'lucide-react';
+import { useNavigate } from 'react-router';
+
+import { DetailPageHeader } from '@/components/common/DetailPageHeader';
+import { Button } from '@/components/ui/button';
+import { Card, CardContent } from '@/components/ui/card';
+import type { CurationV2Spec, CurationV2SpecCode } from '@/types/api';
+
+import { useCurationSpecFormModel } from '../useCurationSpecFormModel';
+import {
+ createWhiskyCurationFormModel,
+ type WhiskyCurationFormModel,
+} from './whisky-curation.schema';
+
+type CreatePageViewState =
+ | 'specs-loading'
+ | 'specs-error'
+ | 'spec-missing'
+ | 'detail-loading'
+ | 'detail-error'
+ | 'form';
+
+interface WhiskyCurationCreateGateRenderArgs {
+ specDetail: CurationV2Spec;
+ formModel: WhiskyCurationFormModel;
+ onBack: () => void;
+}
+
+interface WhiskyCurationCreateGateProps {
+ specCode: CurationV2SpecCode;
+ fallbackTitle: string;
+ children: (args: WhiskyCurationCreateGateRenderArgs) => ReactNode;
+}
+
+export function WhiskyCurationCreateGate({
+ specCode,
+ fallbackTitle,
+ children,
+}: WhiskyCurationCreateGateProps) {
+ const navigate = useNavigate();
+ const { specsQuery, targetSpec, specDetailQuery, specDetail, formModel } =
+ useCurationSpecFormModel({
+ specCode,
+ createFormModel: createWhiskyCurationFormModel,
+ });
+
+ const handleBack = () => {
+ navigate('/dashboard/curations');
+ };
+
+ let viewState: CreatePageViewState = 'form';
+ if (specsQuery.isLoading) {
+ viewState = 'specs-loading';
+ } else if (specsQuery.isError) {
+ viewState = 'specs-error';
+ } else if (!targetSpec) {
+ viewState = 'spec-missing';
+ } else if (specDetailQuery.isLoading) {
+ viewState = 'detail-loading';
+ } else if (specDetailQuery.isError) {
+ viewState = 'detail-error';
+ } else if (!specDetail || !formModel) {
+ viewState = 'detail-loading';
+ }
+
+ const renderContent = () => {
+ switch (viewState) {
+ case 'specs-loading':
+ return ;
+ case 'specs-error':
+ return (
+ void specsQuery.refetch()}
+ onBack={handleBack}
+ />
+ );
+ case 'spec-missing':
+ return (
+
+ );
+ case 'detail-loading':
+ return ;
+ case 'detail-error':
+ return (
+ void specDetailQuery.refetch()}
+ onBack={handleBack}
+ />
+ );
+ case 'form':
+ if (!specDetail || !formModel) {
+ return ;
+ }
+
+ return children({ specDetail, formModel, onBack: handleBack });
+ }
+ };
+
+ if (viewState === 'form') {
+ return renderContent();
+ }
+
+ return (
+
+
+ 목록
+
+ }
+ />
+
+ {renderContent()}
+
+ );
+}
+
+function LoadingState({ message }: { message: string }) {
+ return (
+
+
+
+ {message}
+
+
+ );
+}
+
+interface BlockingStateProps {
+ title: string;
+ description: string;
+ onRetry?: () => void;
+ onBack: () => void;
+}
+
+function BlockingState({ title, description, onRetry, onBack }: BlockingStateProps) {
+ return (
+
+
+
+
+
+
{title}
+
{description}
+
+
+ {onRetry && (
+
+ )}
+
+
+
+
+ );
+}
diff --git a/src/pages/curation/whisky-curation/WhiskyCurationForm.tsx b/src/pages/curation/whisky-curation/WhiskyCurationForm.tsx
new file mode 100644
index 0000000..4b3d142
--- /dev/null
+++ b/src/pages/curation/whisky-curation/WhiskyCurationForm.tsx
@@ -0,0 +1,201 @@
+import { useState, type ReactNode } from 'react';
+import { FormProvider, useForm, type Resolver } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Save } from 'lucide-react';
+import { useNavigate } from 'react-router';
+
+import { DetailPageHeader } from '@/components/common/DetailPageHeader';
+import { Button } from '@/components/ui/button';
+import { useCurationCreate, useCurationUpdate } from '@/hooks/useCurations';
+import { useToast } from '@/hooks/useToast';
+import { useAuthStore } from '@/stores/auth';
+import {
+ type CurationV2CreateRequest,
+ type CurationV2Detail,
+ type CurationV2Spec,
+ type CurationV2UpdateRequest,
+} from '@/types/api';
+
+import { CurationBasicInfoSection } from '../components/CurationBasicInfoSection';
+import { CurationFormSection } from '../components/CurationFormSection';
+import { CurationImageSection } from '../components/CurationImageSection';
+import type { CurationWhiskyCardValue } from '../curation-whisky-card-list.types';
+import { WhiskyCurationPreviewPanel } from './components/WhiskyCurationPreviewPanel';
+import {
+ buildWhiskyCurationPayload,
+ createWhiskyCurationFormStateFromCuration,
+} from './whisky-curation.mapper';
+import {
+ createCurationWhiskyFormSchema,
+ createDefaultPairings,
+ createDefaultWhiskyCurationFormState,
+ createEmptyWhiskyCurationItem,
+ type WhiskyCurationFormModel,
+ type WhiskyCurationFormState,
+} from './whisky-curation.schema';
+
+export interface WhiskyCurationItemExtraRenderContext {
+ index: number;
+ item: CurationWhiskyCardValue | undefined;
+ formModel: WhiskyCurationFormModel;
+ onUploadingChange: (isUploading: boolean) => void;
+}
+
+export interface WhiskyCurationPresentation {
+ showCommentField: boolean;
+ renderItemExtra?: (context: WhiskyCurationItemExtraRenderContext) => ReactNode;
+}
+
+interface WhiskyCurationFormProps {
+ specDetail: CurationV2Spec;
+ formModel: WhiskyCurationFormModel;
+ presentation: WhiskyCurationPresentation;
+ curation?: CurationV2Detail;
+ onBack: () => void;
+}
+
+export function WhiskyCurationForm({
+ specDetail,
+ formModel,
+ presentation,
+ curation,
+ onBack,
+}: WhiskyCurationFormProps) {
+ const navigate = useNavigate();
+ const isRootAdmin = useAuthStore((state) => state.hasRole('ROOT_ADMIN'));
+ const { showToast } = useToast();
+ const [isCurationImageUploading, setIsCurationImageUploading] = useState(false);
+ const [isWhiskyImageUploading, setIsWhiskyImageUploading] = useState(false);
+ const isEditMode = Boolean(curation);
+ const isImageUploading = isCurationImageUploading || isWhiskyImageUploading;
+ const formSchema = createCurationWhiskyFormSchema(formModel, {
+ mode: isEditMode ? 'edit' : 'create',
+ });
+ const defaultValues = curation
+ ? createWhiskyCurationFormStateFromCuration(curation, formModel)
+ : createDefaultWhiskyCurationFormState(formModel);
+
+ const form = useForm({
+ resolver: zodResolver(formSchema as never) as unknown as Resolver,
+ defaultValues,
+ mode: 'onSubmit',
+ });
+
+ const createMutation = useCurationCreate({
+ successMessage: `${specDetail.name} 큐레이션이 등록되었습니다.`,
+ onSuccess: () => {
+ navigate('/dashboard/curations');
+ },
+ });
+ const updateMutation = useCurationUpdate({
+ onSuccess: () => {
+ navigate('/dashboard/curations');
+ },
+ });
+ const isSubmitting = createMutation.isPending || updateMutation.isPending;
+
+ const handleSubmit = form.handleSubmit(
+ (values) => {
+ const request: CurationV2CreateRequest | CurationV2UpdateRequest = {
+ specId: specDetail.id,
+ name: values.name.trim(),
+ description: toNullableTrimmedString(values.description),
+ imageUrls: values.imageUrls,
+ exposureStartDate: toNullableTrimmedString(values.exposureStartDate),
+ exposureEndDate: toNullableTrimmedString(values.exposureEndDate),
+ displayOrder: values.displayOrder,
+ isActive: values.isActive,
+ payload: buildWhiskyCurationPayload(values, formModel),
+ };
+
+ if (curation) {
+ updateMutation.mutate({
+ curationId: curation.id,
+ data: request,
+ });
+ return;
+ }
+
+ createMutation.mutate(request);
+ },
+ () => {
+ showToast({ type: 'warning', message: '입력 정보를 확인해주세요.' });
+ }
+ );
+
+ return (
+
+
+
+
+
+ }
+ />
+
+
+
+
+
+
+ {formModel.sections.map((section) => (
+ createEmptyWhiskyCurationItem(formModel),
+ transformItem: (item) => ({
+ ...item,
+ pairings: createDefaultPairings(formModel),
+ }),
+ showCommentField: presentation.showCommentField,
+ renderItemExtra: presentation.renderItemExtra
+ ? ({ index, item }) =>
+ presentation.renderItemExtra?.({
+ index,
+ item,
+ formModel,
+ onUploadingChange: setIsWhiskyImageUploading,
+ })
+ : undefined,
+ }}
+ />
+ ))}
+
+
+
+
+
+
+
+ 목록
+
+ }
+ />
+
+ {renderContent()}
+
+ );
+}
+
+function LoadingState({ message }: { message: string }) {
+ return (
+
+
+
+ {message}
+
+
+ );
+}
+
+interface BlockingStateProps {
+ title: string;
+ description: string;
+ onRetry?: () => void;
+ onBack: () => void;
+}
+
+function BlockingState({ title, description, onRetry, onBack }: BlockingStateProps) {
+ return (
+
+
+
+
+
+
{title}
+
{description}
+
+
+ {onRetry && (
+
+ )}
+
+
+
+
+ );
+}
diff --git a/src/pages/curation/whisky-tasting-event/WhiskyTastingEventForm.tsx b/src/pages/curation/whisky-tasting-event/WhiskyTastingEventForm.tsx
new file mode 100644
index 0000000..668b12c
--- /dev/null
+++ b/src/pages/curation/whisky-tasting-event/WhiskyTastingEventForm.tsx
@@ -0,0 +1,161 @@
+import { useState } from 'react';
+import { FormProvider, useForm, type Resolver } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Save } from 'lucide-react';
+import { useNavigate } from 'react-router';
+
+import { DetailPageHeader } from '@/components/common/DetailPageHeader';
+import { Button } from '@/components/ui/button';
+import { useCurationCreate, useCurationUpdate } from '@/hooks/useCurations';
+import { useToast } from '@/hooks/useToast';
+import { useAuthStore } from '@/stores/auth';
+import {
+ type CurationV2CreateRequest,
+ type CurationV2Detail,
+ type CurationV2Spec,
+ type CurationV2UpdateRequest,
+} from '@/types/api';
+
+import { CurationBasicInfoSection } from '../components/CurationBasicInfoSection';
+import { CurationFormSection } from '../components/CurationFormSection';
+import { WhiskyTastingEventPreviewPanel } from './components/WhiskyTastingEventPreviewPanel';
+import type { WhiskyTastingEventFormModel } from './whisky-tasting-event.form-model';
+import {
+ buildWhiskyTastingEventPayload,
+ createWhiskyTastingEventFormStateFromCuration,
+} from './whisky-tasting-event.mapper';
+import {
+ createDefaultWhiskyTastingEventFormState,
+ createWhiskyTastingEventFormSchema,
+ type WhiskyTastingEventFormState,
+} from './whisky-tasting-event.schema';
+
+interface WhiskyTastingEventFormProps {
+ specDetail: CurationV2Spec;
+ formModel: WhiskyTastingEventFormModel;
+ curation?: CurationV2Detail;
+ onBack: () => void;
+}
+
+export function WhiskyTastingEventForm({
+ specDetail,
+ formModel,
+ curation,
+ onBack,
+}: WhiskyTastingEventFormProps) {
+ const navigate = useNavigate();
+ const isRootAdmin = useAuthStore((state) => state.hasRole('ROOT_ADMIN'));
+ const { showToast } = useToast();
+ const [isCurationImageUploading, setIsCurationImageUploading] = useState(false);
+ const [isWhiskyImageUploading, setIsWhiskyImageUploading] = useState(false);
+ const isEditMode = Boolean(curation);
+ const isImageUploading = isCurationImageUploading || isWhiskyImageUploading;
+ const formSchema = createWhiskyTastingEventFormSchema(formModel, {
+ mode: isEditMode ? 'edit' : 'create',
+ });
+ const defaultValues = curation
+ ? createWhiskyTastingEventFormStateFromCuration(curation, formModel)
+ : createDefaultWhiskyTastingEventFormState(formModel);
+
+ const form = useForm({
+ resolver: zodResolver(formSchema as never) as unknown as Resolver,
+ defaultValues,
+ mode: 'onSubmit',
+ });
+
+ const createMutation = useCurationCreate({
+ successMessage: '시음회 큐레이션이 등록되었습니다.',
+ onSuccess: () => {
+ navigate('/dashboard/curations');
+ },
+ });
+ const updateMutation = useCurationUpdate({
+ onSuccess: () => {
+ navigate('/dashboard/curations');
+ },
+ });
+ const isSubmitting = createMutation.isPending || updateMutation.isPending;
+
+ const handleSubmit = form.handleSubmit(
+ (values) => {
+ const request: CurationV2CreateRequest | CurationV2UpdateRequest = {
+ specId: specDetail.id,
+ name: values.name.trim(),
+ description: toNullableTrimmedString(values.description),
+ imageUrls: values.imageUrls,
+ exposureStartDate: toNullableTrimmedString(values.exposureStartDate),
+ exposureEndDate: toNullableTrimmedString(values.exposureEndDate),
+ displayOrder: values.displayOrder,
+ isActive: values.isActive,
+ payload: buildWhiskyTastingEventPayload(values, formModel),
+ };
+
+ if (curation) {
+ updateMutation.mutate({
+ curationId: curation.id,
+ data: request,
+ });
+ return;
+ }
+
+ createMutation.mutate(request);
+ },
+ () => {
+ showToast({ type: 'warning', message: '입력 정보를 확인해주세요.' });
+ }
+ );
+
+ return (
+
+
+
+
+
+ }
+ />
+
+
+
+
+
+ {formModel.sections.map((section) => (
+
+ ))}
+
+
+
+