Compare commits
12 Commits
7fac3c3aa8
...
v0.1.87
| Author | SHA1 | Date | |
|---|---|---|---|
| 484696a8f5 | |||
| ca1a014c01 | |||
| d01ab85cbb | |||
| 610572eafe | |||
| 73f1af185f | |||
| c1833c1def | |||
| 521398b0fc | |||
| 74d276b656 | |||
| 3110b40cf9 | |||
| 08f28aeb93 | |||
| fb9c0ad25a | |||
| 322cfae824 |
@@ -81,6 +81,7 @@ export default async function NewInstancePage() {
|
||||
hasOrgBilling={hasOrgBilling}
|
||||
existingOrgBilling={orgBilling}
|
||||
setupFeeChf={pricing.tenantSetupFeeChf}
|
||||
monthlyFeeChf={pricing.tenantMonthlyFeeChf}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -326,6 +326,7 @@ export default async function DashboardPage() {
|
||||
hasOrgBilling={hasOrgBilling}
|
||||
existingOrgBilling={orgBilling}
|
||||
setupFeeChf={platformPricing.tenantSetupFeeChf}
|
||||
monthlyFeeChf={platformPricing.tenantMonthlyFeeChf}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import { signIn } from "next-auth/react";
|
||||
import { useTranslations, useLocale } from "next-intl";
|
||||
import { Link, getPathname } from "@/i18n/navigation";
|
||||
import { Logo } from "@/components/ui/logo";
|
||||
|
||||
export default function LoginPage() {
|
||||
const t = useTranslations("login");
|
||||
@@ -25,10 +26,7 @@ export default function LoginPage() {
|
||||
<div className="relative z-10 w-full max-w-sm px-5 animate-in">
|
||||
{/* Logo mark */}
|
||||
<div className="flex justify-center mb-8">
|
||||
<div className="relative h-12 w-12">
|
||||
<div className="absolute inset-0 rounded-lg bg-accent/15" />
|
||||
<div className="absolute inset-[5px] rounded-md bg-accent" />
|
||||
</div>
|
||||
<Logo className="h-14 w-auto text-accent" />
|
||||
</div>
|
||||
|
||||
<div className="bg-surface-1 rounded-2xl border border-border p-8 shadow-2xl shadow-black/40">
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useRef, forwardRef } from "react";
|
||||
import { useTranslations } from "next-intl";
|
||||
import { useTranslations, useLocale } from "next-intl";
|
||||
import { useRouter, Link } from "@/i18n/navigation";
|
||||
import { Card } from "@/components/ui/card";
|
||||
|
||||
@@ -41,11 +41,17 @@ export default function RegisterPage() {
|
||||
|
||||
const [accountType, setAccountType] = useState<AccountType | null>(null);
|
||||
|
||||
const locale = useLocale();
|
||||
|
||||
const [form, setForm] = useState({
|
||||
companyName: "",
|
||||
givenName: "",
|
||||
familyName: "",
|
||||
email: "",
|
||||
// Default to the language the register page is being viewed in;
|
||||
// the user can change it below. This becomes their ZITADEL
|
||||
// preferredLanguage and the UI language they land on after login.
|
||||
preferredLanguage: locale,
|
||||
});
|
||||
const [state, setState] = useState<FormState>("idle");
|
||||
const [error, setError] = useState("");
|
||||
@@ -94,6 +100,7 @@ export default function RegisterPage() {
|
||||
givenName: form.givenName,
|
||||
familyName: form.familyName,
|
||||
email: form.email,
|
||||
preferredLanguage: form.preferredLanguage,
|
||||
isPersonal,
|
||||
};
|
||||
if (!isPersonal) {
|
||||
@@ -295,6 +302,29 @@ export default function RegisterPage() {
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Preferred language */}
|
||||
<div>
|
||||
<label className="block text-xs font-semibold uppercase tracking-wider text-text-muted mb-1.5">
|
||||
{t("languageLabel")}
|
||||
</label>
|
||||
<select
|
||||
name="preferredLanguage"
|
||||
value={form.preferredLanguage}
|
||||
onChange={(e) =>
|
||||
setForm((prev) => ({
|
||||
...prev,
|
||||
preferredLanguage: e.target.value,
|
||||
}))
|
||||
}
|
||||
className="w-full px-3 py-2 bg-surface-2 border border-border rounded-lg text-sm text-text-primary focus:outline-none focus:ring-1 focus:ring-accent focus:border-accent transition-colors"
|
||||
>
|
||||
<option value="de">Deutsch</option>
|
||||
<option value="en">English</option>
|
||||
<option value="fr">Français</option>
|
||||
<option value="it">Italiano</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="text-xs text-red-400 bg-red-400/10 border border-red-400/20 rounded-lg px-3 py-2">
|
||||
{error}
|
||||
|
||||
@@ -30,13 +30,14 @@ export default async function ProfileSettingsPage() {
|
||||
|
||||
const t = await getTranslations("settingsProfile");
|
||||
|
||||
let initial = { firstName: "", lastName: "", email: user.email };
|
||||
let initial = { firstName: "", lastName: "", email: user.email, language: "" };
|
||||
try {
|
||||
const profile = await getHumanUserDetail(user.id);
|
||||
initial = {
|
||||
firstName: profile.givenName,
|
||||
lastName: profile.familyName,
|
||||
email: profile.email || user.email,
|
||||
language: profile.preferredLanguage,
|
||||
};
|
||||
} catch (e) {
|
||||
// Identity provider unreachable: render the form with whatever
|
||||
|
||||
@@ -6,6 +6,7 @@ import { Card } from "@/components/ui/card";
|
||||
import { BackLink } from "@/components/ui/back-link";
|
||||
import { TeamList } from "@/components/team/team-list";
|
||||
import { InviteForm } from "@/components/team/invite-form";
|
||||
import { AccessOverview } from "@/components/team/access-overview";
|
||||
|
||||
/**
|
||||
* /team — manage org members.
|
||||
@@ -70,6 +71,16 @@ export default async function TeamPage() {
|
||||
canEditRoles={isCustomerOwner(user)}
|
||||
/>
|
||||
</section>
|
||||
|
||||
{/* Access overview — single place to see which member can reach
|
||||
which assistant, instead of checking each tenant page. */}
|
||||
<section className="mt-8 animate-in animate-in-delay-3">
|
||||
<h2 className="text-xs font-semibold uppercase tracking-wider text-text-muted mb-1">
|
||||
{t("accessTitle")}
|
||||
</h2>
|
||||
<p className="text-xs text-text-muted mb-3">{t("accessDescription")}</p>
|
||||
<AccessOverview />
|
||||
</section>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ import { WorkspaceEditor } from "@/components/packages/workspace-editor";
|
||||
import { ChannelUsers } from "@/components/channel-users/channel-users";
|
||||
import { AssignedUsersPanel } from "@/components/tenants/assigned-users-panel";
|
||||
import { SubscriptionToggle } from "@/components/tenants/subscription-toggle";
|
||||
import { ConnectPanel } from "@/components/tenants/connect-panel";
|
||||
import { formatDateTime, formatRelative } from "@/lib/format";
|
||||
import { CHANNEL_PACKAGE_IDS } from "@/lib/packages";
|
||||
|
||||
@@ -216,6 +217,20 @@ export default async function TenantDetailPage({
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Connect: how the customer actually reaches their assistant.
|
||||
The portal manages the assistant; the assistant lives in the
|
||||
customer's messaging app. This bridges that gap right at the
|
||||
top of the page (and calls out the case where no channel is
|
||||
enabled, which would otherwise leave a running assistant
|
||||
unreachable). */}
|
||||
<section className="mb-8 animate-in animate-in-delay-1">
|
||||
<ConnectPanel
|
||||
tenantName={name}
|
||||
enabledChannels={enabledChannels}
|
||||
phase={tenant.status?.phase ?? "Pending"}
|
||||
/>
|
||||
</section>
|
||||
|
||||
{/* Usage */}
|
||||
<section className="mb-8 animate-in animate-in-delay-1">
|
||||
<h2 className="text-xs font-semibold uppercase tracking-wider text-text-muted mb-3">
|
||||
|
||||
@@ -26,6 +26,7 @@ import {
|
||||
const updateSchema = z.object({
|
||||
firstName: z.string().trim().min(1).max(100),
|
||||
lastName: z.string().trim().min(1).max(100),
|
||||
language: z.enum(["de", "en", "fr", "it"]).optional(),
|
||||
});
|
||||
|
||||
export async function GET() {
|
||||
@@ -66,6 +67,7 @@ export async function PUT(request: Request) {
|
||||
userId: user.id,
|
||||
givenName: parsed.data.firstName,
|
||||
familyName: parsed.data.lastName,
|
||||
preferredLanguage: parsed.data.language,
|
||||
});
|
||||
return NextResponse.json({
|
||||
displayName: result.displayName,
|
||||
|
||||
5
src/app/icon.svg
Normal file
5
src/app/icon.svg
Normal file
@@ -0,0 +1,5 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="5.5 3.69 38 38" role="img" aria-label="PieCed">
|
||||
<rect x="5.5" y="3.69" width="38" height="38" rx="7" fill="#0B0F0E"/>
|
||||
<polygon points="38.5,22.69 31.5,10.566 17.5,10.566 10.5,22.69 17.5,34.814 31.5,34.814"
|
||||
fill="#10B981" stroke="#10B981" stroke-width="1.6" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 354 B |
@@ -4,6 +4,15 @@ import { useState, useEffect, useCallback } from "react";
|
||||
import { useTranslations, useFormatter } from "next-intl";
|
||||
import type { PiecedTenant, TenantRequest } from "@/types";
|
||||
import { StatusBadge } from "@/components/ui/status-badge";
|
||||
import { Modal } from "@/components/ui/modal";
|
||||
import {
|
||||
applyTableView,
|
||||
nextSort,
|
||||
SearchInput,
|
||||
SortableTh,
|
||||
Pagination,
|
||||
type SortState,
|
||||
} from "@/components/admin/table-controls";
|
||||
import { formatDateTime, formatRelative } from "@/lib/format";
|
||||
import Link from "next/link";
|
||||
|
||||
@@ -35,6 +44,11 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
const [actionLoading, setActionLoading] = useState<string | null>(null);
|
||||
const [rejectModal, setRejectModal] = useState<string | null>(null);
|
||||
const [rejectNotes, setRejectNotes] = useState("");
|
||||
// Approve is the highest-consequence request action — it provisions
|
||||
// real infrastructure and triggers the billable setup fee — so it now
|
||||
// goes through a confirmation modal like reject/delete, instead of
|
||||
// firing on a single click.
|
||||
const [approveModal, setApproveModal] = useState<string | null>(null);
|
||||
|
||||
// Tenants state
|
||||
const [tenants, setTenants] = useState<PiecedTenant[]>(initialTenants);
|
||||
@@ -48,6 +62,26 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
// Shared
|
||||
const [error, setError] = useState("");
|
||||
|
||||
// Client-side table view state (search / sort / page) for each tab.
|
||||
const [reqSearch, setReqSearch] = useState("");
|
||||
const [reqSort, setReqSort] = useState<SortState>({
|
||||
key: "created",
|
||||
dir: "desc",
|
||||
});
|
||||
const [reqPage, setReqPage] = useState(1);
|
||||
|
||||
const [tenSearch, setTenSearch] = useState("");
|
||||
const [tenSort, setTenSort] = useState<SortState>({
|
||||
key: "created",
|
||||
dir: "desc",
|
||||
});
|
||||
const [tenPage, setTenPage] = useState(1);
|
||||
// Action-scoped error — shown inside the active confirmation modal so
|
||||
// a failed approve/reject/delete surfaces next to the action that
|
||||
// caused it (and keeps the modal open), rather than as a detached
|
||||
// panel-level banner that isn't tied to any row.
|
||||
const [actionError, setActionError] = useState("");
|
||||
|
||||
// ─── Requests fetching ───
|
||||
const fetchRequests = useCallback(async () => {
|
||||
try {
|
||||
@@ -125,18 +159,21 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
// ─── Request actions ───
|
||||
const handleApprove = async (id: string) => {
|
||||
setActionLoading(id);
|
||||
setError("");
|
||||
setActionError("");
|
||||
try {
|
||||
const res = await fetch(`/api/admin/requests/${id}/approve`, {
|
||||
method: "POST",
|
||||
});
|
||||
if (!res.ok) {
|
||||
const data = await res.json();
|
||||
const data = await res.json().catch(() => ({}));
|
||||
throw new Error(data.error || "Approve failed");
|
||||
}
|
||||
setApproveModal(null);
|
||||
await fetchRequests();
|
||||
} catch (e: any) {
|
||||
setError(e.message);
|
||||
// Keep the modal open so the admin sees why provisioning didn't
|
||||
// start; the error renders inside the dialog next to the action.
|
||||
setActionError(e.message);
|
||||
} finally {
|
||||
setActionLoading(null);
|
||||
}
|
||||
@@ -144,7 +181,7 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
|
||||
const handleReject = async (id: string) => {
|
||||
setActionLoading(id);
|
||||
setError("");
|
||||
setActionError("");
|
||||
try {
|
||||
const res = await fetch(`/api/admin/requests/${id}/reject`, {
|
||||
method: "POST",
|
||||
@@ -152,14 +189,14 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
body: JSON.stringify({ adminNotes: rejectNotes || undefined }),
|
||||
});
|
||||
if (!res.ok) {
|
||||
const data = await res.json();
|
||||
const data = await res.json().catch(() => ({}));
|
||||
throw new Error(data.error || "Reject failed");
|
||||
}
|
||||
setRejectModal(null);
|
||||
setRejectNotes("");
|
||||
await fetchRequests();
|
||||
} catch (e: any) {
|
||||
setError(e.message);
|
||||
setActionError(e.message);
|
||||
} finally {
|
||||
setActionLoading(null);
|
||||
}
|
||||
@@ -189,7 +226,7 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
|
||||
const handleDelete = async (name: string) => {
|
||||
setActionLoading(name);
|
||||
setError("");
|
||||
setActionError("");
|
||||
try {
|
||||
const res = await fetch(`/api/admin/tenants/${name}/delete`, {
|
||||
method: "POST",
|
||||
@@ -216,7 +253,7 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
fetchTenants();
|
||||
setTimeout(() => fetchTenants(), 1500);
|
||||
} catch (e: any) {
|
||||
setError(e.message);
|
||||
setActionError(e.message);
|
||||
} finally {
|
||||
setActionLoading(null);
|
||||
}
|
||||
@@ -232,6 +269,53 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
|
||||
const pendingCount = requests.filter((r) => r.status === "pending").length;
|
||||
|
||||
// Derived table views: search → sort → paginate, applied client-side
|
||||
// on top of the already-fetched lists.
|
||||
const reqView = applyTableView(requests, {
|
||||
search: reqSearch,
|
||||
searchOf: (r) => [
|
||||
r.companyName,
|
||||
r.contactName,
|
||||
r.contactEmail,
|
||||
r.agentName,
|
||||
r.tenantName,
|
||||
],
|
||||
sort: reqSort,
|
||||
sortOf: (r, key) =>
|
||||
key === "company"
|
||||
? r.companyName || ""
|
||||
: key === "status"
|
||||
? r.status || ""
|
||||
: r.createdAt || "",
|
||||
page: reqPage,
|
||||
});
|
||||
|
||||
const tenView = applyTableView(tenants, {
|
||||
search: tenSearch,
|
||||
searchOf: (tn) => [
|
||||
tn.metadata.name,
|
||||
tn.spec.displayName,
|
||||
tn.spec.agentName,
|
||||
],
|
||||
sort: tenSort,
|
||||
sortOf: (tn, key) =>
|
||||
key === "name"
|
||||
? tn.spec.displayName || tn.metadata.name
|
||||
: key === "phase"
|
||||
? tn.status?.phase || "Pending"
|
||||
: tn.metadata.creationTimestamp || "",
|
||||
page: tenPage,
|
||||
});
|
||||
|
||||
const onReqSort = (key: string) => {
|
||||
setReqSort((s) => nextSort(s, key));
|
||||
setReqPage(1);
|
||||
};
|
||||
const onTenSort = (key: string) => {
|
||||
setTenSort((s) => nextSort(s, key));
|
||||
setTenPage(1);
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
{/* Tab bar */}
|
||||
@@ -301,20 +385,33 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
{/* ───── REQUESTS TAB ───── */}
|
||||
{tab === "requests" && (
|
||||
<>
|
||||
<div className="flex gap-1.5 mb-4 flex-wrap">
|
||||
{FILTERS.map((f) => (
|
||||
<button
|
||||
key={f}
|
||||
onClick={() => setFilter(f)}
|
||||
className={`px-3 py-1 text-xs rounded-full transition-colors ${
|
||||
filter === f
|
||||
? "bg-accent text-surface-0"
|
||||
: "bg-surface-2 text-text-muted hover:text-text-secondary border border-border"
|
||||
}`}
|
||||
>
|
||||
{t(`filter_${f}`)}
|
||||
</button>
|
||||
))}
|
||||
<div className="flex items-center justify-between gap-3 mb-4 flex-wrap">
|
||||
<div className="flex gap-1.5 flex-wrap">
|
||||
{FILTERS.map((f) => (
|
||||
<button
|
||||
key={f}
|
||||
onClick={() => {
|
||||
setFilter(f);
|
||||
setReqPage(1);
|
||||
}}
|
||||
className={`px-3 py-1 text-xs rounded-full transition-colors ${
|
||||
filter === f
|
||||
? "bg-accent text-surface-0"
|
||||
: "bg-surface-2 text-text-muted hover:text-text-secondary border border-border"
|
||||
}`}
|
||||
>
|
||||
{t(`filter_${f}`)}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
<SearchInput
|
||||
value={reqSearch}
|
||||
onChange={(v) => {
|
||||
setReqSearch(v);
|
||||
setReqPage(1);
|
||||
}}
|
||||
placeholder={t("searchRequestsPlaceholder")}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{loadingRequests ? (
|
||||
@@ -326,15 +423,22 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
<div className="bg-surface-1 border border-border rounded-xl p-12 text-center">
|
||||
<p className="text-text-secondary text-sm">{t("noRequests")}</p>
|
||||
</div>
|
||||
) : reqView.total === 0 ? (
|
||||
<div className="bg-surface-1 border border-border rounded-xl p-12 text-center">
|
||||
<p className="text-text-secondary text-sm">{t("noMatches")}</p>
|
||||
</div>
|
||||
) : (
|
||||
<div className="bg-surface-1 border border-border rounded-xl overflow-hidden">
|
||||
<div className="overflow-x-auto">
|
||||
<table className="w-full text-sm">
|
||||
<thead>
|
||||
<tr className="border-b border-border text-left">
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted">
|
||||
{t("company")}
|
||||
</th>
|
||||
<SortableTh
|
||||
label={t("company")}
|
||||
sortKey="company"
|
||||
sort={reqSort}
|
||||
onSort={onReqSort}
|
||||
/>
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted">
|
||||
{t("contact")}
|
||||
</th>
|
||||
@@ -344,19 +448,26 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted hidden lg:table-cell">
|
||||
{t("packages")}
|
||||
</th>
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted">
|
||||
{t("status")}
|
||||
</th>
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted hidden md:table-cell">
|
||||
{t("submitted")}
|
||||
</th>
|
||||
<SortableTh
|
||||
label={t("status")}
|
||||
sortKey="status"
|
||||
sort={reqSort}
|
||||
onSort={onReqSort}
|
||||
/>
|
||||
<SortableTh
|
||||
label={t("submitted")}
|
||||
sortKey="created"
|
||||
sort={reqSort}
|
||||
onSort={onReqSort}
|
||||
className="hidden md:table-cell"
|
||||
/>
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted">
|
||||
{t("actions")}
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{requests.map((req) => (
|
||||
{reqView.paged.map((req) => (
|
||||
<tr
|
||||
key={req.id}
|
||||
className="border-b border-border last:border-0 hover:bg-surface-2/50 transition-colors"
|
||||
@@ -436,16 +547,20 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
{req.status === "pending" && (
|
||||
<>
|
||||
<button
|
||||
onClick={() => handleApprove(req.id)}
|
||||
onClick={() => {
|
||||
setActionError("");
|
||||
setApproveModal(req.id);
|
||||
}}
|
||||
disabled={actionLoading === req.id}
|
||||
className="px-2.5 py-1 text-xs font-medium bg-emerald-500/15 text-emerald-400 rounded-md hover:bg-emerald-500/25 transition-colors disabled:opacity-50"
|
||||
>
|
||||
{actionLoading === req.id
|
||||
? "…"
|
||||
: t("approve")}
|
||||
{t("approve")}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setRejectModal(req.id)}
|
||||
onClick={() => {
|
||||
setActionError("");
|
||||
setRejectModal(req.id);
|
||||
}}
|
||||
disabled={actionLoading === req.id}
|
||||
className="px-2.5 py-1 text-xs font-medium bg-red-500/15 text-red-400 rounded-md hover:bg-red-500/25 transition-colors disabled:opacity-50"
|
||||
>
|
||||
@@ -466,7 +581,10 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
)}
|
||||
{req.status === "rejected" && (
|
||||
<button
|
||||
onClick={() => handleApprove(req.id)}
|
||||
onClick={() => {
|
||||
setActionError("");
|
||||
setApproveModal(req.id);
|
||||
}}
|
||||
disabled={actionLoading === req.id}
|
||||
className="px-2.5 py-1 text-xs font-medium bg-amber-500/15 text-amber-400 rounded-md hover:bg-amber-500/25 transition-colors disabled:opacity-50"
|
||||
>
|
||||
@@ -485,6 +603,12 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<Pagination
|
||||
page={reqView.page}
|
||||
totalPages={reqView.totalPages}
|
||||
total={reqView.total}
|
||||
onPage={setReqPage}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
@@ -522,6 +646,17 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="flex justify-end mb-4">
|
||||
<SearchInput
|
||||
value={tenSearch}
|
||||
onChange={(v) => {
|
||||
setTenSearch(v);
|
||||
setTenPage(1);
|
||||
}}
|
||||
placeholder={t("searchTenantsPlaceholder")}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{loadingTenants ? (
|
||||
<div className="bg-surface-1 border border-border rounded-xl p-12 text-center">
|
||||
<div className="h-5 w-5 border-2 border-accent border-t-transparent rounded-full animate-spin mx-auto mb-2" />
|
||||
@@ -531,37 +666,51 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
<div className="bg-surface-1 border border-border rounded-xl p-12 text-center">
|
||||
<p className="text-text-secondary text-sm">{t("noTenants")}</p>
|
||||
</div>
|
||||
) : tenView.total === 0 ? (
|
||||
<div className="bg-surface-1 border border-border rounded-xl p-12 text-center">
|
||||
<p className="text-text-secondary text-sm">{t("noMatches")}</p>
|
||||
</div>
|
||||
) : (
|
||||
<div className="bg-surface-1 border border-border rounded-xl overflow-hidden">
|
||||
<div className="overflow-x-auto">
|
||||
<table className="w-full text-sm">
|
||||
<thead>
|
||||
<tr className="border-b border-border text-left">
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted">
|
||||
{t("name")}
|
||||
</th>
|
||||
<SortableTh
|
||||
label={t("name")}
|
||||
sortKey="name"
|
||||
sort={tenSort}
|
||||
onSort={onTenSort}
|
||||
/>
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted">
|
||||
{t("displayName")}
|
||||
</th>
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted">
|
||||
{t("phase")}
|
||||
</th>
|
||||
<SortableTh
|
||||
label={t("phase")}
|
||||
sortKey="phase"
|
||||
sort={tenSort}
|
||||
onSort={onTenSort}
|
||||
/>
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted hidden md:table-cell">
|
||||
{t("packages")}
|
||||
</th>
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted hidden md:table-cell">
|
||||
{t("spendChf")}
|
||||
</th>
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted hidden md:table-cell">
|
||||
{t("created")}
|
||||
</th>
|
||||
<SortableTh
|
||||
label={t("created")}
|
||||
sortKey="created"
|
||||
sort={tenSort}
|
||||
onSort={onTenSort}
|
||||
className="hidden md:table-cell"
|
||||
/>
|
||||
<th className="px-4 py-3 text-xs font-semibold uppercase tracking-wider text-text-muted">
|
||||
{t("actions")}
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{tenants.map((tenant) => {
|
||||
{tenView.paged.map((tenant) => {
|
||||
const tenantSpend =
|
||||
health?.spend?.perTenant?.[tenant.metadata.name];
|
||||
return (
|
||||
@@ -642,9 +791,10 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
: t("suspend")}
|
||||
</button>
|
||||
<button
|
||||
onClick={() =>
|
||||
setDeleteModal(tenant.metadata.name)
|
||||
}
|
||||
onClick={() => {
|
||||
setActionError("");
|
||||
setDeleteModal(tenant.metadata.name);
|
||||
}}
|
||||
disabled={actionLoading === tenant.metadata.name}
|
||||
className="px-2.5 py-1 text-xs font-medium bg-red-500/15 text-red-400 rounded-md hover:bg-red-500/25 transition-colors disabled:opacity-50"
|
||||
>
|
||||
@@ -658,6 +808,12 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<Pagination
|
||||
page={tenView.page}
|
||||
totalPages={tenView.totalPages}
|
||||
total={tenView.total}
|
||||
onPage={setTenPage}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
@@ -772,10 +928,75 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* ───── APPROVE MODAL ───── */}
|
||||
<Modal
|
||||
open={!!approveModal}
|
||||
onClose={() => {
|
||||
setApproveModal(null);
|
||||
setActionError("");
|
||||
}}
|
||||
ariaLabel={t("approveTitle")}
|
||||
>
|
||||
{approveModal &&
|
||||
(() => {
|
||||
const req = requests.find((r) => r.id === approveModal);
|
||||
const isReapprove = req?.status === "rejected";
|
||||
return (
|
||||
<>
|
||||
<h3 className="font-display text-lg font-semibold text-text-primary mb-2">
|
||||
{t("approveTitle")}
|
||||
</h3>
|
||||
<p className="text-sm text-text-secondary mb-2">
|
||||
{isReapprove
|
||||
? t("approveReapproveWarning")
|
||||
: t("approveWarning")}
|
||||
</p>
|
||||
{req && (
|
||||
<p className="text-xs font-mono text-accent bg-surface-2 border border-border rounded-lg px-3 py-2 mb-4">
|
||||
{req.companyName}
|
||||
{req.agentName ? ` · ${req.agentName}` : ""}
|
||||
</p>
|
||||
)}
|
||||
{actionError && (
|
||||
<p className="text-xs text-red-400 bg-red-400/10 border border-red-400/20 rounded-lg px-3 py-2 mb-4">
|
||||
{actionError}
|
||||
</p>
|
||||
)}
|
||||
<div className="flex gap-2 justify-end">
|
||||
<button
|
||||
onClick={() => {
|
||||
setApproveModal(null);
|
||||
setActionError("");
|
||||
}}
|
||||
className="px-4 py-2 text-sm text-text-secondary hover:text-text-primary transition-colors"
|
||||
>
|
||||
{t("cancelAction")}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => handleApprove(approveModal)}
|
||||
disabled={actionLoading === approveModal}
|
||||
className="px-4 py-2 text-sm font-medium bg-emerald-500/15 text-emerald-400 rounded-lg hover:bg-emerald-500/25 transition-colors disabled:opacity-50"
|
||||
>
|
||||
{actionLoading === approveModal ? "…" : t("confirmApprove")}
|
||||
</button>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
})()}
|
||||
</Modal>
|
||||
|
||||
{/* ───── REJECT MODAL ───── */}
|
||||
{rejectModal && (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm">
|
||||
<div className="bg-surface-1 border border-border rounded-xl p-6 max-w-md w-full mx-4 shadow-2xl">
|
||||
<Modal
|
||||
open={!!rejectModal}
|
||||
onClose={() => {
|
||||
setRejectModal(null);
|
||||
setRejectNotes("");
|
||||
setActionError("");
|
||||
}}
|
||||
ariaLabel={t("rejectTitle")}
|
||||
>
|
||||
{rejectModal && (
|
||||
<>
|
||||
<h3 className="font-display text-lg font-semibold text-text-primary mb-4">
|
||||
{t("rejectTitle")}
|
||||
</h3>
|
||||
@@ -789,11 +1010,17 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
rows={3}
|
||||
className="w-full px-3 py-2 bg-surface-2 border border-border rounded-lg text-sm text-text-primary placeholder:text-text-muted focus:outline-none focus:ring-1 focus:ring-accent focus:border-accent transition-colors resize-none mb-4"
|
||||
/>
|
||||
{actionError && (
|
||||
<p className="text-xs text-red-400 bg-red-400/10 border border-red-400/20 rounded-lg px-3 py-2 mb-4">
|
||||
{actionError}
|
||||
</p>
|
||||
)}
|
||||
<div className="flex gap-2 justify-end">
|
||||
<button
|
||||
onClick={() => {
|
||||
setRejectModal(null);
|
||||
setRejectNotes("");
|
||||
setActionError("");
|
||||
}}
|
||||
className="px-4 py-2 text-sm text-text-secondary hover:text-text-primary transition-colors"
|
||||
>
|
||||
@@ -807,14 +1034,21 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
{actionLoading === rejectModal ? "…" : t("confirmReject")}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</Modal>
|
||||
|
||||
{/* ───── DELETE MODAL ───── */}
|
||||
{deleteModal && (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm">
|
||||
<div className="bg-surface-1 border border-border rounded-xl p-6 max-w-md w-full mx-4 shadow-2xl">
|
||||
<Modal
|
||||
open={!!deleteModal}
|
||||
onClose={() => {
|
||||
setDeleteModal(null);
|
||||
setActionError("");
|
||||
}}
|
||||
ariaLabel={t("deleteTitle")}
|
||||
>
|
||||
{deleteModal && (
|
||||
<>
|
||||
<h3 className="font-display text-lg font-semibold text-text-primary mb-2">
|
||||
{t("deleteTitle")}
|
||||
</h3>
|
||||
@@ -824,9 +1058,17 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
<p className="text-xs font-mono text-accent bg-surface-2 border border-border rounded-lg px-3 py-2 mb-4">
|
||||
{deleteModal}
|
||||
</p>
|
||||
{actionError && (
|
||||
<p className="text-xs text-red-400 bg-red-400/10 border border-red-400/20 rounded-lg px-3 py-2 mb-4">
|
||||
{actionError}
|
||||
</p>
|
||||
)}
|
||||
<div className="flex gap-2 justify-end">
|
||||
<button
|
||||
onClick={() => setDeleteModal(null)}
|
||||
onClick={() => {
|
||||
setDeleteModal(null);
|
||||
setActionError("");
|
||||
}}
|
||||
className="px-4 py-2 text-sm text-text-secondary hover:text-text-primary transition-colors"
|
||||
>
|
||||
{t("cancelAction")}
|
||||
@@ -839,9 +1081,9 @@ export function AdminPanel({ initialTenants }: AdminPanelProps) {
|
||||
{actionLoading === deleteModal ? "…" : t("confirmDelete")}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</Modal>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useTranslations } from "next-intl";
|
||||
import { Card } from "@/components/ui/card";
|
||||
@@ -104,25 +104,14 @@ export function NewInvoiceForm({ orgs }: Props) {
|
||||
<label className="text-xs uppercase tracking-wider text-text-muted">
|
||||
{t("newInvoiceOrgLabel")}
|
||||
</label>
|
||||
<select
|
||||
<OrgCombobox
|
||||
orgs={orgs}
|
||||
value={orgId}
|
||||
onChange={(e) => onOrgChange(e.target.value)}
|
||||
className="px-3 py-2 rounded-md border border-border bg-surface-2 text-sm"
|
||||
>
|
||||
<option value="">{t("newInvoiceOrgPlaceholder")}</option>
|
||||
{orgs.map((o) => (
|
||||
<option
|
||||
key={o.zitadelOrgId}
|
||||
value={o.zitadelOrgId}
|
||||
disabled={!o.hasBillingAddress}
|
||||
>
|
||||
{o.companyName ?? o.zitadelOrgId}
|
||||
{!o.hasBillingAddress
|
||||
? ` (${t("newInvoiceOrgNoBilling")})`
|
||||
: ""}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
onChange={onOrgChange}
|
||||
placeholder={t("newInvoiceOrgPlaceholder")}
|
||||
noBillingLabel={t("newInvoiceOrgNoBilling")}
|
||||
noMatchesLabel={t("newInvoiceOrgNoMatches")}
|
||||
/>
|
||||
{selected && !selected.hasBillingAddress && (
|
||||
<p className="text-xs text-error mt-1">
|
||||
{t("newInvoiceOrgBillingMissing")}
|
||||
@@ -164,3 +153,138 @@ export function NewInvoiceForm({ orgs }: Props) {
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Searchable single-select for the billing org. Replaces a plain
|
||||
* <select> that would become unusable once the customer list grows:
|
||||
* type to filter by company name or org id, arrow keys to move, Enter
|
||||
* to pick. Orgs without a billing snapshot stay selectable but are
|
||||
* flagged — selecting one surfaces the existing "billing missing"
|
||||
* warning and keeps the submit button disabled.
|
||||
*/
|
||||
function OrgCombobox({
|
||||
orgs,
|
||||
value,
|
||||
onChange,
|
||||
placeholder,
|
||||
noBillingLabel,
|
||||
noMatchesLabel,
|
||||
}: {
|
||||
orgs: OrgEntry[];
|
||||
value: string;
|
||||
onChange: (orgId: string) => void;
|
||||
placeholder: string;
|
||||
noBillingLabel: string;
|
||||
noMatchesLabel: string;
|
||||
}) {
|
||||
const [open, setOpen] = useState(false);
|
||||
const [query, setQuery] = useState("");
|
||||
const [hi, setHi] = useState(0);
|
||||
const ref = useRef<HTMLDivElement>(null);
|
||||
|
||||
const selected = orgs.find((o) => o.zitadelOrgId === value) || null;
|
||||
const display = selected ? selected.companyName ?? selected.zitadelOrgId : "";
|
||||
|
||||
// Close on outside click so the dropdown doesn't linger.
|
||||
useEffect(() => {
|
||||
const onDoc = (e: MouseEvent) => {
|
||||
if (ref.current && !ref.current.contains(e.target as Node)) {
|
||||
setOpen(false);
|
||||
}
|
||||
};
|
||||
document.addEventListener("mousedown", onDoc);
|
||||
return () => document.removeEventListener("mousedown", onDoc);
|
||||
}, []);
|
||||
|
||||
const q = query.trim().toLowerCase();
|
||||
const filtered = q
|
||||
? orgs.filter(
|
||||
(o) =>
|
||||
(o.companyName ?? "").toLowerCase().includes(q) ||
|
||||
o.zitadelOrgId.toLowerCase().includes(q)
|
||||
)
|
||||
: orgs;
|
||||
|
||||
const choose = (o: OrgEntry) => {
|
||||
onChange(o.zitadelOrgId);
|
||||
setOpen(false);
|
||||
setQuery("");
|
||||
};
|
||||
|
||||
return (
|
||||
<div ref={ref} className="relative">
|
||||
<input
|
||||
type="text"
|
||||
value={open ? query : display}
|
||||
onChange={(e) => {
|
||||
setQuery(e.target.value);
|
||||
setOpen(true);
|
||||
setHi(0);
|
||||
}}
|
||||
onFocus={() => {
|
||||
setOpen(true);
|
||||
setQuery("");
|
||||
}}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "ArrowDown") {
|
||||
e.preventDefault();
|
||||
setOpen(true);
|
||||
setHi((h) => Math.min(h + 1, filtered.length - 1));
|
||||
} else if (e.key === "ArrowUp") {
|
||||
e.preventDefault();
|
||||
setHi((h) => Math.max(h - 1, 0));
|
||||
} else if (e.key === "Enter") {
|
||||
e.preventDefault();
|
||||
if (open && filtered[hi]) choose(filtered[hi]);
|
||||
} else if (e.key === "Escape") {
|
||||
setOpen(false);
|
||||
}
|
||||
}}
|
||||
placeholder={placeholder}
|
||||
role="combobox"
|
||||
aria-expanded={open}
|
||||
aria-autocomplete="list"
|
||||
className="w-full px-3 py-2 rounded-md border border-border bg-surface-2 text-sm text-text-primary placeholder:text-text-muted focus:outline-none focus:ring-1 focus:ring-accent focus:border-accent transition-colors"
|
||||
/>
|
||||
{open && (
|
||||
<ul
|
||||
role="listbox"
|
||||
className="absolute z-20 mt-1 max-h-64 w-full overflow-auto rounded-md border border-border bg-surface-1 shadow-xl py-1"
|
||||
>
|
||||
{filtered.length === 0 ? (
|
||||
<li className="px-3 py-2 text-xs text-text-muted">
|
||||
{noMatchesLabel}
|
||||
</li>
|
||||
) : (
|
||||
filtered.map((o, i) => (
|
||||
<li
|
||||
key={o.zitadelOrgId}
|
||||
role="option"
|
||||
aria-selected={o.zitadelOrgId === value}
|
||||
onMouseEnter={() => setHi(i)}
|
||||
// mousedown (not click) so selection runs before the
|
||||
// input's blur closes the list.
|
||||
onMouseDown={(e) => {
|
||||
e.preventDefault();
|
||||
choose(o);
|
||||
}}
|
||||
className={`px-3 py-2 text-sm cursor-pointer flex items-center justify-between gap-2 ${
|
||||
i === hi ? "bg-surface-3" : "hover:bg-surface-2"
|
||||
}`}
|
||||
>
|
||||
<span className="truncate text-text-primary">
|
||||
{o.companyName ?? o.zitadelOrgId}
|
||||
</span>
|
||||
{!o.hasBillingAddress && (
|
||||
<span className="text-[10px] text-error shrink-0">
|
||||
{noBillingLabel}
|
||||
</span>
|
||||
)}
|
||||
</li>
|
||||
))
|
||||
)}
|
||||
</ul>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
190
src/components/admin/table-controls.tsx
Normal file
190
src/components/admin/table-controls.tsx
Normal file
@@ -0,0 +1,190 @@
|
||||
"use client";
|
||||
|
||||
import { useTranslations } from "next-intl";
|
||||
|
||||
/**
|
||||
* Shared client-side table controls for the admin panel.
|
||||
*
|
||||
* The admin tables (requests, tenants) load their full result set into
|
||||
* state already, so search/sort/pagination are applied client-side on
|
||||
* top — no new API surface. At pilot scale the lists are small enough
|
||||
* that filtering/sorting in memory is free; if they grow past a few
|
||||
* hundred rows this is the seam to move server-side (the page/sort
|
||||
* state would become query params).
|
||||
*/
|
||||
|
||||
export const PAGE_SIZE = 15;
|
||||
|
||||
export interface SortState {
|
||||
key: string;
|
||||
dir: "asc" | "desc";
|
||||
}
|
||||
|
||||
/**
|
||||
* Filter → sort → paginate a list. Pure function, called during render.
|
||||
* `searchOf` returns the haystack strings for a row; `sortOf` returns
|
||||
* the comparable value for the active sort key (string or number).
|
||||
*/
|
||||
export function applyTableView<T>(
|
||||
items: T[],
|
||||
opts: {
|
||||
search: string;
|
||||
searchOf: (item: T) => (string | null | undefined)[];
|
||||
sort: SortState;
|
||||
sortOf: (item: T, key: string) => string | number;
|
||||
page: number;
|
||||
pageSize?: number;
|
||||
}
|
||||
): { paged: T[]; total: number; totalPages: number; page: number } {
|
||||
const pageSize = opts.pageSize ?? PAGE_SIZE;
|
||||
|
||||
const q = opts.search.trim().toLowerCase();
|
||||
const filtered = q
|
||||
? items.filter((it) =>
|
||||
opts
|
||||
.searchOf(it)
|
||||
.some((v) => (v ?? "").toString().toLowerCase().includes(q))
|
||||
)
|
||||
: items;
|
||||
|
||||
const sorted = [...filtered].sort((a, b) => {
|
||||
const av = opts.sortOf(a, opts.sort.key);
|
||||
const bv = opts.sortOf(b, opts.sort.key);
|
||||
const cmp =
|
||||
typeof av === "number" && typeof bv === "number"
|
||||
? av - bv
|
||||
: String(av).localeCompare(String(bv));
|
||||
return opts.sort.dir === "asc" ? cmp : -cmp;
|
||||
});
|
||||
|
||||
const total = sorted.length;
|
||||
const totalPages = Math.max(1, Math.ceil(total / pageSize));
|
||||
const page = Math.min(Math.max(1, opts.page), totalPages);
|
||||
const paged = sorted.slice((page - 1) * pageSize, page * pageSize);
|
||||
|
||||
return { paged, total, totalPages, page };
|
||||
}
|
||||
|
||||
/** Toggle helper: same key flips direction, new key starts ascending. */
|
||||
export function nextSort(current: SortState, key: string): SortState {
|
||||
if (current.key === key) {
|
||||
return { key, dir: current.dir === "asc" ? "desc" : "asc" };
|
||||
}
|
||||
return { key, dir: "asc" };
|
||||
}
|
||||
|
||||
export function SearchInput({
|
||||
value,
|
||||
onChange,
|
||||
placeholder,
|
||||
}: {
|
||||
value: string;
|
||||
onChange: (v: string) => void;
|
||||
placeholder: string;
|
||||
}) {
|
||||
return (
|
||||
<div className="relative">
|
||||
<svg
|
||||
className="absolute left-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-text-muted pointer-events-none"
|
||||
fill="none"
|
||||
viewBox="0 0 24 24"
|
||||
stroke="currentColor"
|
||||
strokeWidth={1.75}
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
d="M21 21l-4.35-4.35M17 11a6 6 0 11-12 0 6 6 0 0112 0z"
|
||||
/>
|
||||
</svg>
|
||||
<input
|
||||
type="search"
|
||||
value={value}
|
||||
onChange={(e) => onChange(e.target.value)}
|
||||
placeholder={placeholder}
|
||||
className="w-full sm:w-72 pl-8 pr-3 py-2 bg-surface-2 border border-border rounded-lg text-sm text-text-primary placeholder:text-text-muted focus:outline-none focus:ring-1 focus:ring-accent focus:border-accent transition-colors"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export function SortableTh({
|
||||
label,
|
||||
sortKey,
|
||||
sort,
|
||||
onSort,
|
||||
className,
|
||||
}: {
|
||||
label: string;
|
||||
sortKey: string;
|
||||
sort: SortState;
|
||||
onSort: (key: string) => void;
|
||||
className?: string;
|
||||
}) {
|
||||
const active = sort.key === sortKey;
|
||||
return (
|
||||
<th className={`px-4 py-3 ${className ?? ""}`}>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => onSort(sortKey)}
|
||||
className={`inline-flex items-center gap-1 text-xs font-semibold uppercase tracking-wider transition-colors cursor-pointer ${
|
||||
active ? "text-text-secondary" : "text-text-muted hover:text-text-secondary"
|
||||
}`}
|
||||
aria-sort={active ? (sort.dir === "asc" ? "ascending" : "descending") : "none"}
|
||||
>
|
||||
{label}
|
||||
<span className="inline-block w-2 text-[9px]" aria-hidden="true">
|
||||
{active ? (sort.dir === "asc" ? "▲" : "▼") : ""}
|
||||
</span>
|
||||
</button>
|
||||
</th>
|
||||
);
|
||||
}
|
||||
|
||||
export function Pagination({
|
||||
page,
|
||||
totalPages,
|
||||
total,
|
||||
onPage,
|
||||
}: {
|
||||
page: number;
|
||||
totalPages: number;
|
||||
total: number;
|
||||
onPage: (p: number) => void;
|
||||
}) {
|
||||
const t = useTranslations("admin");
|
||||
if (totalPages <= 1) {
|
||||
return (
|
||||
<div className="flex items-center justify-end px-4 py-2.5 border-t border-border text-xs text-text-muted">
|
||||
<span>{t("paginationCount", { total })}</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
return (
|
||||
<div className="flex items-center justify-between px-4 py-2.5 border-t border-border text-xs text-text-muted gap-3">
|
||||
<span className="tabular-nums">{t("paginationCount", { total })}</span>
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => onPage(page - 1)}
|
||||
disabled={page <= 1}
|
||||
className="px-2.5 py-1 rounded-md border border-border hover:bg-surface-2 disabled:opacity-40 disabled:cursor-not-allowed transition-colors cursor-pointer"
|
||||
>
|
||||
{t("paginationPrev")}
|
||||
</button>
|
||||
<span className="tabular-nums">
|
||||
{t("paginationPage", { page, total: totalPages })}
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => onPage(page + 1)}
|
||||
disabled={page >= totalPages}
|
||||
className="px-2.5 py-1 rounded-md border border-border hover:bg-surface-2 disabled:opacity-40 disabled:cursor-not-allowed transition-colors cursor-pointer"
|
||||
>
|
||||
{t("paginationNext")}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useTranslations } from "next-intl";
|
||||
import { useTranslations, useLocale } from "next-intl";
|
||||
import { useEffect, useState, useCallback } from "react";
|
||||
import { BudgetEditableCard } from "@/components/dashboard/budget-editable-card";
|
||||
|
||||
@@ -84,42 +84,149 @@ function formatMonth(month: string, locale: string): string {
|
||||
}
|
||||
|
||||
function UsageChart({ data }: { data: DailyUsage[] }) {
|
||||
const t = useTranslations("usage");
|
||||
const locale = useLocale();
|
||||
// Which day's detail is shown in the readout. Defaults to the most
|
||||
// recent day; hover (mouse), tap (touch) or focus (keyboard) all
|
||||
// update it. The previous version put per-day numbers only in SVG
|
||||
// <title> hover tooltips, which are unreachable on touch devices and
|
||||
// invisible to keyboard users — this readout fixes both.
|
||||
const [selected, setSelected] = useState<number | null>(null);
|
||||
|
||||
if (!data.length) return null;
|
||||
const maxTokens = Math.max(...data.map((d) => d.inputTokens + d.outputTokens), 1);
|
||||
|
||||
const maxTokens = Math.max(
|
||||
...data.map((d) => d.inputTokens + d.outputTokens),
|
||||
1
|
||||
);
|
||||
const barW = Math.max(4, Math.floor(600 / data.length) - 2);
|
||||
const h = 120;
|
||||
|
||||
const activeIndex = selected ?? data.length - 1;
|
||||
const active = data[activeIndex];
|
||||
|
||||
const dayLabel = (iso: string) => {
|
||||
const [y, m, dd] = iso.split("-").map(Number);
|
||||
return new Date(y, m - 1, dd).toLocaleDateString(locale, {
|
||||
month: "short",
|
||||
day: "numeric",
|
||||
});
|
||||
};
|
||||
|
||||
const barAria = (d: DailyUsage) =>
|
||||
`${dayLabel(d.date)}: ${fmt(d.inputTokens)} ${t("inputTokens")}, ${fmt(
|
||||
d.outputTokens
|
||||
)} ${t("outputTokens")}, ${chf(d.spend)}`;
|
||||
|
||||
return (
|
||||
<div className="overflow-x-auto">
|
||||
<svg
|
||||
viewBox={`0 0 ${Math.max(data.length * (barW + 2), 600)} ${h + 24}`}
|
||||
className="w-full h-36"
|
||||
preserveAspectRatio="xMinYMid meet"
|
||||
>
|
||||
{data.map((d, i) => {
|
||||
const total = d.inputTokens + d.outputTokens;
|
||||
const totalH = (total / maxTokens) * h;
|
||||
const inputH = (d.inputTokens / maxTokens) * h;
|
||||
const x = i * (barW + 2);
|
||||
return (
|
||||
<g key={d.date}>
|
||||
<title>{d.date}: {fmt(d.inputTokens)} in / {fmt(d.outputTokens)} out — {chf(d.spend)}</title>
|
||||
<rect x={x} y={h - totalH} width={barW} height={totalH - inputH} rx={1} fill="var(--color-accent)" opacity={0.3} />
|
||||
<rect x={x} y={h - inputH} width={barW} height={inputH} rx={1} fill="var(--color-accent)" opacity={0.7} />
|
||||
{i % 7 === 0 && (
|
||||
<text x={x + barW / 2} y={h + 14} textAnchor="middle" fill="var(--color-text-muted)" fontSize="8">{d.date.slice(8)}</text>
|
||||
)}
|
||||
</g>
|
||||
);
|
||||
})}
|
||||
</svg>
|
||||
<div>
|
||||
{/* Readout — the touch/keyboard-accessible equivalent of the old
|
||||
hover-only tooltip. Always reflects the active day. */}
|
||||
<div className="flex flex-wrap items-baseline gap-x-3 gap-y-1 mb-2 text-xs">
|
||||
<span className="font-medium text-text-primary">
|
||||
{dayLabel(active.date)}
|
||||
</span>
|
||||
<span className="text-text-secondary tabular-nums">
|
||||
{fmt(active.inputTokens)} {t("inputTokens")}
|
||||
</span>
|
||||
<span className="text-text-secondary tabular-nums">
|
||||
{fmt(active.outputTokens)} {t("outputTokens")}
|
||||
</span>
|
||||
<span className="text-accent tabular-nums">{chf(active.spend)}</span>
|
||||
</div>
|
||||
|
||||
<div className="overflow-x-auto">
|
||||
<svg
|
||||
viewBox={`0 0 ${Math.max(data.length * (barW + 2), 600)} ${h + 24}`}
|
||||
className="w-full h-36"
|
||||
preserveAspectRatio="xMinYMid meet"
|
||||
role="group"
|
||||
aria-label={t("dailyBreakdown")}
|
||||
>
|
||||
{data.map((d, i) => {
|
||||
const total = d.inputTokens + d.outputTokens;
|
||||
const totalH = (total / maxTokens) * h;
|
||||
const inputH = (d.inputTokens / maxTokens) * h;
|
||||
const x = i * (barW + 2);
|
||||
const isActive = i === activeIndex;
|
||||
return (
|
||||
<g
|
||||
key={d.date}
|
||||
role="button"
|
||||
tabIndex={0}
|
||||
aria-label={barAria(d)}
|
||||
aria-pressed={isActive}
|
||||
className="cursor-pointer focus:outline-none"
|
||||
onClick={() => setSelected(i)}
|
||||
onMouseEnter={() => setSelected(i)}
|
||||
onFocus={() => setSelected(i)}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "Enter" || e.key === " ") {
|
||||
e.preventDefault();
|
||||
setSelected(i);
|
||||
}
|
||||
}}
|
||||
>
|
||||
<title>{barAria(d)}</title>
|
||||
{/* Full-height transparent hit area so thin bars stay
|
||||
easy to tap on touch screens. */}
|
||||
<rect x={x} y={0} width={barW} height={h} fill="transparent" />
|
||||
<rect
|
||||
x={x}
|
||||
y={h - totalH}
|
||||
width={barW}
|
||||
height={Math.max(0, totalH - inputH)}
|
||||
rx={1}
|
||||
fill="var(--color-accent)"
|
||||
opacity={isActive ? 0.5 : 0.3}
|
||||
/>
|
||||
<rect
|
||||
x={x}
|
||||
y={h - inputH}
|
||||
width={barW}
|
||||
height={inputH}
|
||||
rx={1}
|
||||
fill="var(--color-accent)"
|
||||
opacity={isActive ? 1 : 0.7}
|
||||
/>
|
||||
{isActive && (
|
||||
<rect
|
||||
x={x - 1}
|
||||
y={Math.max(0, h - totalH) - 1}
|
||||
width={barW + 2}
|
||||
height={Math.max(2, totalH) + 1}
|
||||
rx={1.5}
|
||||
fill="none"
|
||||
stroke="var(--color-accent)"
|
||||
strokeWidth={1}
|
||||
/>
|
||||
)}
|
||||
{i % 7 === 0 && (
|
||||
<text
|
||||
x={x + barW / 2}
|
||||
y={h + 14}
|
||||
textAnchor="middle"
|
||||
fill="var(--color-text-muted)"
|
||||
fontSize="8"
|
||||
>
|
||||
{d.date.slice(8)}
|
||||
</text>
|
||||
)}
|
||||
</g>
|
||||
);
|
||||
})}
|
||||
</svg>
|
||||
</div>
|
||||
<div className="flex items-center gap-4 text-xs text-text-muted mt-1">
|
||||
<span className="flex items-center gap-1">
|
||||
<span className="inline-block h-2 w-2 rounded-sm bg-accent opacity-70" /> Input
|
||||
<span className="inline-block h-2 w-2 rounded-sm bg-accent opacity-70" />{" "}
|
||||
{t("legendInput")}
|
||||
</span>
|
||||
<span className="flex items-center gap-1">
|
||||
<span className="inline-block h-2 w-2 rounded-sm bg-accent opacity-30" /> Output
|
||||
<span className="inline-block h-2 w-2 rounded-sm bg-accent opacity-30" />{" "}
|
||||
{t("legendOutput")}
|
||||
</span>
|
||||
<span className="ml-auto text-text-muted/70">{t("chartHint")}</span>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
@@ -161,6 +268,7 @@ export function UsageDisplay({
|
||||
canEditBudget?: boolean;
|
||||
}) {
|
||||
const t = useTranslations("usage");
|
||||
const locale = useLocale();
|
||||
const [month, setMonth] = useState(getCurrentMonth);
|
||||
const [data, setData] = useState<UsageData | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
@@ -202,7 +310,7 @@ export function UsageDisplay({
|
||||
←
|
||||
</button>
|
||||
<span className="font-display text-sm font-medium text-text-primary">
|
||||
{formatMonth(month, "en")}
|
||||
{formatMonth(month, locale)}
|
||||
</span>
|
||||
<button
|
||||
onClick={() => setMonth((m) => shiftMonth(m, 1))}
|
||||
|
||||
@@ -8,6 +8,7 @@ import { Link } from "@/i18n/navigation";
|
||||
import { SessionProvider } from "next-auth/react";
|
||||
import type { Session } from "next-auth";
|
||||
import { LanguageSwitcher } from "@/components/ui/language-switcher";
|
||||
import { Logo } from "@/components/ui/logo";
|
||||
|
||||
function NavBar() {
|
||||
const t = useTranslations("common");
|
||||
@@ -79,11 +80,8 @@ function NavBar() {
|
||||
{/* Logo / brand */}
|
||||
<div className="flex items-center gap-6">
|
||||
<Link href="/dashboard" className="flex items-center gap-2.5 group">
|
||||
{/* Geometric mark */}
|
||||
<div className="relative h-7 w-7">
|
||||
<div className="absolute inset-0 rounded-md bg-accent/20 group-hover:bg-accent/30 transition-colors" />
|
||||
<div className="absolute inset-[3px] rounded-sm bg-accent" />
|
||||
</div>
|
||||
{/* Brand mark */}
|
||||
<Logo className="h-7 w-auto text-accent group-hover:text-accent-dim transition-colors" />
|
||||
<span className="font-display text-base font-semibold tracking-tight text-text-primary">
|
||||
{t("appName")}
|
||||
</span>
|
||||
|
||||
@@ -31,6 +31,12 @@ interface OnboardingFlowProps {
|
||||
* step. Forwarded straight to the wizard.
|
||||
*/
|
||||
setupFeeChf?: number | null;
|
||||
/**
|
||||
* Recurring per-tenant monthly fee (net CHF). Forwarded to the
|
||||
* wizard's review-step cost summary so the customer sees the ongoing
|
||||
* commitment, not just the one-time setup fee.
|
||||
*/
|
||||
monthlyFeeChf?: number | null;
|
||||
/**
|
||||
* Bug 6: when present, the wizard is rendered in edit mode against
|
||||
* the given pending request. See `OnboardingWizard` for the full
|
||||
@@ -59,6 +65,7 @@ export function OnboardingFlow({
|
||||
hasOrgBilling,
|
||||
existingOrgBilling,
|
||||
setupFeeChf,
|
||||
monthlyFeeChf,
|
||||
editingRequest,
|
||||
}: OnboardingFlowProps) {
|
||||
const router = useRouter();
|
||||
@@ -71,6 +78,7 @@ export function OnboardingFlow({
|
||||
hasOrgBilling={hasOrgBilling}
|
||||
existingOrgBilling={existingOrgBilling}
|
||||
setupFeeChf={setupFeeChf}
|
||||
monthlyFeeChf={monthlyFeeChf}
|
||||
editingRequest={editingRequest}
|
||||
onComplete={() => {
|
||||
// Navigate back to /dashboard and re-fetch on the server. The
|
||||
|
||||
@@ -432,25 +432,35 @@ export function ProvisioningStatus({ requestId, canAct }: Props) {
|
||||
<span className="text-xs text-text-muted">{t("phase")}</span>
|
||||
<StatusBadge phase={phase} />
|
||||
</div>
|
||||
{conditions.map((c, i) => (
|
||||
<div
|
||||
key={i}
|
||||
className="flex items-center justify-between bg-surface-2 border border-border rounded-lg px-4 py-2"
|
||||
>
|
||||
<span className="text-xs text-text-muted">{c.type}</span>
|
||||
<span
|
||||
className={`text-xs font-mono ${
|
||||
c.status === "True"
|
||||
? "text-emerald-400"
|
||||
: c.status === "False"
|
||||
? "text-red-400"
|
||||
: "text-text-muted"
|
||||
}`}
|
||||
>
|
||||
{c.reason || c.status}
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
{/* Setup progress. The operator reports readiness as a list of
|
||||
internal K8s conditions (OpenBao policy, LiteLLM key, network
|
||||
policy, …) — meaningful to operators, jargon to customers.
|
||||
We surface the *shape* of that progress (how many steps are
|
||||
done) without leaking the internal names. */}
|
||||
{conditions.length > 0 &&
|
||||
(() => {
|
||||
const done = conditions.filter((c) => c.status === "True").length;
|
||||
const total = conditions.length;
|
||||
const pct = Math.round((done / total) * 100);
|
||||
return (
|
||||
<div className="bg-surface-2 border border-border rounded-lg px-4 py-3">
|
||||
<div className="flex items-center justify-between mb-2">
|
||||
<span className="text-xs text-text-muted">
|
||||
{t("setupProgress")}
|
||||
</span>
|
||||
<span className="text-xs font-medium text-text-secondary tabular-nums">
|
||||
{t("setupStepsComplete", { done, total })}
|
||||
</span>
|
||||
</div>
|
||||
<div className="h-1.5 w-full rounded-full bg-surface-3 overflow-hidden">
|
||||
<div
|
||||
className="h-full bg-accent transition-all duration-500"
|
||||
style={{ width: `${pct}%` }}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})()}
|
||||
</div>
|
||||
</Card>
|
||||
);
|
||||
@@ -487,12 +497,27 @@ export function ProvisioningStatus({ requestId, canAct }: Props) {
|
||||
<p className="text-sm text-text-secondary max-w-sm mx-auto mb-4">
|
||||
{t("readyDescription")}
|
||||
</p>
|
||||
<button
|
||||
onClick={() => window.location.reload()}
|
||||
className="py-2 px-6 bg-accent text-surface-0 text-sm font-medium rounded-lg hover:bg-accent-dim transition-colors"
|
||||
>
|
||||
{t("goToDashboard")}
|
||||
</button>
|
||||
{(() => {
|
||||
// Prefer deep-linking straight to the tenant page, where the
|
||||
// ConnectPanel shows how to start chatting. Fall back to a
|
||||
// reload only if we somehow don't have a tenant name yet.
|
||||
const tenantName = data.tenant?.name || data.request.tenantName;
|
||||
return tenantName ? (
|
||||
<Link
|
||||
href={`/tenants/${tenantName}`}
|
||||
className="inline-block py-2 px-6 bg-accent text-surface-0 text-sm font-medium rounded-lg hover:bg-accent-dim transition-colors"
|
||||
>
|
||||
{t("connectCta")}
|
||||
</Link>
|
||||
) : (
|
||||
<button
|
||||
onClick={() => window.location.reload()}
|
||||
className="py-2 px-6 bg-accent text-surface-0 text-sm font-medium rounded-lg hover:bg-accent-dim transition-colors"
|
||||
>
|
||||
{t("goToDashboard")}
|
||||
</button>
|
||||
);
|
||||
})()}
|
||||
</div>
|
||||
</Card>
|
||||
);
|
||||
|
||||
@@ -117,6 +117,13 @@ interface WizardProps {
|
||||
* the order skips the Checkout redirect (handled server-side).
|
||||
*/
|
||||
setupFeeChf?: number | null;
|
||||
/**
|
||||
* The platform's recurring per-tenant monthly fee (net CHF, before
|
||||
* VAT). Shown on the review step alongside the setup fee so the
|
||||
* customer sees the ongoing commitment — not just the one-time
|
||||
* charge — before submitting. Null/0 hides the monthly line.
|
||||
*/
|
||||
monthlyFeeChf?: number | null;
|
||||
/**
|
||||
* Bug 6: when present, the wizard renders in "edit" mode — fields
|
||||
* are pre-populated from the request, the SOUL.md auto-fetch is
|
||||
@@ -157,6 +164,7 @@ export function OnboardingWizard({
|
||||
hasOrgBilling,
|
||||
existingOrgBilling,
|
||||
setupFeeChf,
|
||||
monthlyFeeChf,
|
||||
editingRequest,
|
||||
onComplete,
|
||||
}: WizardProps) {
|
||||
@@ -420,18 +428,51 @@ export function OnboardingWizard({
|
||||
[]
|
||||
);
|
||||
|
||||
// Validate that all secret-requiring enabled packages have complete credentials
|
||||
const packageCredentialsValid = (): boolean => {
|
||||
// Enabled packages that still need something from the user before the
|
||||
// configure step can advance — a missing credential field or an
|
||||
// unaccepted disclaimer. Returns the package defs so the UI can name
|
||||
// exactly what's blocking the (otherwise silently disabled) Next
|
||||
// button instead of greying it out with no explanation.
|
||||
const incompletePackages = (): PackageDef[] => {
|
||||
const out: PackageDef[] = [];
|
||||
for (const pkgId of config.packages) {
|
||||
const def = PACKAGE_CATALOG.find((p) => p.id === pkgId);
|
||||
if (!def?.requiresSecrets) continue;
|
||||
const secrets = packageSecrets[pkgId] || {};
|
||||
for (const field of def.secrets || []) {
|
||||
if (!secrets[field.key]?.trim()) return false;
|
||||
if (!def) continue;
|
||||
let incomplete = false;
|
||||
if (def.requiresSecrets) {
|
||||
const secrets = packageSecrets[pkgId] || {};
|
||||
for (const field of def.secrets || []) {
|
||||
if (!secrets[field.key]?.trim()) {
|
||||
incomplete = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (def.disclaimerKey && !disclaimerAccepted[pkgId]) return false;
|
||||
if (def.disclaimerKey && !disclaimerAccepted[pkgId]) incomplete = true;
|
||||
if (incomplete) out.push(def);
|
||||
}
|
||||
return true;
|
||||
return out;
|
||||
};
|
||||
|
||||
const packageCredentialsValid = (): boolean =>
|
||||
incompletePackages().length === 0;
|
||||
|
||||
// Map zod field paths to human labels for the confirm-step error
|
||||
// summary, so a stray validation failure reads "Postal code" rather
|
||||
// than "billingAddress.postalCode". Unknown paths fall back to the
|
||||
// raw path (this defence-in-depth list should rarely render at all).
|
||||
const fieldLabel = (path: string): string => {
|
||||
const map: Record<string, string> = {
|
||||
instanceName: t("instanceName"),
|
||||
agentName: t("agentName"),
|
||||
"billingAddress.company": t("billingCompany"),
|
||||
"billingAddress.street": t("billingStreet"),
|
||||
"billingAddress.postalCode": t("billingPostalCode"),
|
||||
"billingAddress.city": t("billingCity"),
|
||||
"billingAddress.country": t("billingCountry"),
|
||||
"billingAddress.vatNumber": t("billingVatNumber"),
|
||||
};
|
||||
return map[path] ?? path;
|
||||
};
|
||||
|
||||
const handleSubmit = async () => {
|
||||
@@ -984,20 +1025,33 @@ export function OnboardingWizard({
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex justify-between mt-6">
|
||||
<button
|
||||
onClick={goBack}
|
||||
className="py-2 px-4 text-sm text-text-secondary hover:text-text-primary transition-colors"
|
||||
>
|
||||
{t("back")}
|
||||
</button>
|
||||
<button
|
||||
onClick={goNext}
|
||||
disabled={!packageCredentialsValid()}
|
||||
className="py-2 px-6 bg-accent text-surface-0 text-sm font-medium rounded-lg hover:bg-accent-dim transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
|
||||
>
|
||||
{t("next")}
|
||||
</button>
|
||||
<div className="mt-6">
|
||||
{(() => {
|
||||
const blocking = incompletePackages();
|
||||
if (blocking.length === 0) return null;
|
||||
return (
|
||||
<p className="text-xs text-amber-400/90 mb-3 text-right">
|
||||
{t("packagesIncompleteHint", {
|
||||
packages: blocking.map((p) => p.name).join(", "),
|
||||
})}
|
||||
</p>
|
||||
);
|
||||
})()}
|
||||
<div className="flex justify-between">
|
||||
<button
|
||||
onClick={goBack}
|
||||
className="py-2 px-4 text-sm text-text-secondary hover:text-text-primary transition-colors"
|
||||
>
|
||||
{t("back")}
|
||||
</button>
|
||||
<button
|
||||
onClick={goNext}
|
||||
disabled={!packageCredentialsValid()}
|
||||
className="py-2 px-6 bg-accent text-surface-0 text-sm font-medium rounded-lg hover:bg-accent-dim transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
|
||||
>
|
||||
{t("next")}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</Card>
|
||||
)}
|
||||
@@ -1336,28 +1390,46 @@ export function OnboardingWizard({
|
||||
|
||||
<p className="text-xs text-text-muted">{t("confirmNote")}</p>
|
||||
|
||||
{/* Phase 9b: order-time setup-fee notice + amount. The
|
||||
figure shown is the net platform fee (before VAT);
|
||||
VAT is added server-side based on the billing
|
||||
country. We show "+ VAT" rather than a computed
|
||||
gross to avoid mis-displaying a country-dependent
|
||||
total. If setupFeeChf is null/0, no charge happens
|
||||
and the whole block is suppressed. */}
|
||||
{typeof setupFeeChf === "number" && setupFeeChf > 0 && (
|
||||
{/* Cost summary. Surfaces the full commitment before
|
||||
submitting — not just the one-time setup fee but the
|
||||
recurring monthly per-assistant fee and the fact that
|
||||
AI usage is billed by consumption (with the budget-cap
|
||||
control as the reassurance). All figures are net (before
|
||||
VAT); VAT is added server-side per billing country, so
|
||||
we show "+ VAT" rather than a country-dependent gross.
|
||||
The block is suppressed only when there are no fixed
|
||||
fees at all. */}
|
||||
{((typeof setupFeeChf === "number" && setupFeeChf > 0) ||
|
||||
(typeof monthlyFeeChf === "number" && monthlyFeeChf > 0)) && (
|
||||
<div className="text-xs rounded-md border border-accent/30 bg-accent/10 text-text-secondary px-3 py-3 mt-4">
|
||||
<strong className="block text-text-primary mb-1">
|
||||
{t("setupFeeNoticeHeading")}
|
||||
<strong className="block text-text-primary mb-2">
|
||||
{t("costSummaryHeading")}
|
||||
</strong>
|
||||
<div className="flex items-baseline justify-between mb-2 pb-2 border-b border-accent/20">
|
||||
<span>{t("setupFeeAmountLabel")}</span>
|
||||
<span className="text-sm font-semibold text-text-primary">
|
||||
CHF {setupFeeChf.toFixed(2)}{" "}
|
||||
<span className="text-[10px] font-normal text-text-muted">
|
||||
{t("setupFeePlusVat")}
|
||||
{typeof setupFeeChf === "number" && setupFeeChf > 0 && (
|
||||
<div className="flex items-baseline justify-between mb-1.5">
|
||||
<span>{t("costSetupLabel")}</span>
|
||||
<span className="text-sm font-semibold text-text-primary">
|
||||
CHF {setupFeeChf.toFixed(2)}{" "}
|
||||
<span className="text-[10px] font-normal text-text-muted">
|
||||
{t("setupFeePlusVat")}
|
||||
</span>
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
{typeof monthlyFeeChf === "number" && monthlyFeeChf > 0 && (
|
||||
<div className="flex items-baseline justify-between mb-1.5">
|
||||
<span>{t("costMonthlyLabel")}</span>
|
||||
<span className="text-sm font-semibold text-text-primary">
|
||||
CHF {monthlyFeeChf.toFixed(2)}{" "}
|
||||
<span className="text-[10px] font-normal text-text-muted">
|
||||
{t("setupFeePlusVat")}
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
<div className="mt-2 pt-2 border-t border-accent/20 leading-relaxed">
|
||||
{t("costUsageNote")}
|
||||
</div>
|
||||
{t("setupFeeNoticeBody")}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
@@ -1380,7 +1452,8 @@ export function OnboardingWizard({
|
||||
<ul className="list-disc list-inside space-y-0.5">
|
||||
{Object.entries(errors).map(([path, msg]) => (
|
||||
<li key={path}>
|
||||
<span className="font-mono">{path}</span>: {msg}
|
||||
<span className="font-medium">{fieldLabel(path)}</span>:{" "}
|
||||
{msg}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
import { useState } from "react";
|
||||
import { useSession } from "next-auth/react";
|
||||
import { useTranslations } from "next-intl";
|
||||
import { useTranslations, useLocale } from "next-intl";
|
||||
import { Card } from "@/components/ui/card";
|
||||
|
||||
interface Props {
|
||||
@@ -10,6 +10,8 @@ interface Props {
|
||||
firstName: string;
|
||||
lastName: string;
|
||||
email: string;
|
||||
/** Current ZITADEL preferredLanguage; "" if never set. */
|
||||
language: string;
|
||||
};
|
||||
/**
|
||||
* Personal-account flag. Drives a small hint about how the ZITADEL
|
||||
@@ -43,10 +45,15 @@ interface Props {
|
||||
*/
|
||||
export function ProfileSettingsForm({ initial, isPersonal, orgName }: Props) {
|
||||
const t = useTranslations("settingsProfile");
|
||||
const locale = useLocale();
|
||||
const { update } = useSession();
|
||||
const [form, setForm] = useState({
|
||||
firstName: initial.firstName,
|
||||
lastName: initial.lastName,
|
||||
// Fall back to the current UI locale when the profile has no stored
|
||||
// preference yet (older accounts), so the selector shows something
|
||||
// sensible rather than blank.
|
||||
language: initial.language || locale,
|
||||
});
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
@@ -67,6 +74,7 @@ export function ProfileSettingsForm({ initial, isPersonal, orgName }: Props) {
|
||||
body: JSON.stringify({
|
||||
firstName: form.firstName.trim(),
|
||||
lastName: form.lastName.trim(),
|
||||
language: form.language,
|
||||
}),
|
||||
});
|
||||
const data = await res.json().catch(() => ({}));
|
||||
@@ -79,15 +87,15 @@ export function ProfileSettingsForm({ initial, isPersonal, orgName }: Props) {
|
||||
// to session.user.name. No re-login needed.
|
||||
await update({ name: data.displayName });
|
||||
setSavedFlash(true);
|
||||
// Force a full reload so EVERY server-rendered component picks
|
||||
// up the new session cookie immediately — router.refresh() only
|
||||
// re-runs the current route's server components, leaving the
|
||||
// nav-shell (rendered higher in the tree) and other cached
|
||||
// segments showing the old name until the user navigates.
|
||||
// The 800ms delay lets the "Saved" flash render briefly before
|
||||
// the page reloads, so the user gets visible feedback.
|
||||
// If the language changed, land the user on the new locale (a
|
||||
// full navigation so every server-rendered surface re-renders in
|
||||
// the new language). Otherwise just reload so the new name
|
||||
// propagates. The 800ms delay lets the "Saved" flash show first.
|
||||
const localeChanged = form.language && form.language !== locale;
|
||||
const target = localeChanged ? localePath(form.language) : null;
|
||||
setTimeout(() => {
|
||||
window.location.reload();
|
||||
if (target) window.location.assign(target);
|
||||
else window.location.reload();
|
||||
}, 800);
|
||||
} catch (e: any) {
|
||||
setError(e?.message ?? String(e));
|
||||
@@ -132,6 +140,20 @@ export function ProfileSettingsForm({ initial, isPersonal, orgName }: Props) {
|
||||
className="w-full px-3 py-2 rounded-md bg-surface-2 border border-border text-sm text-text-muted cursor-not-allowed"
|
||||
/>
|
||||
</Field>
|
||||
<Field label={t("languageLabel")} hint={t("languageHint")}>
|
||||
<select
|
||||
value={form.language}
|
||||
onChange={(e) =>
|
||||
setForm((f) => ({ ...f, language: e.target.value }))
|
||||
}
|
||||
className="w-full px-3 py-2 rounded-md bg-surface-2 border border-border focus:border-accent focus:outline-none text-sm"
|
||||
>
|
||||
<option value="de">Deutsch</option>
|
||||
<option value="en">English</option>
|
||||
<option value="fr">Français</option>
|
||||
<option value="it">Italiano</option>
|
||||
</select>
|
||||
</Field>
|
||||
{/* Personal vs company hint. Personals get the
|
||||
"this won't change your invoice name" warning since their
|
||||
ZITADEL name and their invoice identity are intentionally
|
||||
@@ -163,6 +185,15 @@ export function ProfileSettingsForm({ initial, isPersonal, orgName }: Props) {
|
||||
);
|
||||
}
|
||||
|
||||
// Build the as-needed-prefixed path for a target locale from the
|
||||
// current URL (default locale `de` is unprefixed). Client-only — uses
|
||||
// window; called from the save handler.
|
||||
function localePath(lang: string): string {
|
||||
const p =
|
||||
window.location.pathname.replace(/^\/(de|fr|it|en)(?=\/|$)/, "") || "/";
|
||||
return lang === "de" ? p : `/${lang}${p === "/" ? "" : p}`;
|
||||
}
|
||||
|
||||
function Field({
|
||||
label,
|
||||
required,
|
||||
|
||||
219
src/components/team/access-overview.tsx
Normal file
219
src/components/team/access-overview.tsx
Normal file
@@ -0,0 +1,219 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useState } from "react";
|
||||
import { useTranslations } from "next-intl";
|
||||
|
||||
/**
|
||||
* AccessOverview
|
||||
*
|
||||
* Read-only "who can reach which assistant" matrix for owners. Access
|
||||
* was previously only visible per-tenant (the AssignedUsersPanel on each
|
||||
* tenant page) and per-member (the team roster) — with no single place
|
||||
* to see the whole picture, which made it easy to lose track across
|
||||
* several tenants and members.
|
||||
*
|
||||
* This composes existing endpoints only (no new API surface):
|
||||
* - GET /api/team → org members
|
||||
* - GET /api/tenants → the org's tenants
|
||||
* - GET /api/tenants/{name}/assignments → per-tenant assignees
|
||||
*
|
||||
* Owners implicitly see every tenant, so their row is marked
|
||||
* "all assistants" rather than per-cell.
|
||||
*/
|
||||
|
||||
interface Member {
|
||||
userId: string;
|
||||
email: string;
|
||||
displayName?: string;
|
||||
roles: string[];
|
||||
}
|
||||
|
||||
interface TenantLite {
|
||||
name: string;
|
||||
displayName: string;
|
||||
}
|
||||
|
||||
export function AccessOverview() {
|
||||
const t = useTranslations("team");
|
||||
|
||||
const [members, setMembers] = useState<Member[] | null>(null);
|
||||
const [tenants, setTenants] = useState<TenantLite[] | null>(null);
|
||||
// tenant name → set of assigned userIds
|
||||
const [assignments, setAssignments] = useState<Record<string, Set<string>>>(
|
||||
{}
|
||||
);
|
||||
const [error, setError] = useState("");
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
|
||||
(async () => {
|
||||
try {
|
||||
const [teamRes, tenantsRes] = await Promise.all([
|
||||
fetch("/api/team"),
|
||||
fetch("/api/tenants"),
|
||||
]);
|
||||
if (!teamRes.ok || !tenantsRes.ok) throw new Error("load");
|
||||
|
||||
const teamData = await teamRes.json();
|
||||
const tenantsData = await tenantsRes.json();
|
||||
|
||||
const mem: Member[] = teamData.members ?? [];
|
||||
const ten: TenantLite[] = (tenantsData ?? []).map((x: any) => ({
|
||||
name: x.metadata.name,
|
||||
displayName: x.spec?.displayName || x.metadata.name,
|
||||
}));
|
||||
|
||||
// Per-tenant assignment lookups in parallel. A failed lookup
|
||||
// degrades to "no assignees" for that tenant rather than
|
||||
// failing the whole view.
|
||||
const entries = await Promise.all(
|
||||
ten.map(async (tn) => {
|
||||
try {
|
||||
const r = await fetch(
|
||||
`/api/tenants/${encodeURIComponent(tn.name)}/assignments`
|
||||
);
|
||||
if (!r.ok) return [tn.name, new Set<string>()] as const;
|
||||
const data = await r.json();
|
||||
const ids = new Set<string>(
|
||||
(data.assignments ?? data ?? []).map((a: any) => a.userId)
|
||||
);
|
||||
return [tn.name, ids] as const;
|
||||
} catch {
|
||||
return [tn.name, new Set<string>()] as const;
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
if (cancelled) return;
|
||||
setMembers(mem);
|
||||
setTenants(ten);
|
||||
setAssignments(Object.fromEntries(entries));
|
||||
} catch {
|
||||
if (!cancelled) setError(t("accessLoadFailed"));
|
||||
} finally {
|
||||
if (!cancelled) setLoading(false);
|
||||
}
|
||||
})();
|
||||
|
||||
return () => {
|
||||
cancelled = true;
|
||||
};
|
||||
}, [t]);
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<div className="bg-surface-1 border border-border rounded-xl p-6 animate-pulse">
|
||||
<div className="h-4 w-40 bg-surface-3 rounded mb-4" />
|
||||
<div className="h-24 bg-surface-2 rounded" />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (error) {
|
||||
return (
|
||||
<div className="bg-surface-1 border border-border rounded-xl p-6">
|
||||
<p className="text-sm text-text-secondary">{error}</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (!tenants || tenants.length === 0) {
|
||||
return (
|
||||
<div className="bg-surface-1 border border-border rounded-xl p-6">
|
||||
<p className="text-sm text-text-secondary">{t("accessNoTenants")}</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
const isOwner = (m: Member) => m.roles?.includes("owner");
|
||||
|
||||
return (
|
||||
<div className="bg-surface-1 border border-border rounded-xl overflow-hidden">
|
||||
<div className="overflow-x-auto">
|
||||
<table className="w-full text-sm border-collapse">
|
||||
<thead>
|
||||
<tr className="border-b border-border">
|
||||
<th className="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-text-muted sticky left-0 bg-surface-1">
|
||||
{t("accessMemberCol")}
|
||||
</th>
|
||||
{tenants.map((tn) => (
|
||||
<th
|
||||
key={tn.name}
|
||||
className="px-3 py-3 text-center text-xs font-semibold text-text-secondary min-w-[7rem]"
|
||||
title={tn.name}
|
||||
>
|
||||
{tn.displayName}
|
||||
</th>
|
||||
))}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{(members ?? []).map((m) => (
|
||||
<tr
|
||||
key={m.userId}
|
||||
className="border-b border-border last:border-0 hover:bg-surface-2/50 transition-colors"
|
||||
>
|
||||
<td className="px-4 py-3 sticky left-0 bg-surface-1">
|
||||
<div className="text-sm text-text-primary truncate max-w-[14rem]">
|
||||
{m.displayName || m.email}
|
||||
</div>
|
||||
<div className="text-xs text-text-muted truncate max-w-[14rem]">
|
||||
{m.email}
|
||||
</div>
|
||||
</td>
|
||||
{tenants.map((tn) => {
|
||||
const owner = isOwner(m);
|
||||
const has = owner || assignments[tn.name]?.has(m.userId);
|
||||
const label = owner
|
||||
? t("accessOwnerAll")
|
||||
: has
|
||||
? t("accessHasLabel")
|
||||
: t("accessHasNotLabel");
|
||||
return (
|
||||
<td
|
||||
key={tn.name}
|
||||
className="px-3 py-3 text-center"
|
||||
title={label}
|
||||
>
|
||||
<span className="sr-only">{label}</span>
|
||||
{owner ? (
|
||||
<span aria-hidden="true" className="text-accent">
|
||||
●
|
||||
</span>
|
||||
) : has ? (
|
||||
<span
|
||||
aria-hidden="true"
|
||||
className="text-emerald-400 font-semibold"
|
||||
>
|
||||
✓
|
||||
</span>
|
||||
) : (
|
||||
<span aria-hidden="true" className="text-text-muted/50">
|
||||
–
|
||||
</span>
|
||||
)}
|
||||
</td>
|
||||
);
|
||||
})}
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div className="px-4 py-2.5 border-t border-border flex flex-wrap items-center gap-x-4 gap-y-1 text-xs text-text-muted">
|
||||
<span className="flex items-center gap-1.5">
|
||||
<span className="text-accent">●</span> {t("accessOwnerAll")}
|
||||
</span>
|
||||
<span className="flex items-center gap-1.5">
|
||||
<span className="text-emerald-400 font-semibold">✓</span>{" "}
|
||||
{t("accessHasLabel")}
|
||||
</span>
|
||||
<span className="flex items-center gap-1.5">
|
||||
<span className="text-text-muted/50">–</span> {t("accessHasNotLabel")}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
234
src/components/tenants/connect-panel.tsx
Normal file
234
src/components/tenants/connect-panel.tsx
Normal file
@@ -0,0 +1,234 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useState } from "react";
|
||||
import { useTranslations } from "next-intl";
|
||||
import { THREEMA_GATEWAY } from "@/lib/threema-gateway-config";
|
||||
|
||||
/**
|
||||
* ConnectPanel
|
||||
*
|
||||
* The portal is a *management* console — config, billing, usage — but
|
||||
* the assistant itself lives in the customer's messaging app. Nothing
|
||||
* previously told the customer how to actually start talking to the
|
||||
* thing they just provisioned ("Your assistant is ready… now what?").
|
||||
*
|
||||
* This panel closes that gap on the tenant-detail page: for each
|
||||
* enabled channel it shows the concrete first-contact steps, and when
|
||||
* NO channel is enabled it says so explicitly (a running assistant with
|
||||
* no channel is unreachable).
|
||||
*
|
||||
* Once a customer has connected they don't need the steps every visit,
|
||||
* so the panel is dismissible: clicking "I've connected" collapses it
|
||||
* to a slim row and remembers that per-tenant (localStorage). The slim
|
||||
* row keeps a "Show connection details" toggle so it's never lost.
|
||||
* The no-channel warning is NOT dismissible — it's an actionable alert,
|
||||
* not reference material.
|
||||
*
|
||||
* It is intentionally complementary to ChannelUsers below it:
|
||||
* - ConnectPanel → "how do *I* reach the assistant"
|
||||
* - ChannelUsers → "*who* is allowed to reach it"
|
||||
*/
|
||||
|
||||
// Render order is fixed (not the order packages happen to appear in
|
||||
// spec.packages) so the panel layout is stable across tenants.
|
||||
const CHANNEL_ORDER = ["threema", "telegram", "discord"] as const;
|
||||
|
||||
const CHANNEL_NAMES: Record<string, string> = {
|
||||
threema: "Threema",
|
||||
telegram: "Telegram",
|
||||
discord: "Discord",
|
||||
};
|
||||
|
||||
// Per-channel instruction key in the `connect` message namespace.
|
||||
const CHANNEL_STEPS_KEY: Record<string, string> = {
|
||||
threema: "threemaSteps",
|
||||
telegram: "telegramSteps",
|
||||
discord: "discordSteps",
|
||||
};
|
||||
|
||||
const dismissKey = (tenantName: string) =>
|
||||
`pieced:connect-hidden:${tenantName}`;
|
||||
|
||||
export function ConnectPanel({
|
||||
tenantName,
|
||||
enabledChannels,
|
||||
phase,
|
||||
}: {
|
||||
tenantName: string;
|
||||
enabledChannels: string[];
|
||||
/** Tenant phase — connection details only "work" once it's Ready. */
|
||||
phase: string;
|
||||
}) {
|
||||
const t = useTranslations("connect");
|
||||
|
||||
const channels = CHANNEL_ORDER.filter((c) => enabledChannels.includes(c));
|
||||
const ready = phase === "Ready" || phase === "Running" || phase === "Active";
|
||||
|
||||
// Dismissed state is read from localStorage after mount to avoid a
|
||||
// hydration mismatch (server has no localStorage). `hydrated` gates
|
||||
// the collapsed view so the first paint matches the server output.
|
||||
const [collapsed, setCollapsed] = useState(false);
|
||||
const [hydrated, setHydrated] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
try {
|
||||
setCollapsed(localStorage.getItem(dismissKey(tenantName)) === "1");
|
||||
} catch {
|
||||
/* private mode / storage disabled — just stay expanded */
|
||||
}
|
||||
setHydrated(true);
|
||||
}, [tenantName]);
|
||||
|
||||
const dismiss = () => {
|
||||
setCollapsed(true);
|
||||
try {
|
||||
localStorage.setItem(dismissKey(tenantName), "1");
|
||||
} catch {
|
||||
/* no-op */
|
||||
}
|
||||
};
|
||||
|
||||
const reopen = () => {
|
||||
setCollapsed(false);
|
||||
try {
|
||||
localStorage.removeItem(dismissKey(tenantName));
|
||||
} catch {
|
||||
/* no-op */
|
||||
}
|
||||
};
|
||||
|
||||
// No channel at all → the assistant is unreachable. Make it loud and
|
||||
// keep it non-dismissible (it's an alert, not reference material).
|
||||
if (channels.length === 0) {
|
||||
return (
|
||||
<div className="rounded-xl border border-amber-500/30 bg-amber-500/10 p-5">
|
||||
<div className="flex items-start gap-3">
|
||||
<svg
|
||||
className="h-5 w-5 text-amber-400 shrink-0 mt-0.5"
|
||||
fill="none"
|
||||
viewBox="0 0 24 24"
|
||||
stroke="currentColor"
|
||||
strokeWidth={1.5}
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
d="M12 9v3.75m9-.75a9 9 0 11-18 0 9 9 0 0118 0zM12 15.75h.008v.008H12v-.008z"
|
||||
/>
|
||||
</svg>
|
||||
<div className="min-w-0">
|
||||
<div className="text-sm font-semibold text-amber-300">
|
||||
{t("noChannelsTitle")}
|
||||
</div>
|
||||
<p className="text-xs text-text-secondary mt-1 leading-relaxed">
|
||||
{t("noChannelsBody")}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// Collapsed: a slim, unobtrusive row with a toggle to bring the full
|
||||
// panel back. Only shown once hydrated so SSR/CSR agree.
|
||||
if (hydrated && collapsed) {
|
||||
return (
|
||||
<div className="flex items-center justify-between rounded-lg border border-border bg-surface-1 px-4 py-2">
|
||||
<span className="text-xs text-text-muted">{t("title")}</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={reopen}
|
||||
className="shrink-0 inline-flex items-center rounded-md border border-border px-2.5 py-1 text-xs font-medium text-accent hover:bg-surface-2 hover:border-accent/40 transition-colors cursor-pointer"
|
||||
>
|
||||
{t("show")}
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="rounded-xl border border-accent/30 bg-accent/5 p-5">
|
||||
<div className="flex items-start justify-between gap-3 mb-1">
|
||||
<h2 className="font-display text-base font-semibold text-text-primary">
|
||||
{t("title")}
|
||||
</h2>
|
||||
<button
|
||||
type="button"
|
||||
onClick={dismiss}
|
||||
className="shrink-0 inline-flex items-center gap-1.5 rounded-md border border-accent/40 bg-accent/10 px-2.5 py-1 text-xs font-medium text-accent hover:bg-accent/20 hover:border-accent/60 transition-colors cursor-pointer"
|
||||
>
|
||||
<svg
|
||||
className="h-3.5 w-3.5"
|
||||
fill="none"
|
||||
viewBox="0 0 24 24"
|
||||
stroke="currentColor"
|
||||
strokeWidth={2}
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
d="M4.5 12.75l6 6 9-13.5"
|
||||
/>
|
||||
</svg>
|
||||
{t("dismiss")}
|
||||
</button>
|
||||
</div>
|
||||
<p className="text-xs text-text-secondary mb-4 leading-relaxed">
|
||||
{t("description")}
|
||||
</p>
|
||||
|
||||
{!ready && (
|
||||
<p className="text-xs text-amber-300 bg-amber-500/10 border border-amber-500/20 rounded-lg px-3 py-2 mb-4 leading-relaxed">
|
||||
{t("notReadyNote")}
|
||||
</p>
|
||||
)}
|
||||
|
||||
<div className="space-y-3">
|
||||
{channels.map((c) => (
|
||||
<div
|
||||
key={c}
|
||||
className="rounded-lg border border-border bg-surface-1 p-3"
|
||||
>
|
||||
<div className="text-sm font-medium text-text-primary mb-1.5">
|
||||
{CHANNEL_NAMES[c]}
|
||||
</div>
|
||||
|
||||
{c === "threema" ? (
|
||||
<div className="flex items-start gap-3">
|
||||
<div className="bg-white p-1.5 rounded-md shrink-0">
|
||||
{/* Shared gateway QR — identical for every tenant, so
|
||||
it can render before/after provisioning alike.
|
||||
eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img
|
||||
src={THREEMA_GATEWAY.qrCodePath}
|
||||
alt={`QR code for ${THREEMA_GATEWAY.displayName}`}
|
||||
width={88}
|
||||
height={88}
|
||||
style={{ display: "block" }}
|
||||
/>
|
||||
</div>
|
||||
<div className="text-xs text-text-secondary leading-relaxed">
|
||||
<div className="mb-1.5">
|
||||
<span className="text-text-muted">
|
||||
{t("threemaBotIdLabel")}:{" "}
|
||||
</span>
|
||||
<span className="font-mono text-sm text-accent">
|
||||
{THREEMA_GATEWAY.displayName}
|
||||
</span>
|
||||
</div>
|
||||
<div className="whitespace-pre-line">{t("threemaSteps")}</div>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<p className="text-xs text-text-secondary leading-relaxed whitespace-pre-line">
|
||||
{t(CHANNEL_STEPS_KEY[c])}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
83
src/components/ui/logo.tsx
Normal file
83
src/components/ui/logo.tsx
Normal file
@@ -0,0 +1,83 @@
|
||||
/**
|
||||
* PieCed honeycomb mark.
|
||||
*
|
||||
* Six flat-top hexagons: H1/H4 solid, H2/H3 outline, H5/H6 partial.
|
||||
* All strokes/fills use `currentColor` so the mark inherits its colour
|
||||
* from the surrounding text colour (e.g. `text-accent`) and adapts to
|
||||
* hover/theme without editing the SVG. Original brand emerald is
|
||||
* #10B981, which the accent token matches.
|
||||
*
|
||||
* viewBox is portrait (70×106); size it by height and let width follow
|
||||
* (`h-7 w-auto`).
|
||||
*/
|
||||
export function Logo({
|
||||
className,
|
||||
title = "PieCed IT",
|
||||
}: {
|
||||
className?: string;
|
||||
title?: string;
|
||||
}) {
|
||||
return (
|
||||
<svg
|
||||
viewBox="0 0 70 106"
|
||||
className={className}
|
||||
role="img"
|
||||
aria-label={title}
|
||||
fill="none"
|
||||
>
|
||||
<title>{title}</title>
|
||||
{/* H1 — solid, top-left */}
|
||||
<polygon
|
||||
points="38.5,22.69 31.5,10.566 17.5,10.566 10.5,22.69 17.5,34.814 31.5,34.814"
|
||||
fill="currentColor"
|
||||
stroke="currentColor"
|
||||
strokeWidth="1.6"
|
||||
strokeLinejoin="round"
|
||||
/>
|
||||
{/* H2 — outline, upper-right */}
|
||||
<polygon
|
||||
points="59.5,34.814 52.5,22.69 38.5,22.69 31.5,34.814 38.5,46.938 52.5,46.938"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth="1.8"
|
||||
strokeLinejoin="round"
|
||||
strokeLinecap="round"
|
||||
/>
|
||||
{/* H3 — outline, mid-left */}
|
||||
<polygon
|
||||
points="38.5,46.938 31.5,34.814 17.5,34.814 10.5,46.938 17.5,59.062 31.5,59.062"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth="1.8"
|
||||
strokeLinejoin="round"
|
||||
strokeLinecap="round"
|
||||
/>
|
||||
{/* H4 — solid, mid-right */}
|
||||
<polygon
|
||||
points="59.5,59.062 52.5,46.938 38.5,46.938 31.5,59.062 38.5,71.186 52.5,71.186"
|
||||
fill="currentColor"
|
||||
stroke="currentColor"
|
||||
strokeWidth="1.6"
|
||||
strokeLinejoin="round"
|
||||
/>
|
||||
{/* H5 — partial, lower-left */}
|
||||
<polyline
|
||||
points="31.5,83.31 38.5,71.186 31.5,59.062 17.5,59.062 10.5,71.186"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth="1.8"
|
||||
strokeLinejoin="round"
|
||||
strokeLinecap="round"
|
||||
/>
|
||||
{/* H6 — partial, lower-right */}
|
||||
<polyline
|
||||
points="59.5,83.31 52.5,71.186 38.5,71.186 31.5,83.31 38.5,95.434"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth="1.8"
|
||||
strokeLinejoin="round"
|
||||
strokeLinecap="round"
|
||||
/>
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
@@ -111,6 +111,13 @@ export const authConfig: NextAuthConfig = {
|
||||
if (typeof profile.sub === "string") {
|
||||
token.sub = profile.sub;
|
||||
}
|
||||
// Capture the user's preferred language (OIDC `locale` claim,
|
||||
// mapped from ZITADEL preferredLanguage). Read once at sign-in;
|
||||
// middleware uses it to land the user on their language a
|
||||
// single time per login. Stored as-is and validated downstream.
|
||||
if (typeof claims.locale === "string") {
|
||||
token.locale = claims.locale;
|
||||
}
|
||||
}
|
||||
return token;
|
||||
},
|
||||
@@ -140,6 +147,7 @@ export const authConfig: NextAuthConfig = {
|
||||
// both legacy " (Personal)" suffix and current "personal-{8hex}"
|
||||
// opaque names.
|
||||
isPersonal: isPersonalOrgName(orgName),
|
||||
locale: (token.locale as string | undefined) ?? undefined,
|
||||
};
|
||||
(session as any).platformUser = sessionUser;
|
||||
// Also overwrite session.user so any client-side code that uses
|
||||
|
||||
@@ -569,6 +569,7 @@ export async function updateHumanUserProfile(params: {
|
||||
userId: string;
|
||||
givenName: string;
|
||||
familyName: string;
|
||||
preferredLanguage?: string;
|
||||
}): Promise<UpdateHumanUserProfileResult> {
|
||||
const path = `/v2/users/human/${encodeURIComponent(params.userId)}`;
|
||||
// Compose the displayName ourselves so ZITADEL stores something
|
||||
@@ -579,13 +580,22 @@ export async function updateHumanUserProfile(params: {
|
||||
type ZitadelUpdateResponse = {
|
||||
details?: { changeDate?: string };
|
||||
};
|
||||
await zitadelFetch<ZitadelUpdateResponse>(path, "PUT", {
|
||||
profile: {
|
||||
givenName: params.givenName,
|
||||
familyName: params.familyName,
|
||||
displayName,
|
||||
},
|
||||
});
|
||||
// preferredLanguage is part of the same `profile` block; include it
|
||||
// only when provided so a name-only update doesn't clobber it.
|
||||
const profile: {
|
||||
givenName: string;
|
||||
familyName: string;
|
||||
displayName: string;
|
||||
preferredLanguage?: string;
|
||||
} = {
|
||||
givenName: params.givenName,
|
||||
familyName: params.familyName,
|
||||
displayName,
|
||||
};
|
||||
if (params.preferredLanguage) {
|
||||
profile.preferredLanguage = params.preferredLanguage;
|
||||
}
|
||||
await zitadelFetch<ZitadelUpdateResponse>(path, "PUT", { profile });
|
||||
// Re-fetch the user to read back the canonical displayName ZITADEL
|
||||
// committed. Should match what we sent, but reading from the source
|
||||
// of truth catches any sanitization ZITADEL might apply.
|
||||
@@ -607,6 +617,8 @@ export interface HumanUserDetail {
|
||||
familyName: string;
|
||||
displayName: string;
|
||||
email: string;
|
||||
/** ZITADEL profile preferredLanguage (e.g. "de"); "" if unset. */
|
||||
preferredLanguage: string;
|
||||
}
|
||||
|
||||
export async function getHumanUserDetail(
|
||||
@@ -620,6 +632,7 @@ export async function getHumanUserDetail(
|
||||
givenName?: string;
|
||||
familyName?: string;
|
||||
displayName?: string;
|
||||
preferredLanguage?: string;
|
||||
};
|
||||
email?: { email?: string };
|
||||
};
|
||||
@@ -636,5 +649,6 @@ export async function getHumanUserDetail(
|
||||
familyName: human?.profile?.familyName ?? "",
|
||||
displayName: human?.profile?.displayName ?? "",
|
||||
email: human?.email?.email ?? "",
|
||||
preferredLanguage: human?.profile?.preferredLanguage ?? "",
|
||||
};
|
||||
}
|
||||
|
||||
@@ -48,7 +48,8 @@
|
||||
"personalCardTitle": "Privat",
|
||||
"personalCardDescription": "Für Sie persönlich.",
|
||||
"companyCardTitle": "Unternehmen",
|
||||
"companyCardDescription": "Für Ihr Unternehmen oder Team."
|
||||
"companyCardDescription": "Für Ihr Unternehmen oder Team.",
|
||||
"languageLabel": "Sprache"
|
||||
},
|
||||
"onboarding": {
|
||||
"loading": "Status wird geladen…",
|
||||
@@ -94,7 +95,7 @@
|
||||
"provisioningDescription": "Ihr KI-Assistent wird bereitgestellt. Dies dauert in der Regel wenige Minuten.",
|
||||
"phase": "Phase",
|
||||
"readyTitle": "Ihr Assistent ist bereit!",
|
||||
"readyDescription": "Ihr KI-Assistent wurde bereitgestellt und ist aktiv. Sie können ihn nun über das Dashboard verwalten.",
|
||||
"readyDescription": "Ihr KI-Assistent wurde bereitgestellt und läuft. Verbinden Sie ihn als Nächstes mit Ihrer Messaging-App, um den Chat zu starten.",
|
||||
"goToDashboard": "Zum Dashboard",
|
||||
"submittedAt": "Eingereicht",
|
||||
"instanceName": "Instanzname",
|
||||
@@ -143,7 +144,15 @@
|
||||
"telegram": "Öffnen Sie Telegram, schreiben Sie an @userinfobot und fügen Sie die zurückgegebene numerische ID hier ein. Weitere Benutzer können Sie später auf der Mandantenseite hinzufügen.",
|
||||
"discord": "Aktivieren Sie den Entwicklermodus in Discord (Erweiterte Einstellungen), Rechtsklick auf Ihren Namen → Benutzer-ID kopieren, und hier einfügen. Weitere Benutzer können Sie später auf der Mandantenseite hinzufügen.",
|
||||
"threema": "Die 8 Zeichen, die in Ihrer Threema-App unter Einstellungen → Meine Threema-ID angezeigt werden. Sobald Ihr Mandant freigegeben ist und Threema aktiviert wurde, können Sie aus diesem Account heraus mit dem Assistenten chatten. Weitere autorisierte IDs können später auf der Mandantenseite hinzugefügt werden."
|
||||
}
|
||||
},
|
||||
"connectCta": "Assistenten verbinden",
|
||||
"packagesIncompleteHint": "Bitte ergänzen Sie die erforderlichen Angaben für: {packages}",
|
||||
"setupProgress": "Einrichtungsfortschritt",
|
||||
"setupStepsComplete": "{done} von {total} Schritten",
|
||||
"costSummaryHeading": "Was Sie bezahlen",
|
||||
"costSetupLabel": "Einmalige Einrichtung",
|
||||
"costMonthlyLabel": "Monatlich, pro Assistent",
|
||||
"costUsageNote": "Zuzüglich nutzungsabhängiger KI-Kosten, monatlich in CHF abgerechnet. Sie können jederzeit ein Ausgabenlimit pro Assistent festlegen."
|
||||
},
|
||||
"dashboard": {
|
||||
"title": "Dashboard",
|
||||
@@ -226,7 +235,10 @@
|
||||
"budgetCadence_1mo": "Monatlich",
|
||||
"budgetCadence_1y": "Jährlich",
|
||||
"budgetInvalid": "Bitte einen positiven Betrag eingeben.",
|
||||
"budgetSaveFailed": "Budget konnte nicht gespeichert werden. Bitte erneut versuchen."
|
||||
"budgetSaveFailed": "Budget konnte nicht gespeichert werden. Bitte erneut versuchen.",
|
||||
"legendInput": "Input",
|
||||
"legendOutput": "Output",
|
||||
"chartHint": "Für Details auf einen Balken tippen"
|
||||
},
|
||||
"workspace": {
|
||||
"save": "Speichern",
|
||||
@@ -421,7 +433,18 @@
|
||||
"openclawTool": "OpenClaw-Versionen",
|
||||
"billingTool": "Abrechnung →",
|
||||
"skillsQueueTool": "Aktivierungs-Warteschlange",
|
||||
"cronTool": "Automatisierung"
|
||||
"cronTool": "Automatisierung",
|
||||
"approveTitle": "Anfrage genehmigen?",
|
||||
"approveWarning": "Dadurch wird die Infrastruktur des Mandanten bereitgestellt, die Einrichtungsgebühr berechnet und der Kunde benachrichtigt. Bitte prüfen Sie die Angaben, bevor Sie fortfahren.",
|
||||
"approveReapproveWarning": "Dies genehmigt eine zuvor abgelehnte Anfrage erneut: Die Infrastruktur des Mandanten wird bereitgestellt, die Einrichtungsgebühr berechnet und der Kunde benachrichtigt.",
|
||||
"confirmApprove": "Genehmigen & bereitstellen",
|
||||
"searchRequestsPlaceholder": "Anfragen suchen…",
|
||||
"searchTenantsPlaceholder": "Mandanten suchen…",
|
||||
"paginationPrev": "Zurück",
|
||||
"paginationNext": "Weiter",
|
||||
"paginationPage": "Seite {page} von {total}",
|
||||
"paginationCount": "{total} gesamt",
|
||||
"noMatches": "Keine Treffer."
|
||||
},
|
||||
"channelUsers": {
|
||||
"title": "Autorisierte Benutzer",
|
||||
@@ -468,7 +491,15 @@
|
||||
"roleUpdateFailed": "Rolle konnte nicht aktualisiert werden.",
|
||||
"cancel": "Abbrechen",
|
||||
"save": "Speichern",
|
||||
"selfChangeBlocked": "Sie können Ihre eigene Rolle nicht ändern."
|
||||
"selfChangeBlocked": "Sie können Ihre eigene Rolle nicht ändern.",
|
||||
"accessTitle": "Zugriffsübersicht",
|
||||
"accessDescription": "Welches Mitglied auf welchen Assistenten zugreifen kann.",
|
||||
"accessMemberCol": "Mitglied",
|
||||
"accessOwnerAll": "Alle Assistenten (Eigentümer)",
|
||||
"accessHasLabel": "Zugriff",
|
||||
"accessHasNotLabel": "Kein Zugriff",
|
||||
"accessNoTenants": "Noch keine Assistenten.",
|
||||
"accessLoadFailed": "Zugriffsübersicht konnte nicht geladen werden."
|
||||
},
|
||||
"assignments": {
|
||||
"loading": "Zuweisungen werden geladen…",
|
||||
@@ -824,7 +855,8 @@
|
||||
"orgsPayByInvoiceOn": "ein",
|
||||
"orgsPayByInvoiceOff": "aus",
|
||||
"orgsAutoChargeOn": "ein",
|
||||
"orgsAutoChargeOff": "aus"
|
||||
"orgsAutoChargeOff": "aus",
|
||||
"newInvoiceOrgNoMatches": "Keine passenden Kunden."
|
||||
},
|
||||
"skillCostDialog": {
|
||||
"title": "Aktivierungskosten bestätigen",
|
||||
@@ -963,7 +995,9 @@
|
||||
"saveChanges": "Änderungen speichern",
|
||||
"saving": "Speichern…",
|
||||
"saved": "Gespeichert.",
|
||||
"missingRequired": "Vor- und Nachname sind erforderlich."
|
||||
"missingRequired": "Vor- und Nachname sind erforderlich.",
|
||||
"languageLabel": "Sprache",
|
||||
"languageHint": "Wird nach der Anmeldung als Ihre Oberflächensprache verwendet."
|
||||
},
|
||||
"errors": {
|
||||
"title": "Etwas ist schiefgelaufen",
|
||||
@@ -972,5 +1006,18 @@
|
||||
"backToDashboard": "Zurück zum Dashboard",
|
||||
"notFoundTitle": "Seite nicht gefunden",
|
||||
"notFoundDescription": "Die angeforderte Seite existiert nicht oder wurde verschoben."
|
||||
},
|
||||
"connect": {
|
||||
"title": "Mit Ihrem Assistenten verbinden",
|
||||
"description": "Ihr Assistent läuft in Ihrer Messaging-App. So beginnen Sie den Chat mit ihm.",
|
||||
"notReadyNote": "Ihr Assistent wird noch eingerichtet. Diese Verbindungsdetails funktionieren, sobald er bereit ist.",
|
||||
"noChannelsTitle": "Noch kein Messaging-Kanal",
|
||||
"noChannelsBody": "Ihr Assistent läuft, hat aber keinen Kanal zum Chatten. Aktivieren Sie unten im Bereich Pakete einen Kanal – Threema, Telegram oder Discord –, um ihn zu nutzen.",
|
||||
"threemaBotIdLabel": "Threema-ID",
|
||||
"threemaSteps": "1. Öffnen Sie Threema und scannen Sie diesen QR-Code (oder fügen Sie die obige ID als Kontakt hinzu).\n2. Senden Sie eine Nachricht, um den Chat zu starten.\nStellen Sie sicher, dass Ihre eigene Threema-ID in der Liste der autorisierten Benutzer unten steht – nur gelistete IDs erhalten eine Antwort.",
|
||||
"telegramSteps": "Öffnen Sie den verbundenen Telegram-Bot und senden Sie ihm eine Nachricht, um den Chat zu starten. Nur die Benutzer-IDs in der Liste der autorisierten Benutzer unten erhalten eine Antwort.",
|
||||
"discordSteps": "Schreiben Sie dem verbundenen Discord-Bot oder erwähnen Sie ihn in einem Kanal, dem er beigetreten ist. Nur die Benutzer-IDs in der Liste der autorisierten Benutzer unten erhalten eine Antwort.",
|
||||
"dismiss": "Verbunden",
|
||||
"show": "Verbindungsdetails anzeigen"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,7 +48,8 @@
|
||||
"personalCardTitle": "Personal",
|
||||
"personalCardDescription": "For yourself.",
|
||||
"companyCardTitle": "Company",
|
||||
"companyCardDescription": "For your business or team."
|
||||
"companyCardDescription": "For your business or team.",
|
||||
"languageLabel": "Language"
|
||||
},
|
||||
"onboarding": {
|
||||
"loading": "Loading status…",
|
||||
@@ -94,7 +95,7 @@
|
||||
"provisioningDescription": "Your AI assistant is being provisioned. This usually takes a few minutes.",
|
||||
"phase": "Phase",
|
||||
"readyTitle": "Your assistant is ready!",
|
||||
"readyDescription": "Your AI assistant has been provisioned and is running. You can now manage it from the dashboard.",
|
||||
"readyDescription": "Your AI assistant has been provisioned and is running. Next, connect it to your messaging app to start chatting.",
|
||||
"goToDashboard": "Go to Dashboard",
|
||||
"submittedAt": "Submitted",
|
||||
"instanceName": "Instance name",
|
||||
@@ -143,7 +144,15 @@
|
||||
"telegram": "Open Telegram, message @userinfobot, and paste the numeric id it returns. You can add more users later from the tenant page.",
|
||||
"discord": "Enable Developer Mode in Discord (Advanced settings), right-click your name → Copy User ID, and paste it here. You can add more users later from the tenant page.",
|
||||
"threema": "The 8 characters shown in your Threema app under Settings → My Threema ID. Once your tenant is approved and Threema is enabled, you'll be able to chat with the assistant from this account. More authorized IDs can be added later from the tenant page."
|
||||
}
|
||||
},
|
||||
"connectCta": "Connect your assistant",
|
||||
"packagesIncompleteHint": "Add the required details for: {packages}",
|
||||
"setupProgress": "Setup progress",
|
||||
"setupStepsComplete": "{done} of {total} steps",
|
||||
"costSummaryHeading": "What you'll pay",
|
||||
"costSetupLabel": "One-time setup",
|
||||
"costMonthlyLabel": "Monthly, per assistant",
|
||||
"costUsageNote": "Plus usage-based AI costs, billed monthly in CHF. You can set a spending cap per assistant at any time."
|
||||
},
|
||||
"dashboard": {
|
||||
"title": "Dashboard",
|
||||
@@ -226,7 +235,10 @@
|
||||
"budgetCadence_1mo": "Monthly",
|
||||
"budgetCadence_1y": "Yearly",
|
||||
"budgetInvalid": "Please enter a positive amount.",
|
||||
"budgetSaveFailed": "Could not save budget. Please try again."
|
||||
"budgetSaveFailed": "Could not save budget. Please try again.",
|
||||
"legendInput": "Input",
|
||||
"legendOutput": "Output",
|
||||
"chartHint": "Tap a bar for that day"
|
||||
},
|
||||
"workspace": {
|
||||
"save": "Save",
|
||||
@@ -421,7 +433,18 @@
|
||||
"openclawTool": "OpenClaw versions",
|
||||
"billingTool": "Billing →",
|
||||
"skillsQueueTool": "Activation Queue",
|
||||
"cronTool": "Automation"
|
||||
"cronTool": "Automation",
|
||||
"approveTitle": "Approve request?",
|
||||
"approveWarning": "This provisions the tenant's infrastructure, charges the setup fee, and notifies the customer. Check the request details are correct before continuing.",
|
||||
"approveReapproveWarning": "This re-approves a previously rejected request: it provisions the tenant's infrastructure, charges the setup fee, and notifies the customer.",
|
||||
"confirmApprove": "Approve & provision",
|
||||
"searchRequestsPlaceholder": "Search requests…",
|
||||
"searchTenantsPlaceholder": "Search tenants…",
|
||||
"paginationPrev": "Previous",
|
||||
"paginationNext": "Next",
|
||||
"paginationPage": "Page {page} of {total}",
|
||||
"paginationCount": "{total} total",
|
||||
"noMatches": "No matches."
|
||||
},
|
||||
"channelUsers": {
|
||||
"title": "Authorized Users",
|
||||
@@ -468,7 +491,15 @@
|
||||
"roleUpdateFailed": "Could not update role.",
|
||||
"cancel": "Cancel",
|
||||
"save": "Save",
|
||||
"selfChangeBlocked": "You cannot change your own role."
|
||||
"selfChangeBlocked": "You cannot change your own role.",
|
||||
"accessTitle": "Access overview",
|
||||
"accessDescription": "Which member can reach which assistant.",
|
||||
"accessMemberCol": "Member",
|
||||
"accessOwnerAll": "All assistants (owner)",
|
||||
"accessHasLabel": "Has access",
|
||||
"accessHasNotLabel": "No access",
|
||||
"accessNoTenants": "No assistants yet.",
|
||||
"accessLoadFailed": "Couldn't load the access overview."
|
||||
},
|
||||
"assignments": {
|
||||
"loading": "Loading assignments…",
|
||||
@@ -824,7 +855,8 @@
|
||||
"orgsPayByInvoiceOn": "on",
|
||||
"orgsPayByInvoiceOff": "off",
|
||||
"orgsAutoChargeOn": "on",
|
||||
"orgsAutoChargeOff": "off"
|
||||
"orgsAutoChargeOff": "off",
|
||||
"newInvoiceOrgNoMatches": "No matching customers."
|
||||
},
|
||||
"skillCostDialog": {
|
||||
"title": "Confirm activation cost",
|
||||
@@ -963,7 +995,9 @@
|
||||
"saveChanges": "Save changes",
|
||||
"saving": "Saving…",
|
||||
"saved": "Saved.",
|
||||
"missingRequired": "First and last name are required."
|
||||
"missingRequired": "First and last name are required.",
|
||||
"languageLabel": "Language",
|
||||
"languageHint": "Used as your interface language after you sign in."
|
||||
},
|
||||
"errors": {
|
||||
"title": "Something went wrong",
|
||||
@@ -972,5 +1006,18 @@
|
||||
"backToDashboard": "Back to dashboard",
|
||||
"notFoundTitle": "Page not found",
|
||||
"notFoundDescription": "The page you're looking for doesn't exist or has moved."
|
||||
},
|
||||
"connect": {
|
||||
"title": "Connect to your assistant",
|
||||
"description": "Your assistant runs inside your messaging app. Here's how to start chatting with it.",
|
||||
"notReadyNote": "Your assistant is still being set up. These connection details will work as soon as it's ready.",
|
||||
"noChannelsTitle": "No messaging channel yet",
|
||||
"noChannelsBody": "Your assistant is running but has no channel to chat through. Enable a channel — Threema, Telegram, or Discord — in the Packages section below to start using it.",
|
||||
"threemaBotIdLabel": "Threema ID",
|
||||
"threemaSteps": "1. Open Threema and scan this QR code (or add the ID above as a contact).\n2. Send it a message to start chatting.\nMake sure your own Threema ID is on the authorised users list below — only listed IDs get a reply.",
|
||||
"telegramSteps": "Open the Telegram bot you connected and send it a message to start chatting. Only the user IDs on the authorised users list below get a reply.",
|
||||
"discordSteps": "Message the Discord bot you connected, or mention it in a channel it has joined. Only the user IDs on the authorised users list below get a reply.",
|
||||
"dismiss": "I've connected",
|
||||
"show": "Show connection details"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,7 +48,8 @@
|
||||
"personalCardTitle": "Particulier",
|
||||
"personalCardDescription": "Pour vous.",
|
||||
"companyCardTitle": "Entreprise",
|
||||
"companyCardDescription": "Pour votre entreprise ou équipe."
|
||||
"companyCardDescription": "Pour votre entreprise ou équipe.",
|
||||
"languageLabel": "Langue"
|
||||
},
|
||||
"onboarding": {
|
||||
"loading": "Chargement du statut…",
|
||||
@@ -94,7 +95,7 @@
|
||||
"provisioningDescription": "Votre assistant IA est en cours de mise en service. Cela prend généralement quelques minutes.",
|
||||
"phase": "Phase",
|
||||
"readyTitle": "Votre assistant est prêt !",
|
||||
"readyDescription": "Votre assistant IA a été mis en service et est actif. Vous pouvez maintenant le gérer depuis le tableau de bord.",
|
||||
"readyDescription": "Votre assistant IA a été provisionné et fonctionne. Connectez-le maintenant à votre application de messagerie pour commencer à discuter.",
|
||||
"goToDashboard": "Aller au tableau de bord",
|
||||
"submittedAt": "Soumis",
|
||||
"instanceName": "Nom de l'instance",
|
||||
@@ -143,7 +144,15 @@
|
||||
"telegram": "Ouvrez Telegram, écrivez à @userinfobot et collez l'ID numérique qu'il retourne. Vous pourrez ajouter d'autres utilisateurs plus tard depuis la page du tenant.",
|
||||
"discord": "Activez le mode développeur dans Discord (paramètres avancés), clic-droit sur votre nom → Copier l'ID utilisateur, puis collez-le ici. Vous pourrez ajouter d'autres utilisateurs plus tard depuis la page du tenant.",
|
||||
"threema": "Les 8 caractères affichés dans votre app Threema sous Réglages → Mon identifiant Threema. Une fois votre tenant approuvé et Threema activé, vous pourrez discuter avec l'assistant depuis ce compte. D'autres ID autorisés peuvent être ajoutés plus tard depuis la page du tenant."
|
||||
}
|
||||
},
|
||||
"connectCta": "Connecter votre assistant",
|
||||
"packagesIncompleteHint": "Complétez les informations requises pour : {packages}",
|
||||
"setupProgress": "Progression de la configuration",
|
||||
"setupStepsComplete": "{done} sur {total} étapes",
|
||||
"costSummaryHeading": "Ce que vous paierez",
|
||||
"costSetupLabel": "Installation unique",
|
||||
"costMonthlyLabel": "Mensuel, par assistant",
|
||||
"costUsageNote": "Plus les coûts d'IA à l'usage, facturés mensuellement en CHF. Vous pouvez définir un plafond de dépenses par assistant à tout moment."
|
||||
},
|
||||
"dashboard": {
|
||||
"title": "Tableau de bord",
|
||||
@@ -226,7 +235,10 @@
|
||||
"budgetCadence_1mo": "Mensuelle",
|
||||
"budgetCadence_1y": "Annuelle",
|
||||
"budgetInvalid": "Veuillez saisir un montant positif.",
|
||||
"budgetSaveFailed": "Impossible d'enregistrer le budget. Veuillez réessayer."
|
||||
"budgetSaveFailed": "Impossible d'enregistrer le budget. Veuillez réessayer.",
|
||||
"legendInput": "Entrée",
|
||||
"legendOutput": "Sortie",
|
||||
"chartHint": "Touchez une barre pour le détail"
|
||||
},
|
||||
"workspace": {
|
||||
"save": "Enregistrer",
|
||||
@@ -421,7 +433,18 @@
|
||||
"openclawTool": "Versions OpenClaw",
|
||||
"billingTool": "Facturation →",
|
||||
"skillsQueueTool": "File d'activation",
|
||||
"cronTool": "Automatisation"
|
||||
"cronTool": "Automatisation",
|
||||
"approveTitle": "Approuver la demande ?",
|
||||
"approveWarning": "Cela provisionne l'infrastructure du locataire, facture les frais d'installation et notifie le client. Vérifiez l'exactitude des détails de la demande avant de continuer.",
|
||||
"approveReapproveWarning": "Ceci réapprouve une demande précédemment rejetée : l'infrastructure du locataire est provisionnée, les frais d'installation sont facturés et le client est notifié.",
|
||||
"confirmApprove": "Approuver et provisionner",
|
||||
"searchRequestsPlaceholder": "Rechercher des demandes…",
|
||||
"searchTenantsPlaceholder": "Rechercher des locataires…",
|
||||
"paginationPrev": "Précédent",
|
||||
"paginationNext": "Suivant",
|
||||
"paginationPage": "Page {page} sur {total}",
|
||||
"paginationCount": "{total} au total",
|
||||
"noMatches": "Aucun résultat."
|
||||
},
|
||||
"channelUsers": {
|
||||
"title": "Utilisateurs autorisés",
|
||||
@@ -468,7 +491,15 @@
|
||||
"roleUpdateFailed": "Impossible de mettre à jour le rôle.",
|
||||
"cancel": "Annuler",
|
||||
"save": "Enregistrer",
|
||||
"selfChangeBlocked": "Vous ne pouvez pas modifier votre propre rôle."
|
||||
"selfChangeBlocked": "Vous ne pouvez pas modifier votre propre rôle.",
|
||||
"accessTitle": "Aperçu des accès",
|
||||
"accessDescription": "Quel membre peut accéder à quel assistant.",
|
||||
"accessMemberCol": "Membre",
|
||||
"accessOwnerAll": "Tous les assistants (propriétaire)",
|
||||
"accessHasLabel": "Accès",
|
||||
"accessHasNotLabel": "Aucun accès",
|
||||
"accessNoTenants": "Aucun assistant pour l'instant.",
|
||||
"accessLoadFailed": "Impossible de charger l'aperçu des accès."
|
||||
},
|
||||
"assignments": {
|
||||
"loading": "Chargement des attributions…",
|
||||
@@ -824,7 +855,8 @@
|
||||
"orgsPayByInvoiceOn": "actif",
|
||||
"orgsPayByInvoiceOff": "inactif",
|
||||
"orgsAutoChargeOn": "actif",
|
||||
"orgsAutoChargeOff": "inactif"
|
||||
"orgsAutoChargeOff": "inactif",
|
||||
"newInvoiceOrgNoMatches": "Aucun client correspondant."
|
||||
},
|
||||
"skillCostDialog": {
|
||||
"title": "Confirmer le coût d'activation",
|
||||
@@ -963,7 +995,9 @@
|
||||
"saveChanges": "Enregistrer les modifications",
|
||||
"saving": "Enregistrement…",
|
||||
"saved": "Enregistré.",
|
||||
"missingRequired": "Le prénom et le nom sont obligatoires."
|
||||
"missingRequired": "Le prénom et le nom sont obligatoires.",
|
||||
"languageLabel": "Langue",
|
||||
"languageHint": "Utilisée comme langue d'interface après votre connexion."
|
||||
},
|
||||
"errors": {
|
||||
"title": "Une erreur est survenue",
|
||||
@@ -972,5 +1006,18 @@
|
||||
"backToDashboard": "Retour au tableau de bord",
|
||||
"notFoundTitle": "Page introuvable",
|
||||
"notFoundDescription": "La page que vous recherchez n'existe pas ou a été déplacée."
|
||||
},
|
||||
"connect": {
|
||||
"title": "Connectez-vous à votre assistant",
|
||||
"description": "Votre assistant fonctionne dans votre application de messagerie. Voici comment commencer à discuter avec lui.",
|
||||
"notReadyNote": "Votre assistant est encore en cours de configuration. Ces informations de connexion fonctionneront dès qu'il sera prêt.",
|
||||
"noChannelsTitle": "Aucun canal de messagerie",
|
||||
"noChannelsBody": "Votre assistant fonctionne mais n'a aucun canal pour discuter. Activez un canal — Threema, Telegram ou Discord — dans la section Forfaits ci-dessous pour commencer à l'utiliser.",
|
||||
"threemaBotIdLabel": "Identifiant Threema",
|
||||
"threemaSteps": "1. Ouvrez Threema et scannez ce QR code (ou ajoutez l'identifiant ci-dessus comme contact).\n2. Envoyez-lui un message pour commencer à discuter.\nAssurez-vous que votre propre identifiant Threema figure dans la liste des utilisateurs autorisés ci-dessous — seuls les identifiants listés reçoivent une réponse.",
|
||||
"telegramSteps": "Ouvrez le bot Telegram que vous avez connecté et envoyez-lui un message pour commencer à discuter. Seuls les identifiants utilisateur de la liste des utilisateurs autorisés ci-dessous reçoivent une réponse.",
|
||||
"discordSteps": "Écrivez au bot Discord que vous avez connecté, ou mentionnez-le dans un salon qu'il a rejoint. Seuls les identifiants utilisateur de la liste des utilisateurs autorisés ci-dessous reçoivent une réponse.",
|
||||
"dismiss": "Je suis connecté",
|
||||
"show": "Afficher les détails de connexion"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,7 +48,8 @@
|
||||
"personalCardTitle": "Privato",
|
||||
"personalCardDescription": "Per lei.",
|
||||
"companyCardTitle": "Azienda",
|
||||
"companyCardDescription": "Per la sua azienda o team."
|
||||
"companyCardDescription": "Per la sua azienda o team.",
|
||||
"languageLabel": "Lingua"
|
||||
},
|
||||
"onboarding": {
|
||||
"loading": "Caricamento stato…",
|
||||
@@ -94,7 +95,7 @@
|
||||
"provisioningDescription": "Il suo assistente IA è in fase di attivazione. Di solito richiede pochi minuti.",
|
||||
"phase": "Fase",
|
||||
"readyTitle": "Il suo assistente è pronto!",
|
||||
"readyDescription": "Il suo assistente IA è stato attivato ed è operativo. Ora può gestirlo dalla dashboard.",
|
||||
"readyDescription": "Il tuo assistente IA è stato provisionato ed è in funzione. Ora collegalo alla tua app di messaggistica per iniziare a chattare.",
|
||||
"goToDashboard": "Vada alla dashboard",
|
||||
"submittedAt": "Inviato",
|
||||
"instanceName": "Nome istanza",
|
||||
@@ -143,7 +144,15 @@
|
||||
"telegram": "Apra Telegram, scriva a @userinfobot e incolli qui l'ID numerico restituito. Potrà aggiungere altri utenti in seguito dalla pagina del tenant.",
|
||||
"discord": "Attivi la Modalità sviluppatore in Discord (Impostazioni avanzate), clic destro sul suo nome → Copia ID utente, poi incolli qui. Potrà aggiungere altri utenti in seguito dalla pagina del tenant.",
|
||||
"threema": "Gli 8 caratteri mostrati nella sua app Threema in Impostazioni → Il mio ID Threema. Una volta approvato il suo tenant e attivato Threema, potrà chattare con l'assistente da questo account. Altri ID autorizzati possono essere aggiunti in seguito dalla pagina del tenant."
|
||||
}
|
||||
},
|
||||
"connectCta": "Collega il tuo assistente",
|
||||
"packagesIncompleteHint": "Completa i dettagli richiesti per: {packages}",
|
||||
"setupProgress": "Avanzamento configurazione",
|
||||
"setupStepsComplete": "{done} di {total} passaggi",
|
||||
"costSummaryHeading": "Quanto pagherai",
|
||||
"costSetupLabel": "Attivazione una tantum",
|
||||
"costMonthlyLabel": "Mensile, per assistente",
|
||||
"costUsageNote": "Più i costi dell'IA in base all'utilizzo, fatturati mensilmente in CHF. Puoi impostare un limite di spesa per assistente in qualsiasi momento."
|
||||
},
|
||||
"dashboard": {
|
||||
"title": "Dashboard",
|
||||
@@ -226,7 +235,10 @@
|
||||
"budgetCadence_1mo": "Mensile",
|
||||
"budgetCadence_1y": "Annuale",
|
||||
"budgetInvalid": "Inserisca un importo positivo.",
|
||||
"budgetSaveFailed": "Impossibile salvare il budget. Riprova."
|
||||
"budgetSaveFailed": "Impossibile salvare il budget. Riprova.",
|
||||
"legendInput": "Input",
|
||||
"legendOutput": "Output",
|
||||
"chartHint": "Tocca una barra per i dettagli"
|
||||
},
|
||||
"workspace": {
|
||||
"save": "Salvi",
|
||||
@@ -421,7 +433,18 @@
|
||||
"openclawTool": "Versioni OpenClaw",
|
||||
"billingTool": "Fatturazione →",
|
||||
"skillsQueueTool": "Coda di attivazione",
|
||||
"cronTool": "Automazione"
|
||||
"cronTool": "Automazione",
|
||||
"approveTitle": "Approvare la richiesta?",
|
||||
"approveWarning": "Questa operazione effettua il provisioning dell'infrastruttura del tenant, addebita il costo di attivazione e notifica il cliente. Verifica che i dettagli della richiesta siano corretti prima di continuare.",
|
||||
"approveReapproveWarning": "Questo riapprova una richiesta precedentemente rifiutata: effettua il provisioning dell'infrastruttura del tenant, addebita il costo di attivazione e notifica il cliente.",
|
||||
"confirmApprove": "Approva e avvia provisioning",
|
||||
"searchRequestsPlaceholder": "Cerca richieste…",
|
||||
"searchTenantsPlaceholder": "Cerca tenant…",
|
||||
"paginationPrev": "Precedente",
|
||||
"paginationNext": "Successivo",
|
||||
"paginationPage": "Pagina {page} di {total}",
|
||||
"paginationCount": "{total} totali",
|
||||
"noMatches": "Nessun risultato."
|
||||
},
|
||||
"channelUsers": {
|
||||
"title": "Utenti autorizzati",
|
||||
@@ -468,7 +491,15 @@
|
||||
"roleUpdateFailed": "Impossibile aggiornare il ruolo.",
|
||||
"cancel": "Annulli",
|
||||
"save": "Salvi",
|
||||
"selfChangeBlocked": "Non può modificare il suo ruolo."
|
||||
"selfChangeBlocked": "Non può modificare il suo ruolo.",
|
||||
"accessTitle": "Panoramica accessi",
|
||||
"accessDescription": "Quale membro può accedere a quale assistente.",
|
||||
"accessMemberCol": "Membro",
|
||||
"accessOwnerAll": "Tutti gli assistenti (proprietario)",
|
||||
"accessHasLabel": "Accesso",
|
||||
"accessHasNotLabel": "Nessun accesso",
|
||||
"accessNoTenants": "Ancora nessun assistente.",
|
||||
"accessLoadFailed": "Impossibile caricare la panoramica degli accessi."
|
||||
},
|
||||
"assignments": {
|
||||
"loading": "Caricamento assegnazioni…",
|
||||
@@ -824,7 +855,8 @@
|
||||
"orgsPayByInvoiceOn": "attivo",
|
||||
"orgsPayByInvoiceOff": "disattivo",
|
||||
"orgsAutoChargeOn": "attivo",
|
||||
"orgsAutoChargeOff": "disattivo"
|
||||
"orgsAutoChargeOff": "disattivo",
|
||||
"newInvoiceOrgNoMatches": "Nessun cliente corrispondente."
|
||||
},
|
||||
"skillCostDialog": {
|
||||
"title": "Confermi costi di attivazione",
|
||||
@@ -963,7 +995,9 @@
|
||||
"saveChanges": "Salvi modifiche",
|
||||
"saving": "Salvataggio…",
|
||||
"saved": "Salvato.",
|
||||
"missingRequired": "Nome e cognome sono obbligatori."
|
||||
"missingRequired": "Nome e cognome sono obbligatori.",
|
||||
"languageLabel": "Lingua",
|
||||
"languageHint": "Usata come lingua dell'interfaccia dopo l'accesso."
|
||||
},
|
||||
"errors": {
|
||||
"title": "Si è verificato un errore",
|
||||
@@ -972,5 +1006,18 @@
|
||||
"backToDashboard": "Torna alla dashboard",
|
||||
"notFoundTitle": "Pagina non trovata",
|
||||
"notFoundDescription": "La pagina che stai cercando non esiste o è stata spostata."
|
||||
},
|
||||
"connect": {
|
||||
"title": "Collegati al tuo assistente",
|
||||
"description": "Il tuo assistente funziona all'interno della tua app di messaggistica. Ecco come iniziare a chattare con lui.",
|
||||
"notReadyNote": "Il tuo assistente è ancora in fase di configurazione. Questi dettagli di connessione funzioneranno non appena sarà pronto.",
|
||||
"noChannelsTitle": "Nessun canale di messaggistica",
|
||||
"noChannelsBody": "Il tuo assistente è in funzione ma non ha alcun canale per chattare. Attiva un canale — Threema, Telegram o Discord — nella sezione Pacchetti qui sotto per iniziare a usarlo.",
|
||||
"threemaBotIdLabel": "ID Threema",
|
||||
"threemaSteps": "1. Apri Threema e scansiona questo codice QR (oppure aggiungi l'ID sopra come contatto).\n2. Inviagli un messaggio per iniziare a chattare.\nAssicurati che il tuo ID Threema sia presente nell'elenco degli utenti autorizzati qui sotto: solo gli ID elencati ricevono una risposta.",
|
||||
"telegramSteps": "Apri il bot Telegram che hai collegato e inviagli un messaggio per iniziare a chattare. Solo gli ID utente nell'elenco degli utenti autorizzati qui sotto ricevono una risposta.",
|
||||
"discordSteps": "Scrivi al bot Discord che hai collegato, oppure menzionalo in un canale a cui si è unito. Solo gli ID utente nell'elenco degli utenti autorizzati qui sotto ricevono una risposta.",
|
||||
"dismiss": "Mi sono collegato",
|
||||
"show": "Mostra dettagli di connessione"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,6 +6,20 @@ import { routing } from "@/i18n/routing";
|
||||
|
||||
const intlMiddleware = createIntlMiddleware(routing);
|
||||
|
||||
// One-time marker: set after we've applied the user's profile language
|
||||
// once following sign-in, cleared whenever the login page is shown (so
|
||||
// the next sign-in re-applies it). Keeps the header switcher a
|
||||
// per-session override rather than forcing the profile locale on every
|
||||
// navigation.
|
||||
const LOCALE_INIT_COOKIE = "pieced_locale_init";
|
||||
|
||||
const LOCALE_INIT_OPTS = {
|
||||
path: "/",
|
||||
httpOnly: true,
|
||||
sameSite: "lax" as const,
|
||||
maxAge: 8 * 60 * 60,
|
||||
};
|
||||
|
||||
const publicPaths = ["/login", "/register", "/api/auth", "/api/register"];
|
||||
|
||||
function isPublicPath(pathname: string): boolean {
|
||||
@@ -26,6 +40,17 @@ export default async function middleware(request: NextRequest) {
|
||||
return NextResponse.next();
|
||||
}
|
||||
|
||||
const stripped = pathname.replace(/^\/(de|fr|it|en)(?=\/|$)/, "") || "/";
|
||||
|
||||
// Showing the login page resets the one-time locale marker so the
|
||||
// next sign-in re-applies the user's profile language. Logout
|
||||
// redirects here, which makes this the natural reset point.
|
||||
if (stripped === "/login") {
|
||||
const res = intlMiddleware(request);
|
||||
res.cookies.delete(LOCALE_INIT_COOKIE);
|
||||
return res;
|
||||
}
|
||||
|
||||
// Auth guard for protected paths
|
||||
if (!isPublicPath(pathname)) {
|
||||
const session = await auth();
|
||||
@@ -34,6 +59,32 @@ export default async function middleware(request: NextRequest) {
|
||||
loginUrl.searchParams.set("callbackUrl", pathname);
|
||||
return NextResponse.redirect(loginUrl);
|
||||
}
|
||||
|
||||
// One-time apply of the user's preferred language after sign-in.
|
||||
// Gated by LOCALE_INIT_COOKIE (cleared on the /login view), so it
|
||||
// fires at most once per login; afterwards the URL and the header
|
||||
// switcher control the locale freely.
|
||||
const applied = request.cookies.get(LOCALE_INIT_COOKIE)?.value === "1";
|
||||
const pref = (session as { platformUser?: { locale?: string } })
|
||||
.platformUser?.locale;
|
||||
const base = pref?.split("-")[0];
|
||||
if (!applied && base && routing.locales.includes(base as never)) {
|
||||
const target =
|
||||
base === routing.defaultLocale
|
||||
? stripped
|
||||
: `/${base}${stripped === "/" ? "" : stripped}`;
|
||||
if (target !== pathname) {
|
||||
const url = new URL(target, request.url);
|
||||
url.search = request.nextUrl.search;
|
||||
const res = NextResponse.redirect(url);
|
||||
res.cookies.set(LOCALE_INIT_COOKIE, "1", LOCALE_INIT_OPTS);
|
||||
return res;
|
||||
}
|
||||
// Already on the right locale — mark applied and continue.
|
||||
const res = intlMiddleware(request);
|
||||
res.cookies.set(LOCALE_INIT_COOKIE, "1", LOCALE_INIT_OPTS);
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
return intlMiddleware(request);
|
||||
|
||||
@@ -3,6 +3,8 @@ export interface ZitadelClaims {
|
||||
"urn:zitadel:iam:user:resourceowner:id": string;
|
||||
"urn:zitadel:iam:user:resourceowner:name": string;
|
||||
"urn:zitadel:iam:org:project:roles"?: Record<string, Record<string, string>>;
|
||||
/** Standard OIDC claim; ZITADEL maps the user's preferredLanguage. */
|
||||
locale?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -64,6 +66,14 @@ export interface SessionUser {
|
||||
* user's display name instead (Bug 9 — the org name is opaque).
|
||||
*/
|
||||
isPersonal: boolean;
|
||||
/**
|
||||
* The user's preferred UI language, sourced from the ZITADEL profile
|
||||
* (`preferredLanguage`) via the OIDC `locale` claim at sign-in. Used
|
||||
* once after login to land the user on their language; the header
|
||||
* switcher is a per-session URL override that does not change this.
|
||||
* Undefined for users whose ZITADEL profile predates the claim.
|
||||
*/
|
||||
locale?: string;
|
||||
}
|
||||
|
||||
// PiecedTenant CR (pieced.ch/v1alpha1)
|
||||
|
||||
Reference in New Issue
Block a user