260714_01_ENH: 테스트 서버에서 기동 후 중간 테스트를 위한 커밋

This commit is contained in:
2026-07-14 10:59:07 +09:00
parent a8ce35f5bf
commit 192d47bdb1
180 changed files with 11942 additions and 6007 deletions

View File

@@ -13,18 +13,21 @@ import { UserInfo } from "@/types/user";
import { useSelectedProject } from "@/hooks/useSelectedProject";
import { KriSelect, KriSelectItem } from "@/components/common/KriSelect";
import { useAuth } from "@/hooks/useAuth";
import {CONTACT_USER_ROLE, DEFAULT_COMPANY_NAME, FW_USER_ROLE} from "@/const/userConst";
import {CONTACT_INTERVIEWER_ROLE} from "@/const/userConst";
import {
useFieldworkUsersQuery, useOutsourceUsersQuery,
useFieldworkUsersQuery,
useRoleListQuery,
} from "@/query/user";
import { useCmpnListQuery } from "@/query/cmpn";
import {
useAssignedCmpnIdsQuery,
useAssignedFieldworkIdsQuery,
useSaveAssignedFieldworkMutation,
useProjectTopQuery, useAssignedOutsourceIdsQuery,
useProjectTopQuery,
} from "@/query/project";
import { isFieldWorkUser } from "@/utils/userRole";
const ProjectAssignPage = () => {
const mounted = useMounted();
@@ -34,9 +37,9 @@ const ProjectAssignPage = () => {
const prjctIdx = selectedProject?.prjctIdx ?? 0;
const enabled = mounted && prjctIdx > 0;
const companyQuery = useOutsourceUsersQuery(enabled);
const companyQuery = useCmpnListQuery();
const fwUsersQuery = useFieldworkUsersQuery(enabled);
const assignedCompanyQuery = useAssignedOutsourceIdsQuery(prjctIdx, enabled);
const assignedCmpnIdsQuery = useAssignedCmpnIdsQuery(prjctIdx, enabled);
const assignedIdsQuery = useAssignedFieldworkIdsQuery(prjctIdx, enabled);
const saveAssignMutation = useSaveAssignedFieldworkMutation(prjctIdx);
@@ -48,18 +51,14 @@ const ProjectAssignPage = () => {
const projectArray = projectTopQuery.data ?? [];
const companyArray = useMemo(() => {
const companies = companyQuery.data ?? [];
const assigned = assignedCompanyQuery.data ?? [];
const assignedCompanies = companies
.filter(c => !assigned.includes(c.userCmpn))
.map(c => c.userCmpn);
return [DEFAULT_COMPANY_NAME, ...assignedCompanies];
}, [companyQuery.data, assignedCompanyQuery.data]);
const assignedCmpnIds = new Set(assignedCmpnIdsQuery.data ?? []);
return companies.filter((company) => company.ownCmpn || assignedCmpnIds.has(company.cmpnId));
}, [assignedCmpnIdsQuery.data, companyQuery.data]);
const roleArray: KriSelectItem[] = useMemo(() => {
const roles = roleQuery.data ?? [];
return roles
.filter(r => r.roleCd >= FW_USER_ROLE)
.filter(r => isFieldWorkUser(r.roleCd))
.map(r => ({ value: String(r.roleCd), label: r.roleNm }));
}, [roleQuery.data]);
@@ -219,14 +218,23 @@ const ProjectAssignPage = () => {
useEffect(() => {
const cmpn = auth.user?.userCmpn ?? "";
if (cmpn) setCompanyFilter(cmpn);
}, [auth.user?.userCmpn]);
const hasAuthCmpn = companyArray.some((company) => company.cmpnId === cmpn);
if (cmpn && hasAuthCmpn) {
setCompanyFilter(cmpn);
return;
}
if (companyFilter && !companyArray.some((company) => company.cmpnId === companyFilter)) {
setCompanyFilter("");
}
}, [auth.user?.userCmpn, companyArray, companyFilter]);
useEffect(() => {
if (roleFilter) return;
if (roleArray.length === 0) return;
const contactRole = roleArray.find(r => r.value === String(CONTACT_USER_ROLE));
const contactRole = roleArray.find(r => r.value === String(CONTACT_INTERVIEWER_ROLE));
setRoleFilter(contactRole ?? roleArray[0]);
}, [roleArray, roleFilter]);
@@ -269,6 +277,8 @@ const ProjectAssignPage = () => {
items={companyArray}
value={companyFilter}
onChange={handleCompanyChange}
getValue={(item) => item.cmpnId}
getLabel={(item) => item.cmpnAlias || item.cmpnId}
placeholder="회사 선택"
className="w-56 h-9"
useAll={false}
@@ -293,7 +303,7 @@ const ProjectAssignPage = () => {
<div className="grid grid-cols-[minmax(0,1fr)_auto_minmax(0,1fr)] gap-6 mb-6">
<div className="min-w-0">
<div className="p-2 bg-black text-white rounded-lg text-lg mb-2 h-13 flex items-center">
<div className="p-2 bg-primary text-white rounded-lg text-lg mb-2 h-13 flex items-center">
<span className="truncate w-full">{assignInfoString}</span>
</div>
<div className="border border-gray-200 rounded-lg overflow-hidden bg-white shadow-sm">
@@ -308,7 +318,7 @@ const ProjectAssignPage = () => {
<div className="h-[550px] overflow-y-auto">
<table className="w-full">
<thead className="bg-black text-white sticky top-0">
<thead className="bg-primary text-white sticky top-0">
<tr>
<th className="p-2 text-left w-12">
<Checkbox
@@ -353,7 +363,7 @@ const ProjectAssignPage = () => {
<Button
onClick={handleAssign}
disabled={selectedAbleUser.length === 0}
className="bg-black hover:bg-gray-800 w-36 h-12 flex items-center justify-center text-base disabled:bg-gray-300"
className="w-36 h-12 flex items-center justify-center text-base disabled:bg-gray-300"
>
<ChevronLeft className="w-5 h-5" />
<span className="ml-2">배정 {selectedAbleUser.length}명</span>
@@ -369,7 +379,7 @@ const ProjectAssignPage = () => {
</div>
<div className="min-w-0">
<div className="p-2 bg-black text-white rounded-lg text-lg mb-2 h-13">
<div className="p-2 bg-primary text-white rounded-lg text-lg mb-2 h-13">
<KriSingleSelect<ProjectInfo>
items={projectArray}
value={String(sourceProject?.prjctIdx ?? "")}
@@ -401,7 +411,7 @@ const ProjectAssignPage = () => {
<div className="h-[550px] overflow-y-auto">
<table className="w-full">
<thead className="bg-black text-white sticky top-0">
<thead className="bg-primary text-white sticky top-0">
<tr>
<th className="p-2 text-left w-12">
<Checkbox
@@ -446,7 +456,7 @@ const ProjectAssignPage = () => {
<div className="flex justify-center">
<Button
onClick={handleSave}
className="bg-black hover:bg-gray-800 px-12 h-9 text-base font-medium"
className=" px-12 h-9 text-base font-medium"
>
저장
</Button>