This commit is contained in:
@@ -9,6 +9,7 @@ import { PackageList } from "@/components/packages/package-list";
|
||||
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 { formatDateTime, formatRelative } from "@/lib/format";
|
||||
|
||||
const CHANNEL_PACKAGES = ["telegram", "discord", "email"];
|
||||
@@ -40,6 +41,11 @@ export default async function TenantDetailPage({
|
||||
// the same page but with edit controls hidden / fields read-only.
|
||||
const canEdit = canMutate(user);
|
||||
|
||||
// Bug 31: customer-side cancel/resume control. Same gate as canEdit
|
||||
// — only owners (or platform staff) may toggle the subscription.
|
||||
// The current state comes from spec.suspend on the CR.
|
||||
const isSuspended = Boolean(tenant.spec.suspend);
|
||||
|
||||
// Bug 7: assigned-users panel is meaningless for personal tenants
|
||||
// (sole-owner by definition; the only "assignee" is the owner
|
||||
// themselves). We hide the panel when EITHER the CR carries the
|
||||
@@ -102,6 +108,41 @@ export default async function TenantDetailPage({
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Bug 31: prominent banner when the subscription is cancelled.
|
||||
Sits between header and content so it's the first thing the
|
||||
owner sees. Says clearly what state means, and that data is
|
||||
preserved. The Resume action lives in the SubscriptionToggle
|
||||
at the bottom — duplicating it here would clutter the banner
|
||||
for the much-more-common active case. */}
|
||||
{isSuspended && (
|
||||
<div className="mb-8 animate-in animate-in-delay-1 bg-amber-500/10 border border-amber-500/30 rounded-xl p-4">
|
||||
<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("suspendedTitle")}
|
||||
</div>
|
||||
<div className="text-xs text-text-secondary mt-1">
|
||||
{t("suspendedDescription")}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 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">
|
||||
@@ -155,6 +196,25 @@ export default async function TenantDetailPage({
|
||||
<AssignedUsersPanel tenantName={name} canEdit={canEdit} />
|
||||
</section>
|
||||
)}
|
||||
|
||||
{/* Bug 31: subscription cancel/resume — owners + platform staff
|
||||
only. Lives at the bottom of the page (rather than near the
|
||||
status badge) to add deliberate friction; mis-clicking
|
||||
"Cancel subscription" from the top would be too easy. The
|
||||
control itself opens a confirmation modal before sending. */}
|
||||
{canEdit && (
|
||||
<section className="mt-12 pt-8 border-t border-border animate-in animate-in-delay-4">
|
||||
<h2 className="text-xs font-semibold uppercase tracking-wider text-text-muted mb-3">
|
||||
{t("subscriptionTitle")}
|
||||
</h2>
|
||||
<p className="text-sm text-text-secondary mb-4">
|
||||
{isSuspended
|
||||
? t("subscriptionDescriptionSuspended")
|
||||
: t("subscriptionDescriptionActive")}
|
||||
</p>
|
||||
<SubscriptionToggle tenantName={name} suspended={isSuspended} />
|
||||
</section>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user