Repository navigation
[backport cloud/1.52] fix(billing): align pricing-dialog reactivation with the centralized rail policy - #16092
Conversation
|
Important Review skippedIgnore keyword(s) in the title. ⛔ Ignored keywords (2)
Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
🎨 Storybook: ✅ Built — View Storybook🎭 Playwright: ✅ 1982 passed, 0 failed · 3 flaky📊 Browser Reports
📦 Bundle Size
⚡ Performance Report
Absolute values
Raw data{
"timestamp": "2026-08-27T15:23:55.398Z",
"gitSha": "4104b2376308f974093984773c58bb069cdb0f97",
"branch": "backport-16043-to-cloud-1.52",
"measurements": [
{
"name": "canvas-idle",
"durationMs": 2084.8760000000084,
"styleRecalcs": 6,
"styleRecalcDurationMs": 7.354000000000003,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 651.175,
"heapDeltaBytes": 15310068,
"heapUsedBytes": 77564380,
"domNodes": -287,
"jsHeapTotalBytes": 4186112,
"scriptDurationMs": 10.966,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-idle",
"durationMs": 2038.505999999984,
"styleRecalcs": 7,
"styleRecalcDurationMs": 6.916999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 527.8050000000001,
"heapDeltaBytes": 18858992,
"heapUsedBytes": 80913792,
"domNodes": -285,
"jsHeapTotalBytes": 4448256,
"scriptDurationMs": 8.287999999999998,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-mouse-sweep",
"durationMs": 2014.6520000000123,
"styleRecalcs": 77,
"styleRecalcDurationMs": 45.27,
"layouts": 12,
"layoutDurationMs": 3.829,
"taskDurationMs": 1009.0310000000001,
"heapDeltaBytes": -5781680,
"heapUsedBytes": 56810992,
"domNodes": -279,
"jsHeapTotalBytes": 4972544,
"scriptDurationMs": 123.45800000000001,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1948.8230000000613,
"styleRecalcs": 76,
"styleRecalcDurationMs": 42.075,
"layouts": 12,
"layoutDurationMs": 3.487,
"taskDurationMs": 940.2429999999999,
"heapDeltaBytes": -6190988,
"heapUsedBytes": 56199928,
"domNodes": -281,
"jsHeapTotalBytes": 4448256,
"scriptDurationMs": 119.04800000000002,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1738.112000000001,
"styleRecalcs": 32,
"styleRecalcDurationMs": 20.924000000000007,
"layouts": 6,
"layoutDurationMs": 0.75,
"taskDurationMs": 432.8500000000001,
"heapDeltaBytes": 3324360,
"heapUsedBytes": 66310524,
"domNodes": 77,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 13.191999999999998,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1728.3619999999473,
"styleRecalcs": 31,
"styleRecalcDurationMs": 18.967000000000006,
"layouts": 6,
"layoutDurationMs": 0.6130000000000001,
"taskDurationMs": 451.78899999999993,
"heapDeltaBytes": 3440168,
"heapUsedBytes": 65325864,
"domNodes": 75,
"jsHeapTotalBytes": 4980736,
"scriptDurationMs": 13.225999999999997,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "dom-widget-clipping",
"durationMs": 611.8799999999851,
"styleRecalcs": 11,
"styleRecalcDurationMs": 8.543000000000003,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 381.847,
"heapDeltaBytes": 10909220,
"heapUsedBytes": 73844100,
"domNodes": 18,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 58.891,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "dom-widget-clipping",
"durationMs": 601.3809999999467,
"styleRecalcs": 11,
"styleRecalcDurationMs": 7.663000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 378.794,
"heapDeltaBytes": 10977160,
"heapUsedBytes": 73570784,
"domNodes": 18,
"jsHeapTotalBytes": 4718592,
"scriptDurationMs": 58.24699999999999,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "large-graph-idle",
"durationMs": 2056.7369999999983,
"styleRecalcs": 8,
"styleRecalcDurationMs": 13.760000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 691.689,
"heapDeltaBytes": -3311300,
"heapUsedBytes": 73874636,
"domNodes": -279,
"jsHeapTotalBytes": -532480,
"scriptDurationMs": 19.296999999999993,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "large-graph-idle",
"durationMs": 2070.2119999999695,
"styleRecalcs": 8,
"styleRecalcDurationMs": 9.208,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 789.987,
"heapDeltaBytes": -11999864,
"heapUsedBytes": 65333208,
"domNodes": -282,
"jsHeapTotalBytes": 4186112,
"scriptDurationMs": 21.581,
"eventListeners": -181,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "large-graph-pan",
"durationMs": 2240.725999999995,
"styleRecalcs": 69,
"styleRecalcDurationMs": 15.740999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1272.0240000000001,
"heapDeltaBytes": -8414572,
"heapUsedBytes": 69823536,
"domNodes": -280,
"jsHeapTotalBytes": -569344,
"scriptDurationMs": 350.63300000000004,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66999999999998,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "large-graph-pan",
"durationMs": 2417.699000000084,
"styleRecalcs": 67,
"styleRecalcDurationMs": 13.96,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1368.2990000000002,
"heapDeltaBytes": -13768580,
"heapUsedBytes": 64839656,
"domNodes": -287,
"jsHeapTotalBytes": 3137536,
"scriptDurationMs": 401.084,
"eventListeners": -149,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3362.2049999999604,
"styleRecalcs": 65,
"styleRecalcDurationMs": 15.978999999999997,
"layouts": 60,
"layoutDurationMs": 7.84,
"taskDurationMs": 1502.37,
"heapDeltaBytes": -5197920,
"heapUsedBytes": 74419380,
"domNodes": -287,
"jsHeapTotalBytes": 6021120,
"scriptDurationMs": 418.557,
"eventListeners": -155,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3343.9619999999195,
"styleRecalcs": 65,
"styleRecalcDurationMs": 16.431,
"layouts": 60,
"layoutDurationMs": 7.921000000000001,
"taskDurationMs": 1475.696,
"heapDeltaBytes": -5576500,
"heapUsedBytes": 73980056,
"domNodes": -286,
"jsHeapTotalBytes": 5234688,
"scriptDurationMs": 403.279,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666636,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "legacy-node-drag",
"durationMs": 2652.088000000049,
"styleRecalcs": 45,
"styleRecalcDurationMs": 10.053999999999997,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1558.1229999999998,
"heapDeltaBytes": -15386076,
"heapUsedBytes": 69966208,
"domNodes": 10,
"jsHeapTotalBytes": 9474048,
"scriptDurationMs": 498.893,
"eventListeners": 186,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "legacy-node-drag",
"durationMs": 2638.629000000037,
"styleRecalcs": 45,
"styleRecalcDurationMs": 9.691999999999998,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1534.503,
"heapDeltaBytes": -15453228,
"heapUsedBytes": 70111772,
"domNodes": 10,
"jsHeapTotalBytes": 9736192,
"scriptDurationMs": 501.7509999999999,
"eventListeners": 186,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "minimap-idle",
"durationMs": 2060.0110000000313,
"styleRecalcs": 7,
"styleRecalcDurationMs": 6.957999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 687.4529999999999,
"heapDeltaBytes": -12133232,
"heapUsedBytes": 71497120,
"domNodes": -285,
"jsHeapTotalBytes": 4186112,
"scriptDurationMs": 19.156,
"eventListeners": -181,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "minimap-idle",
"durationMs": 2014.5089999999755,
"styleRecalcs": 7,
"styleRecalcDurationMs": 7.083000000000003,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 707.2149999999999,
"heapDeltaBytes": -12642836,
"heapUsedBytes": 64811944,
"domNodes": -285,
"jsHeapTotalBytes": 3137536,
"scriptDurationMs": 18.654,
"eventListeners": -181,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 636.0990000000015,
"styleRecalcs": 45,
"styleRecalcDurationMs": 10.513000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 426.186,
"heapDeltaBytes": 11617100,
"heapUsedBytes": 74307584,
"domNodes": 16,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 126.76100000000001,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 608.6270000000695,
"styleRecalcs": 46,
"styleRecalcDurationMs": 11.258999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 419.26300000000003,
"heapDeltaBytes": 11933728,
"heapUsedBytes": 74455532,
"domNodes": 18,
"jsHeapTotalBytes": 5505024,
"scriptDurationMs": 121.69100000000002,
"eventListeners": 6,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-idle",
"durationMs": 2021.850000000029,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.677999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 545.0690000000001,
"heapDeltaBytes": -6371968,
"heapUsedBytes": 56399208,
"domNodes": -282,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 7.865,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-idle",
"durationMs": 2018.145000000004,
"styleRecalcs": 8,
"styleRecalcDurationMs": 8.402999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 559.497,
"heapDeltaBytes": 3939276,
"heapUsedBytes": 67050568,
"domNodes": -282,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 8.662,
"eventListeners": -181,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1716.2150000000338,
"styleRecalcs": 76,
"styleRecalcDurationMs": 36.723000000000006,
"layouts": 16,
"layoutDurationMs": 4.705,
"taskDurationMs": 828.24,
"heapDeltaBytes": 18055408,
"heapUsedBytes": 81069456,
"domNodes": -282,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 88.52,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1802.398999999923,
"styleRecalcs": 75,
"styleRecalcDurationMs": 41.361999999999995,
"layouts": 16,
"layoutDurationMs": 4.998000000000001,
"taskDurationMs": 909.959,
"heapDeltaBytes": 17992212,
"heapUsedBytes": 81011100,
"domNodes": -283,
"jsHeapTotalBytes": 4710400,
"scriptDurationMs": 100.149,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-transition-enter",
"durationMs": 1417.1539999999823,
"styleRecalcs": 19,
"styleRecalcDurationMs": 31.96399999999999,
"layouts": 14,
"layoutDurationMs": 14.867,
"taskDurationMs": 968.3289999999997,
"heapDeltaBytes": -4134732,
"heapUsedBytes": 86362156,
"domNodes": 13673,
"jsHeapTotalBytes": 11272192,
"scriptDurationMs": 18.612000000000002,
"eventListeners": 2373,
"totalBlockingTimeMs": 147,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "viewport-pan-sweep",
"durationMs": 8810.119000000042,
"styleRecalcs": 249,
"styleRecalcDurationMs": 40.858,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4560.899,
"heapDeltaBytes": 1391376,
"heapUsedBytes": 78913744,
"domNodes": -274,
"jsHeapTotalBytes": 479232,
"scriptDurationMs": 1148.3110000000001,
"eventListeners": -133,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 9145.985999999994,
"styleRecalcs": 249,
"styleRecalcDurationMs": 40.774,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4727.327,
"heapDeltaBytes": -3565744,
"heapUsedBytes": 72650912,
"domNodes": -282,
"jsHeapTotalBytes": 4640768,
"scriptDurationMs": 1174.0309999999997,
"eventListeners": -163,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-idle",
"durationMs": 18258.34199999997,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 17331.837999999996,
"heapDeltaBytes": -49426164,
"heapUsedBytes": 176271256,
"domNodes": -8312,
"jsHeapTotalBytes": -17080320,
"scriptDurationMs": 125.84800000000001,
"eventListeners": -16391,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.773333333333238,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-idle",
"durationMs": 18175.88599999999,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 17234.893,
"heapDeltaBytes": -46834980,
"heapUsedBytes": 178602880,
"domNodes": -8312,
"jsHeapTotalBytes": -16556032,
"scriptDurationMs": 135.471,
"eventListeners": -16389,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-pan",
"durationMs": 21844.54999999997,
"styleRecalcs": 171,
"styleRecalcDurationMs": 20.01400000000003,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 21260.125000000004,
"heapDeltaBytes": -46667548,
"heapUsedBytes": 195744904,
"domNodes": -8312,
"jsHeapTotalBytes": -17133568,
"scriptDurationMs": 423.5760000000001,
"eventListeners": -16385,
"totalBlockingTimeMs": 90,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-pan",
"durationMs": 22349.411999999917,
"styleRecalcs": 174,
"styleRecalcDurationMs": 26.060000000000027,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 21606.743000000002,
"heapDeltaBytes": -22977428,
"heapUsedBytes": 192591404,
"domNodes": -8312,
"jsHeapTotalBytes": -20017152,
"scriptDurationMs": 546.557,
"eventListeners": -16387,
"totalBlockingTimeMs": 201,
"frameDurationMs": 18.330000000000048,
"p95FrameDurationMs": 16.799999999995634
},
{
"name": "workflow-execution",
"durationMs": 475.05799999999,
"styleRecalcs": 18,
"styleRecalcDurationMs": 21.344,
"layouts": 3,
"layoutDurationMs": 1.4049999999999998,
"taskDurationMs": 125.79199999999999,
"heapDeltaBytes": 5304056,
"heapUsedBytes": 67612032,
"domNodes": 150,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 12.810000000000002,
"eventListeners": 99,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "workflow-execution",
"durationMs": 462.7309999999625,
"styleRecalcs": 11,
"styleRecalcDurationMs": 21.962000000000003,
"layouts": 3,
"layoutDurationMs": 0.6839999999999999,
"taskDurationMs": 111.49299999999998,
"heapDeltaBytes": 4993976,
"heapUsedBytes": 67324160,
"domNodes": 121,
"jsHeapTotalBytes": 262144,
"scriptDurationMs": 7.352000000000001,
"eventListeners": 97,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
}
]
} |
Codecov Report✅ All modified and coverable lines are covered by tests. @@ Coverage Diff @@
## cloud/1.52 #16092 +/- ##
=============================================
Coverage ? 81.99%
=============================================
Files ? 1910
Lines ? 109932
Branches ? 30683
=============================================
Hits ? 90141
Misses ? 19453
Partials ? 338
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
…he policy (#15967) ### The bug The cancelled-plan **Resubscribe** action was gated on the server-resolved `can_reactivate`. `legacy_stripe` workspaces have no capability projection row, so it resolves `false` for them and the button disappears for customers who should have it. `CurrentUserPopoverWorkspace` was the third and last site with this problem — the follow-up promised on the #15675 review thread, which deliberately left this file out of scope. ### The refactor (added in review) Fixing the third site would have made a third verbatim copy of the same expression, so per review feedback the policy is now centralized instead of duplicated in views. `useWorkspaceUI` — which already owns `permissions` — exposes one derived value: ```ts // legacy_stripe workspaces have no capability projection row, so the // server-resolved can_reactivate is false for them and cannot gate the // action; that rail stays on the membership check. const canReactivatePlan = computed(() => isCloud && shouldUseWorkspaceBilling.value ? canReactivate.value : permissions.value.canManageSubscriptionLifecycle ) ``` `SubscriptionPanelContentWorkspace`, `BillingStatusBanner` and `CurrentUserPopoverWorkspace` all consume it; their local copies and now-unused `useBillingRouting` / `isCloud` imports are gone. So the third site is fixed **and** the pre-existing duplication is removed. No import cycle — neither `useBillingRouting` nor `useBillingCapabilities` imports `useWorkspaceUI`. ### Deliberately not folded in `useWorkspaceMenuItems` has a similar-looking expression for **cancel**, but it carries an extra free-tier guard (`can_cancel` stays true for an active FREE plan). Same shape, different policy — left alone. ### Verification - Policy tests live in `useWorkspaceUI.test.ts` now, where the policy does: consolidated rail (uses the capability), legacy rail, and off-Cloud (both fall back to membership). Verified they actually bite by stubbing the policy out — **2 failed**. - The off-Cloud case is new: `isCloud` is `false` by default under vitest and the composable test wasn't mocking it, so that branch had never been exercised. - Component tests keep their behavioural cases and drive the shared value. - On this head: `pnpm typecheck` clean; **127 passing** across the four affected files; full suite `1317/1318` files green — the only failures are 12 pre-existing `check-binary-size` cases that fail independently of this change. (cherry picked from commit 0c89141)
abc766d to
2586e76
Compare
…rail policy (#16043) Closes #16033. ### The bug `UnifiedPricingTable` and `useSubscriptionCheckout.handleResubscribe` gated reactivation on `isCloud` plus the **raw** `can_reactivate`, ignoring the billing rail: ```ts const canReactivate = computed(() => isCloud ? capabilities.canReactivate.value : permissions.value.canManageSubscriptionLifecycle ) ``` `legacy_stripe` workspaces have no capability projection row, so on Cloud the raw capability is `false` for them. A cancelled `legacy_stripe` customer therefore saw the pricing dialog's reactivate CTA **disabled**, and `handleResubscribe` returned early even if they got there. This is the same defect #15967 fixed for the workspace surfaces — the pricing dialog is the primary resubscribe path, so it matters more. ### The fix Both sites now consume `canReactivatePlan` from `useWorkspaceUI`, the shared rail-aware policy introduced in #15967. Both files already imported `useWorkspaceUI`, so this removes code rather than adding a layer. ### Verification Each new test was checked against the unfixed code, not just run green: - **`useSubscriptionCheckout`** — new case: raw `can_reactivate` false, derived policy true → resubscribe proceeds. Fails against the old expression. - **`UnifiedPricingTable`** — new case: derived policy false → the Resubscribe CTA is disabled. Fails against the old expression. - Two existing checkout cases drove the raw capability and now drive the derived value; their intent is unchanged. - The pricing-table mock previously wired `canReactivate` to the same ref as `canSubscribeSelfServe`, so raw and derived could not diverge. It now has its own ref, which is what makes the new case meaningful. I also wrote and then **removed** a third test — a legacy-rail pricing case that passed against the unfixed code because its scenario never reached the reactivate branch. A test that passes against the bug is worse than no test. `pnpm typecheck` clean; 150 passing across the two affected files; full suite 1317/1318 with only the 12 pre-existing `check-binary-size` environment failures. (cherry picked from commit 77d3ecb)
f98c6e6 to
5f6a795
Compare
Backport of #16043 to
cloud/1.52.Merge order — this PR is stacked
Base is deliberately
backport-15967-to-cloud-1.52, notcloud/1.52. GitHub retargets this PR tocloud/1.52once its parent merges.cloud/1.52→ #15799 → #15803 → #15804 → #15675 → #15967 → #16043 → #16046 → #16067Every commit in this chain cherry-picks cleanly; there are no hand-resolved conflicts anywhere in the stack.
Verification
Run at the tip of the full stack: 93 unit test files, 1745 tests, 0 failures (
src/platform/workspace,src/platform/cloud/subscription,src/composables/useCoreCommands.test.ts,src/components/actionbar).