mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-07-31 17:38:28 +00:00
[ACA-1455] universal Viewer @effect (#412)
* viewer @effect * universal preview effect * remove router where not needed * update tests * update tests
This commit is contained in:
committed by
Cilibiu Bogdan
parent
d1e5353d7a
commit
f8fe664f1f
@@ -92,7 +92,7 @@
|
||||
[sorting]="[ 'modifiedAt', 'desc' ]"
|
||||
[acaSortingPreferenceKey]="sortingPreferenceKey"
|
||||
[imageResolver]="imageResolver"
|
||||
(node-dblclick)="onNodeDoubleClick($event.detail?.node?.entry)"
|
||||
(node-dblclick)="onNodeDoubleClick($event.detail?.node)"
|
||||
(ready)="onDocumentListReady($event, documentList)"
|
||||
(node-select)="onNodeSelect($event, documentList)"
|
||||
(node-unselect)="onNodeUnselect($event, documentList)">
|
||||
|
@@ -25,7 +25,6 @@
|
||||
|
||||
import { TestBed, async, ComponentFixture } from '@angular/core/testing';
|
||||
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||
import { Router } from '@angular/router';
|
||||
import { RouterTestingModule } from '@angular/router/testing';
|
||||
import { HttpClientModule } from '@angular/common/http';
|
||||
import {
|
||||
@@ -51,7 +50,6 @@ import { INITIAL_STATE } from '../../store/states/app.state';
|
||||
describe('RecentFiles Routed Component', () => {
|
||||
let fixture: ComponentFixture<RecentFilesComponent>;
|
||||
let component: RecentFilesComponent;
|
||||
let router: Router;
|
||||
let alfrescoApi: AlfrescoApiService;
|
||||
let contentService: ContentManagementService;
|
||||
let page;
|
||||
@@ -108,7 +106,6 @@ describe('RecentFiles Routed Component', () => {
|
||||
fixture = TestBed.createComponent(RecentFilesComponent);
|
||||
component = fixture.componentInstance;
|
||||
|
||||
router = TestBed.get(Router);
|
||||
contentService = TestBed.get(ContentManagementService);
|
||||
alfrescoApi = TestBed.get(AlfrescoApiService);
|
||||
alfrescoApi.reset();
|
||||
@@ -153,28 +150,6 @@ describe('RecentFiles Routed Component', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('onNodeDoubleClick()', () => {
|
||||
it('open preview if node is file', () => {
|
||||
spyOn(router, 'navigate').and.stub();
|
||||
const node: any = { id: 'node-id', isFile: true };
|
||||
|
||||
component.onNodeDoubleClick(node);
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(router.navigate['calls'].argsFor(0)[0]).toEqual(['./preview', node.id]);
|
||||
});
|
||||
|
||||
it('does not open preview if node is folder', () => {
|
||||
spyOn(router, 'navigate').and.stub();
|
||||
const node: any = { isFolder: true };
|
||||
|
||||
component.onNodeDoubleClick(node);
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(router.navigate).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe('refresh', () => {
|
||||
it('should call document list reload', () => {
|
||||
spyOn(component.documentList, 'reload');
|
||||
|
@@ -24,8 +24,8 @@
|
||||
*/
|
||||
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { Router, ActivatedRoute } from '@angular/router';
|
||||
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
import { MinimalNodeEntity } from 'alfresco-js-api';
|
||||
import { UserPreferencesService, UploadService } from '@alfresco/adf-core';
|
||||
|
||||
import { ContentManagementService } from '../../common/services/content-management.service';
|
||||
@@ -40,14 +40,13 @@ import { AppStore } from '../../store/states/app.state';
|
||||
export class RecentFilesComponent extends PageComponent implements OnInit {
|
||||
|
||||
constructor(
|
||||
router: Router,
|
||||
route: ActivatedRoute,
|
||||
store: Store<AppStore>,
|
||||
private uploadService: UploadService,
|
||||
private content: ContentManagementService,
|
||||
public permission: NodePermissionService,
|
||||
preferences: UserPreferencesService) {
|
||||
super(preferences, router, route, store);
|
||||
super(preferences, route, store);
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
@@ -61,12 +60,14 @@ export class RecentFilesComponent extends PageComponent implements OnInit {
|
||||
]);
|
||||
}
|
||||
|
||||
onNodeDoubleClick(node: MinimalNodeEntryEntity) {
|
||||
if (node && PageComponent.isLockedNode(node)) {
|
||||
event.preventDefault();
|
||||
onNodeDoubleClick(node: MinimalNodeEntity) {
|
||||
if (node && node.entry) {
|
||||
if (PageComponent.isLockedNode(node.entry)) {
|
||||
event.preventDefault();
|
||||
return;
|
||||
}
|
||||
|
||||
} else if (node && node.isFile) {
|
||||
this.router.navigate(['./preview', node.id], { relativeTo: this.route });
|
||||
this.showPreview(node);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user