Merge remote-tracking branch 'origin/release/6.4.2' into NAE-2290

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

Author: tuplle

CHANGELOG.md

@@ -9,6 +9,10 @@ Full Changelog: [https://github.com/netgrif/components/commits/v6.4.2](https://g
 
 ## [6.4.2](https://github.com/netgrif/components/releases/tag/v6.4.2) (2025-05-16)
 
+### Fixed
+- [NAE-2231] Unable to change behavior of taskRef on finish event without error message
+- [NAE-2268] Fix resolving of referenced taskId on frontend
+
 ### Added
 - [NAE-2100] Case view export button as NAE feature
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@netgrif/components-project",
-    "version": "6.4.2-rc.1",
+    "version": "6.4.2-rc.5",
     "description": "Netgrif Application Engine Frontend project. Project includes angular libraries as base for NAE applications.",
     "homepage": "https://components.netgrif.com",
     "license": "SEE LICENSE IN LICENSE",

projects/netgrif-components-core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@netgrif/components-core",
-    "version": "6.4.2-rc.1",
+    "version": "6.4.2-rc.5",
     "description": "Netgrif Application engine frontend core Angular library",
     "homepage": "https://components.netgrif.com",
     "license": "SEE LICENSE IN LICENSE",

projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/finish-task-event-outcome.ts

@@ -2,5 +2,5 @@ import {TaskEventOutcome} from './task-event-outcome';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface FinishTaskEventOutcome extends TaskEventOutcome {
-
+    isTaskStillExecutable?: boolean;
 }

projects/netgrif-components-core/src/lib/resources/interface/task.ts

@@ -70,4 +70,6 @@ export interface Task {
     delegateTitle?: string;
     immediateData?: Array<ImmediateData>;
     assignedUserPolicy?: AssignedUserPolicy;
+
+    isStillExecutable?: boolean;
 }

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

@@ -206,11 +206,12 @@ export abstract class TaskContentService implements OnDestroy {
     /**
      * Clears the assignee, start date and finish date from the managed Task.
      */
-    public updateStateData(eventOutcome: TaskEventOutcome): void {
+    public updateStateData(eventOutcome: TaskEventOutcome, isStillExecutable: boolean = true): void {
         if (this._task) {
             this._task.user = eventOutcome.task.user;
             this._task.startDate = eventOutcome.task.startDate;
             this._task.finishDate = eventOutcome.task.finishDate;
+            this._task.isStillExecutable = isStillExecutable;
         }
     }
 
@@ -235,7 +236,7 @@ export abstract class TaskContentService implements OnDestroy {
     }
 
     protected updateField(chFields: ChangedFields, field: DataField<any>, frontendActions: Change, referenced: boolean = false): void {
-        if (this._fieldConverterService.resolveType(field) === FieldTypeResource.TASK_REF) {
+        if (this._fieldConverterService.resolveType(field) === FieldTypeResource.TASK_REF && (!!this._task?.isStillExecutable || this._task?.isStillExecutable === undefined)) {
             this._taskDataReloadRequest$.next(frontendActions ? frontendActions : undefined);
             return;
         }
@@ -312,7 +313,7 @@ export abstract class TaskContentService implements OnDestroy {
     protected findTaskRefId(taskId: string, fields: { [fieldId: string]: DataField<any>}): DataField<any> {
         let taskRefId = Object.values(fields).find(f => f instanceof TaskRefField && f.value.includes(taskId));
         if (!taskRefId) {
-            const referencedTaskIds = Object.values(fields).filter(f => f instanceof TaskRefField).map(tr => tr.value);
+            const referencedTaskIds = Array.prototype.concat.apply([], Object.values(fields).filter(f => f instanceof TaskRefField).map(tr => tr.value));
             for (const id of referencedTaskIds) {
                 taskRefId = this.findTaskRefId(taskId, this.taskFieldsIndex[id].fields);
                 if (!!taskRefId) {

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

@@ -133,7 +133,8 @@ export class FinishTaskService extends TaskHandlingService {
             }
 
             if (outcomeResource.success) {
-                this._taskContentService.updateStateData(outcomeResource.outcome as FinishTaskEventOutcome);
+                const outcome = outcomeResource.outcome as FinishTaskEventOutcome
+                this._taskContentService.updateStateData(outcome, outcome.isTaskStillExecutable);
                 const changedFieldsMap: ChangedFieldsMap = this._eventService
                     .parseChangedFieldsFromOutcomeTree(outcomeResource.outcome);
                 if (!!changedFieldsMap) {

projects/netgrif-components/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@netgrif/components",
-    "version": "6.4.2-rc.1",
+    "version": "6.4.2-rc.5",
     "description": "Netgrif Application Engine frontend Angular components",
     "homepage": "https://components.netgrif.com",
     "license": "SEE LICENSE IN LICENSE",
@@ -29,7 +29,7 @@
         "nae frontend"
     ],
     "peerDependencies": {
-        "@netgrif/components-core": "6.4.2-rc.1",
+        "@netgrif/components-core": "6.4.2-rc.5",
         "@angular-material-components/datetime-picker": "~7.0.1",
         "@angular-material-components/moment-adapter": "~7.0.0",
         "@angular/animations": "~13.3.1",