From 814393429967e584ea73c762edefa5b6d362ed6d Mon Sep 17 00:00:00 2001 From: Machac Date: Thu, 2 Oct 2025 15:44:10 +0200 Subject: [PATCH 1/4] Release/7.0.0-RC9 --- application-engine/pom.xml | 2 +- nae-object-library/pom.xml | 2 +- nae-spring-core-adapter/pom.xml | 2 +- nae-user-ce/pom.xml | 2 +- nae-user-common/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application-engine/pom.xml b/application-engine/pom.xml index 002ef02af4..2bd5e7c5a5 100644 --- a/application-engine/pom.xml +++ b/application-engine/pom.xml @@ -6,7 +6,7 @@ com.netgrif application-engine-parent - 7.0.0-RC8 + 7.0.0-RC9 application-engine diff --git a/nae-object-library/pom.xml b/nae-object-library/pom.xml index 98ff04ae46..774d8390ec 100644 --- a/nae-object-library/pom.xml +++ b/nae-object-library/pom.xml @@ -7,7 +7,7 @@ com.netgrif application-engine-parent - 7.0.0-RC8 + 7.0.0-RC9 nae-object-library diff --git a/nae-spring-core-adapter/pom.xml b/nae-spring-core-adapter/pom.xml index 0ada0b8973..baa4218272 100644 --- a/nae-spring-core-adapter/pom.xml +++ b/nae-spring-core-adapter/pom.xml @@ -7,7 +7,7 @@ com.netgrif application-engine-parent - 7.0.0-RC8 + 7.0.0-RC9 nae-spring-core-adapter diff --git a/nae-user-ce/pom.xml b/nae-user-ce/pom.xml index 749945c1a5..83241c8c9d 100644 --- a/nae-user-ce/pom.xml +++ b/nae-user-ce/pom.xml @@ -6,7 +6,7 @@ com.netgrif application-engine-parent - 7.0.0-RC8 + 7.0.0-RC9 nae-user-ce diff --git a/nae-user-common/pom.xml b/nae-user-common/pom.xml index 1c4f6055da..c4e756a301 100644 --- a/nae-user-common/pom.xml +++ b/nae-user-common/pom.xml @@ -6,7 +6,7 @@ com.netgrif application-engine-parent - 7.0.0-RC8 + 7.0.0-RC9 nae-user-common diff --git a/pom.xml b/pom.xml index c889ea0356..8e1c15deb8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.netgrif application-engine-parent - 7.0.0-RC8 + 7.0.0-RC9 pom NETGRIF Application Engine parent From eff6b55439f268ba9e79b161ac0fcfac7912d2b6 Mon Sep 17 00:00:00 2001 From: renczesstefan Date: Tue, 7 Oct 2025 13:40:03 +0200 Subject: [PATCH 2/4] [NAE-2228] Invalid arguments for collectRolesForPreferenceItem - Replaced multiple calls with a single paginated query to improve performance and reduce unnecessary iterations. This simplifies the logic and ensures the first global role is efficiently retrieved. --- .../domain/dataset/logic/action/ActionDelegate.groovy | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy b/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy index f0275b57fb..c344278821 100644 --- a/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy +++ b/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy @@ -2427,11 +2427,7 @@ class ActionDelegate { Map temp = [:] return roles.collectEntries { entry -> if (entry.value == GLOBAL_ROLE) { - Set findGlobalRole = processRoleService.findAllByImportId(ProcessRole.GLOBAL + entry.key) - if (findGlobalRole == null || findGlobalRole.isEmpty()) { - return - } - ProcessRole role = findGlobalRole.find { it.isGlobal() } + ProcessRole role = processRoleService.findAllByImportId(ProcessRole.GLOBAL + entry.key, Pageable.ofSize(1)).getContent().getFirst() if (role == null) { return } From 7e40aca33a4105fd3888d879f2f737e4bb54d8d2 Mon Sep 17 00:00:00 2001 From: renczesstefan Date: Tue, 7 Oct 2025 14:09:44 +0200 Subject: [PATCH 3/4] [NAE-2228] Invalid arguments for collectRolesForPreferenceItem Updated logic to correctly handle cases where no global roles are found by checking for an empty list instead of null. This ensures robustness and prevents potential runtime errors. --- .../domain/dataset/logic/action/ActionDelegate.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy b/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy index c344278821..f22cf8983a 100644 --- a/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy +++ b/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy @@ -2427,10 +2427,11 @@ class ActionDelegate { Map temp = [:] return roles.collectEntries { entry -> if (entry.value == GLOBAL_ROLE) { - ProcessRole role = processRoleService.findAllByImportId(ProcessRole.GLOBAL + entry.key, Pageable.ofSize(1)).getContent().getFirst() - if (role == null) { + List roleList = processRoleService.findAllByImportId(ProcessRole.GLOBAL + entry.key, Pageable.ofSize(1)).getContent() + if (roleList.isEmpty()) { return } + ProcessRole role = roleList.getFirst() return [(role.importId + ":" + GLOBAL_ROLE), ("$role.name (🌍 Global role)" as String)] } else { if (!temp.containsKey(entry.value)) { From 2f8469fb0625b48c096bc9eec1f396c279da5f0f Mon Sep 17 00:00:00 2001 From: Machac Date: Mon, 20 Oct 2025 12:50:56 +0200 Subject: [PATCH 4/4] Release/7.0.0-RC8.1 --- application-engine/pom.xml | 2 +- nae-object-library/pom.xml | 2 +- nae-spring-core-adapter/pom.xml | 2 +- nae-user-ce/pom.xml | 2 +- nae-user-common/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application-engine/pom.xml b/application-engine/pom.xml index 2bd5e7c5a5..da5d0cd77c 100644 --- a/application-engine/pom.xml +++ b/application-engine/pom.xml @@ -6,7 +6,7 @@ com.netgrif application-engine-parent - 7.0.0-RC9 + 7.0.0-RC8.1 application-engine diff --git a/nae-object-library/pom.xml b/nae-object-library/pom.xml index 774d8390ec..24bf6a0247 100644 --- a/nae-object-library/pom.xml +++ b/nae-object-library/pom.xml @@ -7,7 +7,7 @@ com.netgrif application-engine-parent - 7.0.0-RC9 + 7.0.0-RC8.1 nae-object-library diff --git a/nae-spring-core-adapter/pom.xml b/nae-spring-core-adapter/pom.xml index baa4218272..28d2c15eaa 100644 --- a/nae-spring-core-adapter/pom.xml +++ b/nae-spring-core-adapter/pom.xml @@ -7,7 +7,7 @@ com.netgrif application-engine-parent - 7.0.0-RC9 + 7.0.0-RC8.1 nae-spring-core-adapter diff --git a/nae-user-ce/pom.xml b/nae-user-ce/pom.xml index 83241c8c9d..9d2ea018c4 100644 --- a/nae-user-ce/pom.xml +++ b/nae-user-ce/pom.xml @@ -6,7 +6,7 @@ com.netgrif application-engine-parent - 7.0.0-RC9 + 7.0.0-RC8.1 nae-user-ce diff --git a/nae-user-common/pom.xml b/nae-user-common/pom.xml index c4e756a301..c19da92f83 100644 --- a/nae-user-common/pom.xml +++ b/nae-user-common/pom.xml @@ -6,7 +6,7 @@ com.netgrif application-engine-parent - 7.0.0-RC9 + 7.0.0-RC8.1 nae-user-common diff --git a/pom.xml b/pom.xml index 8e1c15deb8..8d9e904ec8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.netgrif application-engine-parent - 7.0.0-RC9 + 7.0.0-RC8.1 pom NETGRIF Application Engine parent