inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-3204] Fix destinationFolder breadcrumb restriction not working (#5984)

Browse Source 
* [AAE-3204] Fix destinationFolder breadcrumb restriction not working

* Remove not needed if-else statement

* Fix comments

* Fix type definition error while bulding

* Fix unit tests
This commit is contained in:
arditdomi
2020-08-13 09:01:20 +01:00
committed by GitHub
parent 8a6358ef44
commit 268cf7af21
3 changed files with 11 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.spec.ts
View File

@@ -102,22 +102,6 @@ describe('AttachFileCloudWidgetComponent', () => {
} }
}; };
const allSourceWithMyFilesParams = {
fileSource: {
name: 'all file sources',
serviceId: 'all-file-sources',
destinationFolderPath: '-my-'
}
};
const allSourceWithShareParams = {
fileSource: {
name: 'all file sources',
serviceId: 'all-file-sources',
destinationFolderPath: '-shared-'
}
};
const allSourceWithWrongAliasParams = { const allSourceWithWrongAliasParams = {
fileSource: { fileSource: {
name: 'all file sources', name: 'all file sources',
@@ -309,16 +293,14 @@ describe('AttachFileCloudWidgetComponent', () => {
}); });
describe('destinationFolderPath', () => { describe('destinationFolderPath', () => {
let fetchNodeIdFromRelativePathSpy: jasmine.Spy;
let openUploadFileDialogSpy: jasmine.Spy; let openUploadFileDialogSpy: jasmine.Spy;
beforeEach(async(() => { beforeEach(async(() => {
fetchNodeIdFromRelativePathSpy = spyOn(contentCloudNodeSelectorService, 'fetchNodeIdFromRelativePath').and.returnValue(mockNodeId);
openUploadFileDialogSpy = spyOn(contentCloudNodeSelectorService, 'openUploadFileDialog').and.returnValue(of([fakeMinimalNode])); openUploadFileDialogSpy = spyOn(contentCloudNodeSelectorService, 'openUploadFileDialog').and.returnValue(of([fakeMinimalNode]));
})); }));
it('should be able to fetch nodeId if destinationFolderPtah defined ', async() => { it('should be able to fetch nodeId if destinationFolderPath is defined', async() => {
const fetchNodeIdFromRelativePathSpy = spyOn(contentCloudNodeSelectorService, 'fetchNodeIdFromRelativePath').and.returnValue(mockNodeId);
widget.field = new FormFieldModel(new FormModel(), { widget.field = new FormFieldModel(new FormModel(), {
type: FormFieldTypes.UPLOAD, type: FormFieldTypes.UPLOAD,
value: [] value: []
@@ -342,7 +324,7 @@ describe('AttachFileCloudWidgetComponent', () => {
expect(widget.rootNodeId).toEqual('mock-node-id'); expect(widget.rootNodeId).toEqual('mock-node-id');
}); });
it('Should be able to set given alias as rootNodeId if destinationFolderPath contains only alias i.e -root-', async() => { it('Should be able to set given alias as rootNodeId if the nodeId of the alias is not fetched from the api', async() => {
widget.field = new FormFieldModel(new FormModel(), { widget.field = new FormFieldModel(new FormModel(), {
type: FormFieldTypes.UPLOAD, type: FormFieldTypes.UPLOAD,
value: [] value: []
@@ -363,48 +345,6 @@ describe('AttachFileCloudWidgetComponent', () => {
expect(openUploadFileDialogSpy).toHaveBeenCalledWith('-root-', 'single', true); expect(openUploadFileDialogSpy).toHaveBeenCalledWith('-root-', 'single', true);
}); });
it('Should be able to set given alias as rootNodeId if destinationFolderPath contains only alias i.e -my-', async() => {
widget.field = new FormFieldModel(new FormModel(), {
type: FormFieldTypes.UPLOAD,
value: []
});
widget.field.id = 'attach-file-alfresco';
widget.field.params = <FormFieldMetadata> allSourceWithMyFilesParams;
fixture.detectChanges();
await fixture.whenStable();
const attachButton: HTMLButtonElement = element.querySelector('#attach-file-alfresco');
expect(attachButton).not.toBeNull();
attachButton.click();
await fixture.whenStable();
fixture.detectChanges();
expect(widget.rootNodeId).toEqual('-my-');
expect(openUploadFileDialogSpy).toHaveBeenCalledWith('-my-', 'single', true);
});
it('Should be able to set given alias as rootNodeId if destinationFolderPath contains only alias i.e -shared-', async() => {
widget.field = new FormFieldModel(new FormModel(), {
type: FormFieldTypes.UPLOAD,
value: []
});
widget.field.id = 'attach-file-alfresco';
widget.field.params = <FormFieldMetadata> allSourceWithShareParams;
fixture.detectChanges();
await fixture.whenStable();
const attachButton: HTMLButtonElement = element.querySelector('#attach-file-alfresco');
expect(attachButton).not.toBeNull();
attachButton.click();
await fixture.whenStable();
fixture.detectChanges();
expect(widget.rootNodeId).toEqual('-shared-');
expect(openUploadFileDialogSpy).toHaveBeenCalledWith('-shared-', 'single', true);
});
it('Should be able to set default alias as rootNodeId if destinationFolderPath contains wrong alias', async() => { it('Should be able to set default alias as rootNodeId if destinationFolderPath contains wrong alias', async() => {
widget.field = new FormFieldModel(new FormModel(), { widget.field = new FormFieldModel(new FormModel(), {
type: FormFieldTypes.UPLOAD, type: FormFieldTypes.UPLOAD,

11
lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts
View File

@@ -90,15 +90,10 @@ export class AttachFileCloudWidgetComponent extends UploadCloudWidgetComponent i
if (this.isAlfrescoAndLocal()) { if (this.isAlfrescoAndLocal()) {
const destinationFolderPath = this.getAliasAndRelativePathFromDestinationFolderPath(this.field.params.fileSource.destinationFolderPath); const destinationFolderPath = this.getAliasAndRelativePathFromDestinationFolderPath(this.field.params.fileSource.destinationFolderPath);
const opts = { relativePath: destinationFolderPath.path };
if (destinationFolderPath.path) { const nodeId = await this.contentNodeSelectorService.fetchNodeIdFromRelativePath(destinationFolderPath.alias, opts);
const opts = { relativePath: destinationFolderPath.path }; this.rootNodeId = nodeId ? nodeId : destinationFolderPath.alias;
await this.contentNodeSelectorService.fetchNodeIdFromRelativePath(destinationFolderPath.alias, opts).then((nodeId: string) => {
this.rootNodeId = nodeId ? nodeId : destinationFolderPath.alias;
});
} else {
this.rootNodeId = destinationFolderPath.alias;
}
} }
this.contentNodeSelectorService this.contentNodeSelectorService

12
lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.ts
View File

@@ -54,13 +54,11 @@ export class ContentCloudNodeSelectorService {
} }
async fetchNodeIdFromRelativePath(alias: string, opts: { relativePath: string }): Promise<string> { async fetchNodeIdFromRelativePath(alias: string, opts: { relativePath: string }): Promise<string> {
let nodeId = ''; const nodeEntry: any = await this.apiService.getInstance().node
await this.apiService.getInstance().node.getNode(alias, opts).then(node => { .getNode(alias, opts)
nodeId = node.entry.id; .catch((err) => this.handleError(err));
}).catch((err) => {
this.handleError(err); return nodeEntry?.entry?.id;
});
return nodeId;
} }
private openContentNodeDialog(data: ContentNodeSelectorComponentData, currentPanelClass: string, chosenWidth: string) { private openContentNodeDialog(data: ContentNodeSelectorComponentData, currentPanelClass: string, chosenWidth: string) {