Merge branch 'release/6.2.2' into NAE-1717

Author: machacjozef

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

@@ -25,6 +25,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 {FileFieldIdBody} from '../models/file-field-id-body';
+import { HttpParams } from '@angular/common/http';
 
 export interface FileState {
     progress: number;
@@ -353,9 +354,11 @@ export abstract class AbstractFileFieldComponent extends AbstractDataFieldCompon
             this._log.error('File cannot be deleted. No task is set to the field.');
             return;
         }
+        let param = new HttpParams();
+        param = param.set("parentTaskId", this.resolveParentTaskId());
 
         this._taskResourceService.deleteFile(this.taskId,
-            this.dataField.stringId).pipe(take(1)).subscribe(response => {
+            this.dataField.stringId, undefined, param).pipe(take(1)).subscribe(response => {
             if (response.success) {
                 const filename = this.dataField.value.name;
                 this.dataField.value = {};
@@ -447,7 +450,7 @@ export abstract class AbstractFileFieldComponent extends AbstractDataFieldCompon
         if (!this.checkFileBeforeDownload()) {
             return;
         }
-        this._taskResourceService.downloadFile(this.taskId, this.dataField.stringId).subscribe(response => {
+        this._taskResourceService.downloadFile(this.resolveParentTaskId(), this.dataField.stringId).subscribe(response => {
             if (!(response as ProviderProgress).type || (response as ProviderProgress).type !== ProgressType.DOWNLOAD) {
                 this._log.debug(`File [${this.dataField.stringId}] ${this.dataField.value.name} was successfully downloaded`);
                 this.initDownloadFile(response);

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

@@ -24,6 +24,7 @@ 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';
+import { HttpParams } from '@angular/common/http';
 
 export interface FilesState {
     progress: number;
@@ -286,9 +287,11 @@ export abstract class AbstractFileListFieldComponent extends AbstractDataFieldCo
             this._log.error('File cannot be deleted. No task is set to the field.');
             return;
         }
+        let param = new HttpParams();
+        param = param.set("parentTaskId", this.resolveParentTaskId());
 
         this._taskResourceService.deleteFile(this.taskId,
-            this.dataField.stringId, fileName).pipe(take(1)).subscribe((response: EventOutcomeMessageResource) => {
+            this.dataField.stringId, fileName, param).pipe(take(1)).subscribe((response: EventOutcomeMessageResource) => {
             if (response.success) {
                 const changedFieldsMap: ChangedFieldsMap = this._eventService.parseChangedFieldsFromOutcomeTree(response.outcome);
                 this.dataField.emitChangedFields(changedFieldsMap);

projects/netgrif-components-core/src/lib/resources/engine-endpoint/task-resource.service.ts

@@ -10,7 +10,7 @@ import {Task} from '../interface/task';
 import {CountService} from '../abstract-endpoint/count-service';
 import {Filter} from '../../filter/models/filter';
 import {FilterType} from '../../filter/models/filter-type';
-import {HttpEventType} from '@angular/common/http';
+import { HttpEventType, HttpParams } from '@angular/common/http';
 import {Page} from '../interface/page';
 import {FieldConverterService} from '../../task-content/services/field-converter.service';
 import {TaskSetDataRequestBody} from '../interface/task-set-data-request-body';
@@ -309,9 +309,9 @@ export class TaskResourceService extends AbstractResourceService implements Coun
      * Delete file from the task
      * DELETE
      */
-    public deleteFile(taskId: string, fieldId: string, name?: string): Observable<MessageResource> {
+    public deleteFile(taskId: string, fieldId: string, name?: string, param?: HttpParams): Observable<MessageResource> {
         const url = !!name ? 'task/' + taskId + '/file/' + fieldId + '/' + name : 'task/' + taskId + '/file/' + fieldId;
-        return this._resourceProvider.delete$(url, this.SERVER_URL).pipe(
+        return this._resourceProvider.delete$(url, this.SERVER_URL, param).pipe(
             map(r => this.changeType(r, undefined))
         );
     }

projects/netgrif-components-core/src/lib/task-content/field-component-resolver/abstract-field-component-resolver.component.ts

@@ -42,8 +42,7 @@ export abstract class AbstractFieldComponentResolverComponent {
     }
 
     getTaskId(): string {
-        const referencedTaskId = this.taskContentService.getReferencedFieldTask(this.getDataField().stringId);
-        return referencedTaskId ?? this.taskContentService.task.stringId;
+        return this.taskContentService.task.stringId;
     }
 
     isField(): boolean {