Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-03-11 13:30:39 +01:00
Code Issues Projects Releases Wiki Activity

[AC-2436] Fix flashing unassigned items banner (#8689)

Browse Source 
* Fix flashing banner for users who shouldn't see it

* Emit the right value the first time

* simplify further

* restore comment
This commit is contained in:
Thomas Rittson 2024-04-11 21:32:44 +10:00 committed by GitHub
parent 9b022d2fc0
commit b843aa6bd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/angular/src/services/unassigned-items-banner.service.spec.ts
View File

@ -1,5 +1,5 @@
import { MockProxy, mock } from "jest-mock-extended"; import { MockProxy, mock } from "jest-mock-extended";
import { firstValueFrom, skip } from "rxjs"; import { firstValueFrom } from "rxjs";
import { FakeStateProvider, mockAccountServiceWith } from "@bitwarden/common/spec"; import { FakeStateProvider, mockAccountServiceWith } from "@bitwarden/common/spec";
import { UserId } from "@bitwarden/common/types/guid"; import { UserId } from "@bitwarden/common/types/guid";
@ -44,10 +44,8 @@ describe("UnassignedItemsBanner", () => {
showBanner.nextState(undefined); showBanner.nextState(undefined);
const sut = sutFactory(); const sut = sutFactory();
// skip first value so we get the recomputed value after the server call
expect(await firstValueFrom(sut.showBanner$.pipe(skip(1)))).toBe(true); expect(await firstValueFrom(sut.showBanner$)).toBe(true);
// Expect to have updated local state
expect(await firstValueFrom(showBanner.state$)).toBe(true);
expect(apiService.getShowUnassignedCiphersBanner).toHaveBeenCalledTimes(1); expect(apiService.getShowUnassignedCiphersBanner).toHaveBeenCalledTimes(1);
}); });
}); });

10
libs/angular/src/services/unassigned-items-banner.service.ts
View File

@ -1,5 +1,5 @@
import { Injectable } from "@angular/core"; import { Injectable } from "@angular/core";
import { EMPTY, concatMap } from "rxjs"; import { concatMap } from "rxjs";
import { import {
StateProvider, StateProvider,
@ -24,15 +24,15 @@ export class UnassignedItemsBannerService {
private _showBanner = this.stateProvider.getActive(SHOW_BANNER_KEY); private _showBanner = this.stateProvider.getActive(SHOW_BANNER_KEY);
showBanner$ = this._showBanner.state$.pipe( showBanner$ = this._showBanner.state$.pipe(
concatMap(async (showBanner) => { concatMap(async (showBannerState) => {
// null indicates that the user has not seen or dismissed the banner yet - get the flag from server // null indicates that the user has not seen or dismissed the banner yet - get the flag from server
if (showBanner == null) { if (showBannerState == null) {
const showBannerResponse = await this.apiService.getShowUnassignedCiphersBanner(); const showBannerResponse = await this.apiService.getShowUnassignedCiphersBanner();
await this._showBanner.update(() => showBannerResponse); await this._showBanner.update(() => showBannerResponse);
return EMPTY; // complete the inner observable without emitting any value; the update on the previous line will trigger another run return showBannerResponse;
} }
return showBanner; return showBannerState;
}), }),
); );