Merge remote-tracking branch 'origin/release/7.0.0-rev10' into NAE-2400

Author: machacjozef

application-engine/src/main/java/com/netgrif/application/engine/workflow/service/TaskService.java

@@ -859,22 +859,27 @@ private List<String> getExistingActors(ActorListFieldValue actorListFieldValue)
             return null;
         }
         return actorListFieldValue.getActorValues().stream()
+                .filter(this::actorExists)
                 .map(ActorFieldValue::getId)
-                .filter(actorId -> {
-                    AbstractUser user = userService.findById(actorId, null);
-                    if (user != null) {
-                        return true;
-                    }
-                    try {
-                        groupService.findById(actorId);
-                        return true;
-                    } catch (IllegalArgumentException ignored) {
-                        return false;
-                    }
-                })
                 .collect(Collectors.toList());
     }
 
+    private boolean actorExists(ActorFieldValue actorFieldValue) {
+        if (actorFieldValue == null || actorFieldValue.getId() == null || actorFieldValue.getId().isBlank() || !ObjectId.isValid(actorFieldValue.getId())) {
+            return false;
+        }
+        AbstractUser user = userService.findById(actorFieldValue.getId(), actorFieldValue.getRealmId());
+        if (user != null) {
+            return true;
+        }
+        try {
+            groupService.findById(actorFieldValue.getId());
+            return true;
+        } catch (IllegalArgumentException ignored) {
+            return false;
+        }
+    }
+
     private Task createFromTransition(Transition transition, Case useCase) {
         final Task task = com.netgrif.application.engine.adapter.spring.workflow.domain.Task.with()
                 .title(transition.getTitle())

application-engine/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowService.java

@@ -255,10 +255,9 @@ public Case resolveActorRef(Case useCase, boolean canSaveUseCase) {
     /**
      * Resolves actor permissions for the useCase based on the actor list data field.
      *
-     * @param useCase useCase where to resolve actor permissions
+     * @param useCase      useCase where to resolve actor permissions
      * @param actorFieldId field id of the actor list
-     * @param permission permission associated with the useCase and actor list
-     *
+     * @param permission   permission associated with the useCase and actor list
      * @return true if the useCase was modified, false otherwise
      */
     private boolean resolveActorRefPermissions(Case useCase, String actorFieldId, Map<String, Boolean> permission) {
@@ -278,22 +277,27 @@ private List<String> getExistingActors(ActorListFieldValue actorListFieldValue)
             return null;
         }
         return actorListFieldValue.getActorValues().stream()
+                .filter(this::actorExists)
                 .map(ActorFieldValue::getId)
-                .filter(actorId -> {
-                    AbstractUser user = userService.findById(actorId, null);
-                    if (user != null) {
-                        return true;
-                    }
-                    try {
-                        groupService.findById(actorId);
-                        return true;
-                    } catch (IllegalArgumentException ignored) {
-                        return false;
-                    }
-                })
                 .collect(Collectors.toList());
     }
 
+    private boolean actorExists(ActorFieldValue actorFieldValue) {
+        if (actorFieldValue == null || actorFieldValue.getId() == null || actorFieldValue.getId().isBlank() || !ObjectId.isValid(actorFieldValue.getId())) {
+            return false;
+        }
+        AbstractUser user = userService.findById(actorFieldValue.getId(), actorFieldValue.getRealmId());
+        if (user != null) {
+            return true;
+        }
+        try {
+            groupService.findById(actorFieldValue.getId());
+            return true;
+        } catch (IllegalArgumentException ignored) {
+            return false;
+        }
+    }
+
     public CreateCaseEventOutcome createCase(CreateCaseParams createCaseParams) {
         fillAndValidateAttributes(createCaseParams);
         PetriNet petriNet = createCaseParams.getProcess();

nae-object-library/src/main/java/com/netgrif/application/engine/objects/workflow/domain/menu/dashboard/DashboardManagementBody.java

@@ -79,8 +79,8 @@ public ToDataSetOutcome toDataSet() {
         outcome.putDataSetEntry(DashboardManagementConstants.FIELD_LANGUAGE_DASHBOARD, FieldType.BOOLEAN, this.profileDashboard);
         outcome.putDataSetEntry(DashboardManagementConstants.FIELD_LOGOUT_DASHBOARD, FieldType.BOOLEAN, this.logoutDashboard);
         if (this.dashboardItems != null) {
-            outcome.putDataSetEntryWithOptions(DashboardManagementConstants.FIELD_DASHBOARD_ITEM_LIST, FieldType.ENUMERATION_MAP, this.dashboardItems, "");
-            outcome.putDataSetEntryWithOptions(DashboardManagementConstants.FIELD_DASHBOARD_ITEM_TO_MENU_ITEM_LIST, FieldType.ENUMERATION_MAP, this.menuItemsToDashboardItems, "");
+            outcome.putDataSetEntryWithOptions(DashboardManagementConstants.FIELD_DASHBOARD_ITEM_LIST, FieldType.ENUMERATION_MAP, this.dashboardItems, null);
+            outcome.putDataSetEntryWithOptions(DashboardManagementConstants.FIELD_DASHBOARD_ITEM_TO_MENU_ITEM_LIST, FieldType.ENUMERATION_MAP, this.menuItemsToDashboardItems, null);
             outcome.putDataSetEntry(DashboardManagementConstants.FIELD_ITEMS_ORDER, FieldType.TEXT, String.join(",", this.dashboardItems.keySet()));
         }
         return outcome;