Merge pull request #21 from netgrif/NAE-1590

[NAE-1590] Taskref with file field must be assigned

Author: machacjozef

projects/netgrif-components-core/src/lib/data-fields/file-field/abstract-file-field.component.ts

@@ -14,6 +14,7 @@ import {take} from 'rxjs/operators';
 import {EventOutcomeMessageResource} from '../../resources/interface/message-resource';
 import {EventService} from '../../event/services/event.service';
 import {ChangedFieldsMap} from '../../event/services/interfaces/changed-fields-map';
+import {FileFieldIdBody} from '../models/file-field-id-body';
 
 export interface FileState {
     progress: number;
@@ -197,8 +198,11 @@ export abstract class AbstractFileFieldComponent extends AbstractDataFieldCompon
         this.state.uploading = true;
         const fileFormData = new FormData();
         const fileToUpload = this.fileUploadEl.nativeElement.files.item(0) as File;
+        const data: FileFieldIdBody = {};
+        data[this.resolveParentTaskId()] = this.dataField.stringId;
         fileFormData.append('file', fileToUpload);
-        this._taskResourceService.uploadFile(this.resolveParentTaskId(), this.dataField.stringId, fileFormData, false)
+        fileFormData.append('data', new Blob([JSON.stringify(data)], {type: 'application/json'}));
+        this._taskResourceService.uploadFile(this.taskId, this.dataField.stringId, fileFormData, false)
             .subscribe((response: EventOutcomeMessageResource) => {
                 if ((response as ProviderProgress).type && (response as ProviderProgress).type === ProgressType.UPLOAD) {
                     this.state.progress = (response as ProviderProgress).progress;
@@ -307,7 +311,7 @@ export abstract class AbstractFileFieldComponent extends AbstractDataFieldCompon
             return;
         }
 
-        this._taskResourceService.deleteFile(this.resolveParentTaskId(),
+        this._taskResourceService.deleteFile(this.taskId,
             this.dataField.stringId).pipe(take(1)).subscribe(response => {
             if (response.success) {
                 const filename = this.dataField.value.name;

projects/netgrif-components-core/src/lib/data-fields/file-list-field/abstract-file-list-field.component.ts

@@ -13,6 +13,7 @@ import {EventOutcomeMessageResource} from '../../resources/interface/message-res
 import {EventService} from '../../event/services/event.service';
 import {ChangedFieldsMap} from '../../event/services/interfaces/changed-fields-map';
 import {Subscription} from 'rxjs';
+import {FileFieldIdBody} from '../models/file-field-id-body';
 
 export interface FilesState {
     progress: number;
@@ -158,7 +159,10 @@ export abstract class AbstractFileListFieldComponent extends AbstractDataFieldCo
         filesToUpload.forEach(fileToUpload => {
             fileFormData.append('files', fileToUpload);
         });
-        this._taskResourceService.uploadFile(this.resolveParentTaskId(),
+        const data: FileFieldIdBody = {};
+        data[this.resolveParentTaskId()] = this.dataField.stringId;
+        fileFormData.append('data', new Blob([JSON.stringify(data)], {type: 'application/json'}));
+        this._taskResourceService.uploadFile(this.taskId,
             this.dataField.stringId, fileFormData, true)
             .subscribe((response: EventOutcomeMessageResource) => {
                 if ((response as ProviderProgress).type && (response as ProviderProgress).type === ProgressType.UPLOAD) {
@@ -253,7 +257,7 @@ export abstract class AbstractFileListFieldComponent extends AbstractDataFieldCo
             return;
         }
 
-        this._taskResourceService.deleteFile(this.resolveParentTaskId(),
+        this._taskResourceService.deleteFile(this.taskId,
             this.dataField.stringId, fileName).pipe(take(1)).subscribe(response => {
             if (response.success) {
                 this.uploadedFiles = this.uploadedFiles.filter(uploadedFile => uploadedFile !== fileName);

projects/netgrif-components-core/src/lib/data-fields/models/file-field-id-body.ts

@@ -0,0 +1,3 @@
+export interface FileFieldIdBody {
+    [key: string]: string;
+}