260722_01_ENH: 버그 수정 및 개선 사항 수정

This commit is contained in:
2026-07-22 16:53:00 +09:00
parent d8b565276d
commit 2dd5b88c6f
67 changed files with 1925 additions and 736 deletions

View File

@@ -1,6 +1,6 @@
'use client'
import { useEffect, useMemo, useState } from 'react'
import { useEffect, useMemo, useRef, useState } from 'react'
import { KriDialog } from '@/components/common/KriDialog'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
@@ -8,14 +8,14 @@ import { Label } from '@/components/ui/label'
import { useDialog } from '@/hooks/useDialog'
import type { DialogId } from '@/store/jotai/dialog'
import { UserInfoSaveRequest } from '@/types/user'
import KriPassword, { KRI_PW_REGEX } from "@/components/common/KriPassword";
import {KriSelect, KriSelectItem} from "@/components/common/KriSelect";
import KriPassword, { type KriPasswordRef } from "@/components/common/KriPassword";
import {KriSelect, KriSelectItem, type KriSelectRef} from "@/components/common/KriSelect";
import type { DataVerification } from "@kri/common";
import {apiError} from "@kri/common/http";
import {CONTACT_INTERVIEWER_ROLE, FW_TEAM, USER_NAME_REGEX} from "@/const/userConst";
import {NONE_HTTP_ERROR, UNKNOWN_HTTP_ERROR} from "@kri/common/http";
import {CONTACT_INTERVIEWER_ROLE, FW_TEAM} from "@/const/userConst";
import {KRI_PW_REGEX, USER_NAME_REGEX} from "@/const/validationConst";
import type { CmpnInfo } from "@/types/cmpn";
import { isExternalManager, isFieldWorkUser } from "@/utils/userRole";
import { validateValue } from "@/utils/validation";
// 외주사(EXTERNAL_USER_ROLE_GROUP)와 콜센터/컨택원/면접원(FW_USER_ROLE_GROUP)은 배정 체계가 완전히 달라
// 서로 넘나드는 권한 수정을 지원하지 않는다. 하나 새로 만들어서 넘기는 게 맞다.
@@ -69,6 +69,13 @@ const UserUpsertDialog = ({
const [isCheckedDuplicate, setIsCheckedDuplicate] = useState(false);
const [isSubmitting, setIsSubmitting] = useState(false);
const [invalidField, setInvalidField] = useState<'userId' | 'userPw' | 'userName' | 'userCmpn' | 'memo' | null>(null);
const userIdRef = useRef<HTMLInputElement>(null);
const userPwRef = useRef<KriPasswordRef>(null);
const userNameRef = useRef<HTMLInputElement>(null);
const userCmpnRef = useRef<KriSelectRef>(null);
const memoRef = useRef<HTMLTextAreaElement>(null);
// 실제 Dialog에 전달할 open 값
const resolvedOpen = open ?? isDialogOpen(dialogId);
@@ -86,6 +93,7 @@ const UserUpsertDialog = ({
// initialData / mode / open 변경 시 폼 세팅
useEffect(() => {
setInvalidField(null);
if (initialData) {
setFormData(prev => ({
...prev,
@@ -108,6 +116,12 @@ const UserUpsertDialog = ({
return userRoleArray.filter((item) => !isCrossExternalFwRoleChange(initialRole, Number(item.value)))
}, [mode, initialData?.userRole, userRoleArray])
// 외주 실사(외주사) 권한은 자사 소속을 가질 수 없으므로 회사 선택지에서 제외한다.
const availableCmpnArray = useMemo(() => {
if (!isExternalManager(formData.userRole)) return userCmpnArray
return userCmpnArray.filter((c) => !c.ownCmpn)
}, [userCmpnArray, formData.userRole])
const handleInputChange = <K extends keyof UserInfoSaveRequest>(field: K, value: UserInfoSaveRequest[K]) => {
setFormData(prev => ({
...prev,
@@ -120,8 +134,11 @@ const UserUpsertDialog = ({
}
const handleCheckDuplicate = async () => {
if (!formData.userId.trim()) {
alert("아이디를 입력해주세요.");
const userIdCheck = validateValue(formData.userId, { required: true, requiredMessage: "아이디를 입력해주세요." });
if (!userIdCheck.valid) {
alert(userIdCheck.message);
setInvalidField('userId');
userIdRef.current?.focus();
return
}
@@ -140,28 +157,73 @@ const UserUpsertDialog = ({
}
const handleSubmit = async () => {
if (!formData.userId.trim()) {
alert("아이디를 입력해주세요.");
setInvalidField(null);
const userIdCheck = validateValue(formData.userId, { required: true, requiredMessage: "아이디를 입력해주세요." });
if (!userIdCheck.valid) {
alert(userIdCheck.message);
setInvalidField('userId');
userIdRef.current?.focus();
return;
}
if (mode === 'create' && !isCheckedDuplicate) {
alert("아이디 중복체크를 해주세요.");
setInvalidField('userId');
userIdRef.current?.focus();
return;
}
if (!formData.userPw.trim()) {
alert("비밀번호를 입력해주세요.");
const userPwCheck = validateValue(formData.userPw, {
required: true,
requiredMessage: "비밀번호를 입력해주세요.",
pattern: KRI_PW_REGEX,
patternMessage: "비밀번호는 영문과 숫자를 포함한 8~20자로 입력해주세요.",
});
if (!userPwCheck.valid) {
alert(userPwCheck.message);
setInvalidField('userPw');
userPwRef.current?.focus();
return;
}
if (!KRI_PW_REGEX.test(formData.userPw)) {
alert("비밀번호는 영문과 숫자를 포함한 8~20자로 입력해주세요.");
const userNameCheck = validateValue(formData.userName, {
required: true,
requiredMessage: "이름을 입력해주세요.",
maxLength: 32,
pattern: USER_NAME_REGEX,
patternMessage: "이름에 허용되지 않는 문자가 포함되어 있습니다.",
});
if (!userNameCheck.valid) {
alert(userNameCheck.message);
setInvalidField('userName');
userNameRef.current?.focus();
return;
}
if (!formData.userName.trim()) {
alert("이름을 입력해주세요.");
const userCmpnCheck = validateValue(formData.userCmpn, {
required: true,
requiredMessage: "회사를 선택해주세요.",
});
if (!userCmpnCheck.valid) {
alert(userCmpnCheck.message);
setInvalidField('userCmpn');
userCmpnRef.current?.focus();
return;
}
if(!USER_NAME_REGEX.test(formData.userName)){
alert("올바르지 않은 이름입니다.");
if (isExternalManager(formData.userRole)) {
const selectedCmpn = userCmpnArray.find((c) => c.cmpnId === formData.userCmpn);
if (selectedCmpn?.ownCmpn) {
alert("외주 실사 권한은 자사를 소속 회사로 선택할 수 없습니다.");
setInvalidField('userCmpn');
userCmpnRef.current?.focus();
return;
}
}
const memoCheck = validateValue(formData.memo ?? '', { maxLength: 2048 });
if (!memoCheck.valid) {
alert(memoCheck.message);
setInvalidField('memo');
memoRef.current?.focus();
return;
}
@@ -173,16 +235,7 @@ const UserUpsertDialog = ({
await onSubmit(formData as UserInfoSaveRequest);
handleOpenChange(false);
} catch (e) {
const err = apiError(e, {
fallbackMessage: "Save failed.",
});
console.error(err.status, err.code, err.message);
if(err.code !== NONE_HTTP_ERROR && err.code !== UNKNOWN_HTTP_ERROR){
alert(err.message);
}
else{
alert("저장에 실패했습니다.");
}
console.error(e);
} finally {
setIsSubmitting(false);
}
@@ -221,11 +274,13 @@ const UserUpsertDialog = ({
</Label>
<div className="flex gap-2">
<Input
ref={userIdRef}
id="userId"
placeholder="Enter ID"
placeholder="아이디를 입력하세요"
value={formData.userId}
onChange={(e) => handleInputChange('userId', e.target.value)}
disabled={mode === 'edit'}
aria-invalid={invalidField === 'userId'}
/>
{mode === 'create' && (
<Button
@@ -240,14 +295,16 @@ const UserUpsertDialog = ({
</div>
<div className="grid gap-2">
<Label htmlFor="password">
PW<span className="text-red-500 ml-1">*</span>
Password<span className="text-red-500 ml-1">*</span>
</Label>
<KriPassword
ref={userPwRef}
id="password"
label=""
value={formData.userPw}
onChange={(v) => handleInputChange('userPw', v)}
placeholder="Enter password"
placeholder="비밀번호를 입력하세요"
aria-invalid={invalidField === 'userPw'}
/>
</div>
<div className="grid gap-2">
@@ -255,14 +312,18 @@ const UserUpsertDialog = ({
이름<span className="text-red-500 ml-1">*</span>
</Label>
<Input
ref={userNameRef}
id="userName"
placeholder="Enter name"
placeholder="이름을 입력하세요"
value={formData.userName}
onChange={(e) => handleInputChange('userName', e.target.value)}
aria-invalid={invalidField === 'userName'}
/>
</div>
<div className="grid gap-2">
<Label>계정 권한</Label>
<Label>
계정 권한 <span className="text-red-500 ml-1">*</span>
</Label>
<KriSelect
items={availableRoleArray}
value={String(formData.userRole)}
@@ -272,7 +333,15 @@ const UserUpsertDialog = ({
if(mode !== 'create'){
alert("권한이 변경되면 해당 계정에 배정된 리스트 정보가 초기화됩니다.");
}
handleInputChange('userRole', Number(e));
const nextRole = Number(e);
handleInputChange('userRole', nextRole);
if (isExternalManager(nextRole)) {
const currentCmpn = userCmpnArray.find((c) => c.cmpnId === formData.userCmpn);
if (currentCmpn?.ownCmpn) {
handleInputChange('userCmpn', '');
}
}
}}
useAll={false}
className="w-full min-w-0 overflow-hidden [&>span]:truncate"
@@ -280,9 +349,12 @@ const UserUpsertDialog = ({
/>
</div>
<div className="grid gap-2">
<Label>소속 회사</Label>
<Label>
소속 회사 <span className="text-red-500 ml-1">*</span>
</Label>
<KriSelect
items={userCmpnArray}
ref={userCmpnRef}
items={availableCmpnArray}
value={formData.userCmpn}
getValue={(item) => item.cmpnId}
getLabel={(item) => item.cmpnAlias || item.cmpnId}
@@ -291,15 +363,17 @@ const UserUpsertDialog = ({
disabled={mode !== 'create'}
className="w-full min-w-0 overflow-hidden [&>span]:truncate"
heightClassName="h-9"
aria-invalid={invalidField === 'userCmpn'}
/>
</div>
<div className="grid gap-2">
<Label htmlFor="memo">메모</Label>
<textarea id="memo" className="flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
<textarea ref={memoRef} id="memo" className="flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20"
rows={3}
placeholder="Enter memo"
placeholder="메모를 입력하세요"
value={formData.memo}
onChange={(e) => handleInputChange('memo', e.target.value)}
aria-invalid={invalidField === 'memo'}
/>
</div>
</KriDialog>