inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-19 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-802] fix error on uploading file to attachment list (#1957)

Browse Source 
* [ADF-802] fix error on uploading file to attachment list

* [ADF-802] improved for loop
This commit is contained in:
Vito 2017-06-13 06:39:16 -07:00 committed by Eugenio Romano
parent fc33bf6333
commit 847be272ed
5 changed files with 3 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ng2-components/ng2-activiti-processlist/src/components/activiti-create-process-attachment.component.css
View File

@ -1,19 +0,0 @@
.adf-upload-attachment-container {
border: 1px solid rgb(224, 224, 224);
background: #fff;
text-align: left;
border-top: none;
padding: 10px;
text-align: center;
}
.adf-drag-area {
border: 1px solid #eee;
padding: 100px 10px;
margin-bottom: 10px;
}
.adf-upload-attachment-container button {
color: rgb(253, 145, 0);
opacity: 0.64;
}

15
ng2-components/ng2-activiti-processlist/src/components/activiti-create-process-attachment.component.html
View File

@ -1,15 +0,0 @@
<div class="adf-upload-attachment-container">
<div class="adf-drag-area"
(upload-files)="onFileUpload($event)"
mode="['click', 'drop']"
[adf-upload]="true">
Drop Files Here...
</div>
<button class="mdl-button mdl-js-button mdl-button--raised"
[adf-upload]="true"
mode="['click']"
[multiple]="true"
(upload-files)="onFileUpload($event)">
Upload Attachment
</button>
</div>

99
ng2-components/ng2-activiti-processlist/src/components/activiti-create-process-attachment.component.spec.ts
View File

@ -1,99 +0,0 @@
/*!
* @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 { SimpleChange } from '@angular/core';
import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
import { ActivitiContentService } from 'ng2-activiti-form';
import { ActivitiCreateProcessAttachmentComponent } from './activiti-create-process-attachment.component';
import { TranslationMock } from './../assets/translation.service.mock';
describe('Activiti Process Instance Create Attachment', () => {
let componentHandler: any;
let service: ActivitiContentService;
let component: ActivitiCreateProcessAttachmentComponent;
let fixture: ComponentFixture<ActivitiCreateProcessAttachmentComponent>;
let createProcessRelatedContentSpy: jasmine.Spy;
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
CoreModule.forRoot()
],
declarations: [
ActivitiCreateProcessAttachmentComponent
],
providers: [
{ provide: AlfrescoTranslationService, useClass: TranslationMock },
ActivitiContentService
]
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ActivitiCreateProcessAttachmentComponent);
component = fixture.componentInstance;
service = fixture.debugElement.injector.get(ActivitiContentService);
createProcessRelatedContentSpy = spyOn(service, 'createProcessRelatedContent').and.returnValue(Observable.of({successCode: true}));
componentHandler = jasmine.createSpyObj('componentHandler', [
'upgradeAllRegistered',
'upgradeElement'
]);
window['componentHandler'] = componentHandler;
});
it('should not call createProcessRelatedContent service when processInstanceId changed', () => {
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({ 'processInstanceId': change });
expect(createProcessRelatedContentSpy).not.toHaveBeenCalled();
});
it('should not call createProcessRelatedContent service when there is no file uploaded', () => {
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({ 'processInstanceId': change });
let customEvent = {
detail: {
files: [
]
}
};
component.onFileUpload(customEvent);
expect(createProcessRelatedContentSpy).not.toHaveBeenCalled();
});
it('should call createProcessRelatedContent service when there is a file uploaded', () => {
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({ 'processInstanceId': change });
let file = new File([new Blob()], 'Test');
let customEvent = {
detail: {
files: [
file
]
}
};
component.onFileUpload(customEvent);
expect(createProcessRelatedContentSpy).toHaveBeenCalled();
});
});

68
ng2-components/ng2-activiti-processlist/src/components/activiti-create-process-attachment.component.ts
View File

@ -1,68 +0,0 @@
/*!
* @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 { Component, OnChanges, Input, SimpleChanges, Output, EventEmitter } from '@angular/core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
import { ActivitiContentService } from 'ng2-activiti-form';
@Component({
selector: 'activiti-create-process-attachment',
styleUrls: ['./activiti-create-process-attachment.component.css'],
templateUrl: './activiti-create-process-attachment.component.html'
})
export class ActivitiCreateProcessAttachmentComponent implements OnChanges {
@Input()
processInstanceId: string;
@Output()
error: EventEmitter<any> = new EventEmitter<any>();
@Output()
success: EventEmitter<any> = new EventEmitter<any>();
constructor(private translateService: AlfrescoTranslationService,
private activitiContentService: ActivitiContentService) {
if (translateService) {
translateService.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src');
}
}
ngOnChanges(changes: SimpleChanges) {
if (changes['processInstanceId'] && changes['processInstanceId'].currentValue) {
this.processInstanceId = changes['processInstanceId'].currentValue;
}
}
onFileUpload(event: any) {
let files: File[] = event.detail.files;
for (let i = 0; i < files.length; i++) {
let file: File = files[i];
this.activitiContentService.createProcessRelatedContent(this.processInstanceId, file).subscribe(
(res) => {
this.success.emit(res);
},
(err) => {
this.error.emit(err);
}
);
}
}
}

6
ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.ts
View File

@ -50,10 +50,10 @@ export class ActivitiCreateTaskAttachmentComponent implements OnChanges {
}
onFileUpload(event: any) {
let files: File[] = event.detail.files;
let filesList: File[] = event.detail.files;
for (let i = 0; i < files.length; i++) {
let file: File = files[i];
for (let fileInfoObj of filesList) {
let file: File = fileInfoObj.file;
this.activitiContentService.createTaskRelatedContent(this.taskId, file).subscribe(
(res) => {
this.success.emit(res);