Skip to content

Commit 3d09e83

Browse files
BTrestoneliykat
authored andcommitted
[PM-24261] Fix infinite loading on members tab (#15833)
Use combineLatest instead of withLatestFrom to ensure the observable always emits whenever any value is updated (cherry picked from commit f079d79)
1 parent 8ddf086 commit 3d09e83

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

apps/web/src/app/admin-console/organizations/members/members.component.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
Observable,
1414
shareReplay,
1515
switchMap,
16-
withLatestFrom,
1716
tap,
1817
} from "rxjs";
1918

@@ -310,10 +309,13 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
310309
),
311310
);
312311

313-
const decryptedCollections$ = this.accountService.activeAccount$.pipe(
314-
getUserId,
315-
switchMap((userId) => this.keyService.orgKeys$(userId)),
316-
withLatestFrom(response),
312+
const decryptedCollections$ = combineLatest([
313+
this.accountService.activeAccount$.pipe(
314+
getUserId,
315+
switchMap((userId) => this.keyService.orgKeys$(userId)),
316+
),
317+
response,
318+
]).pipe(
317319
switchMap(([orgKeys, collections]) =>
318320
this.collectionService.decryptMany$(collections, orgKeys),
319321
),

0 commit comments

Comments
 (0)