Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,9 @@ jobs:
- run: umask 002 && corepack pnpm install --frozen-lockfile

- name: Run the agent, core and data-manager suites and the deployment-user test
# One file worker reduces I/O contention between filesystem-heavy lease fixtures.
run: >-
umask 002 && corepack pnpm exec vitest run --project node
umask 002 && corepack pnpm exec vitest run --project node --maxWorkers=1
apps/ops-agent packages/core services/data-manager
scripts/ops-agent-deployment-user.test.ts

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import type { Metadata } from "next";
import { DataWorkspace } from "@/components/admin/data/DataWorkspace";
export const metadata: Metadata = { title: "Advanced operations — Admin — OpenMapX" };
export default function Page() {
return <DataWorkspace topic="operations" />;
}
6 changes: 6 additions & 0 deletions apps/web/src/app/admin/(full-admin)/data/osm/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import type { Metadata } from "next";
import { DataWorkspace } from "@/components/admin/data/DataWorkspace";
export const metadata: Metadata = { title: "OSM — Admin — OpenMapX" };
export default function Page() {
return <DataWorkspace topic="osm" />;
}
6 changes: 6 additions & 0 deletions apps/web/src/app/admin/(full-admin)/data/overture/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import type { Metadata } from "next";
import { DataWorkspace } from "@/components/admin/data/DataWorkspace";
export const metadata: Metadata = { title: "Overture — Admin — OpenMapX" };
export default function Page() {
return <DataWorkspace topic="overture" />;
}
6 changes: 3 additions & 3 deletions apps/web/src/app/admin/(full-admin)/data/page.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { Metadata } from "next";
import { cookies } from "next/headers";
import { DataWorkflowsPage } from "@/components/admin/services/DataWorkflowsPage";
import { DataWorkspace } from "@/components/admin/data/DataWorkspace";
import { HostedDataTopics } from "@/components/admin/shared/HostedDataTopics";
import { getSelfHosted } from "@/lib/admin/serverDeployment";
export const metadata: Metadata = { title: "Data workflows — Admin — OpenMapX" };
export const metadata: Metadata = { title: "Data — Admin — OpenMapX" };
export default async function Page() {
const selfHosted = await getSelfHosted((await cookies()).toString());
return selfHosted === false ? <HostedDataTopics /> : <DataWorkflowsPage />;
return selfHosted === false ? <HostedDataTopics /> : <DataWorkspace />;
}
6 changes: 6 additions & 0 deletions apps/web/src/app/admin/(full-admin)/data/search/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import type { Metadata } from "next";
import { DataWorkspace } from "@/components/admin/data/DataWorkspace";
export const metadata: Metadata = { title: "Search & places — Admin — OpenMapX" };
export default function Page() {
return <DataWorkspace topic="search" />;
}
6 changes: 6 additions & 0 deletions apps/web/src/app/admin/(full-admin)/data/transfers/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import type { Metadata } from "next";
import { DataWorkspace } from "@/components/admin/data/DataWorkspace";
export const metadata: Metadata = { title: "Prepared transfers — Admin — OpenMapX" };
export default function Page() {
return <DataWorkspace topic="transfers" />;
}
4 changes: 2 additions & 2 deletions apps/web/src/app/admin/(full-admin)/data/transit/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Metadata } from "next";
import { TransitPipelinePage } from "@/components/admin/transit/TransitPipelinePage";
import { TransitWorkspace } from "@/components/admin/transit/TransitWorkspace";
export const metadata: Metadata = { title: "Transit — Admin — OpenMapX" };
export default function Page() {
return <TransitPipelinePage />;
return <TransitWorkspace />;
}
119 changes: 117 additions & 2 deletions apps/web/src/app/admin/privacy/page.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
vi.mock(
"next/navigation",
async () => (await import("@/test/adminNavigation")).adminNavigationMock,
);

import { createApiClient } from "@openmapx/core";
import {
privacyDetail,
privacyReadiness,
} from "@/components/admin/privacy/privacyFixtures.test-support";
import {
PRIVACY_ADMIN_RESUME_KEY,
savePendingPrivacyAdminDelivery,
} from "@/lib/admin/privacyReauthentication";
import { adminTestHistory } from "@/test/adminNavigation";
import { createQueryWrapper, createTestQueryClient } from "@/test/query";

const binding = vi.hoisted(() => ({ client: undefined as unknown }));
Expand Down Expand Up @@ -117,6 +127,8 @@ function installFetch() {

describe("privacy admin case selection", () => {
beforeEach(() => {
adminTestHistory.reset("/admin/privacy");
sessionStorage.clear();
binding.client = createApiClient({ baseUrl: "http://privacy.test", credentials: "include" });
Object.defineProperty(globalThis.crypto, "randomUUID", {
configurable: true,
Expand Down Expand Up @@ -185,10 +197,11 @@ describe("privacy admin case selection", () => {
installFetch();
render(<PrivacyAdminPage />, { wrapper: createQueryWrapper(createTestQueryClient()) });

expect(await screen.findByText("adminNavigation.privacyReadinessBlocked")).toBeInTheDocument();
expect(screen.getByText("privacySetup.readiness.contactFullAdmin")).toBeInTheDocument();
expect(
await screen.findByText("privacySetup.readiness.checks.controller-contact.title"),
screen.getByText(/privacySetup.readiness.checks.controller-contact.title/),
).toBeInTheDocument();
expect(screen.getByText("privacySetup.readiness.contactFullAdmin")).toBeInTheDocument();
expect(screen.queryByRole("link", { name: /controller-contact/ })).not.toBeInTheDocument();
expect(screen.queryByText("controller-contact")).not.toBeInTheDocument();
});
Expand All @@ -200,3 +213,105 @@ describe("privacy admin case selection", () => {
expect(screen.getByLabelText("privacyAdmin.workflows.extensionNotifiedAt")).toBeInTheDocument();
});
});

function pendingDelivery(requestId = CASE_B) {
savePendingPrivacyAdminDelivery({
apiOrigin: "http://privacy.test",
actorId: "synthetic-worker",
requestId,
artifactId: "cccccccc-cccc-4ccc-8ccc-cccccccccccc",
challengeId: "dddddddd-dddd-4ddd-8ddd-dddddddddddd",
channel: "assisted",
expiresAt: new Date(Date.now() + 300000).toISOString(),
});
}
it("restores a pending delivery on return without a case query", async () => {
binding.client = createApiClient({ baseUrl: "http://privacy.test", credentials: "include" });
sessionStorage.clear();
adminTestHistory.reset("/admin/privacy");
pendingDelivery();
installFetch();
render(<PrivacyAdminPage />, { wrapper: createQueryWrapper(createTestQueryClient()) });
await screen.findByText(/registration-for-case-b/);
expect(sessionStorage.getItem(PRIVACY_ADMIN_RESUME_KEY)).not.toBeNull();
});
it("loads an explicitly addressed case independently and clears another case's pending delivery", async () => {
binding.client = createApiClient({ baseUrl: "http://privacy.test", credentials: "include" });
sessionStorage.clear();
pendingDelivery();
adminTestHistory.reset(`/admin/privacy?case=${CASE_A}`);
installFetch();
render(<PrivacyAdminPage />, { wrapper: createQueryWrapper(createTestQueryClient()) });
await screen.findByText(/registration-for-case-a/);
expect(sessionStorage.getItem(PRIVACY_ADMIN_RESUME_KEY)).toBeNull();
});
it("clears pending delivery on a history-driven case switch", async () => {
binding.client = createApiClient({ baseUrl: "http://privacy.test", credentials: "include" });
sessionStorage.clear();
adminTestHistory.reset(`/admin/privacy?case=${CASE_A}`);
installFetch();
render(<PrivacyAdminPage />, { wrapper: createQueryWrapper(createTestQueryClient()) });
await screen.findByText(/registration-for-case-a/);
act(() => adminTestHistory.push(`/admin/privacy?case=${CASE_B}`));
await screen.findByText(/registration-for-case-b/);
pendingDelivery();
act(() => adminTestHistory.back());
await screen.findByText(/registration-for-case-a/);
expect(sessionStorage.getItem(PRIVACY_ADMIN_RESUME_KEY)).toBeNull();
});

it("loads an addressed case that is outside the visible queue", async () => {
binding.client = createApiClient({ baseUrl: "http://privacy.test", credentials: "include" });
sessionStorage.clear();
adminTestHistory.reset(`/admin/privacy?case=${CASE_A}`);
installFetch();
const fetchFixture = globalThis.fetch;
vi.stubGlobal("fetch", (input: RequestInfo | URL, init?: RequestInit) =>
String(input).endsWith("/privacy/admin/queue")
? Promise.resolve(json({ requests: [detail(CASE_B).request] }))
: fetchFixture(input, init),
);
render(<PrivacyAdminPage />, { wrapper: createQueryWrapper(createTestQueryClient()) });
await screen.findByText(/registration-for-case-a/);
expect(screen.queryByText(/registration-for-case-b/)).not.toBeInTheDocument();
});
it.each([403, 404])(
"does not substitute a queue case when an addressed case is refused (%s)",
async (status) => {
binding.client = createApiClient({ baseUrl: "http://privacy.test", credentials: "include" });
sessionStorage.clear();
adminTestHistory.reset(`/admin/privacy?case=${CASE_A}`);
installFetch();
const fetchFixture = globalThis.fetch;
vi.stubGlobal("fetch", (input: RequestInfo | URL, init?: RequestInit) =>
String(input).endsWith(`/privacy/admin/requests/${CASE_A}`)
? Promise.resolve(Response.json({ error: "Unavailable" }, { status }))
: fetchFixture(input, init),
);
render(<PrivacyAdminPage />, { wrapper: createQueryWrapper(createTestQueryClient()) });
await screen.findByText("privacyAdmin.caseFailed");
expect(screen.queryByText(/registration-for-case-b/)).not.toBeInTheDocument();
},
);

it("names a blocked encryption readiness check for privacy operators without a setup link", async () => {
binding.client = createApiClient({ baseUrl: "http://privacy.test", credentials: "include" });
sessionStorage.clear();
adminTestHistory.reset("/admin/privacy");
installFetch();
const fetchFixture = globalThis.fetch;
vi.stubGlobal("fetch", (input: RequestInfo | URL, init?: RequestInit) =>
String(input).endsWith("/privacy/admin/readiness")
? Promise.resolve(
json({
...privacyReadiness(),
checks: [{ id: "encryption-key", status: "fail", detailCode: "unavailable" }],
}),
)
: fetchFixture(input, init),
);
render(<PrivacyAdminPage />, { wrapper: createQueryWrapper(createTestQueryClient()) });
await screen.findByText(/privacySetup.readiness.checks.encryption-key.title/);
expect(screen.getByText("privacySetup.readiness.contactFullAdmin")).toBeInTheDocument();
expect(document.querySelector('a[href="/admin/privacy-setup"]')).toBeNull();
});
Loading
Loading