diff --git a/adminfront/src/features/tenants/components/ParentTenantSelector.picker.test.tsx b/adminfront/src/features/tenants/components/ParentTenantSelector.picker.test.tsx
index 51197cf4..d91d5de3 100644
--- a/adminfront/src/features/tenants/components/ParentTenantSelector.picker.test.tsx
+++ b/adminfront/src/features/tenants/components/ParentTenantSelector.picker.test.tsx
@@ -46,8 +46,10 @@ describe("ParentTenantSelector picker", () => {
fireEvent.click(screen.getByRole("button", { name: /테넌트 선택/ }));
expect(screen.getByRole("dialog")).toBeInTheDocument();
- const pickerSrc = screen.getByTitle("테넌트 선택").getAttribute("src");
- expect(pickerSrc).toContain("/login");
+ const pickerSrc = screen
+ .getByTestId("parent-tenant-picker-frame")
+ .getAttribute("src");
+ expect(pickerSrc).toContain("http://localhost:5175/login");
expect(decodeURIComponent(pickerSrc ?? "")).toContain("/embed/picker");
fireEvent(
@@ -71,6 +73,30 @@ describe("ParentTenantSelector picker", () => {
await waitFor(() => expect(onChange).toHaveBeenCalledWith("company-1"));
});
+ it("scopes the org-chart picker to the requested tenant root", () => {
+ const onChange = vi.fn();
+
+ render(
+
,
+ );
+
+ fireEvent.click(screen.getByRole("button", { name: "한맥가족에서 선택" }));
+
+ const pickerSrc = screen
+ .getByTestId("parent-tenant-picker-frame")
+ .getAttribute("src");
+ expect(decodeURIComponent(pickerSrc ?? "")).toContain("tenantId=group-1");
+ });
+
it("keeps the current tenant out of picker message selections", async () => {
const onChange = vi.fn();
diff --git a/adminfront/src/features/tenants/components/ParentTenantSelector.tsx b/adminfront/src/features/tenants/components/ParentTenantSelector.tsx
index 3b8830b7..79f3e039 100644
--- a/adminfront/src/features/tenants/components/ParentTenantSelector.tsx
+++ b/adminfront/src/features/tenants/components/ParentTenantSelector.tsx
@@ -31,6 +31,7 @@ type ParentTenantSelectorProps = {
labelAction?: ReactNode;
contextLabel?: string;
orgChartPickerLabel?: string;
+ orgChartTenantId?: string;
localPickerLabel?: string;
localTenantFilter?: (tenant: TenantSummary) => boolean;
compact?: boolean;
@@ -49,6 +50,7 @@ export function ParentTenantSelector({
labelAction,
contextLabel,
orgChartPickerLabel,
+ orgChartTenantId,
localPickerLabel,
localTenantFilter,
compact = false,
@@ -66,6 +68,9 @@ export function ParentTenantSelector({
);
const pickerUrl = buildAuthenticatedOrgChartTenantPickerUrl(
import.meta.env.ORGFRONT_URL,
+ {
+ tenantId: orgChartTenantId,
+ },
);
useEffect(() => {
@@ -135,6 +140,7 @@ export function ParentTenantSelector({
title={t("ui.admin.tenants.parent.pick_tenant", "테넌트 선택")}
src={pickerUrl}
className="h-[600px] w-full rounded-md border"
+ data-testid="parent-tenant-picker-frame"
/>
diff --git a/adminfront/src/features/tenants/routes/TenantCreatePage.tsx b/adminfront/src/features/tenants/routes/TenantCreatePage.tsx
index 3725e7a6..ba1a3095 100644
--- a/adminfront/src/features/tenants/routes/TenantCreatePage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantCreatePage.tsx
@@ -61,6 +61,13 @@ function TenantCreatePage() {
});
const tenants = parentQuery.data?.items ?? [];
const selectedParentTenant = tenants.find((tenant) => tenant.id === parentId);
+ const hanmacFamilyTenantId = useMemo(
+ () =>
+ tenants.find(
+ (tenant) => tenant.slug.trim().toLowerCase() === "hanmac-family",
+ )?.id ?? "",
+ [tenants],
+ );
const canConfigureHanmacOrg = useMemo(() => {
if (!selectedParentTenant) return false;
if (selectedParentTenant.slug.toLowerCase() === "hanmac-family") {
@@ -206,6 +213,7 @@ function TenantCreatePage() {
"ui.admin.tenants.create.form.pick_hanmac_parent",
"한맥가족에서 선택",
)}
+ orgChartTenantId={hanmacFamilyTenantId}
localPickerLabel={t(
"ui.admin.tenants.create.form.pick_other_parent",
"다른 테넌트 선택",
diff --git a/adminfront/src/features/tenants/routes/TenantDetailPage.tsx b/adminfront/src/features/tenants/routes/TenantDetailPage.tsx
index 11ef24d1..13011837 100644
--- a/adminfront/src/features/tenants/routes/TenantDetailPage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantDetailPage.tsx
@@ -125,7 +125,7 @@ function TenantDetailPage() {
{/* Outlet for nested routes */}
-
diff --git a/adminfront/src/features/tenants/routes/TenantWorksmobilePage.test.ts b/adminfront/src/features/tenants/routes/TenantWorksmobilePage.test.ts
index 851a9dcf..80bf9377 100644
--- a/adminfront/src/features/tenants/routes/TenantWorksmobilePage.test.ts
+++ b/adminfront/src/features/tenants/routes/TenantWorksmobilePage.test.ts
@@ -1,3 +1,5 @@
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
import { describe, expect, it } from "vitest";
import {
buildWorksmobilePasswordManageUrl,
@@ -28,6 +30,18 @@ import {
} from "./worksmobileComparison";
describe("TenantWorksmobilePage comparison helpers", () => {
+ it("does not apply page-level enter animations to Worksmobile tab panels", () => {
+ const source = readFileSync(
+ join(
+ process.cwd(),
+ "src/features/tenants/routes/TenantWorksmobilePage.tsx",
+ ),
+ "utf8",
+ );
+
+ expect(source).not.toContain("space-y-4 animate-in fade-in duration-500");
+ });
+
it("summarizes comparison rows by status", () => {
const summary = summarizeWorksmobileComparison([
{ resourceType: "USER", status: "matched" },
@@ -594,6 +608,41 @@ describe("TenantWorksmobilePage comparison helpers", () => {
]);
});
+ it("formats backend update reasons when value diff details are not directly visible", () => {
+ expect(
+ formatWorksmobileUpdateDetails({
+ resourceType: "USER",
+ status: "needs_update",
+ baronId: "user-1",
+ baronName: "신현우",
+ worksmobileName: "신현우",
+ baronEmail: "hwshin2@hanmaceng.co.kr",
+ worksmobileEmail: "hwshin2@hanmaceng.co.kr",
+ externalKey: "user-1",
+ updateReasons: ["organization"],
+ }),
+ ).toEqual(["조직: Baron 소속 정보를 WORKS에 반영해야 합니다."]);
+ });
+
+ it("does not format phone update details for spaced Korean country code formatting only", () => {
+ expect(
+ formatWorksmobileUpdateDetails({
+ resourceType: "USER",
+ status: "needs_update",
+ baronId: "user-1",
+ baronName: "강명진",
+ worksmobileName: "강명진",
+ baronEmail: "mjkang4@hanmaceng.co.kr",
+ worksmobileEmail: "mjkang4@hanmaceng.co.kr",
+ externalKey: "user-1",
+ baronPhone: "+821041585840",
+ worksmobilePhone: "+82 1041585840",
+ baronEmployeeNumber: "mjkang4",
+ worksmobileEmployeeNumber: "M17205",
+ }),
+ ).toEqual(["사번: M17205 -> mjkang4"]);
+ });
+
it("formats WORKS account name with level on one line", () => {
expect(
formatWorksmobilePersonName({
diff --git a/adminfront/src/features/tenants/routes/TenantWorksmobilePage.tsx b/adminfront/src/features/tenants/routes/TenantWorksmobilePage.tsx
index cd86aada..b30e03e1 100644
--- a/adminfront/src/features/tenants/routes/TenantWorksmobilePage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantWorksmobilePage.tsx
@@ -520,7 +520,7 @@ export function TenantWorksmobilePage() {