inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-2163] fixed test and added enum for target actions

Browse Source
This commit is contained in:
VitoAlbano
2018-02-02 11:16:02 +00:00
parent 4b58358a13
commit 840ee51852
4 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demo-shell/src/app/components/files/files.component.html
+6 -6
View File
@@ -195,10 +195,10 @@
</data-columns> </data-columns>
<content-actions> <content-actions>
<!-- folder actions --> <!-- common actions -->
<content-action <content-action
icon="content_copy" icon="content_copy"
title="{{'DOCUMENT_LIST.ACTIONS.FOLDER.COPY' | translate}}" title="DOCUMENT_LIST.ACTIONS.FOLDER.COPY"
permission="update" permission="update"
[disableWithNoPermission]="true" [disableWithNoPermission]="true"
(error)="onContentActionError($event)" (error)="onContentActionError($event)"
@@ -207,7 +207,7 @@
</content-action> </content-action>
<content-action <content-action
icon="redo" icon="redo"
title="{{'DOCUMENT_LIST.ACTIONS.FOLDER.MOVE' | translate}}" title="DOCUMENT_LIST.ACTIONS.FOLDER.MOVE"
permission="update" permission="update"
[disableWithNoPermission]="true" [disableWithNoPermission]="true"
(error)="onContentActionError($event)" (error)="onContentActionError($event)"
@@ -218,7 +218,7 @@
icon="delete" icon="delete"
permission="delete" permission="delete"
[disableWithNoPermission]="true" [disableWithNoPermission]="true"
title="{{'DOCUMENT_LIST.ACTIONS.FOLDER.DELETE' | translate}}" title="DOCUMENT_LIST.ACTIONS.FOLDER.DELETE"
(permissionEvent)="handlePermissionError($event)" (permissionEvent)="handlePermissionError($event)"
(success)="onDeleteActionSuccess($event)" (success)="onDeleteActionSuccess($event)"
handler="delete"> handler="delete">
@@ -233,14 +233,14 @@
<content-action <content-action
icon="file_download" icon="file_download"
target="document" target="document"
title="{{'DOCUMENT_LIST.ACTIONS.DOCUMENT.DOWNLOAD' | translate}}" title="DOCUMENT_LIST.ACTIONS.DOCUMENT.DOWNLOAD"
handler="download"> handler="download">
</content-action> </content-action>
<content-action <content-action
*ngIf="authenticationService.isBpmLoggedIn()" *ngIf="authenticationService.isBpmLoggedIn()"
icon="play_arrow" icon="play_arrow"
target="document" target="document"
title="{{'DOCUMENT_LIST.ACTIONS.DOCUMENT.PROCESS_ACTION' | translate}}" title="DOCUMENT_LIST.ACTIONS.DOCUMENT.PROCESS_ACTION"
(execute)="startProcesAction($event)"> (execute)="startProcesAction($event)">
</content-action> </content-action>
</content-actions> </content-actions>
lib/content-services/document-list/components/content-action/content-action.component.spec.ts
+29 -41
View File
@@ -21,7 +21,7 @@ import { async, TestBed } from '@angular/core/testing';
import { ContentService } from '@alfresco/adf-core'; import { ContentService } from '@alfresco/adf-core';
import { DataTableModule } from '@alfresco/adf-core'; import { DataTableModule } from '@alfresco/adf-core';
import { MaterialModule } from '../../../material.module'; import { MaterialModule } from '../../../material.module';
import { FileNode } from '../../../mock';
import { DocumentListService } from '../../services/document-list.service'; import { DocumentListService } from '../../services/document-list.service';
import { ContentActionHandler } from './../../models/content-action.model'; import { ContentActionHandler } from './../../models/content-action.model';
import { DocumentActionsService } from './../../services/document-actions.service'; import { DocumentActionsService } from './../../services/document-actions.service';
@@ -30,6 +30,7 @@ import { NodeActionsService } from './../../services/node-actions.service';
import { DocumentListComponent } from './../document-list.component'; import { DocumentListComponent } from './../document-list.component';
import { ContentActionListComponent } from './content-action-list.component'; import { ContentActionListComponent } from './content-action-list.component';
import { ContentActionComponent } from './content-action.component'; import { ContentActionComponent } from './content-action.component';
import { ContentActionModel } from './../../models/content-action.model';
describe('ContentAction', () => { describe('ContentAction', () => {
@@ -212,20 +213,6 @@ describe('ContentAction', () => {
model.execute('<obj>'); model.execute('<obj>');
}); });
// it('should sync localizable fields with model', () => {
// let action = new ContentActionComponent(actionList, null, null);
// action.title = 'title1';
// action.ngOnInit();
// expect(action.model.title).toBe(action.title);
// action.title = 'title2';
// action.ngOnChanges(null);
// expect(action.model.title).toBe('title2');
// });
it('should not find document action handler with missing service', () => { it('should not find document action handler with missing service', () => {
let action = new ContentActionComponent(actionList, null, null); let action = new ContentActionComponent(actionList, null, null);
expect(action.getSystemHandler('document', 'name')).toBeNull(); expect(action.getSystemHandler('document', 'name')).toBeNull();
@@ -264,32 +251,32 @@ describe('ContentAction', () => {
}); });
// it('should wire model with custom event handler', (done) => { it('should wire model with custom event handler', async(() => {
// let action = new ContentActionComponent(actionList, documentActions, folderActions); let action = new ContentActionComponent(actionList, documentActions, folderActions);
// let file = new FileNode(); let file = new FileNode();
// let handler = new EventEmitter(); let handler = new EventEmitter();
// handler.subscribe((e) => { handler.subscribe((e) => {
// expect(e.value).toBe(file); expect(e.value).toBe(file);
// done(); });
// });
// action.execute = handler; action.execute = handler;
// action.ngOnInit(); action.ngOnInit();
// action.model.execute(file); documentList.actions[0].execute(file);
// }); }));
// it('should allow registering model without handler', () => { it('should allow registering model without handler', () => {
// let action = new ContentActionComponent(actionList, documentActions, folderActions); let action = new ContentActionComponent(actionList, documentActions, folderActions);
// spyOn(actionList, 'registerAction').and.callThrough(); spyOn(actionList, 'registerAction').and.callThrough();
// action.execute = null; action.execute = null;
// action.ngOnInit(); action.handler = null;
action.target = 'document';
action.ngOnInit();
// expect(action.model.handler).toBeUndefined(); expect(actionList.registerAction).toHaveBeenCalledWith(documentList.actions[0]);
// expect(actionList.registerAction).toHaveBeenCalledWith(action.model); });
// });
it('should register on init', () => { it('should register on init', () => {
let action = new ContentActionComponent(actionList, null, null); let action = new ContentActionComponent(actionList, null, null);
@@ -299,11 +286,12 @@ describe('ContentAction', () => {
expect(action.register).toHaveBeenCalled(); expect(action.register).toHaveBeenCalled();
}); });
// it('should require action list to register action with', () => { it('should require action list to register action with', () => {
// let action = new ContentActionComponent(actionList, null, null); const fakeModel = new ContentActionModel();
// expect(action.register()).toBeTruthy(); let action = new ContentActionComponent(actionList, null, null);
expect(action.register(fakeModel)).toBeTruthy();
// action = new ContentActionComponent(null, null, null); action = new ContentActionComponent(null, null, null);
// expect(action.register()).toBeFalsy(); expect(action.register(fakeModel)).toBeFalsy();
// }); });
}); });
lib/content-services/document-list/components/content-action/content-action.component.ts
+7 -7
View File
@@ -22,7 +22,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { ContentActionHandler } from '../../models/content-action.model'; import { ContentActionHandler } from '../../models/content-action.model';
import { DocumentActionsService } from '../../services/document-actions.service'; import { DocumentActionsService } from '../../services/document-actions.service';
import { FolderActionsService } from '../../services/folder-actions.service'; import { FolderActionsService } from '../../services/folder-actions.service';
import { ContentActionModel } from './../../models/content-action.model'; import { ContentActionModel, ContentActionTarget } from './../../models/content-action.model';
import { ContentActionListComponent } from './content-action-list.component'; import { ContentActionListComponent } from './content-action-list.component';
@Component({ @Component({
@@ -49,7 +49,7 @@ export class ContentActionComponent implements OnInit {
/** Type of item that the action appies to. Can be "document" or "folder" */ /** Type of item that the action appies to. Can be "document" or "folder" */
@Input() @Input()
target: string = 'all'; target: string = ContentActionTarget.All;
/** The permission type. */ /** The permission type. */
@Input() @Input()
@@ -90,9 +90,9 @@ export class ContentActionComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
if (this.target === 'all') { if (this.target === ContentActionTarget.All) {
this.generateAction('folder'); this.generateAction(ContentActionTarget.Folder);
this.generateAction('document'); this.generateAction(ContentActionTarget.Document);
} else { } else {
this.generateAction(this.target); this.generateAction(this.target);
} }
@@ -131,7 +131,7 @@ export class ContentActionComponent implements OnInit {
if (target) { if (target) {
let ltarget = target.toLowerCase(); let ltarget = target.toLowerCase();
if (ltarget === 'document') { if (ltarget === ContentActionTarget.Document) {
if (this.documentActions) { if (this.documentActions) {
this.documentActions.permissionEvent.subscribe((permission) => { this.documentActions.permissionEvent.subscribe((permission) => {
this.permissionEvent.emit(permission); this.permissionEvent.emit(permission);
@@ -150,7 +150,7 @@ export class ContentActionComponent implements OnInit {
return null; return null;
} }
if (ltarget === 'folder') { if (ltarget === ContentActionTarget.Folder) {
if (this.folderActions) { if (this.folderActions) {
this.folderActions.permissionEvent.subscribe((permission) => { this.folderActions.permissionEvent.subscribe((permission) => {
this.permissionEvent.emit(permission); this.permissionEvent.emit(permission);
lib/content-services/document-list/models/content-action.model.ts
+6
View File
@@ -39,6 +39,12 @@ export class ContentActionModel {
} }
} }
export enum ContentActionTarget {
Document = 'document',
Folder = 'folder',
All = 'all'
}
export type ContentActionHandler = (obj: any, target?: any, permission?: string) => any; export type ContentActionHandler = (obj: any, target?: any, permission?: string) => any;
export class DocumentActionModel extends ContentActionModel { export class DocumentActionModel extends ContentActionModel {