[ADF-2065] Refactored Content node selector component (#2778)

* [ADF-2065] created dialog component for content node selector

* [ADF-2065] removing SiteModel from site dropdown to use SitePaging model of js-api

* [ADF-2065] - removed site model and updated documentation

* [ADF-2065] fixed test for site component

* [ADF-2065] refactored content node selector and created content node selector dialog

* [ADF-2065] fixed test on site-api service

* [ADF-2065] added a new content node dialog service to centralise the logic for content node dialog

* [ADF-2065] start adding test for node-actions service|

* [ADF-2065] added test for node-actions service

* [ADF-2065] added test for node action service

* [ADF-2065] renamed components to keep backward compatibility

* [ADF-2065] added input just for backward compatibility

* [ADF-2065] added some changes for backward compatibility and updated documentation

* [ADF-2065] updated documentation for content node selector
This commit is contained in:
Vito
2017-12-14 12:36:08 +00:00
committed by Eugenio Romano
parent d489dd175a
commit 9afa632148
35 changed files with 2028 additions and 1526 deletions

View File

@@ -62,7 +62,7 @@ describe('ContentAction', () => {
beforeEach(() => {
contentService = TestBed.get(ContentService);
nodeActionsService = new NodeActionsService(null, null, null);
nodeActionsService = new NodeActionsService(null, null);
documentActions = new DocumentActionsService(nodeActionsService);
folderActions = new FolderActionsService(nodeActionsService, null, contentService);

View File

@@ -32,7 +32,7 @@ describe('DocumentActionsService', () => {
beforeEach(() => {
documentListService = new DocumentListServiceMock();
contentService = new ContentService(null, null, null, null);
nodeActionsService = new NodeActionsService(null, null, null);
nodeActionsService = new NodeActionsService(null, null);
service = new DocumentActionsService(nodeActionsService, documentListService, contentService);
});

View File

@@ -23,6 +23,7 @@ import { ContentActionHandler } from '../models/content-action.model';
import { DocumentListService } from './document-list.service';
import { FolderActionsService } from './folder-actions.service';
import { NodeActionsService } from './node-actions.service';
import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service';
describe('FolderActionsService', () => {
@@ -37,7 +38,8 @@ describe('FolderActionsService', () => {
FolderActionsService,
NodeActionsService,
TranslationService,
NotificationService
NotificationService,
ContentNodeDialogService
]
}).compileComponents();
}));

View File

@@ -0,0 +1,106 @@
/*!
* @license
* Copyright 2016 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 { async, TestBed } from '@angular/core/testing';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { AppConfigService } from '@alfresco/adf-core';
import { DocumentListService } from './document-list.service';
import { NodeActionsService } from './node-actions.service';
import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service';
import { Observable } from 'rxjs/Observable';
const fakeNode: MinimalNodeEntryEntity = <MinimalNodeEntryEntity> {
id: 'fake'
};
describe('NodeActionsService', () => {
let service: NodeActionsService;
let documentListService: DocumentListService;
let contentDialogService: ContentNodeDialogService;
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [],
providers: [
NodeActionsService,
DocumentListService,
ContentNodeDialogService
]
}).compileComponents();
}));
beforeEach(() => {
let appConfig: AppConfigService = TestBed.get(AppConfigService);
appConfig.config.ecmHost = 'http://localhost:9876/ecm';
service = TestBed.get(NodeActionsService);
documentListService = TestBed.get(DocumentListService);
contentDialogService = TestBed.get(ContentNodeDialogService);
});
it('should be able to create the service', () => {
expect(service).not.toBeNull();
});
it('should be able to copy content', async(() => {
spyOn(documentListService, 'copyNode').and.returnValue(Observable.of('FAKE-OK'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
service.copyContent(fakeNode, 'allowed').subscribe((value) => {
expect(value).toBe('OPERATION.SUCCES.CONTENT.COPY');
});
}));
it('should be able to move content', async(() => {
spyOn(documentListService, 'moveNode').and.returnValue(Observable.of('FAKE-OK'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
service.moveContent(fakeNode, 'allowed').subscribe((value) => {
expect(value).toBe('OPERATION.SUCCES.CONTENT.MOVE');
});
}));
it('should be able to move folder', async(() => {
spyOn(documentListService, 'moveNode').and.returnValue(Observable.of('FAKE-OK'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
service.moveFolder(fakeNode, 'allowed').subscribe((value) => {
expect(value).toBe('OPERATION.SUCCES.FOLDER.MOVE');
});
}));
it('should be able to copy folder', async(() => {
spyOn(documentListService, 'copyNode').and.returnValue(Observable.of('FAKE-OK'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
service.copyFolder(fakeNode, 'allowed').subscribe((value) => {
expect(value).toBe('OPERATION.SUCCES.FOLDER.COPY');
});
}));
it('should be able to propagate the dialog error', async(() => {
spyOn(documentListService, 'copyNode').and.returnValue(Observable.throw('FAKE-KO'));
spyOn(contentDialogService, 'openCopyMoveDialog').and.returnValue(Observable.of([fakeNode]));
service.copyFolder(fakeNode, '!allowed').subscribe((value) => {
}, (error) => {
expect(error).toBe('FAKE-KO');
});
}));
});

View File

@@ -15,23 +15,17 @@
* limitations under the License.
*/
import { DataColumn } from '@alfresco/adf-core';
import { ContentService } from '@alfresco/adf-core';
import { EventEmitter, Injectable } from '@angular/core';
import { MatDialog } from '@angular/material';
import { Injectable } from '@angular/core';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { Subject } from 'rxjs/Subject';
import { ContentNodeSelectorComponent } from '../../content-node-selector/content-node-selector.component';
import { ContentNodeSelectorComponentData } from '../../content-node-selector/content-node-selector.component-data.interface';
import { ShareDataRow } from '../data/share-data-row.model';
import { DocumentListService } from './document-list.service';
import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service';
@Injectable()
export class NodeActionsService {
constructor(private dialog: MatDialog,
private documentListService?: DocumentListService,
private contentService?: ContentService) {}
constructor(private contentDialogService: ContentNodeDialogService,
private documentListService?: DocumentListService) {}
/**
* Copy content node
@@ -84,51 +78,20 @@ export class NodeActionsService {
private doFileOperation(action: string, type: string, contentEntry: MinimalNodeEntryEntity, permission?: string): Subject<string> {
const observable: Subject<string> = new Subject<string>();
if (this.contentService.hasPermission(contentEntry, permission)) {
const data: ContentNodeSelectorComponentData = {
title: `${action} '${contentEntry.name}' to ...`,
actionName: action,
currentFolderId: contentEntry.parentId,
rowFilter: this.rowFilter.bind(this, contentEntry.id),
imageResolver: this.imageResolver.bind(this),
select: new EventEmitter<MinimalNodeEntryEntity[]>()
};
this.dialog.open(ContentNodeSelectorComponent, { data, panelClass: 'adf-content-node-selector-dialog', width: '630px' });
data.select.subscribe((selections: MinimalNodeEntryEntity[]) => {
this.contentDialogService
.openCopyMoveDialog(action, contentEntry, permission)
.subscribe((selections: MinimalNodeEntryEntity[]) => {
const selection = selections[0];
this.documentListService[`${action}Node`].call(this.documentListService, contentEntry.id, selection.id)
.subscribe(
observable.next.bind(observable, `OPERATION.SUCCES.${type.toUpperCase()}.${action.toUpperCase()}`),
observable.error.bind(observable)
observable.next.bind(observable, `OPERATION.SUCCES.${type.toUpperCase()}.${action.toUpperCase()}`),
observable.error.bind(observable)
);
this.dialog.closeAll();
},
(error) => {
observable.error(error);
return observable;
});
return observable;
} else {
observable.error(new Error(JSON.stringify({ error: { statusCode: 403 } })));
return observable;
}
}
private rowFilter(currentNodeId, row: ShareDataRow): boolean {
const node: MinimalNodeEntryEntity = row.node.entry;
if (node.id === currentNodeId || node.isFile) {
return false;
} else {
return true;
}
}
private imageResolver(row: ShareDataRow, col: DataColumn): string|null {
const entry: MinimalNodeEntryEntity = row.node.entry;
if (!this.contentService.hasPermission(entry, 'create')) {
return this.documentListService.getMimeTypeIcon('disable/folder');
}
return null;
return observable;
}
}