1
0
forked from baron/baron-sso

누락된 키 추가: 테넌트 수정 화면에 새롭게 추가한 '상위 테넌트' 관련 UI 키 2종을 로컬 설정 파일에 반영했습니다

This commit is contained in:
2026-03-24 16:33:01 +09:00
parent a4f283e4e6
commit 311e491683
11 changed files with 3986 additions and 4045 deletions

View File

@@ -776,7 +776,9 @@ const TenantTreeRow: React.FC<{
if (node.type === "USER_GROUP") { if (node.type === "USER_GROUP") {
// User groups have a different detail path // User groups have a different detail path
const baseTenantId = const baseTenantId =
(node as any).tenantId || (node as any).parentId || ""; (node as unknown as { tenantId?: string }).tenantId ||
node.parentId ||
"";
navigate(`/tenants/${baseTenantId}/organization/${node.id}`); navigate(`/tenants/${baseTenantId}/organization/${node.id}`);
} else { } else {
navigate(`/tenants/${node.id}`); navigate(`/tenants/${node.id}`);

View File

@@ -189,7 +189,7 @@ export function UserGroupDetailPage() {
<p> <p>
Error:{" "} Error:{" "}
{(error as AxiosError<{ error?: string }>)?.response?.data?.error || {(error as AxiosError<{ error?: string }>)?.response?.data?.error ||
(error as any)?.message || (error instanceof Error ? error.message : String(error)) ||
"Not found"} "Not found"}
</p> </p>
</div> </div>

View File

@@ -79,9 +79,8 @@ function UserCreatePage() {
// Lock company for tenant_admin // Lock company for tenant_admin
React.useEffect(() => { React.useEffect(() => {
const p = profile as any; if (profile?.role === "tenant_admin" && profile.tenantSlug) {
if (p?.role === "tenant_admin" && p.tenantSlug) { setValue("tenantSlug", profile.tenantSlug);
setValue("tenantSlug", p.tenantSlug);
} }
}, [profile, setValue]); }, [profile, setValue]);
@@ -362,7 +361,7 @@ function UserCreatePage() {
id="tenantSlug" id="tenantSlug"
className="flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50" className="flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50"
{...register("tenantSlug")} {...register("tenantSlug")}
disabled={(profile as any)?.role === "tenant_admin"} disabled={profile?.role === "tenant_admin"}
> >
<option value=""> <option value="">
{t( {t(

View File

@@ -147,9 +147,21 @@ function TenantProfileCard({
: false, : false,
})} })}
/> />
{errors.metadata?.[tenant.id]?.[field.key] && ( {(
errors.metadata as unknown as Record<
string,
Record<string, { message?: string }>
>
)?.[tenant.id]?.[field.key] && (
<p className="text-[10px] text-destructive"> <p className="text-[10px] text-destructive">
{(errors.metadata as any)?.[tenant.id]?.[field.key]?.message} {
(
errors.metadata as unknown as Record<
string,
Record<string, { message?: string }>
>
)?.[tenant.id]?.[field.key]?.message
}
</p> </p>
)} )}
</div> </div>
@@ -248,7 +260,10 @@ function UserDetailPage() {
position: user.position || "", position: user.position || "",
jobTitle: user.jobTitle || "", jobTitle: user.jobTitle || "",
password: "", password: "",
metadata: (user.metadata || {}) as any, metadata: (user.metadata || {}) as unknown as Record<
string,
Record<string, unknown>
>,
}); });
} }
}, [user, reset]); }, [user, reset]);

View File

@@ -140,7 +140,7 @@ export function UserBulkMoveGroupModal({
userIds, userIds,
tenantSlug: selectedTenantSlug, tenantSlug: selectedTenantSlug,
department: selectedGroupName, // can be empty for "No Department" department: selectedGroupName, // can be empty for "No Department"
} as any); });
}; };
const filteredGroups = React.useMemo(() => { const filteredGroups = React.useMemo(() => {

View File

@@ -22,7 +22,7 @@ user2@test.com,Kim Cheol Su,,admin,baron,IT,E002`;
}, },
}); });
expect(result[1].email).toBe("user2@test.com"); expect(result[1].email).toBe("user2@test.com");
expect((result[1] as any).metadata.emp_id).toBe("E002"); expect(result[1].metadata.emp_id).toBe("E002");
}); });
it("should return empty array for empty input", () => { it("should return empty array for empty input", () => {

View File

@@ -412,13 +412,13 @@ func (h *UserHandler) CreateUser(c *fiber.Ctx) error {
} }
type bulkUserItem struct { type bulkUserItem struct {
Email string `json:"email"` Email string `json:"email"`
Name string `json:"name"` Name string `json:"name"`
Phone string `json:"phone"` Phone string `json:"phone"`
Role string `json:"role"` Role string `json:"role"`
TenantSlug string `json:"tenantSlug"` TenantSlug string `json:"tenantSlug"`
Department string `json:"department"` Department string `json:"department"`
Metadata map[string]any `json:"metadata"` Metadata map[string]any `json:"metadata"`
} }
type bulkUserResult struct { type bulkUserResult struct {

View File

@@ -122,13 +122,13 @@ func TestUserHandler_BulkCreateUsers(t *testing.T) {
{ {
"email": "user1@test.com", "email": "user1@test.com",
"name": "User One", "name": "User One",
"companyCode": "test-tenant", "tenantSlug": "test-tenant",
"metadata": map[string]interface{}{"emp_id": "E001"}, "metadata": map[string]interface{}{"emp_id": "E001"},
}, },
{ {
"email": "user2@test.com", "email": "user2@test.com",
"name": "User Two", "name": "User Two",
"companyCode": "test-tenant", "tenantSlug": "test-tenant",
"metadata": map[string]interface{}{"emp_id": "E002"}, "metadata": map[string]interface{}{"emp_id": "E002"},
}, },
}, },
@@ -155,9 +155,9 @@ func TestUserHandler_BulkCreateUsers(t *testing.T) {
payload := map[string]interface{}{ payload := map[string]interface{}{
"users": []map[string]interface{}{ "users": []map[string]interface{}{
{ {
"email": "fail@test.com", "email": "fail@test.com",
"name": "Fail User", "name": "Fail User",
"companyCode": "wrong-tenant", "tenantSlug": "wrong-tenant",
}, },
}, },
} }
@@ -188,10 +188,10 @@ func TestUserHandler_BulkCreateUsers(t *testing.T) {
payload := map[string]interface{}{ payload := map[string]interface{}{
"users": []map[string]interface{}{ "users": []map[string]interface{}{
{ {
"email": "missing-meta@test.com", "email": "missing-meta@test.com",
"name": "No Meta", "name": "No Meta",
"companyCode": "test-tenant", "tenantSlug": "test-tenant",
"metadata": map[string]interface{}{}, // emp_id missing "metadata": map[string]interface{}{}, // emp_id missing
}, },
}, },
} }
@@ -222,10 +222,10 @@ func TestUserHandler_BulkCreateUsers(t *testing.T) {
payload := map[string]interface{}{ payload := map[string]interface{}{
"users": []map[string]interface{}{ "users": []map[string]interface{}{
{ {
"email": "regex-fail@test.com", "email": "regex-fail@test.com",
"name": "Regex Fail", "name": "Regex Fail",
"companyCode": "test-tenant", "tenantSlug": "test-tenant",
"metadata": map[string]interface{}{"emp_id": "abc"}, // Should start with E and 3 digits "metadata": map[string]interface{}{"emp_id": "abc"}, // Should start with E and 3 digits
}, },
}, },
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff