Phase2.5: Skill SetUp Process
All checks were successful
Build and Push / build (push) Successful in 1m39s
All checks were successful
Build and Push / build (push) Successful in 1m39s
This commit is contained in:
@@ -3,7 +3,11 @@ import { getTranslations, getFormatter } from "next-intl/server";
|
||||
import { redirect, notFound } from "next/navigation";
|
||||
import { getTenant } from "@/lib/k8s";
|
||||
import { canUserSeeTenant } from "@/lib/visibility";
|
||||
import { getPendingResumeRequestForTenant } from "@/lib/db";
|
||||
import {
|
||||
getPendingResumeRequestForTenant,
|
||||
listSkillActivationRequestsForTenant,
|
||||
listSkillPricing,
|
||||
} from "@/lib/db";
|
||||
import { StatusBadge } from "@/components/ui/status-badge";
|
||||
import { WarningBadge } from "@/components/ui/warning-badge";
|
||||
import { UsageDisplay } from "@/components/dashboard/usage-display";
|
||||
@@ -82,6 +86,17 @@ export default async function TenantDetailPage({
|
||||
);
|
||||
const channelUsers = tenant.spec.channelUsers || {};
|
||||
|
||||
// Phase 2.5: surface pending and most-recently-rejected skill
|
||||
// activation requests so PackageCard can render the inline
|
||||
// "Manual review pending" / "Activation rejected" states.
|
||||
// Pricing drives the cost-disclosure dialog before enable.
|
||||
// Both fetches are best-effort — an empty list is the safe
|
||||
// fallback if the DB call fails (cards just show normal toggles).
|
||||
const [activationRequests, skillPricing] = await Promise.all([
|
||||
listSkillActivationRequestsForTenant(name).catch(() => []),
|
||||
listSkillPricing().catch(() => []),
|
||||
]);
|
||||
|
||||
// Bug 19 fix: every viewer (customer or admin) passes the tenant
|
||||
// name to UsageDisplay. The /api/usage route resolves team+alias
|
||||
// from the tenant CR's status and applies the visibility check, so
|
||||
@@ -219,6 +234,8 @@ export default async function TenantDetailPage({
|
||||
enabledPackages={enabledPackages}
|
||||
conditions={tenant.status?.conditions}
|
||||
canEdit={canEdit}
|
||||
activationRequests={activationRequests}
|
||||
skillPricing={skillPricing}
|
||||
/>
|
||||
</section>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user