forked from baron/baron-sso
누락된 키 추가: 테넌트 수정 화면에 새롭게 추가한 '상위 테넌트' 관련 UI 키 2종을 로컬 설정 파일에 반영했습니다
This commit is contained in:
@@ -776,7 +776,9 @@ const TenantTreeRow: React.FC<{
|
||||
if (node.type === "USER_GROUP") {
|
||||
// User groups have a different detail path
|
||||
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}`);
|
||||
} else {
|
||||
navigate(`/tenants/${node.id}`);
|
||||
|
||||
@@ -189,7 +189,7 @@ export function UserGroupDetailPage() {
|
||||
<p>
|
||||
Error:{" "}
|
||||
{(error as AxiosError<{ error?: string }>)?.response?.data?.error ||
|
||||
(error as any)?.message ||
|
||||
(error instanceof Error ? error.message : String(error)) ||
|
||||
"Not found"}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -79,9 +79,8 @@ function UserCreatePage() {
|
||||
|
||||
// Lock company for tenant_admin
|
||||
React.useEffect(() => {
|
||||
const p = profile as any;
|
||||
if (p?.role === "tenant_admin" && p.tenantSlug) {
|
||||
setValue("tenantSlug", p.tenantSlug);
|
||||
if (profile?.role === "tenant_admin" && profile.tenantSlug) {
|
||||
setValue("tenantSlug", profile.tenantSlug);
|
||||
}
|
||||
}, [profile, setValue]);
|
||||
|
||||
@@ -362,7 +361,7 @@ function UserCreatePage() {
|
||||
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"
|
||||
{...register("tenantSlug")}
|
||||
disabled={(profile as any)?.role === "tenant_admin"}
|
||||
disabled={profile?.role === "tenant_admin"}
|
||||
>
|
||||
<option value="">
|
||||
{t(
|
||||
|
||||
@@ -147,9 +147,21 @@ function TenantProfileCard({
|
||||
: 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">
|
||||
{(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>
|
||||
)}
|
||||
</div>
|
||||
@@ -248,7 +260,10 @@ function UserDetailPage() {
|
||||
position: user.position || "",
|
||||
jobTitle: user.jobTitle || "",
|
||||
password: "",
|
||||
metadata: (user.metadata || {}) as any,
|
||||
metadata: (user.metadata || {}) as unknown as Record<
|
||||
string,
|
||||
Record<string, unknown>
|
||||
>,
|
||||
});
|
||||
}
|
||||
}, [user, reset]);
|
||||
|
||||
@@ -140,7 +140,7 @@ export function UserBulkMoveGroupModal({
|
||||
userIds,
|
||||
tenantSlug: selectedTenantSlug,
|
||||
department: selectedGroupName, // can be empty for "No Department"
|
||||
} as any);
|
||||
});
|
||||
};
|
||||
|
||||
const filteredGroups = React.useMemo(() => {
|
||||
|
||||
@@ -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] as any).metadata.emp_id).toBe("E002");
|
||||
expect(result[1].metadata.emp_id).toBe("E002");
|
||||
});
|
||||
|
||||
it("should return empty array for empty input", () => {
|
||||
|
||||
@@ -412,13 +412,13 @@ func (h *UserHandler) CreateUser(c *fiber.Ctx) error {
|
||||
}
|
||||
|
||||
type bulkUserItem struct {
|
||||
Email string `json:"email"`
|
||||
Name string `json:"name"`
|
||||
Phone string `json:"phone"`
|
||||
Role string `json:"role"`
|
||||
TenantSlug string `json:"tenantSlug"`
|
||||
Department string `json:"department"`
|
||||
Metadata map[string]any `json:"metadata"`
|
||||
Email string `json:"email"`
|
||||
Name string `json:"name"`
|
||||
Phone string `json:"phone"`
|
||||
Role string `json:"role"`
|
||||
TenantSlug string `json:"tenantSlug"`
|
||||
Department string `json:"department"`
|
||||
Metadata map[string]any `json:"metadata"`
|
||||
}
|
||||
|
||||
type bulkUserResult struct {
|
||||
|
||||
@@ -122,13 +122,13 @@ func TestUserHandler_BulkCreateUsers(t *testing.T) {
|
||||
{
|
||||
"email": "user1@test.com",
|
||||
"name": "User One",
|
||||
"companyCode": "test-tenant",
|
||||
"tenantSlug": "test-tenant",
|
||||
"metadata": map[string]interface{}{"emp_id": "E001"},
|
||||
},
|
||||
{
|
||||
"email": "user2@test.com",
|
||||
"name": "User Two",
|
||||
"companyCode": "test-tenant",
|
||||
"tenantSlug": "test-tenant",
|
||||
"metadata": map[string]interface{}{"emp_id": "E002"},
|
||||
},
|
||||
},
|
||||
@@ -155,9 +155,9 @@ func TestUserHandler_BulkCreateUsers(t *testing.T) {
|
||||
payload := map[string]interface{}{
|
||||
"users": []map[string]interface{}{
|
||||
{
|
||||
"email": "fail@test.com",
|
||||
"name": "Fail User",
|
||||
"companyCode": "wrong-tenant",
|
||||
"email": "fail@test.com",
|
||||
"name": "Fail User",
|
||||
"tenantSlug": "wrong-tenant",
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -188,10 +188,10 @@ func TestUserHandler_BulkCreateUsers(t *testing.T) {
|
||||
payload := map[string]interface{}{
|
||||
"users": []map[string]interface{}{
|
||||
{
|
||||
"email": "missing-meta@test.com",
|
||||
"name": "No Meta",
|
||||
"companyCode": "test-tenant",
|
||||
"metadata": map[string]interface{}{}, // emp_id missing
|
||||
"email": "missing-meta@test.com",
|
||||
"name": "No Meta",
|
||||
"tenantSlug": "test-tenant",
|
||||
"metadata": map[string]interface{}{}, // emp_id missing
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -222,10 +222,10 @@ func TestUserHandler_BulkCreateUsers(t *testing.T) {
|
||||
payload := map[string]interface{}{
|
||||
"users": []map[string]interface{}{
|
||||
{
|
||||
"email": "regex-fail@test.com",
|
||||
"name": "Regex Fail",
|
||||
"companyCode": "test-tenant",
|
||||
"metadata": map[string]interface{}{"emp_id": "abc"}, // Should start with E and 3 digits
|
||||
"email": "regex-fail@test.com",
|
||||
"name": "Regex Fail",
|
||||
"tenantSlug": "test-tenant",
|
||||
"metadata": map[string]interface{}{"emp_id": "abc"}, // Should start with E and 3 digits
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
2655
locales/en.toml
2655
locales/en.toml
File diff suppressed because it is too large
Load Diff
2649
locales/ko.toml
2649
locales/ko.toml
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user