Improve candidate roles functionalities in role-mining

Evolveum · Dec 1, 2023 · 7532ba9 · 7532ba9
1 parent e488755
commit 7532ba9
Show file tree

Hide file tree

Showing 20 changed files with 1,670 additions and 1,030 deletions.
diff --git a/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/ModificationTargetPanel.java b/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/ModificationTargetPanel.java
@@ -118,7 +118,8 @@ ID_MODIFICATION_TARGET_PANEL, provider, initColumns()) {
             @Override
             protected WebMarkupContainer createButtonToolbar(String id) {
                 //TODO add possibility to assign other candidate.
-                AjaxIconButton ajaxButton = new AjaxIconButton(id, Model.of(" fe fe-assignment"), createStringResource("idk")) {
+                AjaxIconButton ajaxButton = new AjaxIconButton(id, Model.of(" fe fe-assignment"),
+                        createStringResource("RoleAnalysis.modificationTargetPanel.assign")) {
                     @Override
                     public void onClick(AjaxRequestTarget ajaxRequestTarget) {
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRole.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRole.java
@@ -10,21 +10,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
-import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.gui.impl.page.admin.abstractrole.AbstractRoleDetailsModel;
-
-import com.evolveum.midpoint.gui.impl.page.admin.role.mining.model.BusinessRoleApplicationDto;
-
-import com.evolveum.midpoint.gui.impl.page.admin.role.mining.model.BusinessRoleDto;
-import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
-import com.evolveum.midpoint.model.api.mining.RoleAnalysisService;
-import com.evolveum.midpoint.schema.ObjectDeltaOperation;
-import com.evolveum.midpoint.schema.constants.SchemaConstants;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.util.exception.*;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
@@ -33,19 +18,31 @@
 import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
 import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
 import com.evolveum.midpoint.authentication.api.authorization.Url;
+import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.component.wizard.AbstractWizardPanel;
 import com.evolveum.midpoint.gui.impl.component.wizard.WizardPanelHelper;
 import com.evolveum.midpoint.gui.impl.page.admin.DetailsFragment;
+import com.evolveum.midpoint.gui.impl.page.admin.abstractrole.AbstractRoleDetailsModel;
 import com.evolveum.midpoint.gui.impl.page.admin.abstractrole.PageAbstractRole;
 import com.evolveum.midpoint.gui.impl.page.admin.role.component.wizard.ApplicationRoleWizardPanel;
 import com.evolveum.midpoint.gui.impl.page.admin.role.component.wizard.BusinessRoleWizardPanel;
+import com.evolveum.midpoint.gui.impl.page.admin.role.mining.model.BusinessRoleApplicationDto;
+import com.evolveum.midpoint.gui.impl.page.admin.role.mining.model.BusinessRoleDto;
+import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
+import com.evolveum.midpoint.model.api.mining.RoleAnalysisService;
 import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.schema.ObjectDeltaOperation;
+import com.evolveum.midpoint.schema.constants.SchemaConstants;
+import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
+import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.page.admin.roles.component.RoleSummaryPanel;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
 @PageDescriptor(
         urls = {
@@ -181,14 +178,14 @@ protected void postProcessResultForWizard(
             OperationResult result,
             Collection<ObjectDeltaOperation<? extends ObjectType>> executedDeltas,
             AjaxRequestTarget target) {
-        businessRoleMigrationPerform(result, executedDeltas);
+        businessRoleMigrationPerform(result, executedDeltas, target);
 
         super.postProcessResult(result, executedDeltas, target);
     }
 
     private void businessRoleMigrationPerform(
             OperationResult result,
-            Collection<ObjectDeltaOperation<? extends ObjectType>> executedDeltas) {
+            Collection<ObjectDeltaOperation<? extends ObjectType>> executedDeltas, AjaxRequestTarget target) {
 
         if (result.isFatalError()) {
             return;
@@ -208,8 +205,8 @@ private void businessRoleMigrationPerform(
 
         PrismObject<RoleType> roleObject = roleAnalysisService
                 .getRoleTypeObject(roleOid, task, result);
-        if (roleObject != null) {
 
+        if (roleObject != null) {
             if (!patternDeltas.isCandidate()) {
 
                 List<BusinessRoleDto> businessRoleDtos = patternDeltas.getBusinessRoleDtos();
@@ -251,6 +248,10 @@ private void businessRoleMigrationPerform(
             if (activity != null) {
                 roleAnalysisService.executeMigrationTask(
                         patternDeltas.getCluster(), activity, roleObject, taskOid, null, task, result);
+                if (result.isWarning()) {
+                    warn(result.getMessage());
+                    target.add(((PageBase) getPage()).getFeedbackPanel());
+                }
             }
 
         }

diff --git a/...m/evolveum/midpoint/gui/impl/page/admin/role/mining/model/BusinessRoleApplicationDto.java b/...m/evolveum/midpoint/gui/impl/page/admin/role/mining/model/BusinessRoleApplicationDto.java
@@ -30,6 +30,7 @@ public class BusinessRoleApplicationDto implements Serializable {
     PrismObject<RoleType> businessRole;
     List<BusinessRoleDto> businessRoleDtos;
     boolean isCandidate = false;
+    Long patternId;
 
     public BusinessRoleApplicationDto(
             @NotNull PrismObject<RoleAnalysisClusterType> cluster,
@@ -88,7 +89,6 @@ public void setPatternId(Long patternId) {
         this.patternId = patternId;
     }
 
-    Long patternId;
     public boolean isCandidate() {
         return isCandidate;
     }

diff --git a/...ava/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysis.java b/...ava/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysis.java
@@ -397,14 +397,19 @@ public void populateItem(
                                 session.asPrismObject(),
                                 result, task);
 
-                        ObjectReferenceType taskRef = roleAnalysisService.extractTaskRef(session.getOperationExecution());
+                        ObjectReferenceType taskRef = null;
+                        RoleAnalysisOperationStatus operationStatus = session.getOperationStatus();
+                        if (operationStatus != null) {
+                            taskRef = operationStatus.getTaskRef();
+                        }
 
+                        ObjectReferenceType finalTaskRef = taskRef;
                         AjaxLinkPanel ajaxLinkPanel = new AjaxLinkPanel(componentId, Model.of(stateString)) {
                             @Override
                             public void onClick(AjaxRequestTarget target) {
                                 super.onClick(target);
-                                if (taskRef != null) {
-                                    DetailsPageUtil.dispatchToObjectDetailsPage(TaskType.class, taskRef.getOid(),
+                                if (finalTaskRef != null && finalTaskRef.getOid() != null) {
+                                    DetailsPageUtil.dispatchToObjectDetailsPage(TaskType.class, finalTaskRef.getOid(),
                                             this, true);
                                 }
                             }

diff --git a/.../evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysisCluster.java b/.../evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysisCluster.java
@@ -44,6 +44,8 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleAnalysisClusterType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleAnalysisSessionType;
 
+import org.jetbrains.annotations.NotNull;
+
 //TODO correct authorizations
 @PageDescriptor(
         urls = {
@@ -120,9 +122,9 @@ public void detectionPerform(AjaxRequestTarget target) {
         DetectionOption detectionOption = new DetectionOption(cluster);
         RoleAnalysisService roleAnalysisService = pageBase.getRoleAnalysisService();
 
-        OperationResultStatusType status = roleAnalysisService.getOperationExecutionStatus(clusterPrismObject, task, result);
+        @NotNull String status = roleAnalysisService.recomputeAndResolveClusterOpStatus(clusterPrismObject, result, task);
 
-        if (status != null && status.equals(OperationResultStatusType.IN_PROGRESS)) {
+        if (status.equals("processing")) {
             warn("Couldn't start detection. Some process is already in progress.");
             target.add(getFeedbackPanel());
             return;
@@ -134,13 +136,19 @@ public void detectionPerform(AjaxRequestTarget target) {
         roleAnalysisService.executeDetectionTask(cluster.asPrismObject(), null,
                 null, task, result);
 
-        PageParameters params = new PageParameters();
-        params.add(OnePageParameterEncoder.PARAMETER, clusterOid);
-        Class<? extends PageBase> detailsPageClass = DetailsPageUtil.getObjectDetailsPage(RoleAnalysisClusterType.class);
-        ((PageBase) getPage()).navigateToNext(detailsPageClass, params);
+        if (result.isWarning()) {
+            warn(result.getMessage());
+            target.add(pageBase.getFeedbackPanel());
+        } else {
+            PageParameters params = new PageParameters();
+            params.add(OnePageParameterEncoder.PARAMETER, clusterOid);
+            Class<? extends PageBase> detailsPageClass = DetailsPageUtil.getObjectDetailsPage(RoleAnalysisClusterType.class);
+            pageBase.navigateToNext(detailsPageClass, params);
+
+            pageBase.showResult(result);
+            target.add(getFeedbackPanel());
+        }
 
-        ((PageBase) getPage()).showResult(result);
-        target.add(getFeedbackPanel());
     }
 
     public StringResourceModel setDetectionButtonTitle() {

diff --git a/.../evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysisSession.java b/.../evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysisSession.java
@@ -143,10 +143,16 @@ public void clusteringPerform(@NotNull AjaxRequestTarget target) {
         RoleAnalysisService roleAnalysisService = getPageBase().getRoleAnalysisService();
         roleAnalysisService.executeClusteringTask(session.asPrismObject(), null, null, task, result);
 
-        result.recordSuccessIfUnknown();
-        setResponsePage(PageRoleAnalysis.class);
-        ((PageBase) getPage()).showResult(result);
-        target.add(getFeedbackPanel());
+        if (result.isWarning()) {
+            warn(result.getMessage());
+            target.add(getPageBase().getFeedbackPanel());
+        } else {
+            result.recordSuccessIfUnknown();
+            setResponsePage(PageRoleAnalysis.class);
+            ((PageBase) getPage()).showResult(result);
+            target.add(getFeedbackPanel());
+        }
+
     }
 
     public StringResourceModel setDetectionButtonTitle() {