Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Stop promising renewal on a cancelled MSP plan

rcourtman13e90e783340
diff --git a/internal/cloudcp/portal/dist/build_manifest.json b/internal/cloudcp/portal/dist/build_manifest.json
index a9c26f9136..6ac79dc517 100644
--- a/internal/cloudcp/portal/dist/build_manifest.json
+++ b/internal/cloudcp/portal/dist/build_manifest.json
@@ -1,5 +1,5 @@
{
- "source_hash": "7628d86662ee55063fb34fc822829f7e48c22e82124051969be98bbf4fc7ee63",
+ "source_hash": "b7a70a05954be41554248af9cff592b702f874d2c5a03256ae3a84d100e7bded",
"build_inputs": [
"package.json",
"tsconfig.json",
diff --git a/internal/cloudcp/portal/dist/portal_app.js b/internal/cloudcp/portal/dist/portal_app.js
index f66d144862..b1e989da97 100644
--- a/internal/cloudcp/portal/dist/portal_app.js
+++ b/internal/cloudcp/portal/dist/portal_app.js
@@ -2753,7 +2753,7 @@
cta = '<button class="btn-secondary billing-action-button" type="button" data-provider-plan-action="manage-billing"' + (busy ? " disabled" : "") + ">" + (busy === "manage-billing" ? "Opening\u2026" : "Manage billing") + "</button>";
}
} else {
- description = paidLicenceInGrace(plan, now) ? "Your subscription has not renewed. Your clients keep this plan until " + expires + ". Open Manage billing to renew or update your payment method." : "Up to " + clientWorkspaces(plan.workspace_limit) + ". Renews automatically while your subscription is active.";
+ description = paidLicenceInGrace(plan, now) ? "Your subscription has not renewed. Your clients keep this plan until " + expires + ". Open Manage billing to renew or update your payment method." : "Up to " + clientWorkspaces(plan.workspace_limit) + ". Open Manage billing to see when your subscription will renew or end.";
if (canManage) {
cta = '<button class="btn-secondary billing-action-button" type="button" data-provider-plan-action="manage-billing"' + (busy ? " disabled" : "") + ">" + (busy === "manage-billing" ? "Opening\u2026" : "Manage billing") + "</button>";
}
diff --git a/internal/cloudcp/portal/frontend/src/provider_plan.test.ts b/internal/cloudcp/portal/frontend/src/provider_plan.test.ts
index d216146f80..1c465875af 100644
--- a/internal/cloudcp/portal/frontend/src/provider_plan.test.ts
+++ b/internal/cloudcp/portal/frontend/src/provider_plan.test.ts
@@ -83,7 +83,10 @@ describe('renderProviderPlanHTML', () => {
const renewing = renderProviderPlanHTML(view({
plan: evaluationPlan({ plan_version: 'msp_solo', evaluation: false, workspace_limit: 3, expires_at: '2026-11-06T00:00:00Z' }),
}), true, 2, now);
- expect(renewing).toContain('Renews automatically');
+ // A subscription cancelled for the period end looks the same here, so the
+ // copy points to Manage billing instead of promising a renewal.
+ expect(renewing).toContain('Open Manage billing to see when your subscription will renew or end.');
+ expect(renewing).not.toContain('Renews automatically');
expect(renewing).toContain('2 of 3 client workspaces in use');
expect(renewing).not.toContain('2026');
expect(renewing).not.toContain('Nov');
diff --git a/internal/cloudcp/portal/frontend/src/provider_plan.ts b/internal/cloudcp/portal/frontend/src/provider_plan.ts
index c8424ca9d8..d287778726 100644
--- a/internal/cloudcp/portal/frontend/src/provider_plan.ts
+++ b/internal/cloudcp/portal/frontend/src/provider_plan.ts
@@ -118,9 +118,11 @@ function renderCurrentPlan(plan: ProviderPlanState, canManage: boolean, busy: st
} else {
// The renewal date lives in Manage billing; the licence date only
// matters, and only shows, once the subscription has stopped renewing.
+ // The licence does not say whether renewal was cancelled for the period
+ // end, so this copy must not promise that it renews.
description = paidLicenceInGrace(plan, now)
? 'Your subscription has not renewed. Your clients keep this plan until ' + expires + '. Open Manage billing to renew or update your payment method.'
- : 'Up to ' + clientWorkspaces(plan.workspace_limit) + '. Renews automatically while your subscription is active.';
+ : 'Up to ' + clientWorkspaces(plan.workspace_limit) + '. Open Manage billing to see when your subscription will renew or end.';
if (canManage) {
cta = '<button class="btn-secondary billing-action-button" type="button" data-provider-plan-action="manage-billing"' +
(busy ? ' disabled' : '') + '>' + (busy === 'manage-billing' ? 'Opening…' : 'Manage billing') + '</button>';