-
+
+ {header}
+ {body}
);
}
diff --git a/adminfront/src/features/tenants/components/ParentTenantSelector.tsx b/adminfront/src/features/tenants/components/ParentTenantSelector.tsx
index bac4fe1c..fd5df2db 100644
--- a/adminfront/src/features/tenants/components/ParentTenantSelector.tsx
+++ b/adminfront/src/features/tenants/components/ParentTenantSelector.tsx
@@ -33,6 +33,8 @@ type ParentTenantSelectorProps = {
orgChartPickerLabel?: string;
localPickerLabel?: string;
localTenantFilter?: (tenant: TenantSummary) => boolean;
+ compact?: boolean;
+ controlTestId?: string;
};
export function ParentTenantSelector({
@@ -49,6 +51,8 @@ export function ParentTenantSelector({
orgChartPickerLabel,
localPickerLabel,
localTenantFilter,
+ compact = false,
+ controlTestId,
}: ParentTenantSelectorProps) {
const [pickerOpen, setPickerOpen] = useState(false);
const [localPickerOpen, setLocalPickerOpen] = useState(false);
@@ -81,19 +85,37 @@ export function ParentTenantSelector({
}, [excludeTenantId, onChange, pickerOpen]);
return (
- ("public");
+ const [worksmobileExcluded, setWorksmobileExcluded] = useState(false);
useEffect(() => {
if (tenantQuery.data) {
@@ -84,6 +85,7 @@ export function TenantProfilePage() {
setParentId(tenantQuery.data.parentId ?? "");
setOrgUnitType(orgConfig.orgUnitType);
setTenantVisibility(orgConfig.visibility);
+ setWorksmobileExcluded(orgConfig.worksmobileExcluded);
}
}, [tenantQuery.data]);
@@ -101,6 +103,7 @@ export function TenantProfilePage() {
orgConfigCandidate,
])
: false;
+ const orgUnitTypeOptions = getOrgUnitTypeOptionsForTenantType(type);
const updateMutation = useMutation({
mutationFn: (overrideForceDomains?: string[]) => {
@@ -109,6 +112,7 @@ export function TenantProfilePage() {
? mergeTenantOrgConfig(baseConfig, {
orgUnitType,
visibility: tenantVisibility,
+ worksmobileExcluded,
})
: removeTenantOrgConfig(baseConfig);
@@ -226,78 +230,46 @@ export function TenantProfilePage() {
return (
<>
-
-
-
- {t("ui.admin.tenants.profile.title", "테넌트 프로필")}
-
-
- {t(
- "ui.admin.tenants.profile.subtitle",
- "슬러그 및 상태 변경은 즉시 적용됩니다.",
- )}
-
+
+
+
-
+
{loadError && (
-
-
-
+ const header = (
+ - {t( - "ui.admin.user_projection.title", - "User Projection Management", - )} -
-- {t( - "msg.admin.user_projection.subtitle", - "Review and sync the Kratos user read model.", - )} -
-
+
{(error as Error)?.message ||
@@ -243,6 +252,22 @@ function UserProjectionContent() {
) : null}
+
+ );
+
+ if (embedded) {
+ return (
+
+
-
-
-
+
+
+
-
+ + {t("ui.admin.user_projection.title", "User Projection Management")} +
++ {t( + "msg.admin.user_projection.subtitle", + "Review and sync the Kratos user read model.", + )} +
+
+
+
+
+ );
+ const body = (
+ <>
{isError ? (
+ {header}
+ {body}
+
+ );
+ }
+
+ return (
+
- worksmobile
} />
@@ -42,16 +41,11 @@ describe("TenantDetailPage Worksmobile navigation", () => {
vi.clearAllMocks();
});
- it("opens Worksmobile management in the current admin route", async () => {
+ it("does not render Worksmobile as a tenant detail tab", async () => {
renderTenantDetailPage();
- const link = await screen.findByRole("link", { name: /Worksmobile/i });
+ await screen.findByText("프로필");
- expect(link).toHaveAttribute(
- "href",
- "/tenants/hanmac-family-id/worksmobile",
- );
- expect(link).not.toHaveAttribute("target");
- expect(link).not.toHaveAttribute("rel");
+ expect(screen.queryByRole("link", { name: /Worksmobile/i })).toBeNull();
});
});
diff --git a/adminfront/src/features/tenants/routes/TenantListPage.tsx b/adminfront/src/features/tenants/routes/TenantListPage.tsx
index d1569117..16ac296a 100644
--- a/adminfront/src/features/tenants/routes/TenantListPage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantListPage.tsx
@@ -116,7 +116,7 @@ import {
} from "./tenantListView";
const tenantCSVTemplate =
- "name,type,parent_tenant_slug,slug,memo,email_domain,visibility,org_unit_type\n";
+ "name,type,parent_tenant_slug,slug,memo,email_domain,visibility,org_unit_type,worksmobile_sync\n";
const tenantPageSize = 500;
const _tenantVirtualizationThreshold = 250;
const _tenantEstimatedRowHeight = 73;
diff --git a/adminfront/src/features/tenants/routes/TenantProfilePage.tsx b/adminfront/src/features/tenants/routes/TenantProfilePage.tsx
index 3cb672c2..1e979036 100644
--- a/adminfront/src/features/tenants/routes/TenantProfilePage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantProfilePage.tsx
@@ -30,8 +30,8 @@ import {
type ServerDomainConflict,
} from "../utils/domainTags";
import {
+ getOrgUnitTypeOptionsForTenantType,
mergeTenantOrgConfig,
- ORG_UNIT_TYPE_OPTIONS,
readTenantOrgConfig,
removeTenantOrgConfig,
shouldAllowHanmacOrgConfig,
@@ -70,6 +70,7 @@ export function TenantProfilePage() {
const [orgUnitType, setOrgUnitType] = useState("");
const [tenantVisibility, setTenantVisibility] =
useState
+
profile
} />
-
+
{/* Outlet for nested routes */}
diff --git a/adminfront/src/features/tenants/routes/TenantDetailPage.worksmobile.test.tsx b/adminfront/src/features/tenants/routes/TenantDetailPage.worksmobile.test.tsx
index 8bff6fa2..824a4bde 100644
--- a/adminfront/src/features/tenants/routes/TenantDetailPage.worksmobile.test.tsx
+++ b/adminfront/src/features/tenants/routes/TenantDetailPage.worksmobile.test.tsx
@@ -29,7 +29,6 @@ function renderTenantDetailPage() {
{labelAction}
-
+
+
diff --git a/adminfront/src/features/tenants/routes/TenantDetailPage.helpers.ts b/adminfront/src/features/tenants/routes/TenantDetailPage.helpers.ts
deleted file mode 100644
index e3eb9e1b..00000000
--- a/adminfront/src/features/tenants/routes/TenantDetailPage.helpers.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export function canShowWorksmobileEntry(tenant?: {
- id?: string;
- slug?: string;
- parentId?: string | null;
-}) {
- return tenant?.slug === "hanmac-family" && !tenant.parentId;
-}
diff --git a/adminfront/src/features/tenants/routes/TenantDetailPage.test.ts b/adminfront/src/features/tenants/routes/TenantDetailPage.test.ts
deleted file mode 100644
index 4c102e08..00000000
--- a/adminfront/src/features/tenants/routes/TenantDetailPage.test.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { canShowWorksmobileEntry } from "./TenantDetailPage.helpers";
-
-describe("TenantDetailPage Worksmobile entry visibility", () => {
- it("shows Worksmobile entry only for hanmac-family root tenant", () => {
- expect(
- canShowWorksmobileEntry({
- id: "hanmac-family-id",
- slug: "hanmac-family",
- parentId: undefined,
- }),
- ).toBe(true);
-
- expect(
- canShowWorksmobileEntry({
- id: "hanmac-child-id",
- slug: "hanmac-family",
- parentId: "root-id",
- }),
- ).toBe(false);
-
- expect(
- canShowWorksmobileEntry({
- id: "other-id",
- slug: "other",
- parentId: undefined,
- }),
- ).toBe(false);
- });
-});
diff --git a/adminfront/src/features/tenants/routes/TenantDetailPage.tsx b/adminfront/src/features/tenants/routes/TenantDetailPage.tsx
index b7bae980..2d116682 100644
--- a/adminfront/src/features/tenants/routes/TenantDetailPage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantDetailPage.tsx
@@ -5,7 +5,6 @@ import { Button } from "../../../components/ui/button";
import { fetchMe, fetchTenant } from "../../../lib/adminApi";
import { t } from "../../../lib/i18n";
import { normalizeAdminRole } from "../../../lib/roles";
-import { canShowWorksmobileEntry } from "./TenantDetailPage.helpers";
function TenantDetailPage() {
const params = useParams<{ tenantId: string }>();
@@ -26,8 +25,6 @@ function TenantDetailPage() {
const profileRole = normalizeAdminRole(profile?.role);
const canAccessSchema =
profileRole === "super_admin" || profileRole === "tenant_admin";
- const showWorksmobileEntry = canShowWorksmobileEntry(tenantQuery.data);
-
const isPermissionsTab = location.pathname.includes("/permissions");
const isOrganizationTab = location.pathname.includes("/organization");
const isWorksmobileTab = location.pathname.includes("/worksmobile");
@@ -125,18 +122,6 @@ function TenantDetailPage() {
{t("ui.admin.tenants.detail.tab_schema", "사용자 스키마")}
)}
- {showWorksmobileEntry && (
-
- {t("ui.admin.tenants.detail.tab_worksmobile", "Worksmobile")}
-
- )}
+
+ setWorksmobileExcluded(checked === true)
+ }
+ />
+
+
)}
+
+
+ {t("ui.admin.tenants.profile.title", "테넌트 프로필")}
+
+
+ {t(
+ "ui.admin.tenants.profile.subtitle",
+ "슬러그 및 상태 변경은 즉시 적용됩니다.",
+ )}
+
+
+
{loadError}
)}
-
-
- setName(e.target.value)} />
-
-
-
-
-
-
+
+
+
+ setName(e.target.value)} />
+
+
+
+ setSlug(e.target.value)} />
+
+
+
-
+
+
+
{canEditOrgConfig && (
<>
+
-
@@ -360,68 +376,92 @@ export function TenantProfilePage() {
))}
+
+
+
+
)}
-
- setSlug(e.target.value)} />
-
-
-
-