diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 6d7aa49802..40caee08ec 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -389,8 +389,14 @@ {{ versionString }} @if (settingsService.unseenReleasesSince()) { - +
+ + +
} @if (!settingsService.updateCheckingIsSet || appRemoteVersion()) { diff --git a/src-ui/src/app/components/app-frame/app-frame.component.spec.ts b/src-ui/src/app/components/app-frame/app-frame.component.spec.ts index ca4591bc4f..48e3b3220f 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.spec.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.spec.ts @@ -723,6 +723,30 @@ describe('AppFrameComponent', () => { ).toBeUndefined() }) + it('should dismiss new release pill without opening release notes', () => { + settingsService.set(SETTINGS_KEYS.VERSION, '3.5.1') + settingsService.set(SETTINGS_KEYS.WHATS_NEW_LAST_SEEN_VERSION, '3.4.2') + fixture.detectChanges() + const modalSpy = jest.spyOn(modalService, 'open') + + fixture.debugElement + .query(By.css('button[aria-label="Dismiss"]')) + .nativeElement.click() + const req = httpTestingController.expectOne( + `${environment.apiBaseUrl}ui_settings/` + ) + expect(req.request.body.settings.whats_new.last_seen_version).toEqual( + '3.5.1' + ) + req.flush({ success: true }) + fixture.detectChanges() + + expect(modalSpy).not.toHaveBeenCalled() + expect( + fixture.debugElement.query(By.css('button[aria-label="Dismiss"]')) + ).toBeNull() + }) + it('should open current release notes from the version without marking seen', () => { settingsService.set(SETTINGS_KEYS.VERSION, '3.5.1') settingsService.set(SETTINGS_KEYS.WHATS_NEW_LAST_SEEN_VERSION, '3.5.1') diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index 0c443cf805..0f54558eee 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -570,13 +570,18 @@ export class AppFrameComponent const since = this.settingsService.unseenReleasesSince() this.openReleaseNotes(since) if (since) { - this.settingsService - .markReleasesSeen() - .pipe(first()) - .subscribe({ error: () => {} }) + this.dismissReleaseNotes() } } + /** Mark the running version's release notes seen, hiding "New" */ + dismissReleaseNotes() { + this.settingsService + .markReleasesSeen() + .pipe(first()) + .subscribe({ error: () => {} }) + } + /** Notes for releases newer than the running version, not yet installed */ showAvailableReleaseNotes() { this.openReleaseNotes(