merge: integrate origin dev into dev

Includes Worksmobile SSOT sync comparison updates, UUID import conflict resolution, and Playwright route mock stabilization.

adminfront/src/features/users/components/UserBulkUploadModal.tsx

@@ -302,22 +302,6 @@ export function UserBulkUploadModal({
     });
   };
 
-  const downloadTemplate = () => {
-    const headers =
-      "email,sub_email,name,phone,role,tenant_slug,department,grade,position,jobTitle,employee_id,tenant_slug1,department1,grade1,position1,jobTitle1,employee_id1";
-    const example =
-      "user1@example.com,sub1@test.com;sub2@test.com,홍길동,010-1234-5678,user,tenant-slug,개발팀,수석,팀장,프론트엔드,EMP001,second-tenant,센터,책임,,Architecture,EMP002";
-    const blob = new Blob([`${headers}\n${example}`], {
-      type: "text/csv;charset=utf-8;",
-    });
-    const url = URL.createObjectURL(blob);
-    const a = document.createElement("a");
-    a.href = url;
-    a.download = "user_bulk_template.csv";
-    a.click();
-    URL.revokeObjectURL(url);
-  };
-
   const reset = () => {
     setFile(null);
     setPreviewData([]);
@@ -420,7 +404,7 @@ export function UserBulkUploadModal({
                 <Button
                   variant="ghost"
                   size="sm"
-                  onClick={downloadTemplate}
+                  onClick={downloadUserTemplate}
                   className="gap-2"
                 >
                   <Download size={14} />
@@ -626,15 +610,71 @@ export function UserBulkUploadModal({
           ) : (
             <div className="space-y-4 py-4">
               <div className="flex items-center gap-4 p-4 rounded-lg bg-muted/30 border">
-                <div className="flex-1 text-center">
-                  <div className="text-2xl font-bold text-green-600">
-                    {successCount}
-                  </div>
-                  <div className="text-xs text-muted-foreground uppercase">
-                    {t("ui.common.success", "성공")}
-                  </div>
-                </div>
-                <div className="w-px h-10 bg-border" />
+                {results.some((r) => r.success && r.status === "created") && (
+                  <>
+                    <div className="flex-1 text-center">
+                      <div className="text-2xl font-bold text-green-600">
+                        {
+                          results.filter(
+                            (r) => r.success && r.status === "created",
+                          ).length
+                        }
+                      </div>
+                      <div className="text-xs text-muted-foreground uppercase">
+                        {t("ui.common.status.new", "신규")}
+                      </div>
+                    </div>
+                    <div className="w-px h-10 bg-border" />
+                  </>
+                )}
+                {results.some((r) => r.success && r.status === "updated") && (
+                  <>
+                    <div className="flex-1 text-center">
+                      <div className="text-2xl font-bold text-blue-600">
+                        {
+                          results.filter(
+                            (r) => r.success && r.status === "updated",
+                          ).length
+                        }
+                      </div>
+                      <div className="text-xs text-muted-foreground uppercase">
+                        {t("ui.common.status.updated", "수정")}
+                      </div>
+                    </div>
+                    <div className="w-px h-10 bg-border" />
+                  </>
+                )}
+                {results.some((r) => r.success && r.status === "unchanged") && (
+                  <>
+                    <div className="flex-1 text-center">
+                      <div className="text-2xl font-bold text-slate-500">
+                        {
+                          results.filter(
+                            (r) => r.success && r.status === "unchanged",
+                          ).length
+                        }
+                      </div>
+                      <div className="text-xs text-muted-foreground uppercase">
+                        {t("ui.common.status.unchanged", "동일")}
+                      </div>
+                    </div>
+                    <div className="w-px h-10 bg-border" />
+                  </>
+                )}
+                {!results.some((r) => r.success && r.status) &&
+                  successCount > 0 && (
+                    <>
+                      <div className="flex-1 text-center">
+                        <div className="text-2xl font-bold text-green-600">
+                          {successCount}
+                        </div>
+                        <div className="text-xs text-muted-foreground uppercase">
+                          {t("ui.common.success", "성공")}
+                        </div>
+                      </div>
+                      <div className="w-px h-10 bg-border" />
+                    </>
+                  )}
                 <div className="flex-1 text-center">
                   <div className="text-2xl font-bold text-destructive">
                     {failCount}
@@ -664,7 +704,60 @@ export function UserBulkUploadModal({
                         />
                       )}
                       <div className="flex-1 min-w-0">
-                        <div className="font-medium truncate">{r.email}</div>
+                        <div className="flex items-center gap-2">
+                          <div className="font-medium truncate">{r.email}</div>
+                          {r.success && r.status === "created" && (
+                            <span className="px-1.5 py-0.5 rounded-full bg-green-100 text-green-700 text-[10px] font-bold">
+                              {t("ui.common.status.new", "신규")}
+                            </span>
+                          )}
+                          {r.success && r.status === "updated" && (
+                            <span className="px-1.5 py-0.5 rounded-full bg-blue-100 text-blue-700 text-[10px] font-bold">
+                              {t("ui.common.status.updated", "수정")}
+                            </span>
+                          )}
+                          {r.success && r.status === "unchanged" && (
+                            <span className="px-1.5 py-0.5 rounded-full bg-slate-100 text-slate-600 text-[10px] font-bold">
+                              {t("ui.common.status.unchanged", "동일")}
+                            </span>
+                          )}
+                          {r.success && !r.status && (
+                            <span className="px-1.5 py-0.5 rounded-full bg-green-100 text-green-700 text-[10px] font-bold">
+                              {t("ui.common.success", "성공")}
+                            </span>
+                          )}
+                        </div>
+                        {r.success && r.status === "updated" && (
+                          <div className="mt-1 text-[10px] text-muted-foreground flex flex-wrap gap-1 items-center">
+                            <span className="font-medium">
+                              {t(
+                                "ui.admin.users.bulk.modified_fields",
+                                "수정 항목:",
+                              )}
+                            </span>
+                            {r.modifiedFields &&
+                              r.modifiedFields.length > 0 &&
+                              r.modifiedFields.map((field) => (
+                                <span
+                                  key={field}
+                                  className="px-1 py-0.5 rounded bg-blue-50 text-blue-600 border border-blue-100"
+                                >
+                                  {t(
+                                    `ui.admin.users.field.${field.toLowerCase()}`,
+                                    field,
+                                  )}
+                                </span>
+                              ))}
+                          </div>
+                        )}
+                        {r.success && r.status === "unchanged" && (
+                          <div className="mt-1 text-[10px] text-muted-foreground italic">
+                            {t(
+                              "ui.admin.users.bulk.no_changes",
+                              "기존 데이터와 동일 (변경 사항 없음)",
+                            )}
+                          </div>
+                        )}
                         {!r.success && (
                           <div className="text-xs text-destructive">
                             {r.message}

adminfront/src/features/users/utils/csvParser.test.ts

@@ -97,7 +97,7 @@ test@test.com,Test,local-tenant-id,missing-slug,Missing Tenant,COMPANY,parent-sl
     });
   });
 
-  it("should preserve exported user_id for UUID based restore", () => {
+  it("should ignore exported user_id during user CSV import", () => {
     const csv = `user_id,email,name,tenant_id,tenant_slug
 9f8cc1b1-af8d-45d4-946c-924a529c2556,restore@test.com,Restore User,tenant-id,restore-tenant`;
 
@@ -105,12 +105,13 @@ test@test.com,Test,local-tenant-id,missing-slug,Missing Tenant,COMPANY,parent-sl
 
     expect(result).toHaveLength(1);
     expect(result[0]).toMatchObject({
-      userId: "9f8cc1b1-af8d-45d4-946c-924a529c2556",
       email: "restore@test.com",
       name: "Restore User",
       tenantId: "tenant-id",
       tenantSlug: "restore-tenant",
     });
+    expect(result[0]).not.toHaveProperty("id");
+    expect(result[0]).not.toHaveProperty("uuid");
   });
 
   it("should parse one nullable additional appointment from numbered columns", () => {

adminfront/src/features/users/utils/csvParser.ts

@@ -28,9 +28,7 @@ export function parseUserCSV(text: string): BulkUserItem[] {
       const value = values[index];
       if (value === undefined || value === "") continue;
 
-      if (header === "user_id") {
-        item.userId = value;
-      } else if (header === "email") {
+      if (header === "email") {
         item.email = value;
       } else if (header === "name") {
         item.name = value;

adminfront/src/lib/adminApi.ts

@@ -726,7 +726,6 @@ export type BulkUserAppointment = {
 };
 
 export type BulkUserItem = {
-  userId?: string;
   email: string;
   loginId?: string;
   name: string;
@@ -764,6 +763,7 @@ export type BulkUserResult = {
   success: boolean;
   message?: string;
   userId?: string;
+  modifiedFields?: string[];
 };
 
 export type BulkUserResponse = {

adminfront/tests/users_bulk_secondary.spec.ts

@@ -112,7 +112,7 @@ test.describe("Users Bulk Upload Secondary Emails", () => {
 
     await page.getByTestId("bulk-start-btn").click();
 
-    await expect(page.getByText(/성공|Success/i)).toBeVisible();
+    await expect(page.getByText(/성공|Success/i).first()).toBeVisible();
 
     expect(bulkPayload).not.toBeNull();
     expect(bulkPayload.users).toHaveLength(1);

adminfront/tests/users_bulk_uuid.spec.ts

@@ -0,0 +1,139 @@
+import { expect, test } from "@playwright/test";
+
+test.describe("Users Bulk Upload UUID Import Policy", () => {
+  test.beforeEach(async ({ page }) => {
+    await page.addInitScript(() => {
+      window.localStorage.setItem("locale", "ko");
+      window.localStorage.setItem("admin_session", "fake-token");
+      (
+        window as Window & typeof globalThis & { _IS_TEST_MODE?: boolean }
+      )._IS_TEST_MODE = true;
+
+      const authority = "http://localhost:5000/oidc";
+      const client_id = "adminfront";
+      const key = `oidc.user:${authority}:${client_id}`;
+      const authData = {
+        access_token: "fake-token",
+        token_type: "Bearer",
+        profile: { sub: "admin-user", name: "Admin", role: "super_admin" },
+        expires_at: Math.floor(Date.now() / 1000) + 36000,
+      };
+      window.localStorage.setItem(key, JSON.stringify(authData));
+    });
+
+    await page.route("**/api/v1/**", async (route) => {
+      const url = route.request().url();
+      const headers = { "Access-Control-Allow-Origin": "*" };
+
+      if (url.includes("/user/me")) {
+        return route.fulfill({
+          json: {
+            id: "admin-user",
+            name: "Admin",
+            role: "super_admin",
+            manageableTenants: [],
+          },
+          headers,
+        });
+      }
+      if (url.includes("/admin/users") && !url.includes("/bulk")) {
+        return route.fulfill({
+          json: { items: [], total: 0, limit: 50, offset: 0 },
+          headers,
+        });
+      }
+      if (url.includes("/admin/tenants")) {
+        return route.fulfill({
+          json: { items: [], total: 0, limit: 100, offset: 0 },
+          headers,
+        });
+      }
+      return route.fulfill({ json: { items: [], total: 0 }, headers });
+    });
+
+    await page.route("**/oidc/**", async (route) => {
+      await route.fulfill({ json: { issuer: "http://localhost:5000/oidc" } });
+    });
+  });
+
+  test("should not include exported user_id or uuid in bulk upload payload", async ({
+    page,
+  }) => {
+    let bulkPayload = "";
+    const testUuid = "550e8400-e29b-41d4-a716-446655440000";
+
+    await page.route("**/api/v1/admin/users/bulk", async (route) => {
+      bulkPayload = route.request().postData() ?? "";
+      return route.fulfill({
+        json: {
+          results: [
+            { email: "uuid@test.com", success: true, userId: "kratos-id" },
+          ],
+        },
+        headers: { "Access-Control-Allow-Origin": "*" },
+      });
+    });
+
+    await page.goto("/users");
+    await page.getByTestId("user-data-mgmt-btn").click();
+    await page
+      .getByRole("menuitem", { name: /일괄 임포트|Bulk Import/i })
+      .click();
+
+    await page.locator('input[type="file"]').setInputFiles({
+      name: "users_uuid.csv",
+      mimeType: "text/csv",
+      buffer: Buffer.from(
+        `user_id,email,name,uuid\n${testUuid},uuid@test.com,UUID User,${testUuid}\n`,
+      ),
+    });
+
+    await page.getByTestId("bulk-start-btn").click();
+    await expect(page.getByText("uuid@test.com")).toBeVisible();
+
+    const payload = JSON.parse(bulkPayload);
+    expect(payload.users[0]).not.toHaveProperty("userId");
+    expect(payload.users[0]).not.toHaveProperty("uuid");
+    expect(payload.users[0]).not.toHaveProperty("id");
+  });
+
+  test("should treat id column as login id, not UUID import", async ({
+    page,
+  }) => {
+    let bulkPayload = "";
+    const testUuid = "550e8400-e29b-41d4-a716-446655440001";
+
+    await page.route("**/api/v1/admin/users/bulk", async (route) => {
+      bulkPayload = route.request().postData() ?? "";
+      return route.fulfill({
+        json: {
+          results: [
+            { email: "id-uuid@test.com", success: true, userId: "kratos-id" },
+          ],
+        },
+        headers: { "Access-Control-Allow-Origin": "*" },
+      });
+    });
+
+    await page.goto("/users");
+    await page.getByTestId("user-data-mgmt-btn").click();
+    await page
+      .getByRole("menuitem", { name: /일괄 임포트|Bulk Import/i })
+      .click();
+
+    await page.locator('input[type="file"]').setInputFiles({
+      name: "users_id.csv",
+      mimeType: "text/csv",
+      buffer: Buffer.from(
+        `email,name,id\nid-uuid@test.com,ID UUID User,${testUuid}\n`,
+      ),
+    });
+
+    await page.getByTestId("bulk-start-btn").click();
+
+    const payload = JSON.parse(bulkPayload);
+    expect(payload.users[0]).not.toHaveProperty("uuid");
+    expect(payload.users[0].loginId).toBe(testUuid);
+    expect(payload.users[0].metadata.naverworks_id).toBe(testUuid);
+  });
+});

adminfront/tests/worksmobile.spec.ts

@@ -94,6 +94,15 @@ test.describe("Worksmobile tenant management", () => {
         });
       }
 
+      if (
+        url.pathname.endsWith(
+          "/admin/tenants/hanmac-family-id/worksmobile/credential-batches",
+        ) &&
+        method === "GET"
+      ) {
+        return route.fulfill({ json: [], headers });
+      }
+
       if (
         url.pathname.endsWith(
           "/admin/tenants/hanmac-family-id/worksmobile/comparison",
@@ -361,6 +370,15 @@ test.describe("Worksmobile tenant management", () => {
         });
       }
 
+      if (
+        url.pathname.endsWith(
+          "/admin/tenants/hanmac-family-id/worksmobile/credential-batches",
+        ) &&
+        method === "GET"
+      ) {
+        return route.fulfill({ json: [], headers });
+      }
+
       if (
         url.pathname.endsWith(
           "/admin/tenants/hanmac-family-id/worksmobile/comparison",
@@ -467,6 +485,15 @@ test.describe("Worksmobile tenant management", () => {
         });
       }
 
+      if (
+        url.pathname.endsWith(
+          "/admin/tenants/hanmac-family-id/worksmobile/credential-batches",
+        ) &&
+        method === "GET"
+      ) {
+        return route.fulfill({ json: [], headers });
+      }
+
       if (
         url.pathname.endsWith(
           "/admin/tenants/hanmac-family-id/worksmobile/comparison",
@@ -614,6 +641,30 @@ test.describe("Worksmobile tenant management", () => {
         });
       }
 
+      if (
+        url.pathname.endsWith(
+          "/admin/tenants/hanmac-family-id/worksmobile/credential-batches",
+        ) &&
+        method === "GET"
+      ) {
+        return route.fulfill({
+          json: [
+            {
+              batchId: "batch-1",
+              operation: "worksmobile_user_sync",
+              userCount: 1,
+              processedCount: 1,
+              pendingCount: 0,
+              processingCount: 0,
+              failedCount: 0,
+              hasPasswords: true,
+              createdAt: "2026-05-01T00:00:00Z",
+            },
+          ],
+          headers,
+        });
+      }
+
       if (
         url.pathname.endsWith(
           "/admin/tenants/hanmac-family-id/worksmobile/comparison",
@@ -691,7 +742,9 @@ test.describe("Worksmobile tenant management", () => {
     await expect(page.getByText("Worksmobile 연동")).toBeVisible();
 
     const download = page.waitForEvent("download");
-    await page.getByRole("button", { name: "초기 비밀번호 CSV" }).click();
+    await page
+      .getByRole("button", { name: "batch-1 비밀번호 CSV 다운로드" })
+      .click();
     const passwordCsv = await download;
     expect(passwordCsv.suggestedFilename()).toBe("worksmobile-passwords.csv");
     const passwordCsvPath = await passwordCsv.path();