Merge branch 'release/6.2.5' into NAE-1760

Author: machacjozef

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

@@ -171,6 +171,8 @@ export abstract class AbstractFileFieldComponent extends AbstractDataFieldCompon
             if (!!this.filePreview
                 && !!this.dataField.value
                 && !!this.dataField.value.name) {
+                this.fileForDownload = undefined;
+                this.fileForPreview = undefined;
                 this.initializePreviewIfDisplayable();
             }
         })

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

@@ -4,8 +4,7 @@ import {FormControl} from '@angular/forms';
 import {WrappedBoolean} from '../../data-field-template/models/wrapped-boolean';
 import {COMMA, ENTER} from '@angular/cdk/keycodes';
 import {MatChipInputEvent} from '@angular/material/chips';
-import {Observable, of} from 'rxjs';
-import {map, startWith} from 'rxjs/operators';
+import {Observable, of, Subscription} from 'rxjs';
 import {MultichoiceAutocompleteFilterProperty} from './multichoice-autocomplete-filter-property';
 
 @Component({
@@ -21,23 +20,26 @@ export abstract class AbstractMultichoiceAutocompleteFieldComponentComponent imp
 
     separatorKeysCodes: number[] = [ENTER, COMMA];
 
+    subscriptionChangeData$: Subscription;
+
     filteredOptions: Observable<Array<MultichoiceFieldValue>>;
 
     ngOnInit() {
-        this.filteredOptions = this.formControlRef.valueChanges.pipe(
-            startWith(''),
-            map(value => this._filter(value).filter((option) => !this.multichoiceField.value.includes(option.key)))
-        );
+        this.subscriptionChangeData$ =this.formControlRef.valueChanges.subscribe(newVal => {
+            this.filteredOptions = of(this._filter(newVal ?? '').filter((option) => !this.multichoiceField.value?.includes(option.key)));
+        })
     }
 
     ngOnDestroy(): void {
         this.filteredOptions = undefined;
+        this.subscriptionChangeData$.unsubscribe();
     }
 
     add(event: MatChipInputEvent): void {
-        const value = (event['key'] || '').trim();
+        const value = event['key'] ?? '';
 
         if (value) {
+            this.multichoiceField.value = this.multichoiceField.value === null ? [] : this.multichoiceField.value
             const choiceArray = [...this.multichoiceField.value];
             choiceArray.push(value);
             this.multichoiceField.value = choiceArray;

projects/netgrif-components-core/src/lib/task-content/services/task-content.service.ts

@@ -342,20 +342,20 @@ export abstract class TaskContentService implements OnDestroy {
     private isFieldInTaskRef(changedField: string): boolean {
         return !!this.taskFieldsIndex &&
             Object.keys(this.taskFieldsIndex)
-            .some(taskId => taskId !== this.task.stringId && this.taskFieldsIndex[taskId].fields[changedField]);
+                .some(taskId => taskId !== this.task.stringId && this.taskFieldsIndex[taskId].fields[changedField]);
     }
 
     private getReferencedTransitionId(changedField: string): string {
         if (!!this.taskFieldsIndex) {
-           const taskFieldsIndexId = this.getReferencedFieldTask(changedField);
-           return this.taskFieldsIndex[taskFieldsIndexId].transitionId;
+            const taskFieldsIndexId = this.getReferencedFieldTask(changedField);
+            return this.taskFieldsIndex[taskFieldsIndexId].transitionId;
         }
         return undefined;
     }
 
     private getReferencedTaskId(changedField: string): string {
         if (!!this.taskFieldsIndex) {
-            return  Object.keys(this.taskFieldsIndex).find(taskId =>
+            return Object.keys(this.taskFieldsIndex).find(taskId =>
                 Object.keys(this.taskFieldsIndex[taskId].fields).includes(changedField));
         }
         return undefined;