Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions frontend/src/__tests__/recommendations.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3564,6 +3564,54 @@ describe('Bundle B: column header filter triggers', () => {
await load(variants, ['v1684-au']);
expect(document.getElementById('recommendations-action-summary')?.textContent).toMatch(/across 1 row\)$/);
});

// Issue #1705: the Savings Plans child rows use the same nesting rules.
test('Savings Plans children: a single plan keeps its type, variants of a multi-variant plan stay blank', async () => {
const sp = { provider: 'aws', cloud_account_id: 'a1705', region: 'us-east-1', count: 1, upfront_cost: 0 };
await load([
{ ...sp, id: 'sp1705-compute', service: 'savings-plans-compute', resource_type: 'Compute SP', term: 1, payment: 'no-upfront', savings: 40 },
{ ...sp, id: 'sp1705-ec2-1', service: 'savings-plans-ec2instance', resource_type: '', term: 1, payment: 'no-upfront', savings: 30 },
{ ...sp, id: 'sp1705-ec2-3', service: 'savings-plans-ec2instance', resource_type: '', term: 3, payment: 'no-upfront', savings: 50 },
]);
const spChevron = document.querySelector<HTMLButtonElement>('.rec-sp-group-chevron');
if (spChevron?.getAttribute('aria-expanded') !== 'true') spChevron!.click();

// The single-plan child is not a variant: it keeps its resource type.
const single = document.querySelector<HTMLTableRowElement>('tr.recommendation-row[data-rec-id="sp1705-compute"]')!;
expect(single.textContent).toContain('Compute SP');

// The multi-variant child's summary skips its blank resource type.
const childSummary = document.querySelector<HTMLTableRowElement>('tr.rec-sp-group-child')!;
expect(childSummary.querySelector('.rec-cell-identity')?.textContent?.trim()).toBe('us-east-1 \u2014 2 variants');

const childChevron = childSummary.querySelector<HTMLButtonElement>('.rec-cell-chevron')!;
if (childChevron.getAttribute('aria-expanded') !== 'true') childChevron.click();
const variant = document.querySelector<HTMLTableRowElement>('tr.rec-variant-row[data-rec-id="sp1705-ec2-3"]')!;
expect(Array.from(variant.cells).slice(1, 5).map((td) => td.textContent?.trim())).toEqual(['', '', '', '']);
expect(variant.textContent).not.toContain('us-east-1');
});

test('payback card treats a lower bound that rounds to 0.0 as no payback', async () => {
const tiny = { ...base, resource_type: 'db.r6g.large' };
// Best end: 1 / 100 = 0.01 months, which rounds to "0.0"; worst end: 600 / 100 = 6 months.
await load([
{ ...tiny, id: 'v1705-tiny', term: 1, payment: 'partial-upfront', savings: 100, upfront_cost: 1 },
{ ...tiny, id: 'v1705-full', term: 1, payment: 'all-upfront', savings: 100, upfront_cost: 600 },
]);
expect(paybackText()).toContain('Up to 6.0 months');
expect(paybackText()).not.toContain('0.0 \u2013');
});

test('payback card treats a negative lower bound as no payback', async () => {
const credit = { ...base, resource_type: 'db.r6g.xlarge' };
// A negative upfront (a credit) gives -1 / 100 = -0.01 months, which rounds to "-0.0".
await load([
{ ...credit, id: 'v1705-credit', term: 1, payment: 'partial-upfront', savings: 100, upfront_cost: -1 },
{ ...credit, id: 'v1705-paid', term: 1, payment: 'all-upfront', savings: 100, upfront_cost: 600 },
]);
expect(paybackText()).toContain('Up to 6.0 months');
expect(paybackText()).not.toContain('-0.0');
});
});

// Issue #164: cross-column-aware (cascading) distinct values.
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/recommendations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,9 @@ function formatPaybackRange(min: number, max: number): string {
const lo = min.toFixed(1);
const hi = max.toFixed(1);
if (lo === hi) return `${lo} months`;
return min > 0 ? `${lo} – ${hi} months` : `Up to ${hi} months`;
// Decide on the rounded value: a positive bound under 0.05 prints "0.0" and a
// negative one "-0.0" or below, and none of them is a payback period (#1705).
return Number(lo) <= 0 ? `Up to ${hi} months` : `${lo} – ${hi} months`;
}

/** Format a term range, collapsing "1 yr – 1 yr" to "1 yr". */
Expand Down
Loading