From 636da587e35f38d6f94b7fc42eb842b965f315c1 Mon Sep 17 00:00:00 2001 From: kyy Date: Fri, 8 May 2026 16:11:50 +0900 Subject: [PATCH] =?UTF-8?q?5ee9a46663=20=EB=B0=98=EC=98=81=20code-check=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/features/users/UserDetailPage.tsx | 16 ++++---- .../src/features/users/UserListPage.tsx | 37 ++++++------------ scripts/run_adminfront_ci_tests.sh | 39 ++++++++++++++++--- 3 files changed, 54 insertions(+), 38 deletions(-) diff --git a/adminfront/src/features/users/UserDetailPage.tsx b/adminfront/src/features/users/UserDetailPage.tsx index 9d8cb79c..9d9c1240 100644 --- a/adminfront/src/features/users/UserDetailPage.tsx +++ b/adminfront/src/features/users/UserDetailPage.tsx @@ -796,15 +796,15 @@ function UserDetailPage() { payload.metadata = { ...metadata, additionalAppointments: appointments, - primaryTenantId: primaryAppointment?.tenantId, - primaryTenantName: primaryAppointment?.tenantName, - primaryTenantSlug: primaryAppointment?.tenantSlug, - primaryTenantIsOwner: primaryAppointment?.isOwner ?? false, + primaryTenantId: primary?.tenantId, + primaryTenantName: primary?.tenantName, + primaryTenantSlug: primary?.tenantSlug, + primaryTenantIsOwner: primary?.isOwner ?? false, }; - payload.tenantSlug = primaryAppointment?.tenantSlug; - payload.primaryTenantId = primaryAppointment?.tenantId; - payload.primaryTenantName = primaryAppointment?.tenantName; - payload.primaryTenantIsOwner = primaryAppointment?.isOwner ?? false; + payload.tenantSlug = primary?.tenantSlug; + payload.primaryTenantId = primary?.tenantId; + payload.primaryTenantName = primary?.tenantName; + payload.primaryTenantIsOwner = primary?.isOwner ?? false; } mutation.mutate(payload); diff --git a/adminfront/src/features/users/UserListPage.tsx b/adminfront/src/features/users/UserListPage.tsx index 2123d30a..ad8fa582 100644 --- a/adminfront/src/features/users/UserListPage.tsx +++ b/adminfront/src/features/users/UserListPage.tsx @@ -40,6 +40,7 @@ import { SelectTrigger, SelectValue, } from "../../components/ui/select"; +import { Switch } from "../../components/ui/switch"; import { Table, TableBody, @@ -702,39 +703,25 @@ function UserListPage() {
- + aria-label={t( + "ui.admin.users.list.toggle_status", + "{{name}} 활성 상태", + { name: user.name }, + )} + data-testid={`user-status-toggle-${user.id}`} + /> {t(`ui.common.status.${user.status}`, user.status)} diff --git a/scripts/run_adminfront_ci_tests.sh b/scripts/run_adminfront_ci_tests.sh index 3b6549e3..27491756 100755 --- a/scripts/run_adminfront_ci_tests.sh +++ b/scripts/run_adminfront_ci_tests.sh @@ -2,10 +2,36 @@ set -euo pipefail job_name="${1:-adminfront-tests}" +repo_root="$(pwd)" +tmp_dir="" + +cleanup() { + if [ -n "${tmp_dir:-}" ] && [ -d "$tmp_dir" ]; then + rm -rf "$tmp_dir" + fi +} + +trap cleanup EXIT INT TERM mkdir -p reports rm -rf adminfront/node_modules +tmp_dir="$(mktemp -d /tmp/baron-sso-adminfront-tests.XXXXXX)" +playwright_browsers_path="$tmp_dir/ms-playwright" + +if command -v rsync >/dev/null 2>&1; then + rsync -rlptD --delete \ + --exclude 'node_modules' \ + --exclude 'playwright-report' \ + --exclude 'test-results' \ + "$repo_root/adminfront/" "$tmp_dir/adminfront/" +else + cp -R "$repo_root/adminfront" "$tmp_dir/adminfront" + rm -rf "$tmp_dir/adminfront/node_modules" \ + "$tmp_dir/adminfront/playwright-report" \ + "$tmp_dir/adminfront/test-results" +fi + is_port_available() { local port="$1" node -e ' @@ -43,7 +69,7 @@ fi set +e ( - cd adminfront + cd "$tmp_dir/adminfront" npm ci --ignore-scripts ) 2>&1 | tee reports/adminfront-install.log install_exit_code=${PIPESTATUS[0]} @@ -71,8 +97,8 @@ fi set +e ( - cd adminfront - "${playwright_install_cmd[@]}" + cd "$tmp_dir/adminfront" + PLAYWRIGHT_BROWSERS_PATH="$playwright_browsers_path" "${playwright_install_cmd[@]}" ) 2>&1 | tee reports/adminfront-provision.log provision_exit_code=${PIPESTATUS[0]} set -e @@ -106,13 +132,16 @@ if ! is_port_available "$port"; then fi echo "==> adminfront using PORT=$port" ( - cd adminfront - PORT="$port" PLAYWRIGHT_WORKERS="${PLAYWRIGHT_WORKERS:-1}" \ + cd "$tmp_dir/adminfront" + PORT="$port" PLAYWRIGHT_WORKERS="${PLAYWRIGHT_WORKERS:-1}" PLAYWRIGHT_BROWSERS_PATH="$playwright_browsers_path" \ node ./node_modules/playwright/cli.js test ) 2>&1 | tee reports/adminfront-test.log test_exit_code=${PIPESTATUS[0]} set -e +[ -d "$tmp_dir/adminfront/playwright-report" ] && rm -rf reports/adminfront-playwright-report && cp -R "$tmp_dir/adminfront/playwright-report" reports/adminfront-playwright-report || true +[ -d "$tmp_dir/adminfront/test-results" ] && rm -rf reports/adminfront-test-results && cp -R "$tmp_dir/adminfront/test-results" reports/adminfront-test-results || true + if [ "$test_exit_code" -ne 0 ]; then { echo "# Adminfront Test Failure Report"