diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-create-task-attachment.component.css b/ng2-components/ng2-activiti-tasklist/src/components/activiti-create-task-attachment.component.css deleted file mode 100644 index 7371ee4215..0000000000 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-create-task-attachment.component.css +++ /dev/null @@ -1,19 +0,0 @@ -.upload-attachment-container { - border: 1px solid rgb(224, 224, 224); - background: #fff; - text-align: left; - border-top: none; - padding: 10px; - text-align: center; -} - -.drag-area { - border: 1px solid #eee; - padding: 100px 10px; - margin-bottom: 10px; -} - -.upload-attachment-container button { - color: rgb(253, 145, 0); - opacity: 0.64; -} \ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-create-task-attachment.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-create-task-attachment.component.html deleted file mode 100644 index e1d5f20345..0000000000 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-create-task-attachment.component.html +++ /dev/null @@ -1,15 +0,0 @@ -
-
- Drop Files Here... -
- -
\ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-create-task-attachment.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-create-task-attachment.component.spec.ts deleted file mode 100644 index aca833d26e..0000000000 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-create-task-attachment.component.spec.ts +++ /dev/null @@ -1,101 +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 { ActivitiCreateTaskAttachmentComponent } from './activiti-create-task-attachment.component'; - -describe('Activiti Task Create Attachment', () => { - - let componentHandler: any; - let service: ActivitiContentService; - let component: ActivitiCreateTaskAttachmentComponent; - let fixture: ComponentFixture; - let createTaskRelatedContentSpy: jasmine.Spy; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - CoreModule.forRoot() - ], - declarations: [ - ActivitiCreateTaskAttachmentComponent - ], - providers: [ - { provide: AlfrescoTranslationService }, - ActivitiContentService - ] - }).compileComponents(); - })); - - beforeEach(() => { - - fixture = TestBed.createComponent(ActivitiCreateTaskAttachmentComponent); - component = fixture.componentInstance; - service = fixture.debugElement.injector.get(ActivitiContentService); - - createTaskRelatedContentSpy = spyOn(service, 'createTaskRelatedContent').and.returnValue(Observable.of( - { - status: true - })); - - componentHandler = jasmine.createSpyObj('componentHandler', [ - 'upgradeAllRegistered', - 'upgradeElement' - ]); - window['componentHandler'] = componentHandler; - }); - - it('should not call createTaskRelatedContent service when taskId changed', () => { - let change = new SimpleChange(null, '123', true); - component.ngOnChanges({ 'taskId': change }); - expect(createTaskRelatedContentSpy).not.toHaveBeenCalled(); - }); - - it('should not call createTaskRelatedContent service when there is no file uploaded', () => { - let change = new SimpleChange(null, '123', true); - component.ngOnChanges({ 'taskId': change }); - let customEvent = { - detail: { - files: [ - ] - } - }; - component.onFileUpload(customEvent); - expect(createTaskRelatedContentSpy).not.toHaveBeenCalled(); - }); - - it('should call createTaskRelatedContent service when there is a file uploaded', () => { - let change = new SimpleChange(null, '123', true); - component.ngOnChanges({ 'taskId': change }); - let file = new File([new Blob()], 'Test'); - let customEvent = { - detail: { - files: [ - file - ] - } - }; - component.onFileUpload(customEvent); - expect(createTaskRelatedContentSpy).toHaveBeenCalled(); - }); -}); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-create-task-attachment.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-create-task-attachment.component.ts deleted file mode 100644 index 5160aea40a..0000000000 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-create-task-attachment.component.ts +++ /dev/null @@ -1,67 +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-task-attachment', - styleUrls: ['./activiti-create-task-attachment.component.css'], - templateUrl: './activiti-create-task-attachment.component.html' -}) -export class ActivitiCreateTaskAttachmentComponent implements OnChanges { - - @Input() - taskId: string; - - @Output() - error: EventEmitter = new EventEmitter(); - - @Output() - success: EventEmitter = new EventEmitter(); - - constructor(private translateService: AlfrescoTranslationService, - private activitiContentService: ActivitiContentService) { - - if (translateService) { - translateService.addTranslationFolder('ng2-activiti-tasklist', 'node_modules/ng2-activiti-tasklist/src'); - } - } - - ngOnChanges(changes: SimpleChanges) { - if (changes['taskId'] && changes['taskId'].currentValue) { - this.taskId = changes['taskId'].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.createTaskRelatedContent(this.taskId, file).subscribe( - (res) => { - this.success.emit(res); - }, - (err) => { - this.error.emit(err); - } - ); - } - } -} diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.spec.ts index d1c507302c..5b9bbf1d78 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.spec.ts @@ -41,7 +41,7 @@ describe('Activiti Task Create Attachment', () => { ActivitiCreateTaskAttachmentComponent ], providers: [ - {provide: AlfrescoTranslationService}, + { provide: AlfrescoTranslationService }, ActivitiContentService ] }).compileComponents(); @@ -55,7 +55,7 @@ describe('Activiti Task Create Attachment', () => { createTaskRelatedContentSpy = spyOn(service, 'createTaskRelatedContent').and.returnValue(Observable.of( { - status: true + status: true })); componentHandler = jasmine.createSpyObj('componentHandler', [ @@ -67,16 +67,17 @@ describe('Activiti Task Create Attachment', () => { it('should not call createTaskRelatedContent service when taskId changed', () => { let change = new SimpleChange(null, '123', true); - component.ngOnChanges({'taskId': change}); + component.ngOnChanges({ 'taskId': change }); expect(createTaskRelatedContentSpy).not.toHaveBeenCalled(); }); it('should not call createTaskRelatedContent service when there is no file uploaded', () => { let change = new SimpleChange(null, '123', true); - component.ngOnChanges({'taskId': change}); - let customEvent: any = { + component.ngOnChanges({ 'taskId': change }); + let customEvent = { detail: { - files: [] + files: [ + ] } }; component.onFileUpload(customEvent); @@ -85,7 +86,7 @@ describe('Activiti Task Create Attachment', () => { it('should call createTaskRelatedContent service when there is a file uploaded', () => { let change = new SimpleChange(null, '123', true); - component.ngOnChanges({'taskId': change}); + component.ngOnChanges({ 'taskId': change }); let file = new File([new Blob()], 'Test'); let customEvent = { detail: { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.ts index 041de2de0f..72d8010380 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/adf-create-task-attachment.component.ts @@ -50,14 +50,11 @@ export class ActivitiCreateTaskAttachmentComponent implements OnChanges { } onFileUpload(event: any) { - let filesList: File[] = event.detail.files.map(obj => obj.file); + let files: File[] = event.detail.files; - for (let fileInfoObj of filesList) { - let file: File = fileInfoObj; - let opts = { - isRelatedContent: true - }; - this.activitiContentService.createTaskRelatedContent(this.taskId, file, opts).subscribe( + for (let i = 0; i < files.length; i++) { + let file: File = files[i]; + this.activitiContentService.createTaskRelatedContent(this.taskId, file).subscribe( (res) => { this.success.emit(res); },