From 8aa76513f12afde30ccf8d7236d2c2984d806552 Mon Sep 17 00:00:00 2001 From: Cristian Magherusan-Stanciu Date: Mon, 5 Oct 2026 21:12:17 +0200 Subject: [PATCH 1/2] fix(settings): keep propagated default coverage on save and reject an empty field Saving the Settings page PUT every service row with the coverage loaded before the save, overwriting the value the backend had just propagated from a changed default_coverage. Send the new default unless the user edited that SP card, refresh the cached rows after a save, and reject an empty global coverage field instead of saving 0. Refs #522 --- frontend/src/__tests__/settings.test.ts | 67 +++++++++++++++++++++++++ frontend/src/settings.ts | 35 +++++++++++-- 2 files changed, 97 insertions(+), 5 deletions(-) diff --git a/frontend/src/__tests__/settings.test.ts b/frontend/src/__tests__/settings.test.ts index 519642150..75b221de8 100644 --- a/frontend/src/__tests__/settings.test.ts +++ b/frontend/src/__tests__/settings.test.ts @@ -713,6 +713,73 @@ describe('Settings Module', () => { expect(ec2Call![2].coverage).toBe(80); }); + describe('global coverage propagation (issue #522)', () => { + const loadWithCoverage50 = async (): Promise => { + (api.getConfig as jest.Mock).mockResolvedValue({ + global: { enabled_providers: ['aws'], default_term: 3, default_payment: 'all-upfront', default_coverage: 50 }, + services: [ + { provider: 'aws', service: 'ec2', enabled: true, term: 3, payment: 'all-upfront', coverage: 50 }, + { provider: 'aws', service: 'savings-plans-compute', enabled: true, term: 3, payment: 'all-upfront', coverage: 50 }, + ], + }); + (api.updateConfig as jest.Mock).mockResolvedValue({}); + (api.updateServiceConfig as jest.Mock).mockClear().mockResolvedValue(undefined); + await loadGlobalSettings(); + }; + const coverageSentFor = (service: string): number | undefined => { + const call = (api.updateServiceConfig as jest.Mock).mock.calls.find( + ([provider, svc]) => provider === 'aws' && svc === service, + ); + return call?.[2].coverage; + }; + + test('a changed global coverage is not reverted by the per-service PUTs', async () => { + await loadWithCoverage50(); + (document.getElementById('setting-default-coverage') as HTMLInputElement).value = '0'; + + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + + expect(coverageSentFor('ec2')).toBe(0); + expect(coverageSentFor('savings-plans-compute')).toBe(0); + }); + + test('an SP card coverage edited in the same save wins over the new default', async () => { + await loadWithCoverage50(); + (document.getElementById('setting-default-coverage') as HTMLInputElement).value = '70'; + (document.getElementById('aws-savings-plans-compute-coverage') as HTMLInputElement).value = '60'; + + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + + expect(coverageSentFor('ec2')).toBe(70); + expect(coverageSentFor('savings-plans-compute')).toBe(60); + }); + + test('a second save without reload does not resend the pre-save coverage', async () => { + await loadWithCoverage50(); + (document.getElementById('setting-default-coverage') as HTMLInputElement).value = '70'; + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + (api.updateServiceConfig as jest.Mock).mockClear(); + + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + + expect(coverageSentFor('ec2')).toBe(70); + expect(coverageSentFor('savings-plans-compute')).toBe(70); + }); + + test('an empty global coverage field is rejected instead of saving 0', async () => { + await loadWithCoverage50(); + (document.getElementById('setting-default-coverage') as HTMLInputElement).value = ''; + + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + + expect(api.updateConfig).not.toHaveBeenCalled(); + expect(mockShowToast).toHaveBeenCalledWith(expect.objectContaining({ + message: 'Target coverage must be a whole number between 0 and 100', + kind: 'error', + })); + }); + }); + test('saveGlobalSettings sends per-card enabled=false when SP enabled checkbox unchecked (issue #136)', async () => { (api.updateConfig as jest.Mock).mockResolvedValue({}); (api.updateServiceConfig as jest.Mock).mockClear().mockResolvedValue(undefined); diff --git a/frontend/src/settings.ts b/frontend/src/settings.ts index 6c48b5e5f..51417dd5f 100644 --- a/frontend/src/settings.ts +++ b/frontend/src/settings.ts @@ -171,6 +171,11 @@ const savedSnapshot: Record = {}; // non-UI fields (ramp_schedule, include_engines, etc.) that SaveServiceConfig replaces entirely. let loadedServiceConfigs: api.ServiceConfig[] = []; +// Global default_coverage as last loaded or saved. The backend copies a changed +// default onto every service row, so a save that changes it must not send the +// stale per-service coverage back over the propagated value (#522). +let loadedDefaultCoverage: number | undefined; + // saveInFlight guards saveGlobalSettings against concurrent invocations // (rapid Save clicks, Enter-in-form, etc.). Toggled in a try/finally and // mirrored on the Save button's disabled attribute so the UI reflects the @@ -3242,6 +3247,7 @@ export async function loadGlobalSettings(): Promise { const services = data.services ?? []; loadedServiceConfigs = services; + loadedDefaultCoverage = data.global?.default_coverage; for (const svc of services) { const key = `${svc.provider}-${svc.service}`; const termEl = document.getElementById(`${key}-term`) as HTMLSelectElement | null; @@ -3479,8 +3485,10 @@ export async function saveGlobalSettings(e: Event): Promise { saveInFlight = false; return; } - const rawCoverage = Number(byId('setting-default-coverage')?.value ?? '80'); - if (!Number.isFinite(rawCoverage) || !Number.isInteger(rawCoverage) || rawCoverage < 0 || rawCoverage > 100) { + const coverageText = byId('setting-default-coverage')?.value ?? '80'; + const rawCoverage = Number(coverageText); + // Number('') is 0, so an empty field must be rejected explicitly. + if (coverageText.trim() === '' || !Number.isFinite(rawCoverage) || !Number.isInteger(rawCoverage) || rawCoverage < 0 || rawCoverage > 100) { showToast({ message: 'Target coverage must be a whole number between 0 and 100', kind: 'error' }); if (saveBtn) saveBtn.disabled = false; saveInFlight = false; @@ -3557,12 +3565,19 @@ export async function saveGlobalSettings(e: Event): Promise { // controls. Read from the DOM when the card has the controls; fall back // to the base row value (or the global default) otherwise so RI and // Azure/GCP cards continue to inherit the global settings. - let coverage = base?.coverage ?? settings.default_coverage; + const defaultCoverageChanged = loadedDefaultCoverage !== undefined + && settings.default_coverage !== loadedDefaultCoverage; + let coverage = defaultCoverageChanged + ? settings.default_coverage + : (base?.coverage ?? settings.default_coverage); let enabled = base?.enabled ?? true; if ('coverageId' in field && field.coverageId) { const rawCov = byId(field.coverageId)?.value ?? ''; const parsed = Number(rawCov); - if (rawCov !== '' && Number.isFinite(parsed)) coverage = parsed; + // Only a value the user edited on the card overrides the propagated + // default; an untouched card still shows the pre-save coverage. + const loadedCardCoverage = base?.coverage ?? loadedDefaultCoverage ?? settings.default_coverage; + if (rawCov !== '' && Number.isFinite(parsed) && parsed !== loadedCardCoverage) coverage = parsed; } if ('enabledId' in field && field.enabledId) { const el = byId(field.enabledId); @@ -3590,9 +3605,19 @@ export async function saveGlobalSettings(e: Event): Promise { min_count: filters.min_count, } : {}), }; - return api.updateServiceConfig(provider, service, cfg); + return api.updateServiceConfig(provider, service, cfg).then(() => { + loadedServiceConfigs = [ + ...loadedServiceConfigs.filter(s => !(s.provider === provider && s.service === service)), + cfg, + ]; + if ('coverageId' in field && field.coverageId) { + const el = byId(field.coverageId); + if (el) el.value = String(coverage); + } + }); }); await Promise.all(serviceSaves); + loadedDefaultCoverage = settings.default_coverage; snapshotAllFields(); updateDirtyMarkers(); From 70b0dccc02a3162d504f93b619da6ad69b60b4a5 Mon Sep 17 00:00:00 2001 From: Cristian Magherusan-Stanciu Date: Mon, 5 Oct 2026 21:27:18 +0200 Subject: [PATCH 2/2] fix(settings): track coverage saves with the dirty snapshot --- frontend/src/__tests__/settings.test.ts | 61 +++++++++++++++++++++++++ frontend/src/settings.ts | 25 +++++----- 2 files changed, 75 insertions(+), 11 deletions(-) diff --git a/frontend/src/__tests__/settings.test.ts b/frontend/src/__tests__/settings.test.ts index 75b221de8..1fe372662 100644 --- a/frontend/src/__tests__/settings.test.ts +++ b/frontend/src/__tests__/settings.test.ts @@ -766,6 +766,67 @@ describe('Settings Module', () => { expect(coverageSentFor('savings-plans-compute')).toBe(70); }); + test('an SP card edit saved after a global change survives a further save', async () => { + await loadWithCoverage50(); + (document.getElementById('setting-default-coverage') as HTMLInputElement).value = '0'; + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + (document.getElementById('aws-savings-plans-compute-coverage') as HTMLInputElement).value = '70'; + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + (api.updateServiceConfig as jest.Mock).mockClear(); + + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + + expect(coverageSentFor('ec2')).toBe(0); + expect(coverageSentFor('savings-plans-compute')).toBe(70); + }); + + test('a saved SP card edit does not shield the card from a later global change', async () => { + await loadWithCoverage50(); + (document.getElementById('aws-savings-plans-compute-coverage') as HTMLInputElement).value = '70'; + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + (document.getElementById('setting-default-coverage') as HTMLInputElement).value = '20'; + (api.updateServiceConfig as jest.Mock).mockClear(); + + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + + expect(coverageSentFor('ec2')).toBe(20); + expect(coverageSentFor('savings-plans-compute')).toBe(20); + }); + + test('after a partial failure the retry keeps the saved SP card coverage', async () => { + await loadWithCoverage50(); + (document.getElementById('setting-default-coverage') as HTMLInputElement).value = '0'; + (document.getElementById('aws-savings-plans-compute-coverage') as HTMLInputElement).value = '70'; + (api.updateServiceConfig as jest.Mock).mockImplementation(async (provider: string, svc: string) => { + if (provider === 'aws' && svc === 'ec2') throw new Error('ec2 failed'); + }); + + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + expect(coverageSentFor('savings-plans-compute')).toBe(70); + + (api.updateServiceConfig as jest.Mock).mockClear().mockResolvedValue(undefined); + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + + expect(coverageSentFor('ec2')).toBe(0); + expect(coverageSentFor('savings-plans-compute')).toBe(70); + }); + + test('after a partial failure a further global change still reaches the SP card', async () => { + await loadWithCoverage50(); + (document.getElementById('setting-default-coverage') as HTMLInputElement).value = '0'; + (api.updateServiceConfig as jest.Mock).mockImplementation(async (provider: string, svc: string) => { + if (provider === 'aws' && svc === 'ec2') throw new Error('ec2 failed'); + }); + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + + (document.getElementById('setting-default-coverage') as HTMLInputElement).value = '20'; + (api.updateServiceConfig as jest.Mock).mockClear().mockResolvedValue(undefined); + await saveGlobalSettings({ preventDefault: jest.fn() } as unknown as Event); + + expect(coverageSentFor('ec2')).toBe(20); + expect(coverageSentFor('savings-plans-compute')).toBe(20); + }); + test('an empty global coverage field is rejected instead of saving 0', async () => { await loadWithCoverage50(); (document.getElementById('setting-default-coverage') as HTMLInputElement).value = ''; diff --git a/frontend/src/settings.ts b/frontend/src/settings.ts index 51417dd5f..0552e8f7b 100644 --- a/frontend/src/settings.ts +++ b/frontend/src/settings.ts @@ -171,11 +171,6 @@ const savedSnapshot: Record = {}; // non-UI fields (ramp_schedule, include_engines, etc.) that SaveServiceConfig replaces entirely. let loadedServiceConfigs: api.ServiceConfig[] = []; -// Global default_coverage as last loaded or saved. The backend copies a changed -// default onto every service row, so a save that changes it must not send the -// stale per-service coverage back over the propagated value (#522). -let loadedDefaultCoverage: number | undefined; - // saveInFlight guards saveGlobalSettings against concurrent invocations // (rapid Save clicks, Enter-in-form, etc.). Toggled in a try/finally and // mirrored on the Save button's disabled attribute so the UI reflects the @@ -3247,7 +3242,6 @@ export async function loadGlobalSettings(): Promise { const services = data.services ?? []; loadedServiceConfigs = services; - loadedDefaultCoverage = data.global?.default_coverage; for (const svc of services) { const key = `${svc.provider}-${svc.service}`; const termEl = document.getElementById(`${key}-term`) as HTMLSelectElement | null; @@ -3532,7 +3526,18 @@ export async function saveGlobalSettings(e: Event): Promise { } try { + // The backend copies a changed default onto every service row, so a changed + // default must win over the stale per-service coverage (#522). Decide it from + // the dirty snapshot before the save refreshes it. + const defaultCoverageChanged = 'setting-default-coverage' in savedSnapshot + && getFieldValue('setting-default-coverage') !== savedSnapshot['setting-default-coverage']; await api.updateConfig(settings); + if (defaultCoverageChanged) { + // The default is persisted and propagated; mirror that locally so a retry + // after a partial failure does not send the old coverage back. + savedSnapshot['setting-default-coverage'] = getFieldValue('setting-default-coverage'); + loadedServiceConfigs = loadedServiceConfigs.map(s => ({ ...s, coverage: settings.default_coverage })); + } // Read + validate the per-service recommendation filters up front so a bad // min-count aborts the whole save with a targeted toast (rather than firing @@ -3565,8 +3570,6 @@ export async function saveGlobalSettings(e: Event): Promise { // controls. Read from the DOM when the card has the controls; fall back // to the base row value (or the global default) otherwise so RI and // Azure/GCP cards continue to inherit the global settings. - const defaultCoverageChanged = loadedDefaultCoverage !== undefined - && settings.default_coverage !== loadedDefaultCoverage; let coverage = defaultCoverageChanged ? settings.default_coverage : (base?.coverage ?? settings.default_coverage); @@ -3576,8 +3579,8 @@ export async function saveGlobalSettings(e: Event): Promise { const parsed = Number(rawCov); // Only a value the user edited on the card overrides the propagated // default; an untouched card still shows the pre-save coverage. - const loadedCardCoverage = base?.coverage ?? loadedDefaultCoverage ?? settings.default_coverage; - if (rawCov !== '' && Number.isFinite(parsed) && parsed !== loadedCardCoverage) coverage = parsed; + const cardEdited = getFieldValue(field.coverageId) !== savedSnapshot[field.coverageId]; + if (cardEdited && rawCov !== '' && Number.isFinite(parsed)) coverage = parsed; } if ('enabledId' in field && field.enabledId) { const el = byId(field.enabledId); @@ -3613,11 +3616,11 @@ export async function saveGlobalSettings(e: Event): Promise { if ('coverageId' in field && field.coverageId) { const el = byId(field.coverageId); if (el) el.value = String(coverage); + savedSnapshot[field.coverageId] = getFieldValue(field.coverageId); } }); }); await Promise.all(serviceSaves); - loadedDefaultCoverage = settings.default_coverage; snapshotAllFields(); updateDirtyMarkers();