Skip to content

Commit b0eca52

Browse files
[DSC-1956] fix race condition, change interceptor for e2e
1 parent 65bbfa0 commit b0eca52

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

cypress/e2e/community-create.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ beforeEach(() => {
44
});
55

66
it('should show loading component while saving', () => {
7-
cy.intercept('**/sites/**canSubmit**').as('canSubmit');
7+
cy.intercept('**/api/authz/authorizations/search/objects**canSubmit**').as('canSubmit');
88
cy.wait('@canSubmit');
99

1010
const title = 'Test Community Title';

src/app/core/browse/search-manager.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ import {
44
} from '@angular/core';
55
import isArray from 'lodash/isArray';
66
import {
7-
forkJoin,
7+
combineLatest,
88
Observable,
99
of,
1010
} from 'rxjs';
1111
import {
1212
filter,
1313
map,
1414
switchMap,
15+
take,
1516
} from 'rxjs/operators';
1617
import { SearchOptions } from 'src/app/shared/search/models/search-options.model';
1718
import {
@@ -151,8 +152,9 @@ export class SearchManager {
151152
requestsIds.push(getRequestIdFromParams(type, uuidList, features));
152153
});
153154

154-
return forkJoin(requestsIds.map(id => this.authorizationService.isRequestLoading(id))).pipe(
155+
return combineLatest(requestsIds.map(id => this.authorizationService.isRequestLoading(id))).pipe(
155156
filter(loadingItems => loadingItems.every(loading => !loading)),
157+
take(1),
156158
map(() => {
157159
return searchObjects;
158160
}),

0 commit comments

Comments
 (0)