1
0
forked from baron/baron-sso

fix(ci): stabilize pnpm installation and ensure fail-fast testing

This commit is contained in:
2026-05-29 19:39:56 +09:00
parent 6259fb074b
commit 90457394b0
13 changed files with 162 additions and 111 deletions

View File

@@ -890,11 +890,15 @@ jobs:
with: with:
node-version: "24" node-version: "24"
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 10.5.2
- name: Install front workspace dependencies - name: Install front workspace dependencies
run: | run: |
mkdir -p reports mkdir -p reports
set +e set +e
npm install -g pnpm
cd common cd common
pnpm install --no-frozen-lockfile --shamefully-hoist 2>&1 | tee ../reports/front-coverage-install.log pnpm install --no-frozen-lockfile --shamefully-hoist 2>&1 | tee ../reports/front-coverage-install.log
install_exit_code=${PIPESTATUS[0]} install_exit_code=${PIPESTATUS[0]}
@@ -1017,11 +1021,15 @@ jobs:
with: with:
node-version: "24" node-version: "24"
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 10.5.2
- name: Install front workspace dependencies - name: Install front workspace dependencies
run: | run: |
mkdir -p reports mkdir -p reports
set +e set +e
npm install -g pnpm
cd common cd common
pnpm install --no-frozen-lockfile --shamefully-hoist 2>&1 | tee ../reports/front-coverage-install.log pnpm install --no-frozen-lockfile --shamefully-hoist 2>&1 | tee ../reports/front-coverage-install.log
install_exit_code=${PIPESTATUS[0]} install_exit_code=${PIPESTATUS[0]}
@@ -1144,11 +1152,15 @@ jobs:
with: with:
node-version: "24" node-version: "24"
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 10.5.2
- name: Install front workspace dependencies - name: Install front workspace dependencies
run: | run: |
mkdir -p reports mkdir -p reports
set +e set +e
npm install -g pnpm
cd common cd common
pnpm install --no-frozen-lockfile --shamefully-hoist 2>&1 | tee ../reports/front-coverage-install.log pnpm install --no-frozen-lockfile --shamefully-hoist 2>&1 | tee ../reports/front-coverage-install.log
install_exit_code=${PIPESTATUS[0]} install_exit_code=${PIPESTATUS[0]}
@@ -1568,7 +1580,8 @@ jobs:
mkdir -p reports mkdir -p reports
set +e set +e
cd orgfront cd orgfront
npm install -g pnpm corepack enable
corepack prepare pnpm@10.5.2 --activate
{ {
pnpm install -C ../common --no-frozen-lockfile pnpm install -C ../common --no-frozen-lockfile
pnpm install --no-frozen-lockfile pnpm install --no-frozen-lockfile

View File

@@ -6,7 +6,7 @@ WORKDIR /workspace
ENV CI=true ENV CI=true
# Install pnpm # Install pnpm
RUN npm install -g pnpm RUN corepack enable && corepack prepare pnpm@10.5.2 --activate
# Copy workspace configs and common package # Copy workspace configs and common package
COPY common ./common COPY common ./common

View File

@@ -14,8 +14,8 @@
"format": "biome format . --write", "format": "biome format . --write",
"preview": "vite preview", "preview": "vite preview",
"test": "playwright test", "test": "playwright test",
"test:coverage": "vitest run --coverage", "test:coverage": "vitest run --coverage --bail 1",
"test:unit": "vitest run", "test:unit": "vitest run --bail 1",
"test:ui": "playwright test --ui", "test:ui": "playwright test --ui",
"i18n-scan": "cd .. && node tools/i18n-scanner/index.js && node tools/i18n-scanner/report.js" "i18n-scan": "cd .. && node tools/i18n-scanner/index.js && node tools/i18n-scanner/report.js"
}, },

View File

@@ -70,27 +70,6 @@ function AuditLogsPage() {
[logs, deferredSearchActorId, deferredSearchAction, statusFilter], [logs, deferredSearchActorId, deferredSearchAction, statusFilter],
); );
if (isLoading) {
return (
<div className="p-8 text-center">
{t("msg.common.audit.loading", "Loading audit logs...")}
</div>
);
}
if (error) {
const errMsg =
(error as AxiosError<{ error?: string }>).response?.data?.error ??
(error as Error).message;
return (
<div className="p-8 text-center text-red-500">
{t("msg.common.audit.load_error", "Error loading logs: {{error}}", {
error: errMsg,
})}
</div>
);
}
return ( return (
<div className="space-y-6"> <div className="space-y-6">
<PageHeader <PageHeader
@@ -137,68 +116,85 @@ function AuditLogsPage() {
</CardDescription> </CardDescription>
</div> </div>
</CardHeader> </CardHeader>
<CardContent className="space-y-4 pt-0"> {isLoading ? (
<SearchFilterBar <div className="p-8 text-center" data-testid="audit-loading">
primary={ {t("msg.common.audit.loading", "Loading audit logs...")}
<form </div>
onSubmit={(e) => { ) : error ? (
e.preventDefault(); <div
refetch(); className="p-8 text-center text-red-500"
}} data-testid="audit-error"
className="grid flex-1 gap-2 md:grid-cols-[1fr,1fr,180px]" >
> {t("msg.common.audit.load_error", "Error loading logs: {{error}}", {
<div className="relative"> error:
<Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" /> (error as AxiosError<{ error?: string }>).response?.data
?.error ?? (error as Error).message,
})}
</div>
) : (
<CardContent className="space-y-4 pt-0">
<SearchFilterBar
primary={
<form
onSubmit={(e) => {
e.preventDefault();
refetch();
}}
className="grid flex-1 gap-2 md:grid-cols-[1fr,1fr,180px]"
>
<div className="relative">
<Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
<Input
className="pl-10"
data-testid="audit-search-user-id"
value={searchActorId}
onChange={(event) => setSearchActorId(event.target.value)}
placeholder={t(
"ui.common.audit.filters.user_id",
"Filter by User ID",
)}
/>
</div>
<Input <Input
className="pl-10" data-testid="audit-search-action"
data-testid="audit-search-user-id" value={searchAction}
value={searchActorId} onChange={(event) =>
onChange={(event) => setSearchActorId(event.target.value)} setSearchAction(event.target.value.toUpperCase())
}
placeholder={t( placeholder={t(
"ui.common.audit.filters.user_id", "ui.common.audit.filters.action",
"Filter by User ID", "Filter by Action (e.g. ROTATE_SECRET)",
)} )}
/> />
</div> <select
<Input data-testid="audit-filter-status"
data-testid="audit-search-action" className="h-10 rounded-md border border-input bg-background px-3 text-sm"
value={searchAction} value={statusFilter}
onChange={(event) => onChange={(event) => setStatusFilter(event.target.value)}
setSearchAction(event.target.value.toUpperCase()) >
} <option value="all">
placeholder={t( {t("ui.common.audit.filters.status_all", "All Status")}
"ui.common.audit.filters.action", </option>
"Filter by Action (e.g. ROTATE_SECRET)", <option value="success">
)} {t("ui.common.status.success", "Success")}
/> </option>
<select <option value="failure">
data-testid="audit-filter-status" {t("ui.common.status.failure", "Failure")}
className="h-10 rounded-md border border-input bg-background px-3 text-sm" </option>
value={statusFilter} </select>
onChange={(event) => setStatusFilter(event.target.value)} </form>
> }
<option value="all"> />
{t("ui.common.audit.filters.status_all", "All Status")} <AuditLogTable
</option> logs={filteredLogs}
<option value="success"> t={t}
{t("ui.common.status.success", "Success")} loading={isLoading}
</option> hasNextPage={Boolean(hasNextPage)}
<option value="failure"> isFetchingNextPage={isFetchingNextPage}
{t("ui.common.status.failure", "Failure")} onLoadMore={() => fetchNextPage()}
</option> />
</select> </CardContent>
</form> )}
}
/>
<AuditLogTable
logs={filteredLogs}
t={t}
loading={isLoading}
hasNextPage={Boolean(hasNextPage)}
isFetchingNextPage={isFetchingNextPage}
onLoadMore={() => fetchNextPage()}
/>
</CardContent>
</Card> </Card>
</div> </div>
); );

View File

@@ -2,8 +2,10 @@ import { expect, test } from "@playwright/test";
test.describe("Audit Logs Management", () => { test.describe("Audit Logs Management", () => {
test.beforeEach(async ({ page }) => { test.beforeEach(async ({ page }) => {
page.on("console", (msg) => console.log(`[PAGE] ${msg.text()}`));
await page.addInitScript(() => { await page.addInitScript(() => {
const authority = "http://localhost:5000/oidc"; const authority = `${window.location.origin}/oidc`;
const client_id = "adminfront"; const client_id = "adminfront";
const key = `oidc.user:${authority}:${client_id}`; const key = `oidc.user:${authority}:${client_id}`;
const authData = { const authData = {
@@ -30,18 +32,21 @@ test.describe("Audit Logs Management", () => {
}); });
await page.route("**/oidc/**", async (route) => { await page.route("**/oidc/**", async (route) => {
if (route.request().url().includes("/.well-known/openid-configuration")) { const url = route.request().url();
if (url.includes("/.well-known/openid-configuration")) {
const origin = new URL(url).origin;
return route.fulfill({ return route.fulfill({
json: { json: {
issuer: "http://localhost:5000/oidc", issuer: `${origin}/oidc`,
authorization_endpoint: "http://localhost:5000/oidc/auth", authorization_endpoint: `${origin}/oidc/auth`,
token_endpoint: "http://localhost:5000/oidc/token", token_endpoint: `${origin}/oidc/token`,
userinfo_endpoint: "http://localhost:5000/oidc/userinfo", userinfo_endpoint: `${origin}/oidc/userinfo`,
jwks_uri: "http://localhost:5000/oidc/jwks", jwks_uri: `${origin}/oidc/jwks`,
}, },
}); });
} }
await route.fulfill({ json: { issuer: "http://localhost:5000/oidc" } }); const origin = new URL(url).origin;
await route.fulfill({ json: { issuer: `${origin}/oidc` } });
}); });
await page.route("**/v1/audit*", async (route) => { await page.route("**/v1/audit*", async (route) => {
@@ -97,12 +102,29 @@ test.describe("Audit Logs Management", () => {
console.log("[test] Navigating to /audit-logs"); console.log("[test] Navigating to /audit-logs");
await page.goto("/audit-logs"); await page.goto("/audit-logs");
// Check header // Check header - this should be visible immediately now
await expect(page.getByText(/감사 로그|Audit Logs/i).first()).toBeVisible({ await expect(page.getByText(/감사 로그|Audit Logs/i).first()).toBeVisible({
timeout: 20000, timeout: 10000,
}); });
// Wait for the table row to appear (retry mechanism in expect will handle the async load) // Ensure we are not stuck in a global loading state (AppLayout)
await expect(page.locator(".animate-spin")).not.toBeVisible({
timeout: 10000,
});
// Check for audit page specific error
const errorEl = page.getByTestId("audit-error");
if (await errorEl.isVisible()) {
const errorText = await errorEl.innerText();
throw new Error(`Audit log page showed error: ${errorText}`);
}
// Wait for loading to finish
await expect(page.getByTestId("audit-loading")).not.toBeVisible({
timeout: 15000,
});
// Wait for the table row to appear
await expect(page.locator("tbody tr")).toHaveCount(20, { timeout: 15000 }); await expect(page.locator("tbody tr")).toHaveCount(20, { timeout: 15000 });
// Check specific data visible in the row // Check specific data visible in the row
@@ -114,6 +136,12 @@ test.describe("Audit Logs Management", () => {
page, page,
}) => { }) => {
await page.goto("/audit-logs"); await page.goto("/audit-logs");
await expect(page.locator(".animate-spin")).not.toBeVisible({
timeout: 10000,
});
await expect(page.getByTestId("audit-loading")).not.toBeVisible({
timeout: 15000,
});
await expect(page.locator("tbody tr")).toHaveCount(20, { timeout: 15000 }); await expect(page.locator("tbody tr")).toHaveCount(20, { timeout: 15000 });
const loadMoreBtn = page.getByRole("button", { const loadMoreBtn = page.getByRole("button", {
@@ -131,13 +159,19 @@ test.describe("Audit Logs Management", () => {
test("should filter logs by Action and User ID locally", async ({ page }) => { test("should filter logs by Action and User ID locally", async ({ page }) => {
await page.goto("/audit-logs"); await page.goto("/audit-logs");
await expect(page.locator(".animate-spin")).not.toBeVisible({
timeout: 10000,
});
await expect(page.getByTestId("audit-loading")).not.toBeVisible({
timeout: 15000,
});
await expect(page.locator("tbody tr")).toHaveCount(20, { timeout: 15000 }); await expect(page.locator("tbody tr")).toHaveCount(20, { timeout: 15000 });
// Search by User ID // Search by User ID
const userIdInput = page.getByTestId("audit-search-user-id"); const userIdInput = page.getByTestId("audit-search-user-id");
await userIdInput.fill("user-even"); await userIdInput.fill("user-even");
// Playwright expect will retry, so it will wait for deferred value // Wait for deferred value to apply
await expect(page.locator("tbody tr")).toHaveCount(10, { timeout: 15000 }); await expect(page.locator("tbody tr")).toHaveCount(10, { timeout: 15000 });
await expect(page.locator("tbody")).not.toContainText("user-odd"); await expect(page.locator("tbody")).not.toContainText("user-odd");
@@ -156,6 +190,12 @@ test.describe("Audit Logs Management", () => {
test("should filter logs by Status locally", async ({ page }) => { test("should filter logs by Status locally", async ({ page }) => {
await page.goto("/audit-logs"); await page.goto("/audit-logs");
await expect(page.locator(".animate-spin")).not.toBeVisible({
timeout: 10000,
});
await expect(page.getByTestId("audit-loading")).not.toBeVisible({
timeout: 15000,
});
await expect(page.locator("tbody tr")).toHaveCount(20, { timeout: 15000 }); await expect(page.locator("tbody tr")).toHaveCount(20, { timeout: 15000 });
// Select "Failure" status // Select "Failure" status

View File

@@ -302,9 +302,9 @@ test.describe("Users Bulk Upload", () => {
const payload = JSON.parse(bulkPayload); const payload = JSON.parse(bulkPayload);
expect(payload.users[0].tenantSlug).toBe("primary-tenant"); expect(payload.users[0].tenantSlug).toBe("primary-tenant");
expect(payload.users[0].metadata.employee_id).toBe("EMP001"); expect(payload.users[0].metadata.employee_id).toBe("EMP001");
expect(payload.users[0].metadata.sub_email).toBe( expect(payload.users[0].metadata.sub_email).toEqual([
"dual.alias@hanmaceng.co.kr", "dual.alias@hanmaceng.co.kr",
); ]);
expect(payload.users[0].metadata.secondary_emails).toEqual([ expect(payload.users[0].metadata.secondary_emails).toEqual([
"dual.alias@hanmaceng.co.kr", "dual.alias@hanmaceng.co.kr",
]); ]);

View File

@@ -10,7 +10,10 @@ export default defineConfig({
resolve: { resolve: {
alias: { alias: {
"lucide-react": path.resolve(process.cwd(), "node_modules/lucide-react"), "lucide-react": path.resolve(process.cwd(), "node_modules/lucide-react"),
react: path.resolve(process.cwd(), "node_modules/react"),
"react-dom": path.resolve(process.cwd(), "node_modules/react-dom"),
}, },
dedupe: ["react", "react-dom", "react-router-dom"],
}, },
cacheDir: cacheDir:
process.env.ADMINFRONT_VITE_CACHE_DIR ?? process.env.ADMINFRONT_VITE_CACHE_DIR ??

View File

@@ -43,7 +43,7 @@
"react-dom": "^19.2.0", "react-dom": "^19.2.0",
"react-hook-form": "^7.71.1", "react-hook-form": "^7.71.1",
"react-oidc-context": "^3.3.0", "react-oidc-context": "^3.3.0",
"react-router-dom": "^6.28.2", "react-router-dom": "^7.15.1",
"tailwind-merge": "^3.4.0", "tailwind-merge": "^3.4.0",
"zod": "^3.24.1" "zod": "^3.24.1"
} }

View File

@@ -6,7 +6,7 @@ WORKDIR /workspace
ENV CI=true ENV CI=true
# Install pnpm # Install pnpm
RUN npm install -g pnpm RUN corepack enable && corepack prepare pnpm@10.5.2 --activate
# Copy workspace configs and common package # Copy workspace configs and common package
COPY common ./common COPY common ./common

View File

@@ -12,8 +12,8 @@
"lint": "biome check .", "lint": "biome check .",
"preview": "vite preview", "preview": "vite preview",
"test": "playwright test", "test": "playwright test",
"test:coverage": "vitest run --coverage", "test:coverage": "vitest run --coverage --bail 1",
"test:unit": "vitest run", "test:unit": "vitest run --bail 1",
"test:roles": "playwright test tests/devfront-role-switch-report.spec.ts", "test:roles": "playwright test tests/devfront-role-switch-report.spec.ts",
"test:ui": "playwright test --ui" "test:ui": "playwright test --ui"
}, },

View File

@@ -6,7 +6,7 @@ WORKDIR /workspace
ENV CI=true ENV CI=true
# Install pnpm # Install pnpm
RUN npm install -g pnpm RUN corepack enable && corepack prepare pnpm@10.5.2 --activate
# Copy workspace configs and common package # Copy workspace configs and common package
COPY common ./common COPY common ./common

View File

@@ -15,8 +15,8 @@
"lint": "biome check .", "lint": "biome check .",
"preview": "vite preview", "preview": "vite preview",
"test": "playwright test", "test": "playwright test",
"test:coverage": "vitest run --coverage", "test:coverage": "vitest run --coverage --bail 1",
"test:unit": "vitest run", "test:unit": "vitest run --bail 1",
"test:roles": "playwright test tests/devfront-role-switch-report.spec.ts", "test:roles": "playwright test tests/devfront-role-switch-report.spec.ts",
"test:ui": "playwright test --ui" "test:ui": "playwright test --ui"
}, },

View File

@@ -203,9 +203,8 @@ set +e
echo "packages: ['.', '../adminfront']" > pnpm-workspace.yaml echo "packages: ['.', '../adminfront']" > pnpm-workspace.yaml
if [ "$reuse_seed_node_modules" -eq 0 ]; then if [ "$reuse_seed_node_modules" -eq 0 ]; then
if ! command -v pnpm >/dev/null 2>&1; then corepack enable
run_with_retry 3 npm install -g pnpm corepack prepare pnpm@10.5.2 --activate
fi
run_with_retry 3 env CI=true pnpm install --no-frozen-lockfile --shamefully-hoist --store-dir "$pnpm_store_dir" run_with_retry 3 env CI=true pnpm install --no-frozen-lockfile --shamefully-hoist --store-dir "$pnpm_store_dir"
fi fi
@@ -299,7 +298,7 @@ echo "==> adminfront using PORT=$port"
( (
cd "$tmp_dir/adminfront" cd "$tmp_dir/adminfront"
CI=true PORT="$port" PLAYWRIGHT_WORKERS="${PLAYWRIGHT_WORKERS:-1}" \ CI=true PORT="$port" PLAYWRIGHT_WORKERS="${PLAYWRIGHT_WORKERS:-1}" \
pnpm exec playwright test "${playwright_project_args[@]}" pnpm exec playwright test --max-failures=1 "${playwright_project_args[@]}"
) 2>&1 | tee reports/adminfront-test.log ) 2>&1 | tee reports/adminfront-test.log
test_exit_code=${PIPESTATUS[0]} test_exit_code=${PIPESTATUS[0]}
set -e set -e