Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manager: smoother fetch items (fixes #7463) #7464

Merged
merged 11 commits into from
May 22, 2024
Merged

manager: smoother fetch items (fixes #7463) #7464

Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cb4b163
Only take the first observable for the replicators array
Mutugiii May 21, 2024
e627596
Limit emissions from createReplicatorArray observables
Mutugiii May 21, 2024
5061ba4
limit emissions while sharing course/resource
Mutugiii May 21, 2024
5449173
Linting: alignment fix
Mutugiii May 21, 2024
b74e011
Testing across various functions
Mutugiii May 21, 2024
6fc73a4
Reverting in courses and resources
Mutugiii May 22, 2024
1b814c5
Revert to focus on managers fetch only
Mutugiii May 22, 2024
f16e832
Update sync.service.ts
Mutugiii May 22, 2024
81eed52
Update sync.service.ts
dogi May 22, 2024
c2de5c8
Update package.json
dogi May 22, 2024
504af8e
Merge branch 'master' into 7463-double-popups-across-courses-resource…
dogi May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/app/shared/sync.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { Validators } from '@angular/forms';
import { CouchService } from '../shared/couchdb.service';
import { forkJoin, Observable, throwError, of } from 'rxjs';
import { switchMap, map, takeWhile, catchError } from 'rxjs/operators';
import { switchMap, map, takeWhile, catchError, take } from 'rxjs/operators';
import { environment } from '../../environments/environment';
import { StateService } from './state.service';
import { TagsService } from './forms/tags.service';
Expand Down Expand Up @@ -136,8 +136,11 @@ export class SyncService {
};
}

// hack: we take the first observable from the array on initialization since we get 2 as opposed to 1
replicatorsArrayWithTags(items, type: 'pull' | 'push', planetField: 'local' | 'parent') {
return this.stateService.getCouchState('tags', planetField).pipe(map(tags => this.createReplicatorsArray(items, type, tags)));
return this.stateService.getCouchState('tags', planetField).pipe(
take(1),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currently taking only the first observable in the replicators array.

Could compare the 2 received and then take it only if they are the same.

map(tags => this.createReplicatorsArray(items, type, tags)));
}

createReplicatorsArray(items, type: 'pull' | 'push', allTags: any[] = [], replicators = []) {
Expand Down
Loading