feat(admin): authz-pilot — server-renderad advance-resolution + ActionGate (ADR-0001)
CI (SIAX Cloud) / integration (push) Skipped
CI (SIAX Cloud) / sonar (push) Skipped
CI (SIAX Cloud) / sonar (pull_request) Skipped
masterplan-lock / check (pull_request) Successful in 7s
masterplan-lock / check (push) Successful in 8s
CI (SIAX Cloud) / security (push) Successful in 15s
Security Scan (SIAX Cloud) / security (push) Successful in 18s
CI (SIAX Cloud) / security (pull_request) Successful in 20s
Security Scan (SIAX Cloud) / security (pull_request) Successful in 19s
CI (SIAX Cloud) / quality (push) Failing after 1m31s
CI (SIAX Cloud) / quality (pull_request) Failing after 1m33s
CI (SIAX Cloud) / integration (pull_request) Successful in 1m34s
CI (SIAX Cloud) / integration (push) Skipped
CI (SIAX Cloud) / sonar (push) Skipped
CI (SIAX Cloud) / sonar (pull_request) Skipped
masterplan-lock / check (pull_request) Successful in 7s
masterplan-lock / check (push) Successful in 8s
CI (SIAX Cloud) / security (push) Successful in 15s
Security Scan (SIAX Cloud) / security (push) Successful in 18s
CI (SIAX Cloud) / security (pull_request) Successful in 20s
Security Scan (SIAX Cloud) / security (pull_request) Successful in 19s
CI (SIAX Cloud) / quality (push) Failing after 1m31s
CI (SIAX Cloud) / quality (pull_request) Failing after 1m33s
CI (SIAX Cloud) / integration (pull_request) Successful in 1m34s
GET /api/orders returnerar per order frozen advance_action (resolveAction ur lib/order-flow); admin renderar via ActionGate — policy i serverlagret, presentation i klienten (DoD §21). Terminala/okända statusar → read_only med varför-text i stället för missvisande 'klar'. tests/order-flow.test.ts 3/3; full svit 1138 godkända; typecheck grön.
This commit is contained in:
+6
-12
@@ -1,5 +1,8 @@
|
||||
"use client";
|
||||
|
||||
import { ActionGate } from "@siax/ui";
|
||||
import { NEXT_STATUS } from "@/lib/order-flow";
|
||||
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
import { toast } from "sonner";
|
||||
import { useT } from "@/components/locale-provider";
|
||||
@@ -25,13 +28,6 @@ interface Metrics {
|
||||
pipeline_ore: number;
|
||||
}
|
||||
|
||||
const NEXT_STATUS: Record<string, string> = {
|
||||
draft: "quoted",
|
||||
quoted: "in_production",
|
||||
in_production: "review",
|
||||
review: "accepted",
|
||||
accepted: "delivered",
|
||||
};
|
||||
|
||||
export default function AdminPage() {
|
||||
const t = useT();
|
||||
@@ -112,16 +108,14 @@ export default function AdminPage() {
|
||||
<StatusPill status={o.status} />
|
||||
<span className="text-right font-mono text-[12px] tabular-nums">{formatSEK(o.total_ore / 100)}</span>
|
||||
<span className="text-right">
|
||||
{NEXT_STATUS[o.status] ? (
|
||||
<ActionGate action={o.advance_action} className="inline-block text-right">
|
||||
<button
|
||||
onClick={() => advance(o.order_id, o.status)}
|
||||
className="border border-foreground px-3 py-1.5 font-mono text-[10px] uppercase tracking-[0.08em] transition-colors hover:bg-foreground hover:text-background"
|
||||
>
|
||||
→ {NEXT_STATUS[o.status]}
|
||||
→ {NEXT_STATUS[o.status] ?? t({ en: "done", sv: "klar" })}
|
||||
</button>
|
||||
) : (
|
||||
<span className="font-mono text-[10px] uppercase tracking-[0.08em] text-muted-foreground">{t({ en: "done", sv: "klar" })}</span>
|
||||
)}
|
||||
</ActionGate>
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { createOrder, listOwnedOrders, IdempotencyKeyConflictError, type OrderConfig } from "@/lib/orders-store";
|
||||
import { requireOrderOwner } from "@/src/auth/require-order-owner";
|
||||
import { resolveAdvanceAction } from "@/lib/order-flow";
|
||||
import { isSiaxError, siaxErrorResponseForLegacy } from "../siax-error-mapping";
|
||||
|
||||
// POST /api/orders (docs/04) — create a draft order from a configurator config.
|
||||
@@ -56,7 +57,10 @@ export async function GET(req: NextRequest) {
|
||||
if (auth.response) return auth.response;
|
||||
try {
|
||||
const orders = await listOwnedOrders(auth.owner.tenantId);
|
||||
return NextResponse.json(orders);
|
||||
// ADR-0001: servern resolvér advance-aktionen per order — klienten
|
||||
// renderar bara (ActionGate). Policy ägs här, inte i UI-lagret.
|
||||
const withActions = orders.map((o) => ({ ...o, advance_action: resolveAdvanceAction(o.status) }));
|
||||
return NextResponse.json(withActions);
|
||||
} catch (err: unknown) {
|
||||
if (isSiaxError(err)) return siaxErrorResponseForLegacy(err);
|
||||
throw err;
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
# ADR-0001 — Server-renderad authz-resolution för orderåtgärder
|
||||
|
||||
**Status:** Accepted
|
||||
**Date:** 2026-09-29
|
||||
**Owners:** 0pt (simon@siax.io)
|
||||
**Related requirements:** DoD §21 (backend enforcement), §78 (error/why-UX), våg 3.6–3.7 (authz-ux/entitlement)
|
||||
**Related capabilities:** `@siax/contracts/authz-ux` 0.10.0, `@siax/ui` ActionGate 0.11.1
|
||||
|
||||
## Context
|
||||
Admin-ordkön behöver gate:a advance-aktionen. 0pt saknar klientsides-policy;
|
||||
`requireOrderOwner` är server-side. Att resolvé:a i klienten vore påhittad
|
||||
policy (DoD §15).
|
||||
|
||||
## Existing implementations
|
||||
- PATCH `/api/orders/{id}` enforcar ägarskap server-side (sanningsvärdet).
|
||||
- Admin-sidan hämtar ordrar via GET `/api/orders` (owner-scopad).
|
||||
|
||||
## Decision
|
||||
**Server-renderad resolution:** GET `/api/orders` returnerar per order ett
|
||||
frozen `advance_action` (ResolvedAction från `resolveAction`), derivat i
|
||||
`lib/order-flow.ts` ur kanoniskt flöde + sessionens ägarskap. Klienten
|
||||
renderar via `ActionGate` — ingen policylogik i UI-lagret. Ingen extra
|
||||
fetch: resolutionen rids med ordningssvaret.
|
||||
|
||||
## Ownership
|
||||
0pt äger flödet och resolutionen; DES1GN äger kontraktet (`authz-ux`) och
|
||||
renderingen (ActionGate). Product Firewall: 0pt importerar @siax/*, aldrig
|
||||
tvärtom.
|
||||
|
||||
## Contract
|
||||
`ResolvedAction {state, reason?}` — stängda uppsättningar enligt authz-ux.
|
||||
|
||||
## Provider boundary
|
||||
Framtida pay0-entitlement projiceras via `deriveEntitlement` in i samma
|
||||
resolve — ingen ny endpoint behövs.
|
||||
|
||||
## Dependency rules
|
||||
`@siax/ui`/`@siax/contracts` → 0pt. Aldrig reverse.
|
||||
|
||||
## Migration
|
||||
Enda konsument: admin-sidan (denna PR). Övriga ytor migreras per aktion.
|
||||
|
||||
## Alternatives considered
|
||||
- **Klientsides-resolution mot ny endpoint:** extra roundtrip, policy-läckage
|
||||
risk, mer kod — avvisad.
|
||||
- **Hårdkodad disabled i UI:** duplicerar serverns sanningsvärde — avvisad
|
||||
(DoD §21: backend är enforcement, UI är presentation).
|
||||
|
||||
## Risks
|
||||
Flödesändringar måste skriva i `lib/order-flow.ts` (enda källan) —
|
||||
lint-/test-täckning finns (tests/order-flow.test.ts).
|
||||
|
||||
## Testing / Evidence
|
||||
- `tests/order-flow.test.ts`: available för aktiva steg, read_only för
|
||||
terminala (incl. okända statusar i fri-text-DB) — 3/3.
|
||||
- Full svit 1138+3 godkända; typecheck grön.
|
||||
|
||||
## Rollback
|
||||
Ta bort `advance_action`-fältet + ActionGate-wrappen — klienten faller
|
||||
tillbaka till tidigare rendering (flödet oförändrat).
|
||||
@@ -0,0 +1,23 @@
|
||||
import { resolveAction, type ResolvedAction } from "@siax/contracts/authz-ux";
|
||||
|
||||
/** Kanonisk orderflöde — servern äger resolutionen (ADR-0001), UI renderar. */
|
||||
export const NEXT_STATUS: Record<string, string> = {
|
||||
draft: "quoted",
|
||||
quoted: "in_production",
|
||||
in_production: "review",
|
||||
review: "accepted",
|
||||
accepted: "delivered",
|
||||
};
|
||||
|
||||
/**
|
||||
* Server-renderad action-resolution för advance-steget (ADR-0001):
|
||||
* ägarskapenforces redan av requireOrderOwner på GET/PATCH; tillståndet
|
||||
* avgör read_only. Innan Session/roller finns i 0pt är permission alltid
|
||||
* granted för autentiserade ägare — hårdkoda aldrig denna resolve i klienten.
|
||||
*/
|
||||
export function resolveAdvanceAction(status: string): ResolvedAction {
|
||||
if (NEXT_STATUS[status]) {
|
||||
return resolveAction({ permission: "granted", entitlement: "active", approval: "not_required", readOnly: false });
|
||||
}
|
||||
return resolveAction({ permission: "granted", entitlement: "active", approval: "not_required", readOnly: true });
|
||||
}
|
||||
+2
-1
@@ -78,7 +78,8 @@
|
||||
"tailwind-merge": "^3.3.1",
|
||||
"tailwindcss-animate": "^1.0.7",
|
||||
"vaul": "^1.1.2",
|
||||
"zod": "3.25.76"
|
||||
"zod": "3.25.76",
|
||||
"@siax/contracts": "^0.10.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.15.0",
|
||||
|
||||
Generated
+3
@@ -104,6 +104,9 @@ importers:
|
||||
'@siax/config':
|
||||
specifier: ^0.2.1
|
||||
version: 0.2.1(tailwindcss@4.3.3)
|
||||
'@siax/contracts':
|
||||
specifier: ^0.10.0
|
||||
version: 0.10.0
|
||||
'@siax/tokens':
|
||||
specifier: ^0.1.2
|
||||
version: 0.1.2
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
import { describe, it, expect } from "vitest";
|
||||
import { NEXT_STATUS, resolveAdvanceAction } from "@/lib/order-flow";
|
||||
|
||||
describe("order-flow — server-renderad advance-resolution (ADR-0001)", () => {
|
||||
it("flödets fem steg har nästa status", () => {
|
||||
expect(NEXT_STATUS.draft).toBe("quoted");
|
||||
expect(NEXT_STATUS.accepted).toBe("delivered");
|
||||
});
|
||||
|
||||
it("aktivt steg → available", () => {
|
||||
expect(resolveAdvanceAction("draft")).toMatchObject({ state: "available" });
|
||||
expect(resolveAdvanceAction("review")).toMatchObject({ state: "available" });
|
||||
});
|
||||
|
||||
it("terminalt steg → read_only/read_only_resource (inte fake available)", () => {
|
||||
expect(resolveAdvanceAction("delivered")).toMatchObject({ state: "read_only", reason: "read_only_resource" });
|
||||
expect(resolveAdvanceAction("cancelled")).toMatchObject({ state: "read_only", reason: "read_only_resource" });
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user