From 47db4c4fb86f9dce4bb79a641dcbead082e22b2d Mon Sep 17 00:00:00 2001 From: Machac Date: Thu, 2 Oct 2025 16:11:11 +0200 Subject: [PATCH 1/6] Release/7.0.0-rc13 --- package.json | 2 +- projects/netgrif-components-core/package.json | 2 +- projects/netgrif-components/package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 39715c689..6eb1bc1ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@netgrif/components-project", - "version": "7.0.0-rc.12", + "version": "7.0.0-rc.13", "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", diff --git a/projects/netgrif-components-core/package.json b/projects/netgrif-components-core/package.json index e6f2f00cd..9f5c43cef 100644 --- a/projects/netgrif-components-core/package.json +++ b/projects/netgrif-components-core/package.json @@ -1,6 +1,6 @@ { "name": "@netgrif/components-core", - "version": "7.0.0-rc.12", + "version": "7.0.0-rc.13", "description": "Netgrif Application engine frontend core Angular library", "homepage": "https://components.netgrif.com", "license": "SEE LICENSE IN LICENSE", diff --git a/projects/netgrif-components/package.json b/projects/netgrif-components/package.json index ec2fecfbe..786ebde81 100644 --- a/projects/netgrif-components/package.json +++ b/projects/netgrif-components/package.json @@ -1,6 +1,6 @@ { "name": "@netgrif/components", - "version": "7.0.0-rc.12", + "version": "7.0.0-rc.13", "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": "7.0.0-rc.12", + "@netgrif/components-core": "7.0.0-rc.13", "@angular-material-components/datetime-picker": "~16.0.0", "@angular-material-components/moment-adapter": "~16.0.0", "@angular/animations": "~17.1.0", From 3e8f232cebfa4ad6a5e1ac4ac8b2e2889c15f9bd Mon Sep 17 00:00:00 2001 From: Machac Date: Fri, 3 Oct 2025 15:39:08 +0200 Subject: [PATCH 2/6] Release/7.0.0-rc14 --- package.json | 2 +- projects/netgrif-components-core/package.json | 2 +- projects/netgrif-components/package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 6eb1bc1ff..7533010c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@netgrif/components-project", - "version": "7.0.0-rc.13", + "version": "7.0.0-rc.14", "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", diff --git a/projects/netgrif-components-core/package.json b/projects/netgrif-components-core/package.json index 9f5c43cef..54c4c38eb 100644 --- a/projects/netgrif-components-core/package.json +++ b/projects/netgrif-components-core/package.json @@ -1,6 +1,6 @@ { "name": "@netgrif/components-core", - "version": "7.0.0-rc.13", + "version": "7.0.0-rc.14", "description": "Netgrif Application engine frontend core Angular library", "homepage": "https://components.netgrif.com", "license": "SEE LICENSE IN LICENSE", diff --git a/projects/netgrif-components/package.json b/projects/netgrif-components/package.json index 786ebde81..842cd37f6 100644 --- a/projects/netgrif-components/package.json +++ b/projects/netgrif-components/package.json @@ -1,6 +1,6 @@ { "name": "@netgrif/components", - "version": "7.0.0-rc.13", + "version": "7.0.0-rc.14", "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": "7.0.0-rc.13", + "@netgrif/components-core": "7.0.0-rc.14", "@angular-material-components/datetime-picker": "~16.0.0", "@angular-material-components/moment-adapter": "~16.0.0", "@angular/animations": "~17.1.0", From a232034613726a4ef99a105d70c4f1718ea2c054 Mon Sep 17 00:00:00 2001 From: martinkranec <116879585+martinkranec@users.noreply.github.com> Date: Mon, 13 Oct 2025 13:38:15 +0200 Subject: [PATCH 3/6] [NAE-2232] Frontend Actions Task events resolver - add FrontActionService integration to event task services for handling front actions --- .../lib/task/services/assign-task.service.ts | 9 +++++++++ .../lib/task/services/cancel-task.service.ts | 17 ++++++++++++++--- .../lib/task/services/finish-task.service.ts | 13 +++++++++++-- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/projects/netgrif-components-core/src/lib/task/services/assign-task.service.ts b/projects/netgrif-components-core/src/lib/task/services/assign-task.service.ts index b2f96ef2e..bd4bd7e3a 100644 --- a/projects/netgrif-components-core/src/lib/task/services/assign-task.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/assign-task.service.ts @@ -24,6 +24,8 @@ import {ChangedFieldsService} from '../../changed-fields/services/changed-fields import {EventService} from '../../event/services/event.service'; import {ChangedFieldsMap} from '../../event/services/interfaces/changed-fields-map'; import {TaskEventOutcome} from '../../event/model/event-outcomes/task-outcomes/task-event-outcome'; +import {FrontActionService} from '../../actions/services/front-action.service'; +import {FrontAction} from '../../data-fields/models/changed-fields'; /** @@ -42,6 +44,7 @@ export class AssignTaskService extends TaskHandlingService { protected _eventQueue: EventQueueService, protected _eventService: EventService, protected _changedFieldsService: ChangedFieldsService, + protected _frontActionService: FrontActionService, @Inject(NAE_TASK_OPERATIONS) protected _taskOperations: TaskOperations, @Optional() _selectedCaseService: SelectedCaseService, @Optional() protected _taskViewService: TaskViewService, @@ -121,9 +124,15 @@ export class AssignTaskService extends TaskHandlingService { this._taskContentService.updateStateData(outcomeResource.outcome as AssignTaskEventOutcome); const changedFieldsMap: ChangedFieldsMap = this._eventService .parseChangedFieldsFromOutcomeTree(outcomeResource.outcome); + const frontActions: Array = this._eventService.parseFrontActionsFromOutcomeTree(outcomeResource.outcome); + if (!!changedFieldsMap) { this._changedFieldsService.emitChangedFields(changedFieldsMap); } + if (!!frontActions && frontActions.length > 0) { + this._frontActionService.runAll(frontActions); + } + forceReload ? this._taskOperations.forceReload() : this._taskOperations.reload(); this.completeActions(afterAction, nextEvent, true, outcomeResource.outcome as AssignTaskEventOutcome); this._snackBar.openSuccessSnackBar(!!outcomeResource.outcome.message diff --git a/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.ts b/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.ts index ab7a536ff..cfad521dd 100644 --- a/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.ts @@ -23,10 +23,11 @@ import {QueuedEvent} from '../../event-queue/model/queued-event'; import {AfterAction} from '../../utility/call-chain/after-action'; import {PermissionService} from '../../authorization/permission/permission.service'; import {ChangedFieldsService} from '../../changed-fields/services/changed-fields.service'; -import { EventService} from '../../event/services/event.service'; +import {EventService} from '../../event/services/event.service'; import {ChangedFieldsMap} from '../../event/services/interfaces/changed-fields-map'; import {TaskEventOutcome} from '../../event/model/event-outcomes/task-outcomes/task-event-outcome'; - +import {FrontActionService} from '../../actions/services/front-action.service'; +import {FrontAction} from '../../data-fields/models/changed-fields'; /** * Service that handles the logic of canceling a task. */ @@ -49,7 +50,9 @@ export class CancelTaskService extends TaskHandlingService { @Optional() _selectedCaseService: SelectedCaseService, @Optional() protected _taskViewService: TaskViewService, _taskContentService: TaskContentService, - protected permissionService: PermissionService) { + protected permissionService: PermissionService, + protected _frontActionService: FrontActionService +) { super(_taskContentService, _selectedCaseService); } @@ -123,9 +126,17 @@ export class CancelTaskService extends TaskHandlingService { this._taskContentService.updateStateData(outcomeResource.outcome as CancelTaskEventOutcome); const changedFieldsMap: ChangedFieldsMap = this._eventService .parseChangedFieldsFromOutcomeTree(outcomeResource.outcome); + const frontActions: Array = this._eventService.parseFrontActionsFromOutcomeTree(outcomeResource.outcome); + + if (!!changedFieldsMap) { this._changedFieldsService.emitChangedFields(changedFieldsMap); } + + if (!!frontActions && frontActions.length > 0) { + this._frontActionService.runAll(frontActions); + } + forceReload ? this._taskOperations.forceReload() : this._taskOperations.reload(); this.completeActions(afterAction, nextEvent, true, outcomeResource.outcome as CancelTaskEventOutcome); } else if (outcomeResource.error !== undefined) { diff --git a/projects/netgrif-components-core/src/lib/task/services/finish-task.service.ts b/projects/netgrif-components-core/src/lib/task/services/finish-task.service.ts index 9b812068f..4f33e0ad9 100644 --- a/projects/netgrif-components-core/src/lib/task/services/finish-task.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/finish-task.service.ts @@ -24,7 +24,8 @@ import {ChangedFieldsService} from '../../changed-fields/services/changed-fields import {EventService} from '../../event/services/event.service'; import {ChangedFieldsMap} from '../../event/services/interfaces/changed-fields-map'; import {TaskEventOutcome} from '../../event/model/event-outcomes/task-outcomes/task-event-outcome'; - +import {FrontActionService} from '../../actions/services/front-action.service'; +import {FrontAction} from '../../data-fields/models/changed-fields'; /** * Service that handles the logic of finishing a task. @@ -45,7 +46,8 @@ export class FinishTaskService extends TaskHandlingService { protected _changedFieldsService: ChangedFieldsService, @Inject(NAE_TASK_OPERATIONS) protected _taskOperations: TaskOperations, @Optional() _selectedCaseService: SelectedCaseService, - _taskContentService: TaskContentService) { + _taskContentService: TaskContentService, + protected _frontActionService: FrontActionService) { super(_taskContentService, _selectedCaseService); } @@ -136,9 +138,16 @@ export class FinishTaskService extends TaskHandlingService { this._taskContentService.updateStateData(outcomeResource.outcome as FinishTaskEventOutcome); const changedFieldsMap: ChangedFieldsMap = this._eventService .parseChangedFieldsFromOutcomeTree(outcomeResource.outcome); + + const frontActions: Array = this._eventService.parseFrontActionsFromOutcomeTree(outcomeResource.outcome); + if (!!changedFieldsMap) { this._changedFieldsService.emitChangedFields(changedFieldsMap); } + if (!!frontActions && frontActions.length > 0) { + this._frontActionService.runAll(frontActions); + } + this._taskOperations.reload(); this.completeActions(afterAction, nextEvent, true, outcomeResource.outcome as FinishTaskEventOutcome); this._taskOperations.close(); From 75691bf9118b5dd83955ee81a59dcbbbb3280d9b Mon Sep 17 00:00:00 2001 From: martinkranec <116879585+martinkranec@users.noreply.github.com> Date: Mon, 13 Oct 2025 14:38:49 +0200 Subject: [PATCH 4/6] [NAE-2232] Frontend Actions Task events resolver - updates from pr agent --- .../src/lib/task/services/assign-task.service.ts | 2 +- .../src/lib/task/services/cancel-task.service.ts | 3 +-- .../src/lib/task/services/finish-task.service.ts | 1 - .../src/lib/task/services/task-data.service.ts | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/projects/netgrif-components-core/src/lib/task/services/assign-task.service.ts b/projects/netgrif-components-core/src/lib/task/services/assign-task.service.ts index bd4bd7e3a..4855d8267 100644 --- a/projects/netgrif-components-core/src/lib/task/services/assign-task.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/assign-task.service.ts @@ -129,7 +129,7 @@ export class AssignTaskService extends TaskHandlingService { if (!!changedFieldsMap) { this._changedFieldsService.emitChangedFields(changedFieldsMap); } - if (!!frontActions && frontActions.length > 0) { + if (frontActions?.length > 0) { this._frontActionService.runAll(frontActions); } diff --git a/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.ts b/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.ts index cfad521dd..5c6eb17ba 100644 --- a/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.ts @@ -127,13 +127,12 @@ export class CancelTaskService extends TaskHandlingService { const changedFieldsMap: ChangedFieldsMap = this._eventService .parseChangedFieldsFromOutcomeTree(outcomeResource.outcome); const frontActions: Array = this._eventService.parseFrontActionsFromOutcomeTree(outcomeResource.outcome); - if (!!changedFieldsMap) { this._changedFieldsService.emitChangedFields(changedFieldsMap); } - if (!!frontActions && frontActions.length > 0) { + if (frontActions?.length > 0) { this._frontActionService.runAll(frontActions); } diff --git a/projects/netgrif-components-core/src/lib/task/services/finish-task.service.ts b/projects/netgrif-components-core/src/lib/task/services/finish-task.service.ts index 4f33e0ad9..e2596aed7 100644 --- a/projects/netgrif-components-core/src/lib/task/services/finish-task.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/finish-task.service.ts @@ -138,7 +138,6 @@ export class FinishTaskService extends TaskHandlingService { this._taskContentService.updateStateData(outcomeResource.outcome as FinishTaskEventOutcome); const changedFieldsMap: ChangedFieldsMap = this._eventService .parseChangedFieldsFromOutcomeTree(outcomeResource.outcome); - const frontActions: Array = this._eventService.parseFrontActionsFromOutcomeTree(outcomeResource.outcome); if (!!changedFieldsMap) { diff --git a/projects/netgrif-components-core/src/lib/task/services/task-data.service.ts b/projects/netgrif-components-core/src/lib/task/services/task-data.service.ts index 654296068..de6fc4e1e 100644 --- a/projects/netgrif-components-core/src/lib/task/services/task-data.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/task-data.service.ts @@ -489,7 +489,7 @@ export class TaskDataService extends TaskHandlingService implements OnDestroy { if (Object.keys(changedFieldsMap).length > 0) { this._changedFieldsService.emitChangedFields(changedFieldsMap); } - if (!!frontActions && frontActions.length > 0) { + if (frontActions?.length > 0) { this._frontActionService.runAll(frontActions); } this.clearWaitingForResponseFlag(context.body); From 2f4bed2a690963a2e38f41f627035a03685feca2 Mon Sep 17 00:00:00 2001 From: martinkranec <116879585+martinkranec@users.noreply.github.com> Date: Mon, 13 Oct 2025 14:40:30 +0200 Subject: [PATCH 5/6] [NAE-2232] Frontend Actions Task events resolver - updates from pr agent --- .../src/lib/task/services/finish-task.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/netgrif-components-core/src/lib/task/services/finish-task.service.ts b/projects/netgrif-components-core/src/lib/task/services/finish-task.service.ts index e2596aed7..c7938d2c1 100644 --- a/projects/netgrif-components-core/src/lib/task/services/finish-task.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/finish-task.service.ts @@ -143,7 +143,7 @@ export class FinishTaskService extends TaskHandlingService { if (!!changedFieldsMap) { this._changedFieldsService.emitChangedFields(changedFieldsMap); } - if (!!frontActions && frontActions.length > 0) { + if (frontActions?.length > 0) { this._frontActionService.runAll(frontActions); } From 8efb7922303d5539d609c0a0e70b441113c160fc Mon Sep 17 00:00:00 2001 From: martinkranec <116879585+martinkranec@users.noreply.github.com> Date: Mon, 13 Oct 2025 14:42:25 +0200 Subject: [PATCH 6/6] [NAE-2232] Frontend Actions Task events resolver - updates from pr agent --- .../src/lib/task/services/cancel-task.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.ts b/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.ts index 5c6eb17ba..3c7085e2f 100644 --- a/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.ts +++ b/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.ts @@ -131,7 +131,6 @@ export class CancelTaskService extends TaskHandlingService { if (!!changedFieldsMap) { this._changedFieldsService.emitChangedFields(changedFieldsMap); } - if (frontActions?.length > 0) { this._frontActionService.runAll(frontActions); }