[MNT-21419] correctly reset search results (#1487)

* correctly reset search results

* fix tests

* reset the service intstead of copying

* Revert "fix tests"

This reverts commit 8c1ae87caa.

* fix app service tests
This commit is contained in:
Denys Vuika
2020-06-17 12:27:48 +01:00
committed by GitHub
parent 03b75a5fb3
commit 13e506e4dd
5 changed files with 245 additions and 47 deletions

View File

@@ -29,12 +29,14 @@ import { AuthenticationService, AppConfigService } from '@alfresco/adf-core';
import { Subject } from 'rxjs';
import { HttpClientModule } from '@angular/common/http';
import { AppRouteReuseStrategy } from '../routing/app.routes.strategy';
import { SearchQueryBuilderService } from '@alfresco/adf-content-services';
describe('AppService', () => {
let service: AppService;
let auth: AuthenticationService;
let routeReuse: AppRouteReuseStrategy;
let appConfig: AppConfigService;
let searchQueryBuilderService: SearchQueryBuilderService;
beforeEach(() => {
TestBed.configureTestingModule({
@@ -55,9 +57,16 @@ describe('AppService', () => {
routeReuse = TestBed.get(AppRouteReuseStrategy);
auth = TestBed.get(AuthenticationService);
appConfig = TestBed.get(AppConfigService);
searchQueryBuilderService = TestBed.get(SearchQueryBuilderService);
spyOn(routeReuse, 'resetCache').and.stub();
service = new AppService(auth, appConfig, routeReuse);
service = new AppService(
auth,
appConfig,
searchQueryBuilderService,
routeReuse
);
});
it('should be ready if [withCredentials] mode is used', done => {
@@ -67,7 +76,12 @@ describe('AppService', () => {
}
};
const instance = new AppService(auth, appConfig, routeReuse);
const instance = new AppService(
auth,
appConfig,
searchQueryBuilderService,
routeReuse
);
expect(instance.withCredentials).toBeTruthy();
instance.ready$.subscribe(() => {

View File

@@ -28,6 +28,7 @@ import { AuthenticationService, AppConfigService } from '@alfresco/adf-core';
import { Observable, BehaviorSubject } from 'rxjs';
import { RouteReuseStrategy } from '@angular/router';
import { AppRouteReuseStrategy } from '../routing/app.routes.strategy';
import { SearchQueryBuilderService } from '@alfresco/adf-content-services';
@Injectable({
providedIn: 'root'
@@ -47,6 +48,7 @@ export class AppService {
constructor(
auth: AuthenticationService,
private config: AppConfigService,
searchQueryBuilderService: SearchQueryBuilderService,
@Inject(RouteReuseStrategy) routeStrategy: AppRouteReuseStrategy
) {
this.ready = new BehaviorSubject(auth.isLoggedIn() || this.withCredentials);
@@ -58,6 +60,7 @@ export class AppService {
});
auth.onLogout.subscribe(() => {
searchQueryBuilderService.resetToDefaults();
routeStrategy.resetCache();
});
}