[ADF-4424] Pdf Viewer - password dialog does not close when pressing Escape (#4622)

* return to previous page on close

* update e2e

* [ADF-4424] Improve PreviousRouteService to use it in pdfViewer

* change previous Url logic

* remove navigation logic

* remove test

* Update pdfViewer.component.spec.ts

* back button logic for viewer outlet

* unit tests

* remove fdescribe

* remove unused service

* e2e

* return to location

* remove click filter step

* remove unnecessary test steps

* remove un existen export

* unify preview between PS and CS in demo shell

* fix dispalyname property
This commit is contained in:
Cilibiu Bogdan
2019-07-11 19:33:15 +03:00
committed by Eugenio Romano
parent 72b3a75a85
commit ccdcba8778
18 changed files with 149 additions and 317 deletions

View File

@@ -1,61 +0,0 @@
/*!
* @license
* Copyright 2019 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { TestBed } from '@angular/core/testing';
import { setupTestBed } from '../testing/setupTestBed';
import { PreviousRouteService } from './previous-route.service';
import { Router, NavigationEnd } from '@angular/router';
import { Observable } from 'rxjs';
import { CoreTestingModule } from 'core/testing/core.testing.module';
class MockRouter {
firstUrl = new NavigationEnd(0, '/files', '/files');
secondUrl = new NavigationEnd(0, '/home', '/home');
events = new Observable((observer) => {
observer.next(this.firstUrl);
observer.next(this.secondUrl);
observer.complete();
});
}
describe('Previous route service ', () => {
let previousRouteService: PreviousRouteService;
setupTestBed({
imports: [
CoreTestingModule
],
providers: [
{ provide: Router, useClass: MockRouter },
PreviousRouteService
]
});
beforeEach(() => {
previousRouteService = TestBed.get(PreviousRouteService);
});
it('should be able to create the service', () => {
expect(previousRouteService).not.toBeNull();
expect(previousRouteService).toBeDefined();
});
it('should set curent url when new page loads', () => {
expect(previousRouteService.getPreviousUrl()).toBe('/files');
});
});

View File

@@ -1,42 +0,0 @@
/*!
* @license
* Copyright 2019 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Injectable } from '@angular/core';
import { Router, NavigationEnd } from '@angular/router';
@Injectable({
providedIn: 'root'
})
export class PreviousRouteService {
private previousUrl: string;
private currentUrl: string;
constructor(private router: Router) {
this.currentUrl = this.router.url;
this.router.events.subscribe((event) => {
if (event instanceof NavigationEnd) {
this.previousUrl = this.currentUrl;
this.currentUrl = event.url;
}
});
}
public getPreviousUrl(): string {
return this.previousUrl;
}
}

View File

@@ -55,5 +55,4 @@ export * from './jwt-helper.service';
export * from './download-zip.service';
export * from './lock.service';
export * from './automation.service';
export * from './previous-route.service';
export * from './automation.service';