gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-04 15:53:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

A few more fixes to the observable streams

Browse Source
This commit is contained in:
Mattias Granlund 2023-11-16 11:47:35 +01:00
parent 52a028440f
commit 3e76504ded
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/ui/src/lib/vbranches/branchStoresCache.ts
View File

@ -30,10 +30,7 @@ export class VirtualBranchService {
this.branches$ = merge(deltas$, sessionId$, head$, baseBranch$).pipe(
debounceTime(100), // TODO: Remove this when we subscribe to vbranches
combineLatestWith(this.reload$),
switchMap(() => {
console.log('reloading branches');
return listVirtualBranches({ projectId });
}),
switchMap(() => listVirtualBranches({ projectId })),
catchError((e) => {
this.branchesError$.next(e);
return of([]);
@ -47,28 +44,16 @@ export class VirtualBranchService {
subscriber.next(branches)
);
})
)
),
shareReplay(1)
);
}
reload() {
console.log('force relaod');
this.reload$.next();
}
}
export function getRemoteBranchesObs(
projectId: string,
fetches$: Observable<void>,
head$: Observable<any>,
baseBranch$: Observable<any>
) {
return merge(fetches$, head$, baseBranch$).pipe(
switchMap(() => getRemoteBranchesData({ projectId })),
shareReplay(1)
);
}
export class BaseBranchService {
base$: Observable<BaseBranch | null>;
error$ = new BehaviorSubject<any>(undefined);
@ -76,6 +61,7 @@ export class BaseBranchService {
constructor(projectId: string, fetches$: Observable<void>, head$: Observable<string>) {
this.base$ = merge(fetches$, head$, this.reload$).pipe(
debounceTime(100),
switchMap(() => getBaseBranch({ projectId })),
catchError((e) => {
this.error$.next(e);