diff --git a/AGENTS.md b/AGENTS.md index 8c9f904..caab611 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -270,6 +270,7 @@ When implementing or changing frontend UI, use this order: ### Installation and Ownership - Inspect the registry item and its dependencies before installation. Use the shadcn CLI with the approved registry endpoint under `https://ui-registry.kric.com/r/` instead of copying files from `dist/r` manually. +- `kri-data-table` uses the TanStack Table v8 API. Keep `@tanstack/react-table` within the supported `^8.21.3` range and do not upgrade it to v9 until KriUiRegistry provides an explicitly migrated component contract. - Respect the consumer project's component aliases, target paths, package manager, styling system, React version, and existing design tokens. - The shadcn workflow copies component source into the consumer repository. After installation, treat that copy as project-owned code; do not assume registry updates propagate automatically. - Do not overwrite an existing project component without reviewing the diff and confirming that local behavior and accessibility are preserved. diff --git a/package-lock.json b/package-lock.json index 13f6efa..1390186 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,6 +25,7 @@ "@tanstack/react-query": "^5.90.21", "@tanstack/react-table": "^8.21.3", "@tiptap/extension-color": "^3.13.0", + "@tiptap/extension-font-family": "^3.13.0", "@tiptap/extension-highlight": "^3.13.0", "@tiptap/extension-image": "^3.13.0", "@tiptap/extension-link": "^3.13.0", @@ -48,6 +49,7 @@ "lucide-react": "^0.553.0", "next": "^16.0.7", "next-themes": "^0.4.6", + "prettier": "^3.9.6", "qrcode": "^1.5.4", "radix-ui": "^1.6.1", "react": "^19.2.1", @@ -3305,6 +3307,19 @@ "@tiptap/pm": "^3.12.0" } }, + "node_modules/@tiptap/extension-font-family": { + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-font-family/-/extension-font-family-3.13.0.tgz", + "integrity": "sha512-ZJ+P7qYK4dIRjncRibeYT1HI2P/blUe8/CWcmKJmp1e1DE9m6Q+jdllehNCr7a30yZzFxn9yJPJPDmHi5D3c0w==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/ueberdosis" + }, + "peerDependencies": { + "@tiptap/extension-text-style": "^3.13.0" + } + }, "node_modules/@tiptap/extension-gapcursor": { "version": "3.12.0", "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.12.0.tgz", @@ -7758,6 +7773,21 @@ "node": ">= 0.8.0" } }, + "node_modules/prettier": { + "version": "3.9.6", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz", + "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==", + "license": "MIT", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/prop-types": { "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", diff --git a/package.json b/package.json index 886050e..58f0c7a 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "@tanstack/react-query": "^5.90.21", "@tanstack/react-table": "^8.21.3", "@tiptap/extension-color": "^3.13.0", + "@tiptap/extension-font-family": "^3.13.0", "@tiptap/extension-highlight": "^3.13.0", "@tiptap/extension-image": "^3.13.0", "@tiptap/extension-link": "^3.13.0", @@ -49,6 +50,7 @@ "lucide-react": "^0.553.0", "next": "^16.0.7", "next-themes": "^0.4.6", + "prettier": "^3.9.6", "qrcode": "^1.5.4", "radix-ui": "^1.6.1", "react": "^19.2.1", diff --git a/src/app/(pages)/(main)/assign/list/page.tsx b/src/app/(pages)/(main)/assign/list/page.tsx index 8e59f40..91ce3e7 100644 --- a/src/app/(pages)/(main)/assign/list/page.tsx +++ b/src/app/(pages)/(main)/assign/list/page.tsx @@ -17,11 +17,12 @@ import { useResetListAssignMutation, useUpsertListAssignMutation } from '@/query import { ListHeaderAssignConst, LIST_HEADER_TYPE_LABEL } from '@/const/listConst' import { createEmptyListFilter, type ListFilter, type ListHeaderAssignType, type listHeader } from '@/types/list' import type { ResultCode } from '@/types/project' +import { isExternalManager } from '@/utils/userRole' const ASSIGN_TAB_TYPES: ListHeaderAssignType[] = [ - ListHeaderAssignConst.OUTSOURCE, ListHeaderAssignConst.CONTACT_INTERVIEWER, ListHeaderAssignConst.FIELD_INTERVIEWER, + ListHeaderAssignConst.OUTSOURCE, ] const ASSIGNED_SENTINEL = '__ASSIGNED__' @@ -36,8 +37,15 @@ const ListAssignPage = () => { const prjctIdx = selectedProject?.prjctIdx ?? 0 const enabled = mounted && prjctIdx > 0 const userRole = auth?.user?.userRole ?? 0 + const isExternalUser = isExternalManager(userRole) - const [assignType, setAssignType] = useState(ListHeaderAssignConst.OUTSOURCE) + const [assignType, setAssignType] = useState(ListHeaderAssignConst.CONTACT_INTERVIEWER) + const effectiveAssignType = + selectedProject?.ff === false && assignType === ListHeaderAssignConst.FIELD_INTERVIEWER + ? ListHeaderAssignConst.CONTACT_INTERVIEWER + : isExternalUser && assignType === ListHeaderAssignConst.OUTSOURCE + ? ListHeaderAssignConst.CONTACT_INTERVIEWER + : assignType const [selectedAssignId, setSelectedAssignId] = useState(undefined) const [assignFilterIds, setAssignFilterIds] = useState([]) const [transferResve, setTransferResve] = useState(false) @@ -49,22 +57,40 @@ const ListAssignPage = () => { const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled) const upsertListAssignMutation = useUpsertListAssignMutation(prjctIdx) const resetListAssignMutation = useResetListAssignMutation(prjctIdx) - const assignTargetRows = useAssignTargetRows({ prjctIdx, enabled, assignType }) + const assignTargetRows = useAssignTargetRows({ prjctIdx, enabled, assignType: effectiveAssignType }) const resultCodeArray = useMemo(() => resultCodesQuery.data ?? [], [resultCodesQuery.data]) const surveyArray = useMemo(() => projectInfoQuery.data?.surveys ?? [], [projectInfoQuery.data]) const listHeaders = useMemo(() => listHeaderQuery.data ?? [], [listHeaderQuery.data]) + const assignTabTypes = useMemo( + () => + ASSIGN_TAB_TYPES.filter((type) => { + if (type === ListHeaderAssignConst.FIELD_INTERVIEWER && selectedProject?.ff === false) return false + if (type === ListHeaderAssignConst.OUTSOURCE && isExternalUser) return false + return true + }), + [selectedProject?.ff, isExternalUser], + ) + + useEffect(() => { + if (selectedProject?.ff === false && assignType === ListHeaderAssignConst.FIELD_INTERVIEWER) { + setAssignType(ListHeaderAssignConst.CONTACT_INTERVIEWER) + setSelectedAssignId(undefined) + setAssignFilterIds([]) + return + } + if (isExternalUser && assignType === ListHeaderAssignConst.OUTSOURCE) { + setAssignType(ListHeaderAssignConst.CONTACT_INTERVIEWER) + setSelectedAssignId(undefined) + setAssignFilterIds([]) + } + }, [assignType, selectedProject?.ff, isExternalUser]) const handleTabChange = (value: string) => { setAssignType(Number(value) as ListHeaderAssignType) setSelectedAssignId(undefined) } - // 좌측 테이블 선택값이 바뀌면 결과 필터 multiselect도 그 값으로 맞춘다. - useEffect(() => { - setAssignFilterIds(selectedAssignId ? [selectedAssignId] : []) - }, [selectedAssignId]) - // "배정됨"/"배정되지 않음"은 실제 대상 선택과 동시에 선택될 수 없다: 새로 클릭된 쪽만 남긴다. const handleAssignFilterChange = (next: string[]) => { const addedSentinel = next.find((value) => isAssignFilterSentinel(value) && !assignFilterIds.includes(value)) @@ -86,13 +112,13 @@ const ListAssignPage = () => { const externalAssignFilter = useMemo(() => { if (assignFilterIds[0] === ASSIGNED_SENTINEL) { - return { type: assignType, values: [] as string[], condition: 'assigned' as const } + return { type: effectiveAssignType, values: [] as string[], condition: 'assigned' as const } } if (assignFilterIds[0] === UNASSIGNED_SENTINEL) { - return { type: assignType, values: [] as string[], condition: 'unassigned' as const } + return { type: effectiveAssignType, values: [] as string[], condition: 'unassigned' as const } } - return { type: assignType, values: assignFilterIds } - }, [assignType, assignFilterIds]) + return { type: effectiveAssignType, values: assignFilterIds } + }, [effectiveAssignType, assignFilterIds]) const hasNoAppliedFilter = () => filterSummary.length === 0 && assignFilterIds.length === 0 @@ -108,8 +134,8 @@ const ListAssignPage = () => { await upsertListAssignMutation.mutateAsync({ assignId: selectedAssignId, request: { - assignType, - transferResve: assignType === ListHeaderAssignConst.OUTSOURCE? false : transferResve, + assignType: effectiveAssignType, + transferResve: effectiveAssignType === ListHeaderAssignConst.OUTSOURCE? false : transferResve, listFilter: currentListFilter, }, }) @@ -123,7 +149,7 @@ const ListAssignPage = () => { if (!confirm('정말 배정을 초기화 하시겠습니까?')) return await resetListAssignMutation.mutateAsync({ - assignType, + assignType: effectiveAssignType, listFilter: currentListFilter, }) alert('배정이 초기화 되었습니다.') @@ -134,9 +160,9 @@ const ListAssignPage = () => { return (
- - - {ASSIGN_TAB_TYPES.map((type) => ( + + + {assignTabTypes.map((type) => ( {LIST_HEADER_TYPE_LABEL[type]} @@ -147,7 +173,8 @@ const ListAssignPage = () => { @@ -163,10 +190,11 @@ const ListAssignPage = () => { resultCodes={resultCodeArray} surveys={surveyArray} listHeaders={listHeaders} + fieldInterviewEnabled={selectedProject.ff !== false} selectMode="none" onCurrentFilterChange={setCurrentListFilter} onFilterSummaryChange={setFilterSummary} - excludeFilterHeaderTypes={[assignType]} + excludeFilterHeaderTypes={[effectiveAssignType]} externalAssignFilter={externalAssignFilter} filterActions={ { onChange={handleAssignFilterChange} getValue={(item) => item.id} getLabel={(item) => item.name} - placeholder={`${LIST_HEADER_TYPE_LABEL[assignType]} 필터`} + placeholder={`${LIST_HEADER_TYPE_LABEL[effectiveAssignType]} 필터`} widthClassName="w-56" heightClassName="h-9" /> } rightActions={ <> - {assignType === ListHeaderAssignConst.CONTACT_INTERVIEWER && ( + {effectiveAssignType === ListHeaderAssignConst.CONTACT_INTERVIEWER && (
) } diff --git a/src/app/(pages)/(main)/list/manage/page.tsx b/src/app/(pages)/(main)/list/manage/page.tsx index 7035280..9c76a74 100644 --- a/src/app/(pages)/(main)/list/manage/page.tsx +++ b/src/app/(pages)/(main)/list/manage/page.tsx @@ -68,6 +68,7 @@ const downloadArrayBuffer = (buffer: ArrayBuffer, filename: string, type = 'appl const createEmptySearchUiState = (): ListSearchUiState => ({ searchText: '', searchContactResult: [], + searchContactDateRange: { from: '', to: '' }, searchInterviewResult: [], surveyResultSelections: {}, filterRows: [], @@ -284,7 +285,9 @@ const ListManagePage = () => { resultCodes={resultCodeArray} surveys={surveyArray} listHeaders={headerManageRows} + fieldInterviewEnabled={selectedProject?.ff !== false} enableBatchEdit={canManageList} + selectMode={canManageList ? 'multi' : 'click-event'} refreshKey={listRefreshKey} onCurrentFilterChange={setCurrentListFilter} onFilterSummaryChange={setFilterSummary} diff --git a/src/app/(pages)/(main)/page.tsx b/src/app/(pages)/(main)/page.tsx index 3a93d9d..6eb6564 100644 --- a/src/app/(pages)/(main)/page.tsx +++ b/src/app/(pages)/(main)/page.tsx @@ -26,7 +26,8 @@ import {useRouter} from "next/navigation"; import {useCreateProjectMutation, useProjectListQuery, useProjectOwnerListQuery} from "@/query/project"; import {useGroupCodeListQuery} from "@/query/intranet"; import {PROJECT_STATUS_LABEL} from "@/const/projectConst"; -import {isManager} from "@/utils/userRole"; +import {isInternalManager, isManager} from "@/utils/userRole"; +import {CONTACT_INTERVIEWER_ROLE} from "@/const/userConst"; const MainPage = () => { const router = useRouter(); @@ -41,7 +42,6 @@ const MainPage = () => { const [sorting, setSorting] = useState([]); const [query, setQuery] = useState(); - const statusArray: MultiSelectOption[] = useMemo(() => { return (Object.values(ProjectStatus).filter((v) => typeof v === "number") as number[]) .sort((a, b) => a - b) @@ -100,9 +100,9 @@ const MainPage = () => { const [searchDept, setSearchDept] = useState([]); const [searchFw, setSearchFw] = useState([]); - const columns = getProjectColumns(users, groupCodeLabelMap); const userId = auth.user?.userId ?? ""; const userRole = auth.user?.userRole; + const isInternal = isInternalManager(userRole); const handleSearchClick = () => { const searchStatusCode:ProjectStatus[] = searchStatus @@ -123,9 +123,7 @@ const MainPage = () => { showDialog('projectCreateDialog'); } - const handleSubmit = async (data: ProjectCreateRequest): Promise => { - const projectInfo = await createMutation.mutateAsync(data); - + const navigateWithProject = (projectInfo: ProjectInfo, path: string) => { setSelectedProject({ prjctIdx: projectInfo.prjctIdx, prjctCd: projectInfo.prjctCd, @@ -136,22 +134,19 @@ const MainPage = () => { ff: projectInfo.ff } as SelectedProject); - router.push("/project/info"); + router.push(path); }; - const handleClick = (projectInfo:ProjectInfo) => { - setSelectedProject({ - prjctIdx: projectInfo.prjctIdx, - prjctCd: projectInfo.prjctCd, - prjctName: projectInfo.prjctName, - itrntPrjctCd: projectInfo.itrntPrjctCd, - ownerDept: projectInfo.ownerDept, - ownerFw: projectInfo.ownerFw, - ff: projectInfo.ff - } as SelectedProject); + const handleSubmit = async (data: ProjectCreateRequest): Promise => { + const projectInfo = await createMutation.mutateAsync(data); + navigateWithProject(projectInfo, "/project/info"); + }; - router.push(`/list/manage`); - } + const handleClick = (projectInfo: ProjectInfo) => navigateWithProject(projectInfo, "/list/manage"); + + const handleNavigateToInfo = (projectInfo: ProjectInfo) => navigateWithProject(projectInfo, "/project/info"); + + const columns = getProjectColumns(users, groupCodeLabelMap, isInternal ? handleNavigateToInfo : undefined); if (!mounted || isLoading) return ; @@ -211,11 +206,13 @@ const MainPage = () => { 검색
- + > + 프로젝트 등록 + + )}
diff --git a/src/app/(pages)/(main)/progress/message/page.tsx b/src/app/(pages)/(main)/progress/message/page.tsx index fbb70b0..4fb395b 100644 --- a/src/app/(pages)/(main)/progress/message/page.tsx +++ b/src/app/(pages)/(main)/progress/message/page.tsx @@ -49,28 +49,15 @@ const buildRows = (data: SendResultSummaryResponse[]): SummaryRow[] => const moneyUnit = (value: number) => `${value.toLocaleString()}원`; const caseUnit = (value: number) => `${value.toLocaleString()}건`; -const getFirstDayOfMonth = (date: Date) => { - const d = new Date(date.getFullYear(), date.getMonth(), 1); - return d.toISOString().slice(0, 10); -}; - -const getLastDayOfMonth = (date: Date) => { - const d = new Date(date.getFullYear(), date.getMonth() + 1, 0); - return d.toISOString().slice(0, 10); -}; - const MessageProgressPage = () => { const mounted = useMounted(); const { selectedProject } = useSelectedProject(); - const [dateRange, setDateRange] = useState(() => { - const now = new Date(); - return { from: getFirstDayOfMonth(now), to: getLastDayOfMonth(now) }; - }); + const [dateRange, setDateRange] = useState({ from: "", to: "" }); const prjctCd = selectedProject?.prjctCd ?? ""; const itrntPrjctCd = selectedProject?.itrntPrjctCd ?? ""; - const enabled = mounted && !!prjctCd && !!dateRange.from && !!dateRange.to; + const enabled = mounted && !!prjctCd; const summaryQuery = useSendResultSummaryQuery( { diff --git a/src/app/(pages)/(main)/project/info/page.tsx b/src/app/(pages)/(main)/project/info/page.tsx index 58e86f4..daa2074 100644 --- a/src/app/(pages)/(main)/project/info/page.tsx +++ b/src/app/(pages)/(main)/project/info/page.tsx @@ -333,7 +333,7 @@ const SurveyCard = ({ survey, index, itrntPrjctCd, userTeam, invalidField, onReg const ProjectInfoPage = () => { const router = useRouter(); const mounted = useMounted(); - const {selectedProject} = useSelectedProject(); + const {selectedProject, setSelectedProject} = useSelectedProject(); const {isDialogOpen, showDialog, hideDialog} = useDialog(); const {users} = useItrntUserList(); const {auth} = useAuth(); @@ -544,6 +544,16 @@ const ProjectInfoPage = () => { } await updateMutation.mutateAsync(requestUpdateProject); + const savedProjectInfo = requestUpdateProject.projectInfo; + setSelectedProject({ + prjctIdx: savedProjectInfo.prjctIdx, + prjctCd: savedProjectInfo.prjctCd, + prjctName: savedProjectInfo.prjctName, + itrntPrjctCd: savedProjectInfo.itrntPrjctCd, + ownerDept: savedProjectInfo.ownerDept, + ownerFw: savedProjectInfo.ownerFw, + ff: savedProjectInfo.ff, + }); initialProjectInfoRef.current = projectInfo; alert("저장되었습니다."); } diff --git a/src/app/api/assign/[[...slug]]/route.ts b/src/app/api/assign/[[...slug]]/route.ts index 5dd82d1..a4bc663 100644 --- a/src/app/api/assign/[[...slug]]/route.ts +++ b/src/app/api/assign/[[...slug]]/route.ts @@ -2,6 +2,7 @@ import {RouteContext} from "@/types/common"; import {createContactApi} from "@/lib/http-server"; import {errorToResponse} from "@kri/common/http"; +import type {ProjectCompanyAssignSummary, ProjectFieldworkAssignSummary} from "@/types/list"; export const GET = async (req: NextRequest, context: RouteContext) => { try { @@ -19,6 +20,25 @@ export const GET = async (req: NextRequest, context: RouteContext) => { return NextResponse.json(result, { status: 200 }); } + if (action === "prjct-cmpn-summary" && slug.length === 2) { + const result = await contactApi.get(`/assign/prjct-cmpn-summary/${slug[1]}`); + return NextResponse.json(result, { status: 200 }); + } + + if (action === "prjct-fieldwork-summary" && slug.length === 2) { + const assignType = req.nextUrl.searchParams.get("assignType"); + const cmpnIds = req.nextUrl.searchParams.get("cmpnIds"); + if (!assignType) { + return NextResponse.json({ message: "assignType이 필요합니다." }, { status: 400 }); + } + + const query = `?assignType=${assignType}${cmpnIds ? `&cmpnIds=${encodeURIComponent(cmpnIds)}` : ""}`; + const result = await contactApi.get( + `/assign/prjct-fieldwork-summary/${slug[1]}${query}`, + ); + return NextResponse.json(result, { status: 200 }); + } + return NextResponse.json({ message: "Not found" }, { status: 404 }); } catch (error: unknown) { return errorToResponse(error); diff --git a/src/app/api/list-hist/[[...slug]]/route.ts b/src/app/api/list-hist/[[...slug]]/route.ts index 5292002..3aed8c5 100644 --- a/src/app/api/list-hist/[[...slug]]/route.ts +++ b/src/app/api/list-hist/[[...slug]]/route.ts @@ -30,6 +30,23 @@ export const GET = async (req: NextRequest, context: RouteContext) => { } }; +export const DELETE = async (req: NextRequest, context: RouteContext) => { + try { + const { slug = [] } = await context.params; + const [action] = slug; + const contactApi = await createContactApi(); + + if (action === "event" && slug.length === 2) { + await contactApi.del(`/list-hist/event/${slug[1]}`); + return new NextResponse(null, { status: 204 }); + } + + return NextResponse.json({ message: "Not found" }, { status: 404 }); + } catch (error: unknown) { + return errorToResponse(error); + } +}; + export const PUT = async (req: NextRequest, context: RouteContext) => { try { const { slug = [] } = await context.params; diff --git a/src/app/api/reserve/[[...slug]]/route.ts b/src/app/api/reserve/[[...slug]]/route.ts index 7f15f83..a2d4fa2 100644 --- a/src/app/api/reserve/[[...slug]]/route.ts +++ b/src/app/api/reserve/[[...slug]]/route.ts @@ -17,11 +17,31 @@ export const GET = async (req: NextRequest, context: RouteContext) => { return NextResponse.json(result, { status: 200 }); } + if (action === "user" && slug.length === 3 && slug[2] === "search") { + const fromDt = req.nextUrl.searchParams.get("fromDt"); + const toDt = req.nextUrl.searchParams.get("toDt"); + if (!fromDt || !toDt) { + return NextResponse.json({ message: "fromDt, toDt가 필요합니다." }, { status: 400 }); + } + + const result = await contactApi.get( + `/reserve/user/${encodeURIComponent(slug[1])}/search?fromDt=${fromDt}&toDt=${toDt}`, + ); + return NextResponse.json(result, { status: 200 }); + } + if (action === "user" && slug.length === 3) { const result = await contactApi.get(`/reserve/${slug[1]}/user/${slug[2]}`); return NextResponse.json(result, { status: 200 }); } + if (action === "user" && slug.length === 2) { + const requestPast = req.nextUrl.searchParams.get("requestPast"); + const query = requestPast !== null ? `?requestPast=${requestPast}` : ""; + const result = await contactApi.get(`/reserve/user/${encodeURIComponent(slug[1])}${query}`); + return NextResponse.json(result, { status: 200 }); + } + return NextResponse.json({ message: "Not found" }, { status: 404 }); } catch (error: unknown) { return errorToResponse(error); diff --git a/src/app/globals.css b/src/app/globals.css index b313134..87a41f9 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -251,3 +251,4 @@ .ProseMirror [data-resize-container][data-resize-state="resizing"] { outline: 1px dashed #0ea5e9; } + diff --git a/src/components/app-shell/AppHeader.tsx b/src/components/app-shell/AppHeader.tsx index 047e7f0..d5ccf1f 100644 --- a/src/components/app-shell/AppHeader.tsx +++ b/src/components/app-shell/AppHeader.tsx @@ -1,7 +1,7 @@ "use client"; import Image from "next/image"; -import { LogOut, ZoomIn, ZoomOut } from "lucide-react"; +import { CalendarClock, LogOut, ZoomIn, ZoomOut } from "lucide-react"; import { Button } from "@/components/ui/button"; import { KriHeader } from "@/components/layout/KriHeader"; import type { TopMenuItem } from "@/config/menu.types"; @@ -21,6 +21,7 @@ interface AppHeaderProps { onNavigate: (path: string) => void; decreaseFontSize: () => void; increaseFontSize: () => void; + onOpenReserveSearch: () => void; } export function AppHeader({ @@ -37,6 +38,7 @@ export function AppHeader({ onNavigate, decreaseFontSize, increaseFontSize, + onOpenReserveSearch, }: AppHeaderProps) { return (
+ {userInfo?.userName || ""} - - -
- - -
-
- +
+ + + + + +
+ + +
+
+
- {hasValue && !disabled ? ( - - ) : null} -
+ {hasValue && !disabled ? ( + + ) : null} + ) } diff --git a/src/components/common/KriPassword.tsx b/src/components/common/KriPassword.tsx index bb08188..5b9182d 100644 --- a/src/components/common/KriPassword.tsx +++ b/src/components/common/KriPassword.tsx @@ -9,10 +9,10 @@ import { cn } from '@/lib/utils' import { KRI_PW_REGEX, ONLY_ALLOWED_PW_REGEX } from '@/const/validationConst' const requirements = [ - { test: (value: string) => /[A-Za-z]/.test(value), text: '영문 1개 이상' }, - { test: (value: string) => /\d/.test(value), text: '숫자 1개 이상' }, - { test: (value: string) => value.length >= 8 && value.length <= 20, text: '8~20자' }, - { test: (value: string) => !value || ONLY_ALLOWED_PW_REGEX.test(value), text: '허용 문자만 사용' }, + //{ test: (value: string) => /[A-Za-z]/.test(value), text: '영문 1개 이상' }, + //{ test: (value: string) => /\d/.test(value), text: '숫자 1개 이상' }, + //{ test: (value: string) => value.length >= 1 && value.length <= 20, text: '1~20자' }, + { test: (value: string) => !value || KRI_PW_REGEX.test(value), text: '영문, 숫자, 허용된 특수문자를 사용하여 1~20자로 입력해야 합니다.' }, ] export type KriPasswordRef = { @@ -55,12 +55,13 @@ export const KriPassword = forwardRef(function const score = checks.filter((item) => item.met).length const statusText = useMemo(() => { - if (!value) return '비밀번호를 입력하세요' - if (!hasOnlyAllowedChars) return '허용되지 않는 문자가 포함되어 있어요' - return isValid ? '사용 가능한 비밀번호입니다' : '영문과 숫자를 포함한 8~20자로 입력하세요' + if (!value) return '비밀번호를 입력하세요.' + if (!hasOnlyAllowedChars) return '허용되지 않는 문자가 포함되어 있습니다.' + return isValid ? '사용 가능한 비밀번호입니다' : '영문, 숫자, 허용된 특수문자를 사용하여 1~20자로 입력해야 합니다.' }, [hasOnlyAllowedChars, isValid, value]) - const barClass = score <= 1 ? 'bg-destructive' : score === 2 ? 'bg-orange-500' : score === 3 ? 'bg-yellow-400' : 'bg-green-500' + //const barClass = score <= 1 ? 'bg-destructive' : score === 2 ? 'bg-orange-500' : score === 3 ? 'bg-yellow-400' : 'bg-green-500' + const barClass = 'bg-green-500' return (
diff --git a/src/components/common/KriTimePicker.tsx b/src/components/common/KriTimePicker.tsx index 67d1e13..d73ca67 100644 --- a/src/components/common/KriTimePicker.tsx +++ b/src/components/common/KriTimePicker.tsx @@ -9,6 +9,10 @@ export type KriTimePickerProps = { onChange: (value: string) => void disabled?: boolean minuteStep?: number + startHour?: number + endHour?: number + hourLabel?: string + minuteLabel?: string className?: string } @@ -27,72 +31,97 @@ const formatTime = (hour: number, minute: number) => { return `${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}` } +const normalizeHour = (hour: number, fallback: number) => { + return Number.isFinite(hour) ? Math.min(23, Math.max(0, Math.trunc(hour))) : fallback +} + export function KriTimePicker({ - value, - onChange, - disabled = false, - minuteStep = 5, - className, - }: KriTimePickerProps) { + value, + onChange, + disabled = false, + minuteStep = 5, + startHour = 0, + endHour = 23, + hourLabel = '시', + minuteLabel = '분', + className, +}: KriTimePickerProps) { const { hour: selectedHour, minute: selectedMinute } = parseTime(value) const normalizedMinuteStep = Number.isFinite(minuteStep) && minuteStep > 0 - ? Math.min(Math.floor(minuteStep), 60) - : 5 - const hours = Array.from({ length: 24 }, (_, index) => index) + ? Math.min(Math.floor(minuteStep), 60) + : 5 + + const clampedStartHour = normalizeHour(startHour, 0) + const clampedEndHour = normalizeHour(endHour, 23) + // startHour > endHour로 잘못 지정된 경우, 두 값을 뒤바꿔 유효한 범위로 되돌린다. + const [normalizedStartHour, normalizedEndHour] = clampedStartHour > clampedEndHour + ? [clampedEndHour, clampedStartHour] + : [clampedStartHour, clampedEndHour] + + const hours = Array.from( + { length: normalizedEndHour - normalizedStartHour + 1 }, + (_, index) => normalizedStartHour + index, + ) const minutes = Array.from( - { length: Math.ceil(60 / normalizedMinuteStep) }, - (_, index) => index * normalizedMinuteStep, + { length: Math.ceil(60 / normalizedMinuteStep) }, + (_, index) => index * normalizedMinuteStep, ).filter((minute) => minute < 60) const handleTimeChange = (type: 'hour' | 'minute', nextValue: number) => { if (disabled) return - const nextHour = type === 'hour' ? nextValue : selectedHour ?? 0 + const nextHour = type === 'hour' ? nextValue : selectedHour ?? normalizedStartHour const nextMinute = type === 'minute' ? nextValue : selectedMinute ?? 0 onChange(formatTime(nextHour, nextMinute)) } return ( -
- +
+
+
{hourLabel}
+
{hours.map((hour) => ( - - ))} -
- -
- - -
- {minutes.map((minute) => ( - + ))}
+ +
+
{minuteLabel}
+ +
+ {minutes.map((minute) => ( + + ))} +
+ +
+
+
) } diff --git a/src/components/dialog/ListFilterDialog.tsx b/src/components/dialog/ListFilterDialog.tsx index 3588186..00a8816 100644 --- a/src/components/dialog/ListFilterDialog.tsx +++ b/src/components/dialog/ListFilterDialog.tsx @@ -1,7 +1,6 @@ 'use client' import { useEffect, useMemo, useState } from 'react' -import { Plus, X } from 'lucide-react' import { KriDialog } from '@/components/common/KriDialog' import { Button } from '@/components/ui/button' import { Input } from '@/components/ui/input' @@ -33,12 +32,13 @@ export const operatorLabel: Record = { notContains: '포함하지 않음', empty: '값 없음', notEmpty: '값 있음', + none: '필터 없음', } const createFilterRow = (headerId: number, headerOptions: FilterHeaderOption[]): FilterRow => ({ id: crypto.randomUUID(), headerId, - operator: headerOptions.find((option) => option.id === headerId)?.allowedOperators[0] ?? 'eq', + operator: headerOptions.find((option) => option.id === headerId)?.defaultOperator ?? 'eq', textValue: '', multiValues: [], }) @@ -56,18 +56,17 @@ const ListFilterDialog = ({ const [submitting, setSubmitting] = useState(false) const resolvedOpen = open ?? isDialogOpen(dialogId) - const defaultHeaderId = headerOptions.find((option) => !option.disabled)?.id ?? 0 useEffect(() => { if (!resolvedOpen) return - if (initialRows.length > 0) { - setRows(initialRows.map((row) => ({ ...row }))) - return - } - if (defaultHeaderId > 0) { - setRows([createFilterRow(defaultHeaderId, headerOptions)]) - } - }, [resolvedOpen, initialRows, defaultHeaderId, headerOptions]) + const initialByHeaderId = new Map(initialRows.map((row) => [row.headerId, row])) + setRows( + headerOptions.map((option) => { + const existing = initialByHeaderId.get(option.id) + return existing ? { ...existing } : createFilterRow(option.id, headerOptions) + }), + ) + }, [resolvedOpen, initialRows, headerOptions]) const handleOpenChange = (nextOpen: boolean) => { onOpenChange?.(nextOpen) @@ -78,17 +77,8 @@ const ListFilterDialog = ({ hideDialog(dialogId) } - const handleAddRow = () => { - if (defaultHeaderId <= 0) return - setRows((prev) => [...prev, createFilterRow(defaultHeaderId, headerOptions)]) - } - - const handleRemoveRow = (id: string) => { - setRows((prev) => prev.filter((row) => row.id !== id)) - } - - const handleChangeRow = (id: string, updater: (row: FilterRow) => FilterRow) => { - setRows((prev) => prev.map((row) => (row.id === id ? updater(row) : row))) + const handleChangeRow = (headerId: number, updater: (row: FilterRow) => FilterRow) => { + setRows((prev) => prev.map((row) => (row.headerId === headerId ? updater(row) : row))) } const getHeaderOption = (headerId: number) => headerOptions.find((item) => item.id === headerId) @@ -108,6 +98,7 @@ const ListFilterDialog = ({ rows .map((row) => { if (isDisabledHeader(row.headerId)) return null + if (row.operator === 'none') return null if (row.operator === 'empty' || row.operator === 'notEmpty') return row if (isListValueHeader(row.headerId)) return row.multiValues.length > 0 ? row : null return row.textValue.trim().length > 0 ? row : null @@ -117,13 +108,6 @@ const ListFilterDialog = ({ ) const handleConfirm = async () => { - // rows가 아예 없으면 "필터를 전부 지우겠다"는 의도이므로 그대로 통과시킨다. - // rows는 있는데 값을 안 채워 serializedRows가 비면, 실수로 방치된 조건일 가능성이 높아 알려준다. - if (rows.length > 0 && serializedRows.length === 0) { - alert('필터 조건을 입력해주세요.') - return - } - setSubmitting(true) try { await onConfirm(serializedRows) @@ -151,61 +135,33 @@ const ListFilterDialog = ({ } >
-
+
헤더 비교 연산자 값 -
-
+
{rows.map((row) => { const valueOptions = getValueOptions(row.headerId) const listMode = isListValueHeader(row.headerId) const disabled = isDisabledHeader(row.headerId) const rowAllowedOperators = getAllowedOperators(row.headerId) - const isEmptyOperator = row.operator === 'empty' || row.operator === 'notEmpty' + const isValuelessOperator = row.operator === 'empty' || row.operator === 'notEmpty' || row.operator === 'none' + const headerLabel = getHeaderOption(row.headerId)?.label ?? String(row.headerId) return (
- + {headerLabel} - {isEmptyOperator ? ( + {isValuelessOperator ? ( ) : listMode ? ( - handleChangeRow(row.id, (current) => ({ + handleChangeRow(row.headerId, (current) => ({ ...current, multiValues: values, })) @@ -252,36 +208,18 @@ const ListFilterDialog = ({ value={row.textValue} disabled={disabled} onChange={(event) => - handleChangeRow(row.id, (current) => ({ + handleChangeRow(row.headerId, (current) => ({ ...current, textValue: event.target.value, })) } /> )} - -
- -
) })}
- - ) } diff --git a/src/components/dialog/ListHeaderManageDialog.tsx b/src/components/dialog/ListHeaderManageDialog.tsx index f66c4f8..388640d 100644 --- a/src/components/dialog/ListHeaderManageDialog.tsx +++ b/src/components/dialog/ListHeaderManageDialog.tsx @@ -49,6 +49,8 @@ type ListHeaderRowProps = { onDelete: (id: number) => void } +const COMMON_GRADE_ORDER_START = 101 + const isCommonGrade = (grade: ListHeaderGrade) => grade === ListHeaderGrade.COMMON const isImmutableGrade = (grade: ListHeaderGrade) => grade === ListHeaderGrade.IMMUTABLE @@ -328,11 +330,12 @@ const ListHeaderManageDialog = ({ setSubmitting(true) try { - const orderedRows = localRows.map((row, index) => ({ - ...row, - prjctIdx: row.prjctIdx ?? prjctIdx, - listHderOrder: index + 1, - })) + let defaultOrder = 0 + let commonOrder = COMMON_GRADE_ORDER_START - 1 + const orderedRows = localRows.map((row) => { + const listHderOrder = isCommonGrade(row.listHderGrad) ? (commonOrder += 1) : (defaultOrder += 1) + return { ...row, prjctIdx: row.prjctIdx ?? prjctIdx, listHderOrder } + }) await onConfirm(orderedRows) handleOpenChange(false) } finally { diff --git a/src/components/dialog/ReservationListDialog.tsx b/src/components/dialog/ReservationListDialog.tsx deleted file mode 100644 index e33b21f..0000000 --- a/src/components/dialog/ReservationListDialog.tsx +++ /dev/null @@ -1,91 +0,0 @@ -'use client' - -import { KriDialog } from '@/components/common/KriDialog' -import { useDialog } from '@/hooks/useDialog' -import type { DialogId } from '@/store/jotai/dialog' -import type { ListReserve } from '@/types/list' -import { formatKst } from '@kri/common' - -export type ReservationListDialogProps = { - dialogId?: DialogId - open?: boolean - onOpenChange?: (open: boolean) => void - reservations: ListReserve[] - onSelectReservation: (sid: string) => void -} - -// 오늘과 가장 가까운(과거/미래 무관) 예약의 sid를 찾는다. -export const findClosestReservationSid = (reservations: ListReserve[], now: Date = new Date()): string | null => { - if (reservations.length === 0) return null - - return reservations.reduce((closest, current) => { - const closestDiff = Math.abs(new Date(closest.resveDt).getTime() - now.getTime()) - const currentDiff = Math.abs(new Date(current.resveDt).getTime() - now.getTime()) - return currentDiff < closestDiff ? current : closest - }, reservations[0]).sid -} - -const ReservationListDialog = ({ - dialogId = 'reservationListDialog', - open, - onOpenChange, - reservations, - onSelectReservation, -}: ReservationListDialogProps) => { - const { isDialogOpen, showDialog, hideDialog } = useDialog() - const resolvedOpen = open ?? isDialogOpen(dialogId) - const closestSid = findClosestReservationSid(reservations) - - const handleOpenChange = (nextOpen: boolean) => { - onOpenChange?.(nextOpen) - if (nextOpen) { - showDialog(dialogId) - return - } - hideDialog(dialogId) - } - - const handleSelect = (sid: string) => { - onSelectReservation(sid) - handleOpenChange(false) - } - - return ( - 예약리스트 조회} - contentClassName="sm:max-w-[480px]" - showDefaultFooter - > -
- {reservations.length === 0 ? ( -
예약된 리스트가 없습니다.
- ) : ( - - - - - - - - - {reservations.map((item) => ( - handleSelect(item.sid)} - > - - - - ))} - -
SID예약 일시
{item.sid}{formatKst(item.resveDt, 'dateHourMin')}
- )} -
-
- ) -} - -export default ReservationListDialog diff --git a/src/components/dialog/ReserveSearchDialog.tsx b/src/components/dialog/ReserveSearchDialog.tsx new file mode 100644 index 0000000..51fbb02 --- /dev/null +++ b/src/components/dialog/ReserveSearchDialog.tsx @@ -0,0 +1,150 @@ +'use client' + +import { useState } from 'react' +import { useRouter } from 'next/navigation' +import { useQueryClient } from '@tanstack/react-query' +import { formatKst } from '@kri/common' +import { KriDialog } from '@/components/common/KriDialog' +import { KriDateRangePicker, type KriDateRange } from '@/components/common/KriDateRangePicker' +import { useDialog } from '@/hooks/useDialog' +import { useAuth } from '@/hooks/useAuth' +import { useSelectedProject } from '@/hooks/useSelectedProject' +import { useCtiCallPhase } from '@/hooks/useCtiCallPhase' +import { CTI_CALL_PHASE } from '@/const/ctiConst' +import { useReserveSearchQuery } from '@/query/reserve' +import { nextApi } from '@/lib/http-client' +import { qk } from '@/query/key/keys' +import type { DialogId } from '@/store/jotai/dialog' +import type { SelectedProject } from '@/store/jotai/project' +import type { ProjectInfo } from '@/types/project' + +export type ReserveSearchDialogProps = { + dialogId?: DialogId + open?: boolean + onOpenChange?: (open: boolean) => void +} + +const toDateInput = (date: Date) => { + const year = date.getFullYear() + const month = String(date.getMonth() + 1).padStart(2, '0') + const day = String(date.getDate()).padStart(2, '0') + return `${year}-${month}-${day}` +} + +const todayRange = (): KriDateRange => { + const today = toDateInput(new Date()) + return { from: today, to: today } +} + +const ReserveSearchDialog = ({ + dialogId = 'reserveSearchDialog', + open, + onOpenChange, +}: ReserveSearchDialogProps) => { + const router = useRouter() + const queryClient = useQueryClient() + const { isDialogOpen, showDialog, hideDialog } = useDialog() + const { auth } = useAuth() + const { setSelectedProject } = useSelectedProject() + const ctiCallPhase = useCtiCallPhase() + const shouldBlockNavigation = CTI_CALL_PHASE.includes(ctiCallPhase) + + const [range, setRange] = useState(todayRange) + const [navigatingSid, setNavigatingSid] = useState(null) + + const resolvedOpen = open ?? isDialogOpen(dialogId) + const userId = auth.user?.userId ?? '' + const enabled = resolvedOpen && !!userId && !!range.from && !!range.to + + const reserveSearchQuery = useReserveSearchQuery(userId, range.from, range.to, enabled) + const reservations = reserveSearchQuery.data ?? [] + + const handleOpenChange = (nextOpen: boolean) => { + onOpenChange?.(nextOpen) + if (nextOpen) { + showDialog(dialogId) + return + } + hideDialog(dialogId) + } + + const handleRowClick = async (prjctIdx: number, sid: string) => { + if (shouldBlockNavigation) { + alert('통화 중에는 이동할 수 없습니다.') + return + } + + setNavigatingSid(sid) + try { + const projectInfo = await queryClient.fetchQuery({ + queryKey: qk.projectInfo(prjctIdx), + queryFn: () => nextApi.get(`/project/info/${prjctIdx}`), + }) + + setSelectedProject({ + prjctIdx: projectInfo.prjctIdx, + prjctCd: projectInfo.prjctCd, + prjctName: projectInfo.prjctName, + itrntPrjctCd: projectInfo.itrntPrjctCd, + ownerDept: projectInfo.ownerDept, + ownerFw: projectInfo.ownerFw, + ff: projectInfo.ff, + } as SelectedProject) + + handleOpenChange(false) + router.push(`/list/contact?sid=${encodeURIComponent(sid)}`) + } finally { + setNavigatingSid(null) + } + } + + return ( + 예약 내역 조회} + contentClassName="sm:max-w-[860px]" + showDefaultFooter + > +
+ + +
+ {reserveSearchQuery.isLoading ? ( +
불러오는 중...
+ ) : reservations.length === 0 ? ( +
예약된 내역이 없습니다.
+ ) : ( + + + + + + + + + + {reservations.map((item) => ( + handleRowClick(item.prjctIdx, item.sid)} + > + + + + + ))} + +
프로젝트SID예약 일시
{item.prjctName}{item.sid} + {formatKst(item.resveDt, 'dateHourMin')} + {navigatingSid === item.sid ? ' (이동 중...)' : ''} +
+ )} +
+
+
+ ) +} + +export default ReserveSearchDialog diff --git a/src/components/dialog/SingleMessageSendDialog.tsx b/src/components/dialog/SingleMessageSendDialog.tsx index 55664c5..a4909e8 100644 --- a/src/components/dialog/SingleMessageSendDialog.tsx +++ b/src/components/dialog/SingleMessageSendDialog.tsx @@ -18,6 +18,7 @@ import { ChannelType, type TemplateSms, type TemplateSummary } from '@kri/common import { sanitizeHtmlForPreview } from '@/components/kri-editor/utils/sanitizeHtml' import { KriEditor } from '@/components/kri-editor' import { getNearestFutureDateTime } from '@/lib/datetime' +import { escapeHtml, substituteVariables } from '@/lib/variableSubstitution' import type { DialogId } from '@/store/jotai/dialog' import type { MessageSendChannel, TemplateEmailWithAttachments } from '@/types/message' import TemplateAttachmentList from '@/components/message-template/TemplateAttachmentList' @@ -36,6 +37,7 @@ export type SingleMessageSendDialogProps = { itrntPrjctCd: string sid: string destHeaderId: number + variableValues?: Record onSent?: () => void } @@ -48,6 +50,7 @@ const SingleMessageSendDialog = ({ itrntPrjctCd, sid, destHeaderId, + variableValues, onSent, }: SingleMessageSendDialogProps) => { const { isDialogOpen, showDialog, hideDialog } = useDialog() @@ -68,6 +71,9 @@ const SingleMessageSendDialog = ({ const mainTemplateQuery = useMainTemplateIdxQuery(prjctIdx, chnnlTy, enabled) const mainTemplateIdx = mainTemplateQuery.data ?? null + const previewValues = variableValues ?? {} + const resolvedTitle = selectedTemplate ? substituteVariables(selectedTemplate.tmplatTitle ?? '', previewValues) : '' + const sendSingleMutation = useSendSingleMessageMutation(channel, prjctIdx) const mainTemplateAppliedRef = useRef(false) @@ -199,26 +205,33 @@ const SingleMessageSendDialog = ({ {selectedTemplate && ( <> {chnnlTy !== ChannelType.SMS && ( -
{`제목: ${selectedTemplate.tmplatTitle}` || '(제목 없음)'}
+
{resolvedTitle ? `제목: ${resolvedTitle}` : '(제목 없음)'}
)} {chnnlTy === ChannelType.SMS ? (
{}} isSmsReadOnly placeholder="문자 내용을 입력해 주세요" className="max-w-80 mx-0" debounceMs={600} - smsTitle={(selectedTemplate as TemplateSms).tmplatTitle} + smsTitle={resolvedTitle} />
) : ( <>
[key, escapeHtml(val)])), + ), + ), + }} /> & { mode: 'html' } @@ -47,12 +48,31 @@ export function KriEditorHtmlOnly({ else scheduleChange(next) }, [flushChange, scheduleChange]) + // 사용자가 타이핑한 값이 아니라 외부에서 새로 세팅된 데이터일 때만(최초 마운트 포함) + // prettier로 포맷팅해서 반영한다 — 편집 중(commitHtml 경로)에는 절대 재포맷하지 않는다. + const applyExternalValue = React.useCallback((next: string) => { + setHtml(next) + latestHtmlRef.current = next + formatHtmlSource(next) + .then((formatted) => { + if (latestHtmlRef.current !== next) return // 그 사이 값이 또 바뀌었으면 건너뜀 + setHtml(formatted) + latestHtmlRef.current = formatted + }) + .catch(() => {}) + }, []) + + React.useEffect(() => { + applyExternalValue(value || '') + // 최초 마운트 시 1회만 실행 — 이후 value 변경은 아래 effect가 처리한다. + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []) + React.useEffect(() => { if ((value || '') !== latestHtmlRef.current) { - setHtml(value || '') - latestHtmlRef.current = value || '' + applyExternalValue(value || '') } - }, [value]) + }, [value, applyExternalValue]) React.useEffect(() => { onEditorReady?.(textareaRef.current) @@ -122,7 +142,20 @@ export function KriEditorHtmlOnly({ } } - const previewHtml = React.useMemo(() => sanitizeHtmlForPreview(preserveEmptyParagraphs(html)), [html]) + const handleFormatHtml = React.useCallback(async () => { + try { + const formatted = await formatHtmlSource(latestHtmlRef.current) + commitHtml(formatted) + } catch (error) { + toast.error('HTML 정렬에 실패했습니다.') + console.error(error) + } + }, [commitHtml]) + + const previewHtml = React.useMemo( + () => sanitizeHtmlForPreview(preserveEmptyParagraphs(html)), + [html], + ) return (
@@ -130,11 +163,16 @@ export function KriEditorHtmlOnly({
HTML 모드 - {onImageUpload ? ( - - ) : null} + {onImageUpload ? ( + + ) : null} +