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

[ACA-3218] Fix attach file widget - wrong payload when link is true (#5777)

Browse Source 
* [ACA-3218] Fix attach file widget link is always false

* Add unit tests
This commit is contained in:
arditdomi
2020-06-18 18:18:34 +01:00
committed by GitHub
parent 71205a704c
commit 01244b1250
3 changed files with 62 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/form/services/activiti-alfresco.service.ts
View File

@@ -102,7 +102,7 @@ export class ActivitiContentService {
mimeType: node.content.mimeType,
sourceId: node.id + ';' + node.properties['cm:versionLabel'] + '@' + currentSideId,
name: node.name,
link: false
link: node.isLink
};
return from(apiService.activiti.contentApi.createTemporaryRelatedContent(params))
.pipe(

5
lib/process-services/src/lib/content-widget/attach-file-widget.component.ts
View File

@@ -225,6 +225,11 @@ export class AttachFileWidgetComponent extends UploadWidgetComponent implements
private uploadFileFromCS(fileNodeList: any[], accountId: string, siteId?: string) {
const filesSaved = [];
fileNodeList.forEach(node => {
node.isLink = this.field.params.link;
});
from(fileNodeList).pipe(
mergeMap((node) =>
zip(

58
lib/process-services/src/lib/content-widget/attach-file-widget.components.spec.ts
View File

@@ -41,7 +41,8 @@ const fakeRepositoryListAnswer = [
'serviceId': 'alfresco-9999-SHAREME',
'metaDataAllowed': true,
'name': 'SHAREME',
'repositoryUrl': 'http://localhost:0000/SHAREME'
'repositoryUrl': 'http://localhost:0000/SHAREME',
'id': 1000
},
{
'authorized': true,
@@ -60,7 +61,8 @@ const onlyLocalParams = {
const allSourceParams = {
fileSource: {
serviceId: 'all-file-sources'
}
},
link: false
};
const allSourceParamsWithLinkEnabled = {
@@ -231,6 +233,58 @@ describe('AttachFileWidgetComponent', () => {
});
});
it('should isLink property of the selected node become true when the widget has link enabled', async (done) => {
spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(of(fakeRepositoryListAnswer));
const applyAlfrescoNodeSpy = spyOn(activitiContentService, 'applyAlfrescoNode');
spyOn(contentNodeDialogService, 'openFileBrowseDialogBySite').and.returnValue(of([fakeMinimalNode]));
widget.field = new FormFieldModel(new FormModel(), {
type: FormFieldTypes.UPLOAD,
value: []
});
widget.field.id = 'attach-file-attach';
widget.field.params = <FormFieldMetadata> allSourceParamsWithLinkEnabled;
fixture.detectChanges();
await fixture.whenRenderingDone();
const attachButton: HTMLButtonElement = element.querySelector('#attach-file-attach');
expect(attachButton).not.toBeNull();
attachButton.click();
fixture.detectChanges();
await fixture.whenStable();
fixture.debugElement.query(By.css('#attach-SHAREME')).nativeElement.click();
expect(applyAlfrescoNodeSpy).toHaveBeenCalledWith({ ...fakeMinimalNode, isLink: true }, undefined, 'alfresco-1000-SHAREME');
done();
});
it('should isLink property of the selected node become false when the widget has link disabled', async (done) => {
spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(of(fakeRepositoryListAnswer));
const applyAlfrescoNodeSpy = spyOn(activitiContentService, 'applyAlfrescoNode');
spyOn(contentNodeDialogService, 'openFileBrowseDialogBySite').and.returnValue(of([fakeMinimalNode]));
widget.field = new FormFieldModel(new FormModel(), {
type: FormFieldTypes.UPLOAD,
value: []
});
widget.field.id = 'attach-file-attach';
widget.field.params = <FormFieldMetadata> allSourceParams;
fixture.detectChanges();
await fixture.whenRenderingDone();
const attachButton: HTMLButtonElement = element.querySelector('#attach-file-attach');
expect(attachButton).not.toBeNull();
attachButton.click();
fixture.detectChanges();
await fixture.whenStable();
fixture.debugElement.query(By.css('#attach-SHAREME')).nativeElement.click();
expect(applyAlfrescoNodeSpy).toHaveBeenCalledWith({ ...fakeMinimalNode, isLink: false }, undefined, 'alfresco-1000-SHAREME');
done();
});
it('should be able to upload files coming from content node selector', async(() => {
spyOn(activitiContentService, 'getAlfrescoRepositories').and.returnValue(of(fakeRepositoryListAnswer));
spyOn(activitiContentService, 'applyAlfrescoNode').and.returnValue(of(fakePngAnswer));