Compare commits

..

19 Commits

Author SHA1 Message Date
f4b46d564f Merge pull request '261103_01_ENH: 공연 상세 관계자 정보 유형별 빈 행 표시 및 단체(인)명 수정 가능하도록 개선' (#19) from develop into master
Reviewed-on: #19
2026-11-03 16:13:06 +09:00
4566276e64 Merge pull request '261026_02_ENH: 변경 타입에 clearLabel을 전체 -> 선택 해제로 수정' (#18) from develop into master
Reviewed-on: #18
2026-10-26 17:21:35 +09:00
b02abfe77c Merge pull request '261026_01_ENH: 공연 상세정보에 관리번호(NCAS), 변경 메모 추가' (#17) from develop into master
Reviewed-on: #17
2026-10-26 16:23:18 +09:00
39de5a9f6f Merge pull request '260909_01_ENH: 문자 미리보기는 의미가 없어서 제거' (#16) from develop into master
Reviewed-on: #16
2026-09-09 15:09:40 +09:00
a2940f2432 Merge pull request '260826_01_ENH: notihub 수정으로 인한 후속 조치' (#15) from develop into master
Reviewed-on: #15
2026-08-26 12:29:15 +09:00
a8e38a928e Merge pull request 'develop' (#14) from develop into master
Reviewed-on: #14
2026-08-19 11:10:19 +09:00
8855393723 Merge pull request '260806_01_ENH: 문자 템플릿 저장 json에서 form 방식으로 교체' (#13) from develop into master
Reviewed-on: #13
2026-08-06 14:36:56 +09:00
95a118b65e Merge pull request '260728_01_ENH: 연구원 계정에 사업 삭제 기능 부여' (#12) from develop into master
Reviewed-on: #12
2026-07-28 14:58:56 +09:00
daf5514124 Merge pull request '260723_01_ENH: 모니터링 배정 다이얼로그 디폴트 페이지 사이즈 변동 적용 되게 수정' (#11) from develop into master
Reviewed-on: #11
2026-07-23 09:16:29 +09:00
ad5b50088a Merge pull request '260713_01_ENH: 미진행인 모니터링 평가에 대해서도 upload가 가능하도록 수정 및 재단 계정에서도 업로드 가능하게 수정' (#10) from develop into master
Reviewed-on: #10
2026-07-13 12:12:36 +09:00
0f59300b02 Merge pull request 'develop' (#9) from develop into master
Reviewed-on: #9
2026-07-08 16:56:42 +09:00
2e7ce34894 Merge pull request '260708_01_ENH: api 응답 대기시간 300초로 수정' (#8) from develop into master
Reviewed-on: #8
2026-07-08 14:31:17 +09:00
ebb00ca2ed Merge pull request '260707_01_ENH: 모니터링 출발/도착 버튼은 모니터링 일자 이후로 부터 노출되게 수정 및 관리자는 출발 도착 삭제 가능하게 수정' (#7) from develop into master
Reviewed-on: #7
2026-07-07 15:09:06 +09:00
19a85882fb Merge pull request '260702_04_ENH: KON 조회 compact 조회에서 전체 조회로 수정' (#6) from develop into master
Reviewed-on: #6
2026-07-02 16:09:34 +09:00
bf19690c11 Merge pull request '260702_03_ENH: 사용자 페이지 페이지네이션 제거' (#5) from develop into master
Reviewed-on: #5
2026-07-02 15:47:26 +09:00
999ba522cb Merge pull request '260702_02_ENH: 페이지네이션 제거' (#4) from develop into master
Reviewed-on: #4
2026-07-02 15:44:23 +09:00
ab9d372d88 Merge pull request 'develop' (#3) from develop into master
Reviewed-on: #3
2026-07-02 11:38:17 +09:00
91f885da12 Merge pull request '260623_07_ENH: 필터 옵션에 불필요 내용 제거, 모니터링에서 리스트 클릭시 select box에 선택 내용 적용 제거, 모니터링에서 도착이 아닌 경우 업로드 못하게 조치, 지자체 파일 업로드 항시 가능하게 수정' (#2) from develop into master
Reviewed-on: #2
2026-06-23 16:20:28 +09:00
363cae4b93 Merge pull request 'develop' (#1) from develop into master
Reviewed-on: #1
2026-06-23 15:25:44 +09:00
2 changed files with 22 additions and 31 deletions

View File

@@ -29,7 +29,6 @@ import {
filterPerformance,
getCodeLabel,
includesText,
isFoundationRole,
isInternalRole,
isResearcherRole,
isWrittenReviewerRole
@@ -123,7 +122,6 @@ const PerformancePage = () => {
const userRole = auth.user?.userRole;
const userId = auth.user?.userId;
const canEdit = isInternalRole(userRole);
const canEditNoticeAndStaff = isFoundationRole(userRole);
const canDelete = isResearcherRole(userRole);
const isWrittenReviewer = isWrittenReviewerRole(userRole);
const {isDialogOpen, showDialog, hideDialog} = useDialog();
@@ -658,7 +656,6 @@ const PerformancePage = () => {
performance={detailData ?? data.find((item) => item.id === selectedId) ?? null}
codes={codes}
canEdit={canEdit}
canEditNoticeAndStaff={canEditNoticeAndStaff}
canDelete={canDelete}
onSave={(draft) => updateMutation.mutate(draft)}
onDelete={deletePerformance}

View File

@@ -494,7 +494,6 @@ export function PerformanceDetailDialog({
performance,
codes,
canEdit,
canEditNoticeAndStaff = false,
canDelete,
onSave,
onDelete,
@@ -504,8 +503,6 @@ export function PerformanceDetailDialog({
performance: PerformanceFull | PerformanceCompact | null;
codes: CodeMap;
canEdit: boolean;
// 기본 정보는 표시만 하고 변경 정보, 관계자 정보만 수정할 수 있는 권한
canEditNoticeAndStaff?: boolean;
canDelete: boolean;
onSave?: (performance: PerformanceCompact) => void;
onDelete?: (performanceId: number) => void;
@@ -513,8 +510,6 @@ export function PerformanceDetailDialog({
const {auth} = useAuth();
const [draft, setDraft] = useState<PerformanceCompact | null>(null);
const [isEditing, setIsEditing] = useState(false);
const canModify = canEdit || canEditNoticeAndStaff;
const isEditingBasic = isEditing && canEdit;
const {data: monitoringUsers = []} = useUsersQuery(ROLE.MONITORING, open);
const {data: writtenUsers = []} = useUsersQuery(ROLE.WRITTEN_REVIEWER, open);
const monitoringUserMap = useMemo(
@@ -662,8 +657,7 @@ export function PerformanceDetailDialog({
alert(`${PERFORMANCE_FIELD_LABELS.UpdateNoticeTarget}을 선택한 경우 ${PERFORMANCE_FIELD_LABELS.UpdateNoticeMemo}을 입력해 주세요.`);
return;
}
// 기본 정보를 수정할 수 없는 권한은 기존 값을 고칠 수 없으므로 검사하지 않는다.
if (canEdit && (draft.artistName ?? "").trim() === "") {
if ((draft.artistName ?? "").trim() === "") {
alert(`${PERFORMANCE_FIELD_LABELS.artistName}을 입력해 주세요.`);
return;
}
@@ -714,36 +708,36 @@ export function PerformanceDetailDialog({
<section className="rounded-md border">
<DetailRow label={PERFORMANCE_FIELD_LABELS.no}>{draft.performanceDetail["performanceNo"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.id}>{draft.id}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.NCAS}>{isEditingBasic ? <Input inputMode="numeric" maxLength={DETAIL_TEXT_MAX_LENGTH} value={draft.performanceDetail["NCAS"] ?? ""} onChange={(event) => updateDetail("NCAS", event.target.value.replace(/\D/g, ""))} /> : draft.performanceDetail["NCAS"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.NCAS}>{isEditing ? <Input inputMode="numeric" maxLength={DETAIL_TEXT_MAX_LENGTH} value={draft.performanceDetail["NCAS"] ?? ""} onChange={(event) => updateDetail("NCAS", event.target.value.replace(/\D/g, ""))} /> : draft.performanceDetail["NCAS"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.monitoringAdd}>{draft.id % 100 !== 1? "추가" : ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.businessType}>{getCodeLabel(codes, "business_type", draft.businessType)}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceGenre}>{getCodeLabel(codes, "genre", draft.performanceGenre)}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceArea}>
{isEditingBasic ? (
{isEditing ? (
<FilterSelect value={String(draft.performanceArea ?? "")} onChange={(value) => updateDraft("performanceArea", Number(value))} options={codes.area ?? []} placeholder={PERFORMANCE_FIELD_LABELS.performanceArea} />
) : getCodeLabel(codes, "area", draft.performanceArea)}
</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceAreaDetail}>{isEditingBasic ? <Input value={draft.performanceDetail["performanceAreaDetail"] ?? ""} onChange={(event) => updateDetail("performanceAreaDetail", event.target.value)} /> : draft.performanceDetail["performanceAreaDetail"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.artistName}>{isEditingBasic ? <Input maxLength={ARTIST_NAME_MAX_LENGTH} value={draft.artistName ?? ""} onChange={(event) => updateDraft("artistName", event.target.value)} /> : draft.artistName}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceName}>{isEditingBasic ? <Input value={draft.performanceName} onChange={(event) => updateDraft("performanceName", event.target.value)} /> : draft.performanceName}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceStartMonth}>{isEditingBasic ? <Input type="number" value={draft.performanceStartMonth} onChange={(event) => updateDraft("performanceStartMonth", Number(event.target.value))} /> : `${draft.performanceStartMonth}월`}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceDtInfo}>{isEditingBasic ? <Input value={draft.performanceDtInfo} onChange={(event) => updateDraft("performanceDtInfo", event.target.value)} /> : draft.performanceDtInfo}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceTimeInfo}>{isEditingBasic ? <Input value={draft.performanceTimeInfo} onChange={(event) => updateDraft("performanceTimeInfo", event.target.value)} /> : draft.performanceTimeInfo}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceAreaDetail}>{isEditing ? <Input value={draft.performanceDetail["performanceAreaDetail"] ?? ""} onChange={(event) => updateDetail("performanceAreaDetail", event.target.value)} /> : draft.performanceDetail["performanceAreaDetail"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.artistName}>{isEditing ? <Input maxLength={ARTIST_NAME_MAX_LENGTH} value={draft.artistName ?? ""} onChange={(event) => updateDraft("artistName", event.target.value)} /> : draft.artistName}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceName}>{isEditing ? <Input value={draft.performanceName} onChange={(event) => updateDraft("performanceName", event.target.value)} /> : draft.performanceName}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceStartMonth}>{isEditing ? <Input type="number" value={draft.performanceStartMonth} onChange={(event) => updateDraft("performanceStartMonth", Number(event.target.value))} /> : `${draft.performanceStartMonth}월`}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceDtInfo}>{isEditing ? <Input value={draft.performanceDtInfo} onChange={(event) => updateDraft("performanceDtInfo", event.target.value)} /> : draft.performanceDtInfo}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceTimeInfo}>{isEditing ? <Input value={draft.performanceTimeInfo} onChange={(event) => updateDraft("performanceTimeInfo", event.target.value)} /> : draft.performanceTimeInfo}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.ticketReservationStatus}>
{isEditingBasic ? (
{isEditing ? (
<FilterSelect value={String(draft.ticketReservationStatus ?? "")} onChange={(value) => updateDraft("ticketReservationStatus", Number(value))} options={codes.ticket_reservation_status ?? []} placeholder={PERFORMANCE_FIELD_LABELS.ticketReservationStatus} />
) : getCodeLabel(codes, "ticket_reservation_status", draft.ticketReservationStatus)}
</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.ticketReservationMemo}>{isEditingBasic ? <Input value={draft.ticketReservationMemo} onChange={(event) => updateDraft("ticketReservationMemo", event.target.value)} /> : draft.ticketReservationMemo}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.monitoringDate}>{isEditingBasic ? <DatePicker value={draft.performanceMonitoringSchedule?.monitoringDate ?? ""} onChange={(value) => updateSchedule("monitoringDate", value)} /> : draft.performanceMonitoringSchedule?.monitoringDate ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.monitoringTimeInfo}>{isEditingBasic ? <Input value={draft.performanceMonitoringSchedule?.monitoringTimeInfo ?? ""} onChange={(event) => updateSchedule("monitoringTimeInfo", event.target.value)} /> : draft.performanceMonitoringSchedule?.monitoringTimeInfo}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.needMonitoring}>{isEditingBasic ? <Input value={draft.performanceDetail["needMonitoring"] ?? ""} onChange={(event) => updateDetail("needMonitoring", event.target.value)} /> : draft.performanceDetail["needMonitoring"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.needWrittenReview}>{isEditingBasic ? <Input value={draft.performanceDetail["needWrittenReview"] ?? ""} onChange={(event) => updateDetail("needWrittenReview", event.target.value)} /> : draft.performanceDetail["needWrittenReview"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.checkDeliver}>{isEditingBasic ? <Input value={draft.performanceDetail["checkDeliver"] ?? ""} onChange={(event) => updateDetail("checkDeliver", event.target.value)} /> : draft.performanceDetail["checkDeliver"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.timeTreeCheckDt}>{isEditingBasic ? <DatePicker value={draft.performanceDetail["timeTreeCheckDt"] ?? ""} onChange={(value) => updateDetail("timeTreeCheckDt", value)} /> : draft.performanceDetail["timeTreeCheckDt"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.monitoringAddress}>{isEditingBasic ? <Input value={draft.performanceMonitoringSchedule?.monitoringAddress ?? ""} onChange={(event) => updateSchedule("monitoringAddress", event.target.value)} /> : draft.performanceMonitoringSchedule?.monitoringAddress}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceMemo}>{isEditingBasic ? <Input value={draft.performanceMemo} onChange={(event) => updateDraft("performanceMemo", event.target.value)} /> : draft.performanceMemo}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.checkReport}>{isEditingBasic ? <Input value={draft.performanceDetail["checkReport"] ?? ""} onChange={(event) => updateDetail("checkReport", event.target.value)} /> : draft.performanceDetail["checkReport"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.ticketReservationMemo}>{isEditing ? <Input value={draft.ticketReservationMemo} onChange={(event) => updateDraft("ticketReservationMemo", event.target.value)} /> : draft.ticketReservationMemo}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.monitoringDate}>{isEditing ? <DatePicker value={draft.performanceMonitoringSchedule?.monitoringDate ?? ""} onChange={(value) => updateSchedule("monitoringDate", value)} /> : draft.performanceMonitoringSchedule?.monitoringDate ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.monitoringTimeInfo}>{isEditing ? <Input value={draft.performanceMonitoringSchedule?.monitoringTimeInfo ?? ""} onChange={(event) => updateSchedule("monitoringTimeInfo", event.target.value)} /> : draft.performanceMonitoringSchedule?.monitoringTimeInfo}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.needMonitoring}>{isEditing ? <Input value={draft.performanceDetail["needMonitoring"] ?? ""} onChange={(event) => updateDetail("needMonitoring", event.target.value)} /> : draft.performanceDetail["needMonitoring"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.needWrittenReview}>{isEditing ? <Input value={draft.performanceDetail["needWrittenReview"] ?? ""} onChange={(event) => updateDetail("needWrittenReview", event.target.value)} /> : draft.performanceDetail["needWrittenReview"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.checkDeliver}>{isEditing ? <Input value={draft.performanceDetail["checkDeliver"] ?? ""} onChange={(event) => updateDetail("checkDeliver", event.target.value)} /> : draft.performanceDetail["checkDeliver"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.timeTreeCheckDt}>{isEditing ? <DatePicker value={draft.performanceDetail["timeTreeCheckDt"] ?? ""} onChange={(value) => updateDetail("timeTreeCheckDt", value)} /> : draft.performanceDetail["timeTreeCheckDt"] ?? ""}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.monitoringAddress}>{isEditing ? <Input value={draft.performanceMonitoringSchedule?.monitoringAddress ?? ""} onChange={(event) => updateSchedule("monitoringAddress", event.target.value)} /> : draft.performanceMonitoringSchedule?.monitoringAddress}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceMemo}>{isEditing ? <Input value={draft.performanceMemo} onChange={(event) => updateDraft("performanceMemo", event.target.value)} /> : draft.performanceMemo}</DetailRow>
<DetailRow label={PERFORMANCE_FIELD_LABELS.checkReport}>{isEditing ? <Input value={draft.performanceDetail["checkReport"] ?? ""} onChange={(event) => updateDetail("checkReport", event.target.value)} /> : draft.performanceDetail["checkReport"] ?? ""}</DetailRow>
</section>
<section className="rounded-md border">
@@ -821,8 +815,8 @@ export function PerformanceDetailDialog({
<DialogFooter className="shrink-0 border-t pt-4">
{canDelete && draft && <Button type="button" variant="destructive" onClick={deletePerformance}>삭제</Button>}
{canModify && draft && !isEditing && <Button type="button" onClick={() => setIsEditing(true)}>수정</Button>}
{canModify && draft && isEditing && (
{canEdit && draft && !isEditing && <Button type="button" onClick={() => setIsEditing(true)}>수정</Button>}
{canEdit && draft && isEditing && (
<>
<Button type="button" onClick={save}>저장</Button>
<Button type="button" variant="outline" onClick={() => { resetDraft(); setIsEditing(false); }}>취소</Button>