260722_01_ENH: 버그 수정 및 개선 사항 수정
This commit is contained in:
@@ -24,6 +24,7 @@ import { LoadingOverlayAdapter } from "@/components/app-shell/LoadingOverlayAdap
|
||||
import {useItrntUserList} from "@/hooks/useItrntUserList";
|
||||
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";
|
||||
|
||||
@@ -52,8 +53,21 @@ const MainPage = () => {
|
||||
|
||||
const enabled = mounted && !isLoading; // intranet user list 준비된 뒤에만 호출
|
||||
const ownerQuery = useProjectOwnerListQuery(enabled);
|
||||
const groupCodeListQuery = useGroupCodeListQuery(enabled);
|
||||
|
||||
const groupCodeLabelMap = useMemo(() => {
|
||||
return new Map((groupCodeListQuery.data ?? []).map((g) => [g.groupCode, g.groupCodeLabel]));
|
||||
}, [groupCodeListQuery.data]);
|
||||
|
||||
const deptArray = useMemo(() => {
|
||||
const ownerDeptList = ownerQuery.data?.ownerDeptList ?? [];
|
||||
|
||||
return ownerDeptList.map((code) => ({
|
||||
value: code,
|
||||
label: groupCodeLabelMap.get(code) ?? code,
|
||||
}));
|
||||
}, [ownerQuery.data?.ownerDeptList, groupCodeLabelMap]);
|
||||
|
||||
const deptArray = ownerQuery.data?.ownerDeptList ?? [];
|
||||
const fwArray = useMemo(() => {
|
||||
const ownerFwIDList = ownerQuery.data?.ownerFwList ?? [];
|
||||
|
||||
@@ -86,7 +100,7 @@ const MainPage = () => {
|
||||
const [searchDept, setSearchDept] = useState<string[]>([]);
|
||||
const [searchFw, setSearchFw] = useState<string[]>([]);
|
||||
|
||||
const columns = getProjectColumns(users);
|
||||
const columns = getProjectColumns(users, groupCodeLabelMap);
|
||||
const userId = auth.user?.userId ?? "";
|
||||
const userRole = auth.user?.userRole;
|
||||
|
||||
@@ -119,7 +133,6 @@ const MainPage = () => {
|
||||
itrntPrjctCd: projectInfo.itrntPrjctCd,
|
||||
ownerDept: projectInfo.ownerDept,
|
||||
ownerFw: projectInfo.ownerFw,
|
||||
surveyTy: projectInfo.surveyTy,
|
||||
ff: projectInfo.ff
|
||||
} as SelectedProject);
|
||||
|
||||
@@ -134,7 +147,6 @@ const MainPage = () => {
|
||||
itrntPrjctCd: projectInfo.itrntPrjctCd,
|
||||
ownerDept: projectInfo.ownerDept,
|
||||
ownerFw: projectInfo.ownerFw,
|
||||
surveyTy: projectInfo.surveyTy,
|
||||
ff: projectInfo.ff
|
||||
} as SelectedProject);
|
||||
|
||||
@@ -177,6 +189,8 @@ const MainPage = () => {
|
||||
items={deptArray}
|
||||
value={searchDept}
|
||||
onChange={setSearchDept}
|
||||
getValue={(item) => item.value}
|
||||
getLabel={(item) => item.label}
|
||||
placeholder="담당 그룹"
|
||||
widthClassName="w-60"
|
||||
heightClassName="h-9"
|
||||
|
||||
Reference in New Issue
Block a user