From aabcd6635f13467811c608058f8ecd9d3d73e3a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Tk=C3=A1=C4=8Dik?= <tonydamage@gmail.com>
Date: Mon, 4 Sep 2023 09:38:05 +0200
Subject: [PATCH 01/14] Switched directory from  icf-* to connid-connectors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tony Tkáčik <tonydamage@gmail.com>
---
 config/config-native.xml                                        | 1 +
 model/workflow-impl/src/test/resources/test-config.xml          | 1 +
 .../provisioning/ucf/impl/connid/TestUcfDummyMulti.java         | 2 +-
 .../java/com/evolveum/midpoint/audit/api/AuditEventType.java    | 2 ++
 repo/repo-sqale/src/test/resources/config-test.xml              | 1 +
 .../src/test/resources/config-test-datasource.xml               | 1 +
 repo/repo-sql-impl-test/src/test/resources/config-test.xml      | 2 ++
 repo/repo-test-util/src/main/resources/test-config-new-repo.xml | 2 +-
 repo/repo-test-util/src/main/resources/test-config-no-repo.xml  | 1 +
 repo/repo-test-util/src/main/resources/test-config.xml          | 2 +-
 .../java/com/evolveum/midpoint/init/ApplicationHomeSetup.java   | 1 +
 repo/system-init/src/main/resources/config.xml                  | 1 +
 12 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/config/config-native.xml b/config/config-native.xml
index 0fc3410b49a..71b1dee6ccf 100644
--- a/config/config-native.xml
+++ b/config/config-native.xml
@@ -50,6 +50,7 @@ https://github.com/Evolveum/midpoint/blob/master/repo/system-init/src/main/resou
         <icf>
             <scanClasspath>true</scanClasspath>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore.jceks</keyStorePath>
diff --git a/model/workflow-impl/src/test/resources/test-config.xml b/model/workflow-impl/src/test/resources/test-config.xml
index b0e4244148a..2343cecd569 100644
--- a/model/workflow-impl/src/test/resources/test-config.xml
+++ b/model/workflow-impl/src/test/resources/test-config.xml
@@ -39,6 +39,7 @@
             <scanDirectory>/C:/tmp</scanDirectory>
             <scanDirectory>/var/tmp</scanDirectory>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore.jceks</keyStorePath>
diff --git a/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java b/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java
index 247e1216443..b1a5268892e 100644
--- a/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java
+++ b/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java
@@ -58,7 +58,7 @@ public class TestUcfDummyMulti extends AbstractUcfDummyTest {
 
     private static final File CONNECTOR_FAKE = new File("src/test/resources/dummy-connector-fake-4.2.jar");
     private static final File MIDPOINT_HOME = new File("target/midpoint-home");
-    private static final File MIDPOINT_HOME_ICF = new File(MIDPOINT_HOME, "icf-connectors");
+    private static final File MIDPOINT_HOME_ICF = new File(MIDPOINT_HOME, "connid-connectors");
 
     @Test
     public void test000PrismContextSanity() {
diff --git a/repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventType.java b/repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventType.java
index ea8094433ee..6aa782ffc74 100644
--- a/repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventType.java
+++ b/repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventType.java
@@ -52,6 +52,8 @@ public enum AuditEventType {
 
     DISCOVER_OBJECT;
 
+
+
     public static AuditEventType fromSchemaValue(AuditEventTypeType event) {
         if (event == null) {
             return null;
diff --git a/repo/repo-sqale/src/test/resources/config-test.xml b/repo/repo-sqale/src/test/resources/config-test.xml
index 4856371caf7..fc715f79ef8 100644
--- a/repo/repo-sqale/src/test/resources/config-test.xml
+++ b/repo/repo-sqale/src/test/resources/config-test.xml
@@ -50,6 +50,7 @@
         <icf>
             <scanClasspath>true</scanClasspath>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
             <scanDirectory>/var/tmp</scanDirectory>
         </icf>
         <keystore>
diff --git a/repo/repo-sql-impl-test/src/test/resources/config-test-datasource.xml b/repo/repo-sql-impl-test/src/test/resources/config-test-datasource.xml
index fc2109a8e05..7b9f021288b 100644
--- a/repo/repo-sql-impl-test/src/test/resources/config-test-datasource.xml
+++ b/repo/repo-sql-impl-test/src/test/resources/config-test-datasource.xml
@@ -24,6 +24,7 @@
         <icf>
             <scanClasspath>true</scanClasspath>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
             <scanDirectory>/var/tmp</scanDirectory>
         </icf>
         <keystore>
diff --git a/repo/repo-sql-impl-test/src/test/resources/config-test.xml b/repo/repo-sql-impl-test/src/test/resources/config-test.xml
index 8c8b09bf2f6..76c4098d770 100644
--- a/repo/repo-sql-impl-test/src/test/resources/config-test.xml
+++ b/repo/repo-sql-impl-test/src/test/resources/config-test.xml
@@ -39,7 +39,9 @@
         <icf>
             <scanClasspath>true</scanClasspath>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
             <scanDirectory>/var/tmp</scanDirectory>
+
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore-test.jceks</keyStorePath>
diff --git a/repo/repo-test-util/src/main/resources/test-config-new-repo.xml b/repo/repo-test-util/src/main/resources/test-config-new-repo.xml
index 53cc4a617ac..4e5aaf0d31b 100644
--- a/repo/repo-test-util/src/main/resources/test-config-new-repo.xml
+++ b/repo/repo-test-util/src/main/resources/test-config-new-repo.xml
@@ -60,7 +60,7 @@
         </taskManager>
         <icf>
             <scanClasspath>true</scanClasspath>
-            <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore.jceks</keyStorePath>
diff --git a/repo/repo-test-util/src/main/resources/test-config-no-repo.xml b/repo/repo-test-util/src/main/resources/test-config-no-repo.xml
index 748cddce6e0..90309363eaa 100644
--- a/repo/repo-test-util/src/main/resources/test-config-no-repo.xml
+++ b/repo/repo-test-util/src/main/resources/test-config-no-repo.xml
@@ -33,6 +33,7 @@
             <scanDirectory>/C:/tmp</scanDirectory>
             <scanDirectory>/var/tmp</scanDirectory>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore.jceks</keyStorePath>
diff --git a/repo/repo-test-util/src/main/resources/test-config.xml b/repo/repo-test-util/src/main/resources/test-config.xml
index 56a40334fc6..7ce03a0d03f 100644
--- a/repo/repo-test-util/src/main/resources/test-config.xml
+++ b/repo/repo-test-util/src/main/resources/test-config.xml
@@ -53,7 +53,7 @@
         </taskManager>
         <icf>
             <scanClasspath>true</scanClasspath>
-            <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore.jceks</keyStorePath>
diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
index ae20b77bc33..79fb27fcbb8 100644
--- a/repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
+++ b/repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
@@ -58,6 +58,7 @@ private void createMidpointHomeDirectories() {
 
         Path[] directories = {
                 midPointHomePath.resolve("icf-connectors"),
+                midPointHomePath.resolve("connid-connectors"),
                 midPointHomePath.resolve("idm-legacy"),
                 midPointHomePath.resolve("log"),
                 midPointHomePath.resolve("schema"),
diff --git a/repo/system-init/src/main/resources/config.xml b/repo/system-init/src/main/resources/config.xml
index 59a839fb2ed..4b949c3cfa4 100644
--- a/repo/system-init/src/main/resources/config.xml
+++ b/repo/system-init/src/main/resources/config.xml
@@ -65,6 +65,7 @@ to a file, not its content, is the actual value.
         <icf>
             <scanClasspath>true</scanClasspath>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore.jceks</keyStorePath>

From b86fd211b1fc2ac4d97f3e1a8329ab9aa10cf406 Mon Sep 17 00:00:00 2001
From: tchrapovic <chrapovic.tadeas@gmail.com>
Date: Mon, 4 Sep 2023 14:44:40 +0200
Subject: [PATCH 02/14] Fix for role-mining failed test.

---
 .../evolveum/midpoint/model/intest/tasks/TestMiscTasks.java | 6 ++++--
 .../src/test/resources/tasks/misc/cluster-role-based.xml    | 1 -
 .../tasks/misc/task-role-analysis-clustering-basic.xml      | 2 +-
 .../misc/task-role-analysis-pattern-detection-basic.xml     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestMiscTasks.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestMiscTasks.java
index c482260800d..08d925a34e5 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestMiscTasks.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestMiscTasks.java
@@ -85,7 +85,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
                 ROLE_APPLICATION_1, ROLE_APPLICATION_2, ROLE_BUSINESS_1,
                 USER_1, USER_2);
 
-        if(isNativeRepository()){
+        if (isNativeRepository()) {
             initTestObjects(initTask, initResult, SESSION_ROLE_BASED, CLUSTER_ROLE_BASED);
         }
     }
@@ -648,12 +648,14 @@ public void test400RoleAnalysisClusteringBasic() throws Exception {
     }
 
     @Test
-    public void test410RoleAnalysisPatternDetectionBasic() throws CommonException {
+    public void test410RoleAnalysisPatternDetectionBasic() throws Exception {
         skipIfNotNativeRepository();
 
         Task task = getTestTask();
         OperationResult result = task.getResult();
 
+        initTestObjects(task, result, CLUSTER_ROLE_BASED);
+
         when("task is run");
         TASK_ROLE_ANALYSIS_PATTERN_DETECTION_BASIC.init(this, task, result);
         TASK_ROLE_ANALYSIS_PATTERN_DETECTION_BASIC.rerun(result); // asserts success
diff --git a/model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml b/model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml
index 280d7bc91e2..c3339248eac 100644
--- a/model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml
+++ b/model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml
@@ -7,7 +7,6 @@
     <roleAnalysisSessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"
             relation="org:default"
             type="c:RoleAnalysisSessionType">
-        <!-- role_based_analysis_session -->
     </roleAnalysisSessionRef>
     <detectionOption>
         <minRolesOccupancy>10</minRolesOccupancy>
diff --git a/model/model-intest/src/test/resources/tasks/misc/task-role-analysis-clustering-basic.xml b/model/model-intest/src/test/resources/tasks/misc/task-role-analysis-clustering-basic.xml
index 99335135932..8764c47a818 100644
--- a/model/model-intest/src/test/resources/tasks/misc/task-role-analysis-clustering-basic.xml
+++ b/model/model-intest/src/test/resources/tasks/misc/task-role-analysis-clustering-basic.xml
@@ -13,7 +13,7 @@
     <activity>
         <work>
             <roleAnalysisClustering>
-                <sessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"/> <!-- random OID for now -->
+                <sessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"/>
             </roleAnalysisClustering>
         </work>
     </activity>
diff --git a/model/model-intest/src/test/resources/tasks/misc/task-role-analysis-pattern-detection-basic.xml b/model/model-intest/src/test/resources/tasks/misc/task-role-analysis-pattern-detection-basic.xml
index f3fb299049e..87d4bfe7c29 100644
--- a/model/model-intest/src/test/resources/tasks/misc/task-role-analysis-pattern-detection-basic.xml
+++ b/model/model-intest/src/test/resources/tasks/misc/task-role-analysis-pattern-detection-basic.xml
@@ -13,7 +13,7 @@
     <activity>
         <work>
             <roleAnalysisPatternDetection>
-                <clusterRef oid="16a8b95a-8a37-4f91-b835-bb77670c2899"/> <!-- random OID for now -->
+                <clusterRef oid="16a8b95a-8a37-4f91-b835-bb77670c2899"/>
             </roleAnalysisPatternDetection>
         </work>
     </activity>

From f89a43add42f1462bec0bc26894297649ad71597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Tk=C3=A1=C4=8Dik?= <tonydamage@gmail.com>
Date: Mon, 4 Sep 2023 15:07:44 +0200
Subject: [PATCH 03/14] Added security pipeline for owasp:dependency-check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tony Tkáčik <tonydamage@gmail.com>
---
 config/false-positives.xml               | 211 +++++++++++++++++++++++
 pom.xml                                  |  11 ++
 tools/jenkins/midpoint-security-pipeline |  89 ++++++++++
 3 files changed, 311 insertions(+)
 create mode 100644 config/false-positives.xml
 create mode 100644 tools/jenkins/midpoint-security-pipeline

diff --git a/config/false-positives.xml b/config/false-positives.xml
new file mode 100644
index 00000000000..b082b0abaac
--- /dev/null
+++ b/config/false-positives.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+  <!-- IMPORTANT: It may be bit weird, having first reason for suppresion, then the issue suppresed, but dependency-chek uses strict schema and they decided on that order of elements. When any of suppresion has notes and cve reordered, it will not load suppression file
+  -->
+  <suppress>
+    <notes>
+      False Positive. H2 is not recommended for production use, only for demo testing use-cases.
+    </notes>
+    <cve>CVE-2021-42392</cve>
+    <cve>CVE-2022-23221</cve>
+    <cve>CVE-2018-14335</cve>
+    <cve>CVE-2022-45868</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint and its dependencies does not use affected functionality of SnakeYaml.
+    </notes>
+    <cve>CVE-2022-1471</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use Spring Security in a way neccessary to cause described vulnerability.
+    </notes>
+    <cve>CVE-2022-31692</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not run as ActiveMQ Artemis server, only client.
+    </notes>
+    <cve>CVE-2022-23913</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use OpenSSL for SSL and crypthography.
+    </notes>
+    <cve>CVE-2023-0217</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use OpenSSL for SSL and crypthography.
+    </notes>
+    <cve>CVE-2023-0401</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use OpenSSL for SSL and crypthography.
+    </notes>
+    <cve>CVE-2023-0464</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use OpenSSL for SSL and crypthography.
+    </notes>
+    <cve>CVE-2023-0216</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use OpenSSL for SSL and crypthography.
+    </notes>
+    <cve>CVE-2022-3996</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use OpenSSL for SSL and crypthography.
+    </notes>
+    <cve>CVE-2022-4450</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use OpenSSL for SSL and crypthography.
+    </notes>
+    <cve>CVE-2023-0286</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use WYSIWYG editors from AdminLTE.
+    </notes>
+    <cve>CVE-2022-24729</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use affected functionality (BeanDeserializer) during JSON / YAML parsing.
+    </notes>
+    <cve>CVE-2022-42004</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use affected functionality (BeanDeserializer) during JSON / YAML parsing.
+    </notes>
+    <cve>CVE-2022-42003</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use Moment.js on server-side.
+    </notes>
+    <cve>CVE-2022-31129</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use Moment.js on server-side.
+    </notes>
+    <cve>CVE-2022-24785</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      Updated Netty Library in upcoming 4.4.5 release.
+    </notes>
+    <cve>CVE-2022-41881</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use affected functionality of library.
+    </notes>
+    <cve>CVE-2022-3171</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use affected functionality of library.
+    </notes>
+    <cve>CVE-2022-3509</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint does not use affected functionality of library.
+    </notes>
+    <cve>CVE-2022-3510</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      Minor. MidPoint integrator and/or MidPoint Administrator is only person able to edit JDBC URL.
+    </notes>
+    <cve>CVE-2022-26520</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      Updated Spring Framework in upcoming midPoint 4.4.5 release.
+    </notes>
+    <cve>CVE-2023-20860</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      Minor. Fixed use of dependency to be not affected by this issue. Fix is available in upcoming midPoint 4.4.5 release.
+    </notes>
+    <cve>CVE-2022-40152</cve>
+  </suppress>
+  <!-- Wicket: Midpoint uses Wicket 9.5 or newer since midPoint 4.4.1 -->
+  <suppress>
+    <notes>
+      False Positive. MidPoint uses Wicket 9.5 in midPoint 4.4.1 and newer versions in other releases.
+    </notes>
+    <cve>CVE-2017-15719</cve>
+  </suppress>
+    <suppress>
+    <notes>
+      False Positive. MidPoint uses Wicket 9.5 in midPoint 4.4.1 and newer versions in other releases. MidPoint does not use WYSIWYG editor.
+    </notes>
+    <cve>CVE-2018-1325</cve>
+  </suppress>
+    <suppress>
+    <notes>
+      False Positive. MidPoint uses Wicket 9.5 in midPoint 4.4.1 and newer versions in other releases.
+    </notes>
+    <cve>CVE-2021-23937</cve>
+  </suppress>
+  
+  <!-- Busybox: Busybox is not used by midPoint, but is part of docker container. -->
+  <suppress>
+    <notes>
+      False Positive. busybox is bundled in docker container, but midPoint does not use it during normal run.
+    </notes>
+    <cve>CVE-2022-28391</cve>
+  </suppress>
+    <suppress>
+    <notes>
+      False Positive. busybox is bundled in docker container, but midPoint does not use it during normal run.
+    </notes>
+    <cve>CVE-2022-30065</cve>
+  </suppress>
+
+  <!-- Bootstrap: MidPoint uses newer unaffected version of bootstrap. -->
+  <suppress>
+    <notes>
+      False Positive. MidPoint 4.4.1 uses AdminLTE 2.4.18, which contains Bootstrap 3.4.1 which is not affected.
+    </notes>
+    <cve>CVE-2016-10735</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint 4.4.1 uses AdminLTE 2.4.18, which contains Bootstrap 3.4.1 which is not affected.
+    </notes>
+    <cve>CVE-2018-20676</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint 4.4.1 uses AdminLTE 2.4.18, which contains Bootstrap 3.4.1 which is not affected.
+    </notes>
+    <cve>CVE-2019-8331</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint 4.4.1 uses AdminLTE 2.4.18, which contains Bootstrap 3.4.1 which is not affected.
+    </notes>
+    <cve>CVE-2018-20677</cve>
+  </suppress>
+  <suppress>
+    <notes>
+      False Positive. MidPoint and Wicket are not used to display HTML from untrusted sources.
+    </notes>
+    <cve>CVE-2020-11023</cve>
+  </suppress>  
+</suppressions>
diff --git a/pom.xml b/pom.xml
index fbf98cd0d74..4a15cd8e7d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2019,6 +2019,17 @@
                     <artifactId>git-commit-id-plugin</artifactId>
                     <version>4.9.10</version>
                 </plugin>
+                
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <version>8.2.1</version>
+                    <configuration>
+                      <suppressionFile>config/false-positives.xml</suppressionFile>
+                      <formats>HTML,JENKINS,XML,JSON</formats>
+                      <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
diff --git a/tools/jenkins/midpoint-security-pipeline b/tools/jenkins/midpoint-security-pipeline
new file mode 100644
index 00000000000..29571a3fcf9
--- /dev/null
+++ b/tools/jenkins/midpoint-security-pipeline
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2010-2022 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+def verbose = params.VERBOSE ?: '0'
+
+podTemplate(
+        nodeSelector: params.NODE_SELECTOR,
+        activeDeadlineSeconds: 900,
+        idleMinutes: 1,
+        workspaceVolume: dynamicPVC(requestsSize: "10Gi"),
+        containers: [
+                containerTemplate(name: 'jnlp',
+                        image: 'jenkins/inbound-agent:4.13-2-alpine',
+                        runAsUser: '0',
+                        resourceRequestCpu: '1',
+                        resourceLimitCpu: '1',
+                        resourceRequestMemory: '1Gi',
+                        resourceLimitMemory: '1Gi'),
+                containerTemplate(name: 'maven',
+                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-17',
+                        runAsUser: '0',
+                        ttyEnabled: true,
+                        command: 'cat',
+                        resourceRequestCpu: params.BUILDER_CPU ?: '4',
+                        resourceLimitCpu: params.BUILDER_CPU ?: '4',
+                        resourceRequestMemory: '4Gi',
+                        resourceLimitMemory: '4Gi')
+        ]
+) {
+    node(POD_LABEL) {
+        try {
+            stage("checkout") {
+                sh """#!/bin/bash -ex
+                    if [ "${verbose}" -ge 1 ]
+                    then
+                        df -h
+                    fi
+                """
+                git branch: params.BRANCH ?: 'master',
+                        url: 'https://github.com/Evolveum/midpoint.git'
+            }
+            stage("analyze") {
+                container('maven') {
+                    sh """#!/bin/bash -ex
+                        if [ "${verbose}" -ge 1 ]
+                        then
+                            id
+                            env | sort
+                            mvn --version
+                        fi
+
+                        mvn org.owasp:dependency-check-maven:aggregate
+                    """
+                }
+            }
+            stage("publish") {
+                steps {
+                    dependencyCheckPublisher pattern: 'dependency-check-report.xml'
+                }
+            }
+
+            currentBuild.result = 'SUCCESS'
+        } catch (Exception e) {
+            currentBuild.result = 'FAILURE' // error below will not set result for mailer!
+            error "Marking build as FAILURE because of: ${e}"
+        } finally {
+            try {
+                // Very basic mails, later we can use https://plugins.jenkins.io/email-ext/
+                step([$class: 'Mailer',
+                    notifyEveryUnstableBuild: true,
+                    recipients: env.DEFAULT_MAIL_RECIPIENT,
+                    sendToIndividuals: false])
+
+                sh """#!/bin/bash -ex
+                    if [ "${verbose}" -ge 1 ]
+                    then
+                        df -h
+                    fi
+                """
+            } catch (Exception e) {
+                println 'Could not send email: ' + e
+            }
+        }
+    }
+}

From a59215df93f7fafb1cde58486deccabca2e095a9 Mon Sep 17 00:00:00 2001
From: lskublik <lskublik@evolveum.com>
Date: Mon, 4 Sep 2023 15:14:12 +0200
Subject: [PATCH 04/14] DATABASETABLE connector 1.5.1.0-M1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fd7821ee518..29685cbfe0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -957,7 +957,7 @@
             <dependency>
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-databasetable</artifactId>
-                <version>1.5.1.0-SNAPSHOT</version>
+                <version>1.5.1.0-M1</version>
                 <exclusions>
                     <!-- Connectors may have dependencies on various versions of connector-common,
                          as they can be built against various versions of polygon.

From e0ba1b432564f6907d4612144f2e49427272255c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Tk=C3=A1=C4=8Dik?= <tonydamage@gmail.com>
Date: Mon, 4 Sep 2023 15:07:44 +0200
Subject: [PATCH 05/14] Added security pipeline for owasp:dependency-check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tony Tkáčik <tonydamage@gmail.com>
---
 .../src/test/resources/tasks/misc/cluster-role-based.xml     | 5 -----
 tools/jenkins/midpoint-security-pipeline                     | 4 +---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml b/model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml
index 280d7bc91e2..d388ec239c7 100644
--- a/model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml
+++ b/model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml
@@ -4,11 +4,6 @@
         oid="16a8b95a-8a37-4f91-b835-bb77670c2899">
     <name>cluster_0</name>
     <!--TODO members-->
-    <roleAnalysisSessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"
-            relation="org:default"
-            type="c:RoleAnalysisSessionType">
-        <!-- role_based_analysis_session -->
-    </roleAnalysisSessionRef>
     <detectionOption>
         <minRolesOccupancy>10</minRolesOccupancy>
         <minUserOccupancy>10</minUserOccupancy>
diff --git a/tools/jenkins/midpoint-security-pipeline b/tools/jenkins/midpoint-security-pipeline
index 29571a3fcf9..d6ac8727b0a 100644
--- a/tools/jenkins/midpoint-security-pipeline
+++ b/tools/jenkins/midpoint-security-pipeline
@@ -58,9 +58,7 @@ podTemplate(
                 }
             }
             stage("publish") {
-                steps {
-                    dependencyCheckPublisher pattern: 'dependency-check-report.xml'
-                }
+                dependencyCheckPublisher pattern: 'dependency-check-report.xml'
             }
 
             currentBuild.result = 'SUCCESS'

From de84cf4f731b0c8b1144f229d7bbfa5d27a7237d Mon Sep 17 00:00:00 2001
From: Patrik <patkomalinak@gmail.com>
Date: Mon, 4 Sep 2023 15:25:21 +0200
Subject: [PATCH 06/14] Identity recovery tweaks - updated layout, scss,
 repaired some components and icons

---
 .../frontend/scss/_admin-lte-overrides.scss   |  4 +++
 gui/admin-gui/src/frontend/scss/midpoint.scss | 14 +++++++++-
 .../PageAbstractAttributeVerification.html    |  2 +-
 .../PageAbstractAuthenticationModule.html     |  4 +--
 .../login/module/PageArchetypeSelection.html  |  4 +--
 .../gui/impl/page/login/module/PageLogin.html | 16 +++++-------
 .../lostusername/IdentityDetailsPanel.html    | 26 ++++++++++---------
 .../lostusername/PageIdentityRecovery.html    | 15 ++++++-----
 8 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss b/gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss
index 13582024060..248a18cfebe 100644
--- a/gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss
+++ b/gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss
@@ -7,6 +7,10 @@
 
 .user-panel {
   border-bottom: 0 !important;
+
+  &.info-box {
+    min-height:70px;
+  }
 }
 
 .btn-default {
diff --git a/gui/admin-gui/src/frontend/scss/midpoint.scss b/gui/admin-gui/src/frontend/scss/midpoint.scss
index 9c79d5bf49c..0d7345fdd12 100644
--- a/gui/admin-gui/src/frontend/scss/midpoint.scss
+++ b/gui/admin-gui/src/frontend/scss/midpoint.scss
@@ -1745,8 +1745,20 @@ span.yui-skin-sam {
   width: 600px !important;
 }
 
-.login-box {
+@mixin login-box {
   width: 400px !important;
+
+  & .login-card-body .spacer hr {
+    border-color:#dfdfdf;
+  }
+
+  & .login-card-body .spacer span {
+    color:#dfdfdf;
+  }
+
+  & .login-card-body .user-panel.info-box .image img {
+    width:2.4rem;
+  }
 }
 
 .info-box.activity-item-processing > .info-box-content > .progress-description {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAttributeVerification.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAttributeVerification.html
index d381b80db24..fdc0df8180e 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAttributeVerification.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAttributeVerification.html
@@ -19,7 +19,7 @@
             <label wicket:id="attributeName"></label>
             <div wicket:id="attributeValue"/>
         </div>
-        <div>
+        <div class="mt-4">
             <input type="submit" class="btn btn-primary login-panel-control" wicket:message="value:PageBase.button.send" />
         </div>
     </form>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAuthenticationModule.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAuthenticationModule.html
index 0571f0677c1..b62f1222af1 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAuthenticationModule.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAuthenticationModule.html
@@ -15,9 +15,9 @@
     <wicket:child/>
 
     <wicket:enclosure child="flowLinkContainer">
-        <div class="d-flex align-items-center my-2">
+        <div class="d-flex align-items-center my-2 py-1 spacer">
             <hr class="w-100" style="border-color: #818d98;">
-            <span class="mx-3 text-secondary">OR</span>
+            <span class="mx-3">OR</span>
             <hr class="w-100" style="border-color: #818d98;">
         </div>
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageArchetypeSelection.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageArchetypeSelection.html
index 6c46b5b269e..663f051c776 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageArchetypeSelection.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageArchetypeSelection.html
@@ -20,8 +20,8 @@
                 <div class="card mb-0 simple-tile selectable" wicket:id="archetype"/>
             </wicket:container>
         </div>
-        <div>
-            <input type="submit" class="btn btn-primary mt-4 login-panel-control" wicket:message="value:PageBase.button.send" />
+        <div class="mt-4">
+            <input type="submit" class="btn btn-primary login-panel-control" wicket:message="value:PageBase.button.send" />
         </div>
     </form>
 </wicket:extend>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html
index a9250691dde..1802e508ca2 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html
@@ -16,10 +16,10 @@
             </label>
             <div class="input-group d-flex login-panel-control">
                 <input wicket:id="username" name="username" type="text" class="form-control form-control-sm">
-                <div class="input-group-append">
-                    <div class="input-group-text">
-                        <span class="fas fa-user"></span>
-                    </div>
+                <div class="input-group-prepend">
+                    <span class="input-group-text">
+                        <i class="fas fa-user"></i>
+                    </span>
                 </div>
             </div>
         </div>
@@ -30,9 +30,9 @@
             <div class="input-group d-flex login-panel-control">
                 <input name="password" type="password" class="form-control form-control-sm d-flex flex-wrap gap-2">
                 <div class="input-group-append">
-                    <div class="input-group-text">
-                        <span class="fas fa-lock"></span>
-                    </div>
+                    <span class="input-group-text">
+                        <i class="fas fa-lock"></i>
+                    </span>
                 </div>
             </div>
         </div>
@@ -45,8 +45,6 @@
         <div wicket:id="csrfField"/>
     </form>
 
-
-
 </wicket:extend>
 
 </html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/IdentityDetailsPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/IdentityDetailsPanel.html
index 61946c8907c..b1ca847d5a4 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/IdentityDetailsPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/IdentityDetailsPanel.html
@@ -8,27 +8,29 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <div wicket:id="headerPanel" class="d-flex flex-wrap gap-2 w-100">
-        <div class="image col-md-2 mt-3">
-            <img wicket:id="photo" class="user-image img-circle elevation-2"/>
+    <div wicket:id="headerPanel" class="d-flex flex-wrap gap-1 w-100 align-items-center px-1">
+        <div class="image col-auto pl-2">
+            <img wicket:id="photo" class="user-image img-circle"/>
         </div>
-        <div class="info col-md-8">
-            <div class="text-lg" wicket:id="displayName"/>
-            <div class="text-md" wicket:id="archetypeLabel"/>
+        <div class="info col py-0">
+            <div class="text-md" wicket:id="displayName"/>
+            <div class="text-sm text-secondary" wicket:id="archetypeLabel"/>
         </div>
-        <a class="pull-right col-md-1 mt-3" wicket:id="expandButton">
+        <div class="col-auto">
+        <a class="btn btn-tool pull-right m-0" wicket:id="expandButton">
             <i wicket:id="arrowIcon"></i>
         </a>
+        </div>
     </div>
     <wicket:enclosure child="itemsPanel">
-        <div class="border-top w-100">
-            <div wicket:id="itemsPanel" class="d-flex flex-wrap gap-2 mt-2">
-                <label class="col-md-5" wicket:id="itemName"></label>
+        <div class="border-top d-flex flex-column pt-3 gap-2 w-100">
+            <div wicket:id="itemsPanel" class="d-flex flex-wrap gap-2">
+                <label class="col-md-4 m-0" wicket:id="itemName"></label>
                 <div wicket:id="itemValue"/>
             </div>
         </div>
-        <a wicket:id="confirmIdentity" class="d-flex btn btn-primary justify-content-center w-100 mt-2">
-            <i class="mt-1 mr-2 fa-fw fa fa-check" />
+        <a wicket:id="confirmIdentity" class="d-flex btn btn-primary align-items-center justify-content-center w-100 mt-2">
+            <i class="mr-2 fa fa-check" />
             <wicket:message key="PageIdentityRecovery.confirmIdentity"/>
         </a>
     </wicket:enclosure>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/PageIdentityRecovery.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/PageIdentityRecovery.html
index 1a63eaec6e9..54ffa6cf150 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/PageIdentityRecovery.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/PageIdentityRecovery.html
@@ -11,16 +11,19 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <body>
 <wicket:extend>
-    <div wicket:id="recoveredIdentities" class="user-panel info-box my-3 pb-2 ">
-        <div wicket:id="detailsPanel" class="d-flex flex-wrap gap-2 w-100" />
+    <div class="d-flex flex-column gap-2">
+        <div wicket:id="recoveredIdentities" class="user-panel info-box mb-1">
+            <div wicket:id="detailsPanel" class="d-flex flex-wrap gap-2 w-100" />
+        </div>
     </div>
-    <div wicket:id="paging" class="d-flex gap-2 w-100 justify-content-center" />
+    <div wicket:id="paging" class="d-flex gap-2 w-100 justify-content-center mt-3 mb-1" />
     <div>
-        <a wicket:id="restartFlow" class="d-flex btn btn-default justify-content-center w-100 mt-4">
-            <i class="mt-1 mr-2 fa fa-sync-alt" />
+        <a wicket:id="restartFlow" class="d-flex btn btn-default justify-content-center w-100 mt-4 align-items-center">
+            <i class="mr-2 fa fa-sync-alt" />
             <wicket:message key="PageIdentityRecovery.restartFlow"/>
         </a>
-        <a wicket:id="registrationLink" class="d-flex justify-content-center w-100 mt-4">
+        <a wicket:id="registrationLink" class="d-flex btn btn-default justify-content-center w-100 mt-2 align-items-center">
+            <i class="mr-2 fa fa-solid fa-user-plus" />
             <wicket:message key="PageLogin.registerNewAccount"/>
         </a>
     </div>

From a2ee94d44b08476dc01e65fb13434f602471be68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Tk=C3=A1=C4=8Dik?= <tonydamage@gmail.com>
Date: Mon, 4 Sep 2023 15:37:44 +0200
Subject: [PATCH 07/14] Finetuning check location
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tony Tkáčik <tonydamage@gmail.com>
---
 tools/jenkins/midpoint-security-pipeline | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/jenkins/midpoint-security-pipeline b/tools/jenkins/midpoint-security-pipeline
index d6ac8727b0a..636e979d810 100644
--- a/tools/jenkins/midpoint-security-pipeline
+++ b/tools/jenkins/midpoint-security-pipeline
@@ -58,7 +58,7 @@ podTemplate(
                 }
             }
             stage("publish") {
-                dependencyCheckPublisher pattern: 'dependency-check-report.xml'
+                dependencyCheckPublisher pattern: 'target/dependency-check-report.xml'
             }
 
             currentBuild.result = 'SUCCESS'

From c8d25c2c19e248c059dcae064bf7969dc9fb5118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Tk=C3=A1=C4=8Dik?= <tonydamage@gmail.com>
Date: Mon, 4 Sep 2023 15:50:35 +0200
Subject: [PATCH 08/14] Moved publisher to maven step
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tony Tkáčik <tonydamage@gmail.com>
---
 tools/jenkins/midpoint-security-pipeline | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/jenkins/midpoint-security-pipeline b/tools/jenkins/midpoint-security-pipeline
index 636e979d810..f8f3b6c6d6e 100644
--- a/tools/jenkins/midpoint-security-pipeline
+++ b/tools/jenkins/midpoint-security-pipeline
@@ -55,11 +55,9 @@ podTemplate(
 
                         mvn org.owasp:dependency-check-maven:aggregate
                     """
+                    dependencyCheckPublisher pattern: 'target/dependency-check-report.xml'
                 }
             }
-            stage("publish") {
-                dependencyCheckPublisher pattern: 'target/dependency-check-report.xml'
-            }
 
             currentBuild.result = 'SUCCESS'
         } catch (Exception e) {

From e4ce71ec694ed7cb3dda33b598c5b55c819c9554 Mon Sep 17 00:00:00 2001
From: Patrik <patkomalinak@gmail.com>
Date: Mon, 4 Sep 2023 16:11:44 +0200
Subject: [PATCH 09/14] PageLogin.html fixed unwanted change

---
 .../evolveum/midpoint/gui/impl/page/login/module/PageLogin.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html
index 1802e508ca2..c552505ccef 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html
@@ -16,7 +16,7 @@
             </label>
             <div class="input-group d-flex login-panel-control">
                 <input wicket:id="username" name="username" type="text" class="form-control form-control-sm">
-                <div class="input-group-prepend">
+                <div class="input-group-append">
                     <span class="input-group-text">
                         <i class="fas fa-user"></i>
                     </span>

From 4e130f777bbe413dc3845f7ca231286711ec5006 Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Mon, 4 Sep 2023 16:18:26 +0200
Subject: [PATCH 10/14] Add primitive role mining task progress reporting

Currently, we increase the progress by one on each activity step.
Work in progress. To be tested.
---
 .../utils/chunk/PrepareChunkStructure.java    | 28 +++++------
 .../utils/chunk/PrepareExpandStructure.java   | 24 ++++-----
 .../mining/objects/handler/Handler.java       | 50 +++++++++++++------
 .../mining/utils/algorithm/JaccardSorter.java |  4 +-
 .../OutcomeKeyedCounterTypeUtil.java          | 34 +++++--------
 .../impl/mining/algorithm/BaseAction.java     | 36 +++++++++++++
 .../chunk/PrepareChunkStructure.java          | 28 +++++------
 .../cluster/action/ClusteringAction.java      | 35 ++++++++-----
 .../cluster/action/RoleBasedClustering.java   |  4 +-
 .../cluster/action/UserBasedClustering.java   |  4 +-
 .../mechanism/DensityBasedClustering.java     |  2 +-
 .../detection/DetectionActionExecutor.java    |  2 +-
 .../detection/DetectionActionExecutorNew.java | 26 +++++++---
 .../algorithm/detection/PatternResolver.java  | 20 ++++----
 .../utils/RoleAnalysisAlgorithmUtils.java     |  8 +--
 ...RoleAnalysisClusteringActivityHandler.java | 33 ++++--------
 ...alysisPatternDetectionActivityHandler.java | 25 +++-------
 .../activity/run/state/ActivityProgress.java  |  2 +-
 18 files changed, 206 insertions(+), 159 deletions(-)
 create mode 100644 model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/BaseAction.java

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareChunkStructure.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareChunkStructure.java
index f0ab09c5ede..d80516f0b7b 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareChunkStructure.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareChunkStructure.java
@@ -85,7 +85,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
         Set<String> membersOidSet = new HashSet<>();
 
         handler.setActive(true);
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType member : members) {
             handler.iterateActualStatus();
@@ -109,7 +109,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
         }
 
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(members.size());
         int roleMapSize = roleMap.size();
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
@@ -122,7 +122,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
         }
 
         int userChunkSize = userChunk.size();
-        handler.setSubTitle("Process Role Structure");
+        handler.enterNewStep("Process Role Structure");
         handler.setOperationCountToProcess(userChunkSize);
         for (List<String> users : userChunk.keySet()) {
             handler.iterateActualStatus();
@@ -146,7 +146,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
         int memberCount = membersOidSet.size();
         int roleChunkSize = roleChunk.size();
-        handler.setSubTitle("Process User Structure");
+        handler.enterNewStep("Process User Structure");
         handler.setOperationCountToProcess(roleChunkSize);
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -187,7 +187,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
         Set<String> membersOidSet = new HashSet<>();
 
         handler.setActive(true);
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType member : members) {
             handler.iterateActualStatus();
@@ -214,7 +214,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
         }
 
         int roleMapSize = roleMap.size();
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(roleMapSize);
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
         for (String key : roleMap.keySet()) {
@@ -224,7 +224,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
         }
 
         int userChunkSize = userChunk.size();
-        handler.setSubTitle("Process User Structure");
+        handler.enterNewStep("Process User Structure");
         handler.setOperationCountToProcess(userChunkSize);
         for (List<String> key : userChunk.keySet()) {
             handler.iterateActualStatus();
@@ -250,7 +250,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
 
         int roleChunkSize = roleChunk.size();
 
-        handler.setSubTitle("Process Role Structure");
+        handler.enterNewStep("Process Role Structure");
         handler.setOperationCountToProcess(roleChunkSize);
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -291,7 +291,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
 
         List<ObjectReferenceType> members = cluster.getMember();
         handler.setActive(true);
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType objectReferenceType : members) {
             handler.iterateActualStatus();
@@ -317,7 +317,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
         int membersCount = membersOidSet.size();
         //user //role
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(roleMap.size());
 
         for (String key : roleMap.keySet()) {
@@ -326,7 +326,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
             roleChunk.put(values, key);
         }
 
-        handler.setSubTitle("Prepare User Structure");
+        handler.enterNewStep("Prepare User Structure");
         handler.setOperationCountToProcess(roleChunk.size());
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -363,7 +363,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
 
         List<ObjectReferenceType> members = cluster.getMember();
         handler.setActive(true);
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType objectReferenceType : members) {
             handler.iterateActualStatus();
@@ -389,7 +389,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
         //user //role
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
 
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(roleMap.size());
         for (String key : roleMap.keySet()) {
             handler.iterateActualStatus();
@@ -398,7 +398,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
             roleChunk.put(values, key);
         }
 
-        handler.setSubTitle("Prepare Role Structure");
+        handler.enterNewStep("Prepare Role Structure");
         handler.setOperationCountToProcess(roleChunk.size());
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareExpandStructure.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareExpandStructure.java
index b0a67e6c5b7..ca27e5f6929 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareExpandStructure.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareExpandStructure.java
@@ -87,7 +87,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
         int rolesCount = rolesElements.size();
         handler.setActive(true);
-        handler.setSubTitle("Prepare Role Structure");
+        handler.enterNewStep("Prepare Role Structure");
         handler.setOperationCountToProcess(rolesCount);
         for (ObjectReferenceType rolesElement : rolesElements) {
             handler.iterateActualStatus();
@@ -115,7 +115,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
         int userChunkSize = userChunk.size();
 
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(miningRoleTypeChunks.size());
         for (MiningRoleTypeChunk chunk : miningRoleTypeChunks) {
             handler.iterateActualStatus();
@@ -125,7 +125,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
         int memberCount = membersOidSet.size();
 
-        handler.setSubTitle("Prepare User Structure");
+        handler.enterNewStep("Prepare User Structure");
         handler.setOperationCountToProcess(userChunk.size());
         for (String key : userChunk.keySet()) {
             handler.iterateActualStatus();
@@ -164,7 +164,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
         int usersCount = members.size();
 
         handler.setActive(true);
-        handler.setSubTitle("Prepare User Structure");
+        handler.enterNewStep("Prepare User Structure");
         handler.setOperationCountToProcess(usersCount);
         for (int i = 0; i < usersCount; i++) {
             handler.iterateActualStatus();
@@ -196,7 +196,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
 
         int roleChunkSize = roleChunk.size();
 
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(usersCount);
         for (MiningUserTypeChunk chunk : miningUserTypeChunks) {
             handler.iterateActualStatus();
@@ -206,7 +206,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
 
         int memberCount = membersOidSet.size();
 
-        handler.setSubTitle("Prepare Role Structure");
+        handler.enterNewStep("Prepare Role Structure");
         handler.setOperationCountToProcess(usersCount);
         for (String key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -244,7 +244,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
         Set<String> membersOidSet = new HashSet<>();
 
         handler.setActive(true);
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(rolesElements.size());
         for (ObjectReferenceType objectReferenceType : rolesElements) {
             handler.iterateActualStatus();
@@ -267,7 +267,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
 
         //user //role
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(roleMap.size());
         for (String key : roleMap.keySet()) {
             handler.iterateActualStatus();
@@ -278,7 +278,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
 
         int memberCount = membersOidSet.size();
 
-        handler.setSubTitle("Prepare User Structure");
+        handler.enterNewStep("Prepare User Structure");
         handler.setOperationCountToProcess(roleChunk.size());
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -317,7 +317,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
         List<ObjectReferenceType> members = cluster.getMember();
 
         handler.setActive(true);
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType objectReferenceType : members) {
             handler.iterateActualStatus();
@@ -346,7 +346,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
         //user //role
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
 
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(roleMap.size());
         for (String key : roleMap.keySet()) {
             handler.iterateActualStatus();
@@ -357,7 +357,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
 
         int memberCount = membersOidSet.size();
 
-        handler.setSubTitle("Prepare Role Structure");
+        handler.enterNewStep("Prepare Role Structure");
         handler.setOperationCountToProcess(roleChunk.size());
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/Handler.java b/infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/Handler.java
index 87d1fcbc9c8..93d23dc8bd6 100644
--- a/infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/Handler.java
+++ b/infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/Handler.java
@@ -7,25 +7,41 @@
 
 package com.evolveum.midpoint.common.mining.objects.handler;
 
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+
+import org.jetbrains.annotations.Nullable;
+
 import java.io.Serializable;
 import java.time.Duration;
 
-import static com.evolveum.midpoint.util.ClassPathUtil.LOGGER;
-
-//TODO
+/**
+ * Keeps the state of the role-mining activity (clustering, pattern detection, etc).
+ *
+ * TODO rename
+ */
 public class Handler implements Serializable {
 
+    private static final Trace LOGGER = TraceManager.getTrace(Handler.class);
+
     private String title;
     private String subTitle;
     private int operationCountToProcess;
     private boolean isActive;
     private int actualStatus;
-    private int stepsCount;
+    private final int stepsCount;
     private int currentStep;
     private String objectId;
     private final long startTime;
     private long endTime;
 
+    /**
+     * Called when an external progress value (currently, for tasks) has to be incremented.
+     *
+     * TODO what about serializability? Currently we assume we'll never use deserialized version of this class isntance
+     */
+    @Nullable private transient final Runnable progressIncrementer;
+
     public int getPercentage() {
         return percentage;
     }
@@ -43,6 +59,10 @@ public String getDuration() {
     }
 
     public Handler(String title, int stepsCount) {
+        this(title, stepsCount, null);
+    }
+
+    public Handler(String title, int stepsCount, @Nullable Runnable progressIncrementer) {
         this.startTime = System.currentTimeMillis();
         this.endTime = System.currentTimeMillis();
         this.title = title;
@@ -50,22 +70,26 @@ public Handler(String title, int stepsCount) {
         this.isActive = true;
         this.actualStatus = 0;
         this.currentStep = 0;
+        this.progressIncrementer = progressIncrementer;
     }
 
     public void iterateActualStatus() {
         this.actualStatus++;
         this.endTime = System.currentTimeMillis();
         this.percentage = (int) ((actualStatus / (double) operationCountToProcess) * 100);
-        print();
+        log();
     }
 
-    public void setSubTitle(String subTitle) {
+    public void enterNewStep(String subTitle) {
+        if (progressIncrementer != null) {
+            progressIncrementer.run();
+        }
         this.currentStep++;
         this.operationCountToProcess = 0;
         this.actualStatus = 0;
         this.subTitle = subTitle;
         this.percentage = 0;
-        print();
+        log();
     }
 
     @Override
@@ -76,12 +100,12 @@ public String toString() {
                 isActive, actualStatus, getObjectId(), getDuration());
     }
 
-    public void print() {
-        String handler = String.format("Step{%d/%d} - Status{%s, subOperation='%s', percentage=%d processedCount=%d, "
-                        + "isActive=%b, actualStatus=%d} Object Id{%s} Duration{%s}",
+    public void log() {
+        LOGGER.debug(
+                "Step {}/{} - Status=[{}, subOperation='{}', percentage={} processedCount={}, "
+                        + "isActive={}, actualStatus={}] Object Id={} Duration={}",
                 currentStep, stepsCount, title, subTitle, percentage, operationCountToProcess, isActive,
                 actualStatus, getObjectId(), getDuration());
-        LOGGER.info(handler);
     }
 
     public void setOperationCountToProcess(int operationCountToProcess) {
@@ -127,8 +151,4 @@ public void setActualStatus(int actualStatus) {
     public void setObjectId(String objectId) {
         this.objectId = objectId;
     }
-
-    public void setStepsCount(int stepsCount) {
-        this.stepsCount = stepsCount;
-    }
 }
diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/mining/utils/algorithm/JaccardSorter.java b/infra/common/src/main/java/com/evolveum/midpoint/common/mining/utils/algorithm/JaccardSorter.java
index 8eac58955ba..3bf4006ae7f 100644
--- a/infra/common/src/main/java/com/evolveum/midpoint/common/mining/utils/algorithm/JaccardSorter.java
+++ b/infra/common/src/main/java/com/evolveum/midpoint/common/mining/utils/algorithm/JaccardSorter.java
@@ -35,7 +35,7 @@ public class JaccardSorter {
     public static List<MiningUserTypeChunk> jaccardUserBasedSorter(List<MiningUserTypeChunk> dataPoints) {
 
         Handler handler = new Handler("Jaccard Sort", 1);
-        handler.setSubTitle("Sorting");
+        handler.enterNewStep("Sorting");
         handler.setActive(true);
 
         List<MiningUserTypeChunk> sorted = new ArrayList<>();
@@ -97,7 +97,7 @@ > jacquardSimilarity(sorted.get(0).getRoles(),
     public static List<MiningRoleTypeChunk> jaccardRoleBasedSorter(List<MiningRoleTypeChunk> dataPoints) {
 
         Handler handler = new Handler("Jaccard Sort", 1);
-        handler.setSubTitle("Sorting");
+        handler.enterNewStep("Sorting");
         handler.setActive(true);
 
         List<MiningRoleTypeChunk> sorted = new ArrayList<>();
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/OutcomeKeyedCounterTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/OutcomeKeyedCounterTypeUtil.java
index 4a88e12e305..631a718587b 100644
--- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/OutcomeKeyedCounterTypeUtil.java
+++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/OutcomeKeyedCounterTypeUtil.java
@@ -7,7 +7,6 @@
 
 package com.evolveum.midpoint.schema.statistics;
 
-import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ItemProcessingOutcomeType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OutcomeKeyedCounterType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.QualifiedItemProcessingOutcomeType;
@@ -27,8 +26,7 @@ public class OutcomeKeyedCounterTypeUtil {
     /** Adds two lists of counters: finds matching pairs and adds them. */
     public static void addCounters(List<OutcomeKeyedCounterType> sumCounters, List<OutcomeKeyedCounterType> deltaCounters) {
         for (OutcomeKeyedCounterType deltaCounter : deltaCounters) {
-            OutcomeKeyedCounterType matchingCounter =
-                    findOrCreateCounter(sumCounters, deltaCounter.getOutcome(), null);
+            OutcomeKeyedCounterType matchingCounter = findOrCreateCounter(sumCounters, deltaCounter.getOutcome());
             addMatchingCounters(matchingCounter, deltaCounter);
         }
     }
@@ -39,25 +37,24 @@ private static void addMatchingCounters(OutcomeKeyedCounterType sum, OutcomeKeye
     }
 
     /** Finds a counter, creating _and adding to the list_ if necessary. */
-    static OutcomeKeyedCounterType findOrCreateCounter(List<OutcomeKeyedCounterType> counters,
-            QualifiedItemProcessingOutcomeType outcome, PrismContext prismContext) {
+    private static OutcomeKeyedCounterType findOrCreateCounter(
+            List<OutcomeKeyedCounterType> counters, QualifiedItemProcessingOutcomeType outcome) {
         return counters.stream()
                 .filter(counter -> Objects.equals(counter.getOutcome(), outcome))
                 .findFirst()
                 .orElseGet(
-                        () -> add(counters, new OutcomeKeyedCounterType(prismContext).outcome(outcome.clone())));
+                        () -> add(counters, new OutcomeKeyedCounterType().outcome(outcome.clone())));
     }
 
     /** Like {@link List#add(Object)} but returns the value. */
-    static <T> T add(List<T> list, T value) {
+    private static <T> T add(List<T> list, T value) {
         list.add(value);
         return value;
     }
 
     /** Increments counter corresponding to given outcome. */
-    public static int incrementCounter(List<OutcomeKeyedCounterType> counters, QualifiedItemProcessingOutcomeType outcome,
-            PrismContext prismContext) {
-        OutcomeKeyedCounterType counter = findOrCreateCounter(counters, outcome, prismContext);
+    public static int incrementCounter(List<OutcomeKeyedCounterType> counters, QualifiedItemProcessingOutcomeType outcome) {
+        OutcomeKeyedCounterType counter = findOrCreateCounter(counters, outcome);
         counter.setCount(or0(counter.getCount()) + 1);
         return counter.getCount();
     }
@@ -101,7 +98,7 @@ public static ItemProcessingOutcomeType getOutcome(OutcomeKeyedCounterType count
         }
     }
 
-    public static String getOutcomeQualifierUri(OutcomeKeyedCounterType counter) {
+    static String getOutcomeQualifierUri(OutcomeKeyedCounterType counter) {
         if (counter != null && counter.getOutcome() != null) {
             return counter.getOutcome().getQualifierUri();
         } else {
@@ -118,15 +115,10 @@ static Comparator<? super OutcomeKeyedCounterType> createOutcomeKeyedCounterComp
     }
 
     public static Predicate<OutcomeKeyedCounterType> getCounterFilter(ItemProcessingOutcomeType outcome) {
-        switch (outcome) {
-            case SUCCESS:
-                return OutcomeKeyedCounterTypeUtil::isSuccess;
-            case FAILURE:
-                return OutcomeKeyedCounterTypeUtil::isFailure;
-            case SKIP:
-                return OutcomeKeyedCounterTypeUtil::isSkip;
-            default:
-                throw new AssertionError(outcome);
-        }
+        return switch (outcome) {
+            case SUCCESS -> OutcomeKeyedCounterTypeUtil::isSuccess;
+            case FAILURE -> OutcomeKeyedCounterTypeUtil::isFailure;
+            case SKIP -> OutcomeKeyedCounterTypeUtil::isSkip;
+        };
     }
 }
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/BaseAction.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/BaseAction.java
new file mode 100644
index 00000000000..2e74f608376
--- /dev/null
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/BaseAction.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2010-2023 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+package com.evolveum.midpoint.model.impl.mining.algorithm;
+
+import com.evolveum.midpoint.repo.common.activity.run.AbstractActivityRun;
+
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ItemProcessingOutcomeType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.QualifiedItemProcessingOutcomeType;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Abstract (base) action class for clustering and pattern detection.
+ *
+ * Assumes the execution within an activity!
+ */
+public abstract class BaseAction {
+
+    /** This is the corresponding "activity run" object that gives us all the context. */
+    @NotNull protected final AbstractActivityRun<?, ?, ?> activityRun;
+
+    protected BaseAction(@NotNull AbstractActivityRun<?, ?, ?> activityRun) {
+        this.activityRun = activityRun;
+    }
+
+    protected void incrementProgress() {
+        activityRun.incrementProgress(
+                new QualifiedItemProcessingOutcomeType()
+                        .outcome(ItemProcessingOutcomeType.SUCCESS));
+    }
+}
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/chunk/PrepareChunkStructure.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/chunk/PrepareChunkStructure.java
index 38816ec09df..113bdb27d03 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/chunk/PrepareChunkStructure.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/chunk/PrepareChunkStructure.java
@@ -84,7 +84,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
         Set<String> membersOidSet = new HashSet<>();
 
         handler.setActive(true);
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType member : members) {
             handler.iterateActualStatus();
@@ -108,7 +108,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
         }
 
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(members.size());
         int roleMapSize = roleMap.size();
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
@@ -121,7 +121,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
         }
 
         int userChunkSize = userChunk.size();
-        handler.setSubTitle("Process Role Structure");
+        handler.enterNewStep("Process Role Structure");
         handler.setOperationCountToProcess(userChunkSize);
         for (List<String> users : userChunk.keySet()) {
             handler.iterateActualStatus();
@@ -145,7 +145,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
         int memberCount = membersOidSet.size();
         int roleChunkSize = roleChunk.size();
-        handler.setSubTitle("Process User Structure");
+        handler.enterNewStep("Process User Structure");
         handler.setOperationCountToProcess(roleChunkSize);
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -186,7 +186,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
         Set<String> membersOidSet = new HashSet<>();
 
         handler.setActive(true);
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType member : members) {
             handler.iterateActualStatus();
@@ -213,7 +213,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
         }
 
         int roleMapSize = roleMap.size();
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(roleMapSize);
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
         for (String key : roleMap.keySet()) {
@@ -223,7 +223,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
         }
 
         int userChunkSize = userChunk.size();
-        handler.setSubTitle("Process User Structure");
+        handler.enterNewStep("Process User Structure");
         handler.setOperationCountToProcess(userChunkSize);
         for (List<String> key : userChunk.keySet()) {
             handler.iterateActualStatus();
@@ -249,7 +249,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
 
         int roleChunkSize = roleChunk.size();
 
-        handler.setSubTitle("Process Role Structure");
+        handler.enterNewStep("Process Role Structure");
         handler.setOperationCountToProcess(roleChunkSize);
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -290,7 +290,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
 
         List<ObjectReferenceType> members = cluster.getMember();
         handler.setActive(true);
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType objectReferenceType : members) {
             handler.iterateActualStatus();
@@ -316,7 +316,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
         int membersCount = membersOidSet.size();
         //user //role
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(roleMap.size());
 
         for (String key : roleMap.keySet()) {
@@ -325,7 +325,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
             roleChunk.put(values, key);
         }
 
-        handler.setSubTitle("Prepare User Structure");
+        handler.enterNewStep("Prepare User Structure");
         handler.setOperationCountToProcess(roleChunk.size());
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
@@ -362,7 +362,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
 
         List<ObjectReferenceType> members = cluster.getMember();
         handler.setActive(true);
-        handler.setSubTitle("Map Users");
+        handler.enterNewStep("Map Users");
         handler.setOperationCountToProcess(members.size());
         for (ObjectReferenceType objectReferenceType : members) {
             handler.iterateActualStatus();
@@ -388,7 +388,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
         //user //role
         ListMultimap<List<String>, String> roleChunk = ArrayListMultimap.create();
 
-        handler.setSubTitle("Map Roles");
+        handler.enterNewStep("Map Roles");
         handler.setOperationCountToProcess(roleMap.size());
         for (String key : roleMap.keySet()) {
             handler.iterateActualStatus();
@@ -397,7 +397,7 @@ public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalys
             roleChunk.put(values, key);
         }
 
-        handler.setSubTitle("Prepare Role Structure");
+        handler.enterNewStep("Prepare Role Structure");
         handler.setOperationCountToProcess(roleChunk.size());
         for (List<String> key : roleChunk.keySet()) {
             handler.iterateActualStatus();
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/ClusteringAction.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/ClusteringAction.java
index 83ef5f1d85f..c2617300f32 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/ClusteringAction.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/ClusteringAction.java
@@ -13,6 +13,11 @@
 import java.util.List;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.model.impl.ModelBeans;
+
+import com.evolveum.midpoint.model.impl.mining.algorithm.BaseAction;
+import com.evolveum.midpoint.repo.common.activity.run.AbstractActivityRun;
+
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.common.mining.objects.handler.Handler;
@@ -22,17 +27,23 @@
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-public class ClusteringAction {
+/**
+ * TODO
+ */
+public class ClusteringAction extends BaseAction {
 
     private Clusterable clusterable;
 
-    Handler handler = new Handler("Density Clustering", 7);
+    private final Handler handler = new Handler("Density Clustering", 7, this::incrementProgress);
 
-    public ClusteringAction() {
+    public ClusteringAction(@NotNull AbstractActivityRun<?, ?, ?> activityRun) {
+        super(activityRun);
     }
 
-    public void execute(@NotNull ModelService modelService, String sessionOid,
-            @NotNull OperationResult result, Task task) {
+    public void execute(String sessionOid, @NotNull OperationResult result) {
+
+        var task = activityRun.getRunningTask();
+        ModelService modelService = ModelBeans.get().modelService;
 
         PrismObject<RoleAnalysisSessionType> prismSession = getSessionTypeObject(modelService, result, sessionOid, task);
         if (prismSession != null) {
@@ -47,11 +58,10 @@ public void execute(@NotNull ModelService modelService, String sessionOid,
             }
 
             RoleAnalysisSessionType session = prismSession.asObjectable();
-            List<PrismObject<RoleAnalysisClusterType>> clusterObjects = clusterable.executeClustering(session,
-                    result, modelService, handler, task);
-
-            importObjects(clusterObjects, session, modelService, result, handler, task);
+            List<PrismObject<RoleAnalysisClusterType>> clusterObjects =
+                    clusterable.executeClustering(session, result, modelService, handler, task);
 
+            importObjects(clusterObjects, session, modelService, task, result);
         }
     }
 
@@ -59,8 +69,7 @@ private void importObjects(
             List<PrismObject<RoleAnalysisClusterType>> clusters,
             @NotNull RoleAnalysisSessionType session,
             ModelService modelService,
-            OperationResult result,
-            Handler handler, Task task) {
+            Task task, OperationResult result) {
         List<ObjectReferenceType> roleAnalysisClusterRef = new ArrayList<>();
         String sessionOid = session.getOid();
 
@@ -76,7 +85,7 @@ private void importObjects(
 
         double meanDensity = 0;
 
-        handler.setSubTitle("Importing Clusters");
+        handler.enterNewStep("Importing Clusters");
         handler.setOperationCountToProcess(clusters.size());
         for (PrismObject<RoleAnalysisClusterType> clusterTypePrismObject : clusters) {
             handler.iterateActualStatus();
@@ -111,7 +120,7 @@ private void importObjects(
         sessionStatistic.setMeanDensity(meanDensity);
         sessionStatistic.setClusterCount(clusters.size());
 
-        handler.setSubTitle("Update Session");
+        handler.enterNewStep("Update Session");
         handler.setOperationCountToProcess(clusters.size());
         modifySessionAfterClustering(sessionRef,
                 sessionStatistic,
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/RoleBasedClustering.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/RoleBasedClustering.java
index 6459335ee4d..f844a749b41 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/RoleBasedClustering.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/RoleBasedClustering.java
@@ -38,13 +38,13 @@ public List<PrismObject<RoleAnalysisClusterType>> executeClustering(@NotNull Rol
         int minUserOccupancy = sessionOptionType.getPropertiesRange().getMin().intValue();
         int maxUserOccupancy = sessionOptionType.getPropertiesRange().getMax().intValue();
 
-        handler.setSubTitle("Load Data");
+        handler.enterNewStep("Load Data");
         handler.setOperationCountToProcess(1);
         ListMultimap<List<String>, String> chunkMap = loadData(result, modelService,
                 minUserOccupancy, maxUserOccupancy, sessionOptionType.getQuery(), task);
         handler.iterateActualStatus();
 
-        handler.setSubTitle("Prepare Data");
+        handler.enterNewStep("Prepare Data");
         handler.setOperationCountToProcess(1);
         List<DataPoint> dataPoints = prepareDataPoints(chunkMap);
         handler.iterateActualStatus();
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/UserBasedClustering.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/UserBasedClustering.java
index 21d70178be6..9c18d339341 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/UserBasedClustering.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/UserBasedClustering.java
@@ -41,14 +41,14 @@ public List<PrismObject<RoleAnalysisClusterType>> executeClustering(@NotNull Rol
         int minRolesOccupancy = sessionOptionType.getPropertiesRange().getMin().intValue();
         int maxRolesOccupancy = sessionOptionType.getPropertiesRange().getMax().intValue();
 
-        handler.setSubTitle("Load Data");
+        handler.enterNewStep("Load Data");
         handler.setOperationCountToProcess(1);
         //roles //users
         ListMultimap<List<String>, String> chunkMap = loadData(result, modelService,
                 minRolesOccupancy, maxRolesOccupancy, sessionOptionType.getQuery(), task);
         handler.iterateActualStatus();
 
-        handler.setSubTitle("Prepare Data");
+        handler.enterNewStep("Prepare Data");
         handler.setOperationCountToProcess(1);
         List<DataPoint> dataPoints = prepareDataPoints(chunkMap);
         handler.iterateActualStatus();
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/mechanism/DensityBasedClustering.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/mechanism/DensityBasedClustering.java
index af7815a35a0..d8ff96f8fe1 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/mechanism/DensityBasedClustering.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/mechanism/DensityBasedClustering.java
@@ -32,7 +32,7 @@ public List<Cluster<T>> cluster(Collection<T> points, Handler handler) {
         Map<Clusterable, PointStatus> visited = new HashMap<>();
 
         handler.setActive(true);
-        handler.setSubTitle("Clustering");
+        handler.enterNewStep("Clustering");
         handler.setOperationCountToProcess(points.size());
         for (T point : points) {
             handler.iterateActualStatus();
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutor.java
index 769df7e0bd3..a024c62f395 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutor.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutor.java
@@ -20,7 +20,7 @@
 public class DetectionActionExecutor implements Serializable {
     private final DetectionOperation detectionType;
 
-    Handler handler = new Handler("Pattern Detection", 6);
+    private final Handler handler = new Handler("Pattern Detection", 6);
 
     private final DetectionOption detectionOption;
 
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutorNew.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutorNew.java
index d085eca8c0a..78e30a7d740 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutorNew.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutorNew.java
@@ -22,8 +22,11 @@
 import com.evolveum.midpoint.common.mining.objects.handler.Handler;
 import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisSortMode;
 import com.evolveum.midpoint.model.api.ModelService;
+import com.evolveum.midpoint.model.impl.ModelBeans;
+import com.evolveum.midpoint.model.impl.mining.algorithm.BaseAction;
 import com.evolveum.midpoint.model.impl.mining.algorithm.chunk.PrepareChunkStructure;
 import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.repo.common.activity.run.AbstractActivityRun;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
@@ -31,25 +34,34 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleAnalysisProcessModeType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleAnalysisSessionType;
 
-public class DetectionActionExecutorNew implements Serializable {
+import org.jetbrains.annotations.NotNull;
+
+public class DetectionActionExecutorNew extends BaseAction {
+
     private final DetectionOperation detectionType;
-    Handler handler;
+    private final Handler handler = new Handler("Pattern Detection", 6, this::incrementProgress);
     private final String clusterOid;
     private final ModelService modelService;
+
+    /** BEWARE! Do not create subresults from this value. Just to avoid confusion. */
     private final OperationResult result;
+
     private final Task task;
 
-    public DetectionActionExecutorNew(String clusterOid, ModelService modelService, OperationResult result, Task task) {
+    public DetectionActionExecutorNew(
+            @NotNull AbstractActivityRun<?, ?, ?> activityRun,
+            String clusterOid,
+            OperationResult result) {
+        super(activityRun);
         this.detectionType = new PatternResolver();
         this.clusterOid = clusterOid;
-        this.modelService = modelService;
+        this.modelService = ModelBeans.get().modelService;
         this.result = result;
-        this.handler = new Handler("Pattern Detection", 6);
-        this.task = task;
+        this.task = activityRun.getRunningTask();
     }
 
     public void executeDetectionProcess() {
-        handler.setSubTitle("Load Data");
+        handler.enterNewStep("Load Data");
         handler.setActive(true);
         handler.setOperationCountToProcess(1);
         PrismObject<RoleAnalysisClusterType> clusterPrismObject = getClusterTypeObject(modelService, clusterOid, result, task);
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/PatternResolver.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/PatternResolver.java
index 6cc3f9594f0..93e5e64c7a9 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/PatternResolver.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/PatternResolver.java
@@ -24,7 +24,7 @@ public class PatternResolver implements DetectionOperation, Serializable {
     public List<DetectedPattern> performUserBasedDetection(List<MiningRoleTypeChunk> miningRoleTypeChunks,
             DetectionOption detectionOption, Handler handler) {
 
-        handler.setSubTitle("Data Preparation");
+        handler.enterNewStep("Data Preparation");
         handler.setActive(true);
         handler.setOperationCountToProcess(miningRoleTypeChunks.size());
 
@@ -57,7 +57,7 @@ public List<DetectedPattern> performUserBasedDetection(List<MiningRoleTypeChunk>
 
         }
 
-        handler.setSubTitle("Outer Detection");
+        handler.enterNewStep("Outer Detection");
         handler.setOperationCountToProcess(preparedObjects.size());
 
         Set<List<String>> outerIntersections = new HashSet<>();
@@ -80,7 +80,7 @@ public List<DetectedPattern> performUserBasedDetection(List<MiningRoleTypeChunk>
 
         List<List<String>> outerIntersectionsList = new ArrayList<>(outerIntersections);
 
-        handler.setSubTitle("Inner Detection");
+        handler.enterNewStep("Inner Detection");
         handler.setOperationCountToProcess(outerIntersectionsList.size());
         Set<List<String>> innerIntersections = new HashSet<>();
         for (int i = 0; i < outerIntersectionsList.size(); i++) {
@@ -99,7 +99,7 @@ public List<DetectedPattern> performUserBasedDetection(List<MiningRoleTypeChunk>
 
             }
         }
-        handler.setSubTitle("Inner Pattern Preparation");
+        handler.enterNewStep("Inner Pattern Preparation");
         handler.setOperationCountToProcess(outerIntersectionsList.size());
 
         for (List<String> members : outerIntersectionsList) {
@@ -119,7 +119,7 @@ public List<DetectedPattern> performUserBasedDetection(List<MiningRoleTypeChunk>
             }
         }
 
-        handler.setSubTitle("Outer Pattern Preparation");
+        handler.enterNewStep("Outer Pattern Preparation");
         handler.setOperationCountToProcess(innerIntersections.size());
 
         for (List<String> members : innerIntersections) {
@@ -150,7 +150,7 @@ public List<DetectedPattern> performUserBasedDetection(List<MiningRoleTypeChunk>
     public List<DetectedPattern> performRoleBasedDetection(List<MiningUserTypeChunk> miningUserTypeChunks,
             DetectionOption roleAnalysisSessionDetectionOptionType, Handler handler) {
 
-        handler.setSubTitle("Data Preparation");
+        handler.enterNewStep("Data Preparation");
         handler.setActive(true);
         handler.setOperationCountToProcess(miningUserTypeChunks.size());
 
@@ -184,7 +184,7 @@ public List<DetectedPattern> performRoleBasedDetection(List<MiningUserTypeChunk>
             }
         }
 
-        handler.setSubTitle("Outer Pattern Detection");
+        handler.enterNewStep("Outer Pattern Detection");
         handler.setOperationCountToProcess(preparedObjects.size());
 
         Set<List<String>> outerIntersections = new HashSet<>();
@@ -207,7 +207,7 @@ public List<DetectedPattern> performRoleBasedDetection(List<MiningUserTypeChunk>
         }
 
         List<List<String>> outerIntersectionsList = new ArrayList<>(outerIntersections);
-        handler.setSubTitle("Inner Pattern Detection");
+        handler.enterNewStep("Inner Pattern Detection");
         handler.setOperationCountToProcess(outerIntersectionsList.size());
 
         Set<List<String>> innerIntersections = new HashSet<>();
@@ -228,7 +228,7 @@ public List<DetectedPattern> performRoleBasedDetection(List<MiningUserTypeChunk>
             }
         }
 
-        handler.setSubTitle("Outer Pattern Preparation");
+        handler.enterNewStep("Outer Pattern Preparation");
         handler.setOperationCountToProcess(outerIntersectionsList.size());
 
         for (List<String> members : outerIntersectionsList) {
@@ -249,7 +249,7 @@ public List<DetectedPattern> performRoleBasedDetection(List<MiningUserTypeChunk>
             }
         }
 
-        handler.setSubTitle("Inner Pattern Preparation");
+        handler.enterNewStep("Inner Pattern Preparation");
         handler.setOperationCountToProcess(innerIntersections.size());
         for (List<String> members : innerIntersections) {
             handler.iterateActualStatus();
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/utils/RoleAnalysisAlgorithmUtils.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/utils/RoleAnalysisAlgorithmUtils.java
index 32384a51b5e..a71f0d2b53b 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/utils/RoleAnalysisAlgorithmUtils.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/utils/RoleAnalysisAlgorithmUtils.java
@@ -44,7 +44,7 @@ public List<PrismObject<RoleAnalysisClusterType>> processClusters(ModelService m
                 : UserType.COMPLEX_TYPE;
 
         int size = clusters.size();
-        handler.setSubTitle("Generate Cluster Statistics model");
+        handler.enterNewStep("Generate Cluster Statistics model");
         handler.setOperationCountToProcess(size);
         List<PrismObject<RoleAnalysisClusterType>> clusterTypeObjectWithStatistic = IntStream.range(0, size)
                 .mapToObj(i -> {
@@ -56,7 +56,7 @@ public List<PrismObject<RoleAnalysisClusterType>> processClusters(ModelService m
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
 
-        handler.setSubTitle("Prepare Outliers");
+        handler.enterNewStep("Prepare Outliers");
         handler.setOperationCountToProcess(dataPoints.size());
         PrismObject<RoleAnalysisClusterType> clusterTypePrismObject = prepareOutlierClusters(modelService, task, result,
                 dataPoints, complexType, session.getProcessMode(), handler, sessionTypeObjectCount);
@@ -82,7 +82,7 @@ public List<PrismObject<RoleAnalysisClusterType>> processExactMatch(ModelService
         List<DataPoint> dataPointsOutliers = new ArrayList<>();
         int size = dataPoints.size();
 
-        handler.setSubTitle("Generate Cluster Statistics model");
+        handler.enterNewStep("Generate Cluster Statistics model");
         handler.setOperationCountToProcess(size);
         List<PrismObject<RoleAnalysisClusterType>> clusterTypeObjectWithStatistic = IntStream.range(0, size)
                 .mapToObj(i -> {
@@ -94,7 +94,7 @@ public List<PrismObject<RoleAnalysisClusterType>> processExactMatch(ModelService
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
 
-        handler.setSubTitle("Prepare Outliers");
+        handler.enterNewStep("Prepare Outliers");
         handler.setOperationCountToProcess(dataPoints.size());
         PrismObject<RoleAnalysisClusterType> clusterTypePrismObject = prepareOutlierClusters(modelService, task, result, dataPoints,
                 processedObjectComplexType, session.getProcessMode(), handler, sessionTypeObjectCount);
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisClusteringActivityHandler.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisClusteringActivityHandler.java
index d5afe32d718..8d9c4472a14 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisClusteringActivityHandler.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisClusteringActivityHandler.java
@@ -13,7 +13,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
-import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.model.impl.mining.algorithm.cluster.action.ClusteringAction;
 import com.evolveum.midpoint.prism.Referencable;
 import com.evolveum.midpoint.repo.common.activity.definition.AbstractWorkDefinition;
@@ -24,10 +23,7 @@
 import com.evolveum.midpoint.repo.common.activity.run.ActivityRunResult;
 import com.evolveum.midpoint.repo.common.activity.run.LocalActivityRun;
 import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.schema.result.OperationResultStatus;
 import com.evolveum.midpoint.task.api.RunningTask;
-import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.task.api.TaskManager;
 import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.util.exception.ConfigurationException;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -77,7 +73,7 @@ public String getDefaultArchetypeOid() {
         return new MyActivityRun(context);
     }
 
-    class MyActivityRun
+    static class MyActivityRun
             extends LocalActivityRun<MyWorkDefinition, RoleAnalysisClusteringActivityHandler, AbstractActivityWorkStateType> {
 
         MyActivityRun(
@@ -91,22 +87,19 @@ class MyActivityRun
             RunningTask runningTask = getRunningTask();
             runningTask.setExecutionSupport(this);
 
+            // There are 7 steps; currently, we simply increase the progress value by 1 on each step.
+            // Later, we will provide more elaborate progress reporting.
+            activityState.getLiveProgress().setExpectedTotal(7);
+
             // We need to create a subresult in order to be able to determine its status - we have to close it to get the status.
             OperationResult result = parentResult.createSubresult(OP_EXECUTE);
 
             try {
-                LOGGER.info(
-                        "Running role analysis clustering activity - FIXME add the implementation; session OID = {}",
-                        getWorkDefinition().sessionOid);
-
-                // FIXME add the implementation
-
-                TaskManager taskManager = getModelBeans().taskManager;
-                ModelService modelService = getModelBeans().modelService;
-                Task task = taskManager.createTaskInstance("ClusteringActionActivity");
+                String sessionOid = getWorkDefinition().sessionOid;
+                LOGGER.debug("Running role analysis clustering activity; session OID = {}", sessionOid);
 
-                ClusteringAction clusteringAction = new ClusteringAction();
-                clusteringAction.execute(modelService, getWorkDefinition().sessionOid, result, task);
+                ClusteringAction clusteringAction = new ClusteringAction(this);
+                clusteringAction.execute(sessionOid, result);
 
             } catch (Throwable t) {
                 result.recordException(t);
@@ -116,13 +109,7 @@ class MyActivityRun
                 result.close();
             }
 
-            OperationResultStatus status = result.getStatus();
-
-            // We increase the progress only from 0 to 1.
-            incrementProgress(new QualifiedItemProcessingOutcomeType()
-                    .outcome(status.isError() ? ItemProcessingOutcomeType.FAILURE : ItemProcessingOutcomeType.SUCCESS));
-
-            return standardRunResult(status);
+            return standardRunResult(result.getStatus());
         }
     }
 
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisPatternDetectionActivityHandler.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisPatternDetectionActivityHandler.java
index 92a9ba3fa10..a535818e1c6 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisPatternDetectionActivityHandler.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisPatternDetectionActivityHandler.java
@@ -98,20 +98,17 @@ class MyActivityRun
             RunningTask runningTask = getRunningTask();
             runningTask.setExecutionSupport(this);
 
+            // There are 6 steps; currently, we simply increase the progress value by 1 on each step.
+            // See the analogous situation in RoleAnalysisClusteringActivityHandler.
+            activityState.getLiveProgress().setExpectedTotal(6);
+
             // We need to create a subresult in order to be able to determine its status - we have to close it to get the status.
             OperationResult result = parentResult.createSubresult(OP_EXECUTE);
             try {
-                LOGGER.info(
-                        "Running role analysis pattern detection activity - FIXME add the implementation; cluster OID: {}",
-                        getWorkDefinition().clusterOid);
-
-                // FIXME add the implementation here
-                TaskManager taskManager = getModelBeans().taskManager;
-                ModelService modelService = getModelBeans().modelService;
-                Task task = taskManager.createTaskInstance("DetectionActionActivity");
+                String clusterOid = getWorkDefinition().clusterOid;
+                LOGGER.debug("Running role analysis pattern detection activity; cluster OID: {}", clusterOid);
 
-//                RepositoryService repositoryService = getBeans().repositoryService;
-                new DetectionActionExecutorNew(getWorkDefinition().clusterOid, modelService, result, task)
+                new DetectionActionExecutorNew(this, clusterOid, result)
                         .executeDetectionProcess();
 
             } catch (Throwable t) {
@@ -122,13 +119,7 @@ class MyActivityRun
                 result.close();
             }
 
-            OperationResultStatus status = result.getStatus();
-
-            // We increase the progress only from 0 to 1.
-            incrementProgress(new QualifiedItemProcessingOutcomeType()
-                    .outcome(status.isError() ? ItemProcessingOutcomeType.FAILURE : ItemProcessingOutcomeType.SUCCESS));
-
-            return standardRunResult(status);
+            return standardRunResult(result.getStatus());
         }
     }
 
diff --git a/repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/state/ActivityProgress.java b/repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/state/ActivityProgress.java
index 5c73aa165f1..15fb1bae874 100644
--- a/repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/state/ActivityProgress.java
+++ b/repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/state/ActivityProgress.java
@@ -63,7 +63,7 @@ public void initialize(ActivityProgressType initialValue) {
     public synchronized void increment(QualifiedItemProcessingOutcomeType outcome, @NotNull Counters counters) {
         assertInitialized();
         List<OutcomeKeyedCounterType> counter = counters == Counters.COMMITTED ? value.getCommitted() : value.getUncommitted();
-        int newCount = OutcomeKeyedCounterTypeUtil.incrementCounter(counter, outcome, getBeans().prismContext);
+        int newCount = OutcomeKeyedCounterTypeUtil.incrementCounter(counter, outcome);
         LOGGER.trace("Incremented progress (counters: {}) to {} for {} in activity run {}",
                 counters, newCount, outcome, getActivityRun());
     }

From 7bfb240afcaa6cfa30aa7edb9644a7f4f5cd4cae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Tk=C3=A1=C4=8Dik?= <tonydamage@gmail.com>
Date: Mon, 4 Sep 2023 16:33:31 +0200
Subject: [PATCH 11/14] CVE-2023-34034: False Positive. Added to suppressions

---
 config/false-positives.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config/false-positives.xml b/config/false-positives.xml
index b082b0abaac..e2c04b03201 100644
--- a/config/false-positives.xml
+++ b/config/false-positives.xml
@@ -2,6 +2,13 @@
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
   <!-- IMPORTANT: It may be bit weird, having first reason for suppresion, then the issue suppresed, but dependency-chek uses strict schema and they decided on that order of elements. When any of suppresion has notes and cve reordered, it will not load suppression file
   -->
+
+  <suppress>
+    <notes>
+      False Positive. midPoint uses Spring Security, but does not use Spring WebFlux, so it is unaffected.
+    </notes>
+    <cve>CVE-2023-34034</cve>
+  </suppress>
   <suppress>
     <notes>
       False Positive. H2 is not recommended for production use, only for demo testing use-cases.

From a5d4045cbb5ee7fd58a8c074845358b19a86c37d Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Mon, 4 Sep 2023 17:16:49 +0200
Subject: [PATCH 12/14] Update role mining task progress information

The progress was not committed into the repository before.
---
 .../impl/mining/algorithm/BaseAction.java     |  2 ++
 ...RoleAnalysisClusteringActivityHandler.java | 14 +++++++------
 ...alysisPatternDetectionActivityHandler.java | 20 +++++++++----------
 .../ActivityItemProcessingStatistics.java     |  6 +++---
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/BaseAction.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/BaseAction.java
index 2e74f608376..63ec41c5418 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/BaseAction.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/BaseAction.java
@@ -32,5 +32,7 @@ protected void incrementProgress() {
         activityRun.incrementProgress(
                 new QualifiedItemProcessingOutcomeType()
                         .outcome(ItemProcessingOutcomeType.SUCCESS));
+        // This is brutal hack as it generates its own operation result. TODO rework
+        activityRun.getActivityState().getLiveItemProcessingStatistics().updateStatisticsForSimpleClients(true);
     }
 }
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisClusteringActivityHandler.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisClusteringActivityHandler.java
index 8d9c4472a14..093caf86425 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisClusteringActivityHandler.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisClusteringActivityHandler.java
@@ -8,6 +8,10 @@
 
 import static com.evolveum.midpoint.util.MiscUtil.configNonNull;
 
+import com.evolveum.midpoint.repo.common.activity.run.*;
+
+import com.evolveum.midpoint.util.exception.*;
+
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import org.jetbrains.annotations.NotNull;
@@ -18,14 +22,9 @@
 import com.evolveum.midpoint.repo.common.activity.definition.AbstractWorkDefinition;
 import com.evolveum.midpoint.repo.common.activity.definition.AffectedObjectsInformation;
 import com.evolveum.midpoint.repo.common.activity.definition.WorkDefinitionFactory;
-import com.evolveum.midpoint.repo.common.activity.run.AbstractActivityRun;
-import com.evolveum.midpoint.repo.common.activity.run.ActivityRunInstantiationContext;
-import com.evolveum.midpoint.repo.common.activity.run.ActivityRunResult;
-import com.evolveum.midpoint.repo.common.activity.run.LocalActivityRun;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.RunningTask;
 import com.evolveum.midpoint.util.DebugUtil;
-import com.evolveum.midpoint.util.exception.ConfigurationException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -83,13 +82,16 @@ static class MyActivityRun
         }
 
         @Override
-        protected @NotNull ActivityRunResult runLocally(OperationResult parentResult) {
+        protected @NotNull ActivityRunResult runLocally(OperationResult parentResult)
+                throws ActivityRunException, CommonException {
             RunningTask runningTask = getRunningTask();
             runningTask.setExecutionSupport(this);
 
             // There are 7 steps; currently, we simply increase the progress value by 1 on each step.
             // Later, we will provide more elaborate progress reporting.
             activityState.getLiveProgress().setExpectedTotal(7);
+            activityState.updateProgressNoCommit();
+            activityState.flushPendingTaskModifications(parentResult);
 
             // We need to create a subresult in order to be able to determine its status - we have to close it to get the status.
             OperationResult result = parentResult.createSubresult(OP_EXECUTE);
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisPatternDetectionActivityHandler.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisPatternDetectionActivityHandler.java
index a535818e1c6..e0da6b470b2 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisPatternDetectionActivityHandler.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RoleAnalysisPatternDetectionActivityHandler.java
@@ -13,27 +13,24 @@
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
-import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.model.impl.ModelBeans;
 import com.evolveum.midpoint.model.impl.mining.algorithm.detection.DetectionActionExecutorNew;
 import com.evolveum.midpoint.prism.Referencable;
 import com.evolveum.midpoint.repo.common.activity.definition.AbstractWorkDefinition;
 import com.evolveum.midpoint.repo.common.activity.definition.AffectedObjectsInformation;
 import com.evolveum.midpoint.repo.common.activity.definition.WorkDefinitionFactory;
-import com.evolveum.midpoint.repo.common.activity.run.AbstractActivityRun;
-import com.evolveum.midpoint.repo.common.activity.run.ActivityRunInstantiationContext;
-import com.evolveum.midpoint.repo.common.activity.run.ActivityRunResult;
-import com.evolveum.midpoint.repo.common.activity.run.LocalActivityRun;
+import com.evolveum.midpoint.repo.common.activity.run.*;
 import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.schema.result.OperationResultStatus;
 import com.evolveum.midpoint.task.api.RunningTask;
-import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.task.api.TaskManager;
 import com.evolveum.midpoint.util.DebugUtil;
+import com.evolveum.midpoint.util.exception.CommonException;
 import com.evolveum.midpoint.util.exception.ConfigurationException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractActivityWorkStateType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleAnalysisPatternDetectionWorkDefinitionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.WorkDefinitionsType;
 
 /**
  * TODO
@@ -94,13 +91,16 @@ class MyActivityRun
         }
 
         @Override
-        protected @NotNull ActivityRunResult runLocally(OperationResult parentResult) {
+        protected @NotNull ActivityRunResult runLocally(OperationResult parentResult)
+                throws ActivityRunException, CommonException {
             RunningTask runningTask = getRunningTask();
             runningTask.setExecutionSupport(this);
 
             // There are 6 steps; currently, we simply increase the progress value by 1 on each step.
             // See the analogous situation in RoleAnalysisClusteringActivityHandler.
             activityState.getLiveProgress().setExpectedTotal(6);
+            activityState.updateProgressNoCommit();
+            activityState.flushPendingTaskModifications(parentResult);
 
             // We need to create a subresult in order to be able to determine its status - we have to close it to get the status.
             OperationResult result = parentResult.createSubresult(OP_EXECUTE);
diff --git a/repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/state/ActivityItemProcessingStatistics.java b/repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/state/ActivityItemProcessingStatistics.java
index cb04a1ed2fe..e060096dfe0 100644
--- a/repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/state/ActivityItemProcessingStatistics.java
+++ b/repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/state/ActivityItemProcessingStatistics.java
@@ -288,7 +288,7 @@ public void done(QualifiedItemProcessingOutcomeType outcome, Throwable exception
             recordOperationEnd(this, outcome, exception);
             if (startInfo.isSimpleCaller()) {
                 activityState.getLiveProgress().increment(outcome, ActivityProgress.Counters.COMMITTED);
-                updateStatisticsForSimpleClients();
+                updateStatisticsForSimpleClients(false);
             }
         }
 
@@ -327,10 +327,10 @@ public long getEndTimeMillis() {
      * Very ugly hack. We create our own operation result (!!).
      */
     @Experimental
-    private void updateStatisticsForSimpleClients() {
+    public void updateStatisticsForSimpleClients(boolean forced) {
         try {
             activityState.updateProgressAndStatisticsNoCommit();
-            if (System.currentTimeMillis() > lastStatisticsUpdatedForSimpleClients + STATISTICS_UPDATE_INTERVAL) {
+            if (forced || System.currentTimeMillis() > lastStatisticsUpdatedForSimpleClients + STATISTICS_UPDATE_INTERVAL) {
                 lastStatisticsUpdatedForSimpleClients = System.currentTimeMillis();
                 activityState.flushPendingTaskModificationsChecked(new OperationResult(OP_UPDATE_STATISTICS_FOR_SIMPLE_CLIENT));
             }

From 6fb83ef75d89642621cef47815dcb303ccbc5e2e Mon Sep 17 00:00:00 2001
From: tchrapovic <chrapovic.tadeas@gmail.com>
Date: Mon, 4 Sep 2023 17:34:14 +0200
Subject: [PATCH 13/14] Update role-mining feature 1. Different GUI changes. 2.
 Algorithm bugs fix. 3. Navigation improve. 4. Add new session navigation
 panel. 5. Add panel for detected pattern. 6. Role mining operation table
 improvements.

---
 .../impl/component/menu/LeftMenuPanel.java    |  14 +-
 .../component/CandidateAssignPanel.java       |  62 +-
 .../wizard/BusinessRoleWizardPanel.java       |  13 +
 .../mining/page/page/PageRoleAnalysis.java    |  16 +-
 .../page/page/PageRoleAnalysisSession.java    |  31 +-
 .../page/panel/RoleAnalysisBasicPanel.java    |   2 +
 .../panel/cluster/DetectedPatternPanel.html   |  21 +
 .../panel/cluster/DetectedPatternPanel.java   |  96 ++++
 .../panel/cluster/MembersDetailsPanel.html    |   4 -
 .../panel/cluster/MembersDetailsPanel.java    |  13 +-
 .../panel/cluster/MigratedRolesPanel.html     |   2 +-
 .../panel/cluster/MigratedRolesPanel.java     |  33 +-
 .../cluster/PageClusterOperationsPanel.html   |   1 -
 .../cluster/PageClusterOperationsPanel.java   | 196 ++++---
 .../panel/cluster/PatternDetailsPanel.html    |  15 +
 .../panel/cluster/PatternDetailsPanel.java    |  90 +++
 .../panel/experimental/ProgressStatus.java    |   4 +-
 .../page/panel/session/ClustersPanel.java     |   1 -
 .../wizard/ProcessModeChoiceStepPanel.java    |   6 +-
 .../tables/MiningIntersectionTable.java       | 417 --------------
 ... => RoleAnalysisDetectedPatternTable.html} |   0
 .../RoleAnalysisDetectedPatternTable.java     | 543 ++++++++++++++++++
 ...e.html => RoleAnalysisRoleBasedTable.html} |   0
 ...e.java => RoleAnalysisRoleBasedTable.java} | 233 ++++++--
 ...e.html => RoleAnalysisUserBasedTable.html} |   0
 ...e.java => RoleAnalysisUserBasedTable.java} | 227 ++++++--
 .../mining/utils/chunk/MiningStructure.java   |  10 +-
 .../utils/chunk/PrepareChunkStructure.java    |  12 +-
 .../utils/chunk/PrepareExpandStructure.java   |  12 +-
 .../AjaxCompositedIconSubmitButton.java       |   7 +-
 ...TablePanel.html => RoleAnalysisTable.html} |  23 +-
 ...TablePanel.java => RoleAnalysisTable.java} | 294 ++++------
 ...l => RoleAnalysisTableHeadersToolbar.html} |   0
 ...a => RoleAnalysisTableHeadersToolbar.java} |   4 +-
 .../component/data/paging/NavigatorPanel.java |  14 +-
 .../util/RoleAnalysisTablePageable.java       |  38 ++
 .../component/util/RoleMiningProvider.java    | 116 +---
 ...ava => RoleAnalysisProgressIncrement.java} |  10 +-
 .../mining/utils/ExtractPatternUtils.java     |   5 +-
 .../mining/utils/algorithm/JaccardSorter.java |   6 +-
 .../xml/ns/public/common/common-mining-3.xsd  |  11 +-
 .../algorithm/chunk/MiningStructure.java      |  10 +-
 .../chunk/PrepareChunkStructure.java          |  12 +-
 .../algorithm/cluster/action/Clusterable.java |   4 +-
 .../cluster/action/ClusteringAction.java      |  14 +-
 .../cluster/action/RoleBasedClustering.java   |  10 +-
 .../cluster/action/UserBasedClustering.java   |  10 +-
 .../cluster/mechanism/Clusterer.java          |   4 +-
 .../mechanism/DensityBasedClustering.java     |  13 +-
 .../detection/DefaultPatternResolver.java     |   2 +-
 .../detection/DetectionActionExecutor.java    |   4 +-
 .../detection/DetectionActionExecutorNew.java |   7 +-
 .../detection/DetectionOperation.java         |   6 +-
 .../algorithm/detection/PatternResolver.java  |   6 +-
 .../utils/RoleAnalysisAlgorithmUtils.java     |  33 +-
 55 files changed, 1634 insertions(+), 1103 deletions(-)
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/DetectedPatternPanel.html
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/DetectedPatternPanel.java
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PatternDetailsPanel.html
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PatternDetailsPanel.java
 delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningIntersectionTable.java
 rename gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/{MiningIntersectionTable.html => RoleAnalysisDetectedPatternTable.html} (100%)
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisDetectedPatternTable.java
 rename gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/{MiningRoleBasedTable.html => RoleAnalysisRoleBasedTable.html} (100%)
 rename gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/{MiningRoleBasedTable.java => RoleAnalysisRoleBasedTable.java} (69%)
 rename gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/{MiningUserBasedTable.html => RoleAnalysisUserBasedTable.html} (100%)
 rename gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/{MiningUserBasedTable.java => RoleAnalysisUserBasedTable.java} (70%)
 rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/{SpecialBoxedTablePanel.html => RoleAnalysisTable.html} (77%)
 rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/{SpecialBoxedTablePanel.java => RoleAnalysisTable.java} (66%)
 rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/{RoleMiningTableHeadersToolbar.html => RoleAnalysisTableHeadersToolbar.html} (100%)
 rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/{RoleMiningTableHeadersToolbar.java => RoleAnalysisTableHeadersToolbar.java} (93%)
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/RoleAnalysisTablePageable.java
 rename infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/{Handler.java => RoleAnalysisProgressIncrement.java} (92%)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
index d40716ac3dc..c31a7c416c7 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
@@ -14,6 +14,7 @@
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.gui.impl.page.admin.role.mining.page.page.PageRoleAnalysis;
+import com.evolveum.midpoint.gui.impl.page.admin.role.mining.page.page.PageRoleAnalysisSession;
 import com.evolveum.midpoint.model.api.authentication.GuiProfiledPrincipal;
 
 import com.evolveum.midpoint.web.page.admin.resources.PageResourceTemplates;
@@ -87,6 +88,8 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
+import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.page.page.PageRoleAnalysisSession.PARAM_IS_WIZARD;
+
 public class LeftMenuPanel extends BasePanel<Void> {
 
     private static final String ID_MENU = "menu";
@@ -396,9 +399,14 @@ private MainMenuItem createRolesMenu() {
         MainMenuItem roleMenu = createMainMenuItem("PageAdmin.menu.top.roles", GuiStyleConstants.CLASS_OBJECT_ROLE_ICON_COLORED
         );
         createBasicAssignmentHolderMenuItems(roleMenu, PageTypes.ROLE);
-//        roleMenu.addMenuItem(new MenuItem("PageAdmin.menu.top.roles.mining", PageRoleMiningSimple.class));
-//        roleMenu.addMenuItem(new MenuItem("RBAM", PageRoleMiningRBAM.class));
-        roleMenu.addMenuItem(new MenuItem("Mining", PageRoleAnalysis.class));
+
+        roleMenu.addMenuItemAtIndex(new MenuItem("PageRoleAnalysis.menu.title",
+                GuiStyleConstants.EVO_CASE_OBJECT_ICON,
+                PageRoleAnalysis.class), 1);
+        roleMenu.addMenuItem(new MenuItem("PageRoleAnalysisSession.menu.title",
+                GuiStyleConstants.CLASS_PLUS_CIRCLE,
+                PageRoleAnalysisSession.class,
+                new PageParameters().add(PARAM_IS_WIZARD, true)));
 
         return roleMenu;
     }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/CandidateAssignPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/CandidateAssignPanel.java
index 745b8dd5c79..6fc3de90dae 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/CandidateAssignPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/CandidateAssignPanel.java
@@ -7,24 +7,30 @@
 
 package com.evolveum.midpoint.gui.impl.page.admin.abstractrole.component;
 
+import java.io.Serial;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.StringResourceModel;
 
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.component.MainObjectListPanel;
+import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
+import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
+import com.evolveum.midpoint.gui.impl.component.icon.LayeredIconCssStyle;
 import com.evolveum.midpoint.gui.impl.page.admin.role.mining.model.BusinessRoleDto;
-import com.evolveum.midpoint.web.component.AjaxIconButton;
+import com.evolveum.midpoint.web.component.AjaxCompositedIconSubmitButton;
 import com.evolveum.midpoint.web.component.dialog.Popupable;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
@@ -66,7 +72,8 @@ protected List<Component> createToolbarButtonsList(String buttonId) {
             protected List<IColumn<SelectableBean<UserType>, String>> createDefaultColumns() {
                 List<IColumn<SelectableBean<UserType>, String>> defaultColumns = super.createDefaultColumns();
 
-                defaultColumns.add(new AbstractColumn<>(createStringResource("Add as candidate")) {
+                defaultColumns.add(new AbstractColumn<>(
+                        createStringResource("RoleMining.cluster.table.column.header.display")) {
                     @Override
                     public void populateItem(Item<ICellPopulator<SelectableBean<UserType>>> item, String s,
                             IModel<SelectableBean<UserType>> iModel) {
@@ -74,31 +81,50 @@ public void populateItem(Item<ICellPopulator<SelectableBean<UserType>>> item, St
                         String oid = iModel.getObject().getValue().getOid();
 
                         enable = !existMembersOid.contains(oid);
+                        CompositedIcon icon = resolveIcon(enable);
+
+                        AjaxCompositedIconSubmitButton addCandidateButton = new AjaxCompositedIconSubmitButton(s,
+                                icon,
+                                createStringResource("RoleMining.button.title.add")) {
+                            @Serial private static final long serialVersionUID = 1L;
 
-                        AjaxIconButton ajaxButton = new AjaxIconButton(s, new LoadableDetachableModel<>() {
                             @Override
-                            protected String load() {
-                                if (enable) {
-                                    return " fa fa-plus";
-                                } else {
-                                    return " fa fa-ban";
-                                }
+                            public CompositedIcon getIcon() {
+
+                                return resolveIcon(enable);
                             }
-                        },
-                                createStringResource("idk")) {
 
                             @Override
-                            public void onClick(AjaxRequestTarget ajaxRequestTarget) {
+                            protected void onSubmit(AjaxRequestTarget target) {
                                 this.setEnabled(false);
                                 enable = false;
-                                ajaxRequestTarget.add(this);
-                                performAddOperation(ajaxRequestTarget, iModel);
+                                target.add(this);
+                                performAddOperation(target, iModel);
+                            }
+
+                            @Override
+                            protected void onError(AjaxRequestTarget target) {
+                                target.add(((PageBase) getPage()).getFeedbackPanel());
                             }
                         };
-                        ajaxButton.setOutputMarkupId(true);
-                        ajaxButton.setEnabled(enable);
-                        item.add(ajaxButton);
+                        addCandidateButton.titleAsLabel(true);
+                        addCandidateButton.setOutputMarkupId(true);
+                        addCandidateButton.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
+                        addCandidateButton.setEnabled(enable);
+                        item.add(addCandidateButton);
+
+                    }
 
+                    private CompositedIcon resolveIcon(boolean enable) {
+                        CompositedIconBuilder iconBuilder;
+                        if (CandidateAssignPanel.this.enable) {
+                            iconBuilder = new CompositedIconBuilder().setBasicIcon(GuiStyleConstants.CLASS_PLUS_CIRCLE,
+                                    LayeredIconCssStyle.IN_ROW_STYLE);
+                        } else {
+                            iconBuilder = new CompositedIconBuilder().setBasicIcon(GuiStyleConstants.CLASS_BAN,
+                                    LayeredIconCssStyle.IN_ROW_STYLE);
+                        }
+                        return iconBuilder.build();
                     }
                 });
                 return defaultColumns;
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/BusinessRoleWizardPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/BusinessRoleWizardPanel.java
index b7273bd9d06..dc981190212 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/BusinessRoleWizardPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/component/wizard/BusinessRoleWizardPanel.java
@@ -14,8 +14,12 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.impl.page.admin.role.mining.page.page.PageRoleAnalysis;
 
+import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
+import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 
@@ -41,6 +45,8 @@
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
 /**
  * @author lskublik
  */
@@ -230,6 +236,13 @@ private ActivityDefinitionType createActivity(List<BusinessRoleDto> patternDelta
     private void exitToPreview(AjaxRequestTarget target) {
         if (isRoleMigration) {
             setResponsePage(PageRoleAnalysis.class);
+            PageParameters parameters = new PageParameters();
+            String clusterOid = getHelper().getDetailsModel().getPatternDeltas().getCluster().getOid();
+            parameters.add(OnePageParameterEncoder.PARAMETER, clusterOid);
+            parameters.add("panelId", "clusterDetails");
+            Class<? extends PageBase> detailsPageClass = DetailsPageUtil
+                    .getObjectDetailsPage(RoleAnalysisClusterType.class);
+            getPageBase().navigateToNext(detailsPageClass, parameters);
         } else {
             showChoiceFragment(
                     target,
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysis.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysis.java
index 582cab592ea..96ffb6ecac2 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysis.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysis.java
@@ -8,6 +8,7 @@
 package com.evolveum.midpoint.gui.impl.page.admin.role.mining.page.page;
 
 import static com.evolveum.midpoint.common.mining.utils.RoleAnalysisUtils.getSessionOptionType;
+import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.page.page.PageRoleAnalysisSession.PARAM_IS_WIZARD;
 import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.RoleAnalysisObjectUtils.*;
 import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.table.Tools.densityBasedColor;
 
@@ -20,6 +21,7 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 
 import com.evolveum.midpoint.gui.impl.prism.panel.PrismPropertyHeaderPanel;
+import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.PrismContainerDefinition;
 
@@ -419,16 +421,12 @@ public IModel<String> getDataModel(IModel<SelectableBean<RoleAnalysisSessionType
             protected void newObjectPerformed(AjaxRequestTarget target, AssignmentObjectRelation relation,
                     CompiledObjectCollectionView collectionView) {
 
-                setResponsePage(new PageRoleAnalysisSession(true));
+                PageParameters parameters = new PageParameters();
+                parameters.add(PARAM_IS_WIZARD, true);
+                Class<? extends PageBase> detailsPageClass = DetailsPageUtil
+                        .getObjectDetailsPage(RoleAnalysisSessionType.class);
+                getPageBase().navigateToNext(detailsPageClass, parameters);
 
-//                ExecuteClusteringPanel detailsPanel = new ExecuteClusteringPanel(((PageBase) getPage()).getMainPopupBodyId(),
-//                        Model.of("New cluster")) {
-//                    @Override
-//                    public void onClose(AjaxRequestTarget ajaxRequestTarget) {
-//                        super.onClose(ajaxRequestTarget);
-//                    }
-//                };
-//                ((PageBase) getPage()).showMainPopup(detailsPanel, target);
             }
 
             @Override
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysisSession.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysisSession.java
index b9b3d71ab6a..ea2a20407e6 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysisSession.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/page/PageRoleAnalysisSession.java
@@ -45,6 +45,8 @@
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
+import org.apache.wicket.util.string.StringValue;
+
 //TODO correct authorizations
 @PageDescriptor(
         urls = {
@@ -57,19 +59,30 @@
         @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_ROLE_ANALYSIS_SESSION_URL,
                 label = "PageRoleAnalysis.auth.roleAnalysisSession.label",
                 description = "PageRoleAnalysis.auth.roleAnalysisSession.description")
-        })
+})
 
 public class PageRoleAnalysisSession extends PageAssignmentHolderDetails<RoleAnalysisSessionType, AssignmentHolderDetailsModel<RoleAnalysisSessionType>> {
-    boolean isEditPanel = false;
+    boolean isWizardPanel = false;
+
+    public static final String PARAM_IS_WIZARD = "isWizard";
+
+    public boolean isWizardPanel() {
+        StringValue stringValue = getPageParameters().get(PARAM_IS_WIZARD);
+        if (stringValue != null) {
+            if ("true".equalsIgnoreCase(stringValue.toString())
+                    || "false".equalsIgnoreCase(stringValue.toString())) {
+                this.isWizardPanel = getPageParameters().get(PARAM_IS_WIZARD).toBoolean();
+            } else {
+                getPageParameters().remove(PARAM_IS_WIZARD);
+            }
+        }
+        return isWizardPanel;
+    }
 
     public PageRoleAnalysisSession() {
         super();
     }
 
-    public PageRoleAnalysisSession(boolean isEditPanel) {
-        this.isEditPanel = true;
-    }
-
     @Override
     public void afterDeletePerformed(AjaxRequestTarget target) {
         PageBase pageBase = (PageBase) getPage();
@@ -192,7 +205,7 @@ protected IModel<String> createPageTitleModel() {
     }
 
     private boolean canShowWizard() {
-        return isEditPanel;
+        return isWizardPanel();
     }
 
     protected DetailsFragment createDetailsFragment() {
@@ -217,6 +230,10 @@ public IModel<List<ContainerPanelConfigurationType>> getPanelConfigurations() {
         IModel<List<ContainerPanelConfigurationType>> panelConfigurations = super.getPanelConfigurations();
         RoleAnalysisProcessModeType processMode = getObjectDetailsModels().getObjectWrapper().getObject().asObjectable().getProcessMode();
 
+        if (processMode == null) {
+            return super.getPanelConfigurations();
+        }
+
         List<ContainerPanelConfigurationType> object = panelConfigurations.getObject();
         for (ContainerPanelConfigurationType containerPanelConfigurationType : object) {
             if (containerPanelConfigurationType.getIdentifier().equals("sessionOptions")) {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/RoleAnalysisBasicPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/RoleAnalysisBasicPanel.java
index 4bb524093e0..04909bb2e3f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/RoleAnalysisBasicPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/RoleAnalysisBasicPanel.java
@@ -34,10 +34,12 @@
 @PanelType(name = "miningBasic", defaultContainerPath = "empty")
 @PanelInstance(identifier = "sessionBasic",
         applicableForType = RoleAnalysisSessionType.class,
+        defaultPanel = true,
         display = @PanelDisplay(label = "pageAdminFocus.basic", order = 10))
 
 @PanelInstance(identifier = "clusterBasic",
         applicableForType = RoleAnalysisClusterType.class,
+        defaultPanel = true,
         display = @PanelDisplay(label = "pageAdminFocus.basic", order = 10))
 public class RoleAnalysisBasicPanel<AH extends AssignmentHolderType> extends AbstractObjectMainPanel<AH, ObjectDetailsModels<AH>> {
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/DetectedPatternPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/DetectedPatternPanel.html
new file mode 100644
index 00000000000..1af9e6d2b39
--- /dev/null
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/DetectedPatternPanel.html
@@ -0,0 +1,21 @@
+<!--
+  ~ Copyright (C) 2010-2023 Evolveum and contributors
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+
+    <div class="row">
+        <div class="col-md-12">
+            <div wicket:id="container">
+                <div wicket:id="panelId" />
+            </div>
+        </div>
+    </div>
+
+</wicket:panel>
+</html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/DetectedPatternPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/DetectedPatternPanel.java
new file mode 100644
index 00000000000..070df94c1de
--- /dev/null
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/DetectedPatternPanel.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2010-2023 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+package com.evolveum.midpoint.gui.impl.page.admin.role.mining.page.panel.cluster;
+
+import static com.evolveum.midpoint.common.mining.utils.ExtractPatternUtils.transformDefaultPattern;
+
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.jetbrains.annotations.NotNull;
+
+import com.evolveum.midpoint.common.mining.objects.detection.DetectedPattern;
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel;
+import com.evolveum.midpoint.gui.impl.page.admin.ObjectDetailsModels;
+import com.evolveum.midpoint.gui.impl.page.admin.role.mining.tables.RoleAnalysisDetectedPatternTable;
+import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
+import com.evolveum.midpoint.web.application.PanelDisplay;
+import com.evolveum.midpoint.web.application.PanelInstance;
+import com.evolveum.midpoint.web.application.PanelType;
+import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleAnalysisClusterType;
+
+@PanelType(name = "detectedPattern")
+@PanelInstance(
+        identifier = "detectedPattern",
+        applicableForType = RoleAnalysisClusterType.class,
+        display = @PanelDisplay(
+                label = "RoleAnalysisDetectionPatternType.detectedPattern",
+                icon = GuiStyleConstants.CLASS_CIRCLE_FULL,
+                order = 30
+        )
+)
+public class DetectedPatternPanel extends AbstractObjectMainPanel<RoleAnalysisClusterType, ObjectDetailsModels<RoleAnalysisClusterType>> {
+
+    private static final String ID_CONTAINER = "container";
+    private static final String ID_PANEL = "panelId";
+
+    public DetectedPatternPanel(String id, ObjectDetailsModels<RoleAnalysisClusterType> model,
+            ContainerPanelConfigurationType config) {
+        super(id, model, config);
+    }
+
+    @Override
+    protected void initLayout() {
+
+        WebMarkupContainer container = new WebMarkupContainer(ID_CONTAINER);
+        container.setOutputMarkupId(true);
+        add(container);
+
+        RoleAnalysisDetectedPatternTable components = loadTable();
+        container.add(components);
+    }
+
+    @NotNull
+    private RoleAnalysisDetectedPatternTable loadTable() {
+        RoleAnalysisDetectedPatternTable components = new RoleAnalysisDetectedPatternTable(ID_PANEL,
+                new LoadableDetachableModel<>() {
+                    @Override
+                    protected List<DetectedPattern> load() {
+                        return transformDefaultPattern(getObjectDetailsModels().getObjectType());
+                    }
+                }, false, getObjectDetailsModels().getObjectType()) {
+            @Override
+            protected void onRefresh(AjaxRequestTarget target) {
+                PageParameters parameters = new PageParameters();
+                parameters.add(OnePageParameterEncoder.PARAMETER, getObjectDetailsModels().getObjectType().getOid());
+                parameters.add(ID_PANEL, getPanelConfiguration().getIdentifier());
+                Class<? extends PageBase> detailsPageClass = DetailsPageUtil
+                        .getObjectDetailsPage(RoleAnalysisClusterType.class);
+                getPageBase().navigateToNext(detailsPageClass, parameters);
+            }
+        };
+        components.setOutputMarkupId(true);
+        return components;
+    }
+
+    public PageBase getPageBase() {
+        return ((PageBase) getPage());
+    }
+
+    protected RoleAnalysisDetectedPatternTable getTable() {
+        return (RoleAnalysisDetectedPatternTable) get(((PageBase) getPage()).createComponentPath(ID_CONTAINER, ID_PANEL));
+    }
+
+}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MembersDetailsPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MembersDetailsPanel.html
index aa7f51e64e6..75130b44a5d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MembersDetailsPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MembersDetailsPanel.html
@@ -10,10 +10,6 @@
 <wicket:panel>
 
     <div wicket:id="table"></div>
-    <!--    <div wicket:id="list">-->
-    <!--        <div wicket:id="object">-->
-    <!--        </div>-->
-    <!--    </div>-->
 
 </wicket:panel>
 </html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MembersDetailsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MembersDetailsPanel.java
index 0baa61b7e5d..89582790f30 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MembersDetailsPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MembersDetailsPanel.java
@@ -122,12 +122,12 @@ public void onClose(AjaxRequestTarget ajaxRequestTarget) {
 
     @Override
     public int getWidth() {
-        return 70;
+        return 60;
     }
 
     @Override
     public int getHeight() {
-        return 70;
+        return 50;
     }
 
     @Override
@@ -147,9 +147,10 @@ public Component getContent() {
 
     @Override
     public StringResourceModel getTitle() {
-        if (processModeType.equals(RoleAnalysisProcessModeType.ROLE)) {
-            return new StringResourceModel("RoleMining.members.details.panel.title.roles");
-        }
-        return new StringResourceModel("RoleMining.members.details.panel.title.users");
+//        if (processModeType.equals(RoleAnalysisProcessModeType.ROLE)) {
+//            return new StringResourceModel("RoleMining.members.details.panel.title.roles");
+//        }
+//        return new StringResourceModel("RoleMining.members.details.panel.title.users");
+        return null;
     }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MigratedRolesPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MigratedRolesPanel.html
index 7c2f0776fd4..1af9e6d2b39 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MigratedRolesPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MigratedRolesPanel.html
@@ -12,7 +12,7 @@
     <div class="row">
         <div class="col-md-12">
             <div wicket:id="container">
-                <div wicket:id="panel" />
+                <div wicket:id="panelId" />
             </div>
         </div>
     </div>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MigratedRolesPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MigratedRolesPanel.java
index 7700f7fbf4b..2165ab99284 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MigratedRolesPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/MigratedRolesPanel.java
@@ -15,7 +15,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
+import com.evolveum.midpoint.web.component.AjaxIconButton;
+
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
@@ -59,7 +63,7 @@
 public class MigratedRolesPanel extends AbstractObjectMainPanel<RoleAnalysisClusterType, ObjectDetailsModels<RoleAnalysisClusterType>> {
 
     private static final String ID_CONTAINER = "container";
-    private static final String ID_PANEL = "panel";
+    private static final String ID_PANEL = "panelId";
 
     private final OperationResult operationResult = new OperationResult("LoadMigratedRoles");
 
@@ -107,7 +111,23 @@ public void setObject(List<RoleType> object) {
     private BoxedTablePanel<RoleType> generateTable(RoleMiningProvider<RoleType> provider) {
 
         BoxedTablePanel<RoleType> table = new BoxedTablePanel<>(
-                ID_PANEL, provider, initColumns());
+                ID_PANEL, provider, initColumns()) {
+            @Override
+            protected WebMarkupContainer createButtonToolbar(String id) {
+                AjaxIconButton refreshIcon = new AjaxIconButton(id, new Model<>(GuiStyleConstants.CLASS_RECONCILE),
+                        createStringResource("MainObjectListPanel.refresh")) {
+
+                    @Serial private static final long serialVersionUID = 1L;
+
+                    @Override
+                    public void onClick(AjaxRequestTarget target) {
+                        onRefresh();
+                    }
+                };
+                refreshIcon.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
+                return refreshIcon;
+            }
+        };
         table.setOutputMarkupId(true);
         return table;
     }
@@ -255,6 +275,15 @@ public void populateItem(Item<ICellPopulator<RoleType>> item, String componentId
         return columns;
     }
 
+    private void onRefresh() {
+        PageParameters parameters = new PageParameters();
+        parameters.add(OnePageParameterEncoder.PARAMETER, getObjectDetailsModels().getObjectType().getOid());
+        parameters.add(ID_PANEL, getPanelConfiguration().getIdentifier());
+        Class<? extends PageBase> detailsPageClass = DetailsPageUtil
+                .getObjectDetailsPage(RoleAnalysisClusterType.class);
+        getPageBase().navigateToNext(detailsPageClass, parameters);
+    }
+
     public PageBase getPageBase() {
         return ((PageBase) getPage());
     }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PageClusterOperationsPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PageClusterOperationsPanel.html
index 8dcbe7b0d19..4aff0d55e31 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PageClusterOperationsPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PageClusterOperationsPanel.html
@@ -11,7 +11,6 @@
 <wicket:panel>
     <div wicket:id="main">
         <div wicket:id="datatable_extra"/>
-        <div wicket:id="table_intersection"/>
     </div>
 </wicket:panel>
 </body>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PageClusterOperationsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PageClusterOperationsPanel.java
index 341962d9fc2..bbf7a2218ab 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PageClusterOperationsPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PageClusterOperationsPanel.java
@@ -8,42 +8,35 @@
 package com.evolveum.midpoint.gui.impl.page.admin.role.mining.page.panel.cluster;
 
 import static com.evolveum.midpoint.common.mining.utils.ExtractPatternUtils.transformDefaultPattern;
-import static com.evolveum.midpoint.common.mining.utils.RoleAnalysisUtils.loadDetectionOption;
-import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.RoleAnalysisObjectUtils.*;
-import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.table.Tools.*;
+import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.RoleAnalysisObjectUtils.getSessionTypeObject;
+import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.table.Tools.getScaleScript;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisChunkMode;
-
-import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisOperationMode;
-import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisSortMode;
-
-import com.evolveum.midpoint.model.api.ModelService;
-import com.evolveum.midpoint.task.api.Task;
-
-import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 
+import com.evolveum.midpoint.common.mining.objects.chunk.MiningOperationChunk;
+import com.evolveum.midpoint.common.mining.objects.chunk.MiningRoleTypeChunk;
+import com.evolveum.midpoint.common.mining.objects.chunk.MiningUserTypeChunk;
+import com.evolveum.midpoint.common.mining.objects.detection.DetectedPattern;
+import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisChunkMode;
+import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisOperationMode;
+import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisSortMode;
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel;
 import com.evolveum.midpoint.gui.impl.page.admin.ObjectDetailsModels;
-import com.evolveum.midpoint.common.mining.objects.detection.DetectedPattern;
-import com.evolveum.midpoint.common.mining.objects.detection.DetectionOption;
-import com.evolveum.midpoint.common.mining.objects.chunk.MiningOperationChunk;
-import com.evolveum.midpoint.common.mining.objects.chunk.MiningRoleTypeChunk;
-import com.evolveum.midpoint.common.mining.objects.chunk.MiningUserTypeChunk;
-import com.evolveum.midpoint.gui.impl.page.admin.role.mining.tables.MiningIntersectionTable;
-import com.evolveum.midpoint.gui.impl.page.admin.role.mining.tables.MiningRoleBasedTable;
-import com.evolveum.midpoint.gui.impl.page.admin.role.mining.tables.MiningUserBasedTable;
+import com.evolveum.midpoint.gui.impl.page.admin.role.mining.tables.RoleAnalysisRoleBasedTable;
+import com.evolveum.midpoint.gui.impl.page.admin.role.mining.tables.RoleAnalysisUserBasedTable;
 import com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.chunk.PrepareChunkStructure;
 import com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.chunk.PrepareExpandStructure;
+import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.web.application.PanelDisplay;
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
@@ -53,7 +46,6 @@
 @PanelInstance(
         identifier = "clusterDetails",
         applicableForType = RoleAnalysisClusterType.class,
-        defaultPanel = true,
         display = @PanelDisplay(
                 label = "RoleAnalysisClusterType.operationsPanel",
                 icon = GuiStyleConstants.CLASS_CIRCLE_FULL,
@@ -64,15 +56,11 @@ public class PageClusterOperationsPanel extends AbstractObjectMainPanel<RoleAnal
 
     private static final String ID_MAIN_PANEL = "main";
     private static final String ID_DATATABLE = "datatable_extra";
-    private static final String ID_DATATABLE_INTERSECTIONS = "table_intersection";
-
     private final OperationResult result = new OperationResult("GetObject");
-    private DetectionOption detectionOption;
-    private DetectedPattern detectedPattern = null;
-    private List<ObjectReferenceType> reductionObjects = new ArrayList<>();
+    private DetectedPattern analysePattern = null;
     private MiningOperationChunk miningOperationChunk;
     private RoleAnalysisSortMode roleAnalysisSortMode;
-    private RoleAnalysisProcessModeType processMode;
+    private boolean isRoleMode;
     private boolean compress = true;
 
     public PageClusterOperationsPanel(String id, ObjectDetailsModels<RoleAnalysisClusterType> model, ContainerPanelConfigurationType config) {
@@ -87,18 +75,9 @@ protected void initLayout() {
         RoleAnalysisClusterType cluster = getObjectDetailsModels().getObjectType();
         PrismObject<RoleAnalysisSessionType> getParent = getSessionTypeObject(modelService, result,
                 cluster.getRoleAnalysisSessionRef().getOid(), task);
-        reductionObjects = cluster.getResolvedPattern();
-
-        if (reductionObjects != null && !reductionObjects.isEmpty()) {
-            for (ObjectReferenceType referenceType : reductionObjects) {
-                if (referenceType.getOid() == null) {
-                    reductionObjects = new ArrayList<>();
-                }
-            }
-        }
 
         if (getParent != null) {
-            processMode = getParent.asObjectable().getProcessMode();
+            isRoleMode = getParent.asObjectable().getProcessMode().equals(RoleAnalysisProcessModeType.ROLE);
         }
 
         AnalysisClusterStatisticType clusterStatistics = cluster.getClusterStatistics();
@@ -108,28 +87,18 @@ protected void initLayout() {
         if (max <= 500) {
             roleAnalysisSortMode = RoleAnalysisSortMode.JACCARD;
         } else {
-            roleAnalysisSortMode = RoleAnalysisSortMode.NONE;
-        }
-
-        if (cluster.getDetectionOption() != null) {
-            detectionOption = loadDetectionOption(cluster.getDetectionOption());
-        } else {
-            detectionOption = new DetectionOption(30, 100, 10, 10);
+            roleAnalysisSortMode = RoleAnalysisSortMode.FREQUENCY;
         }
 
-        List<DetectedPattern> detectedPatternList = transformDefaultPattern(cluster);
         loadMiningTableData();
 
         WebMarkupContainer webMarkupContainer = new WebMarkupContainer(ID_MAIN_PANEL);
         webMarkupContainer.setOutputMarkupId(true);
 
         loadMiningTable(webMarkupContainer);
-
-        Component component = generateTableIntersection(ID_DATATABLE_INTERSECTIONS, detectedPatternList);
-        component.setOutputMarkupId(true);
-        webMarkupContainer.add(component);
         add(webMarkupContainer);
 
+
     }
 
     private void loadMiningTableData() {
@@ -138,6 +107,14 @@ private void loadMiningTableData() {
         ModelService modelService = ((PageBase) getPage()).getModelService();
 
         RoleAnalysisClusterType cluster = getObjectDetailsModels().getObjectType();
+
+        RoleAnalysisProcessModeType processMode;
+        if (isRoleMode) {
+            processMode = RoleAnalysisProcessModeType.ROLE;
+        } else {
+            processMode = RoleAnalysisProcessModeType.USER;
+        }
+
         if (compress) {
             miningOperationChunk = new PrepareChunkStructure().executeOperation(cluster, true,
                     processMode, modelService, result, task);
@@ -150,18 +127,21 @@ private void loadMiningTableData() {
     }
 
     private void loadMiningTable(WebMarkupContainer webMarkupContainer) {
-        if (processMode.equals(RoleAnalysisProcessModeType.ROLE)) {
-            MiningRoleBasedTable boxedTablePanel = generateMiningRoleBasedTable(
-                    detectionOption.getMinFrequencyThreshold(),
-                    null,
-                    detectionOption.getMaxFrequencyThreshold());
+        RoleAnalysisDetectionOptionType detectionOption = getObjectDetailsModels().getObjectType().getDetectionOption();
+        if (detectionOption == null || detectionOption.getFrequencyRange() == null) {
+            return;
+        }
+
+        if (isRoleMode) {
+            RoleAnalysisRoleBasedTable boxedTablePanel = generateMiningRoleBasedTable(
+                    null
+            );
             boxedTablePanel.setOutputMarkupId(true);
             webMarkupContainer.add(boxedTablePanel);
-        } else if (processMode.equals(RoleAnalysisProcessModeType.USER)) {
-            MiningUserBasedTable boxedTablePanel = generateMiningUserBasedTable(
-                    detectionOption.getMinFrequencyThreshold(),
-                    null,
-                    detectionOption.getMaxFrequencyThreshold());
+        } else {
+            RoleAnalysisUserBasedTable boxedTablePanel = generateMiningUserBasedTable(
+                    null
+            );
             boxedTablePanel.setOutputMarkupId(true);
             webMarkupContainer.add(boxedTablePanel);
         }
@@ -170,6 +150,11 @@ private void loadMiningTable(WebMarkupContainer webMarkupContainer) {
 
     private void updateMiningTable(AjaxRequestTarget target, boolean resetStatus) {
 
+        RoleAnalysisDetectionOptionType detectionOption = getObjectDetailsModels().getObjectType().getDetectionOption();
+        if (detectionOption == null || detectionOption.getFrequencyRange() == null) {
+            return;
+        }
+
         List<MiningRoleTypeChunk> simpleMiningRoleTypeChunks = miningOperationChunk.getSimpleMiningRoleTypeChunks();
 
         List<MiningUserTypeChunk> simpleMiningUserTypeChunks = miningOperationChunk.getSimpleMiningUserTypeChunks();
@@ -183,22 +168,20 @@ private void updateMiningTable(AjaxRequestTarget target, boolean resetStatus) {
             }
         }
 
-        if (processMode.equals(RoleAnalysisProcessModeType.ROLE)) {
-            MiningRoleBasedTable boxedTablePanel = generateMiningRoleBasedTable(
-                    detectionOption.getMinFrequencyThreshold(),
-                    detectedPattern,
-                    detectionOption.getMaxFrequencyThreshold());
+        if (isRoleMode) {
+            RoleAnalysisRoleBasedTable boxedTablePanel = generateMiningRoleBasedTable(
+                    analysePattern
+            );
             boxedTablePanel.setOutputMarkupId(true);
             getMiningRoleBasedTable().replaceWith(boxedTablePanel);
             target.appendJavaScript(getScaleScript());
             target.add(getMiningRoleBasedTable().setOutputMarkupId(true));
 
-        } else if (processMode.equals(RoleAnalysisProcessModeType.USER)) {
+        } else {
 
-            MiningUserBasedTable boxedTablePanel = generateMiningUserBasedTable(
-                    detectionOption.getMinFrequencyThreshold(),
-                    detectedPattern,
-                    detectionOption.getMaxFrequencyThreshold());
+            RoleAnalysisUserBasedTable boxedTablePanel = generateMiningUserBasedTable(
+                    analysePattern
+            );
             boxedTablePanel.setOutputMarkupId(true);
             getMiningUserBasedTable().replaceWith(boxedTablePanel);
             target.appendJavaScript(getScaleScript());
@@ -207,10 +190,12 @@ private void updateMiningTable(AjaxRequestTarget target, boolean resetStatus) {
 
     }
 
-    public MiningUserBasedTable generateMiningUserBasedTable(double frequency, DetectedPattern intersection, double maxFrequency) {
-        return new MiningUserBasedTable(ID_DATATABLE, miningOperationChunk, frequency / 100,
-                intersection, maxFrequency / 100,
-                reductionObjects, roleAnalysisSortMode, getObjectWrapperObject()) {
+    public RoleAnalysisUserBasedTable generateMiningUserBasedTable(DetectedPattern selectedPattern) {
+
+        return new RoleAnalysisUserBasedTable(ID_DATATABLE, miningOperationChunk,
+                selectedPattern,
+                roleAnalysisSortMode,
+                getObjectWrapperObject()) {
             @Override
             public void resetTable(AjaxRequestTarget target) {
                 updateMiningTable(target, false);
@@ -228,17 +213,31 @@ protected void onPerform(AjaxRequestTarget ajaxRequestTarget) {
                 updateMiningTable(ajaxRequestTarget, false);
                 ajaxRequestTarget.add(this);
             }
+
+            @Override
+            protected void showDetectedPatternPanel(AjaxRequestTarget target) {
+                RoleAnalysisClusterType cluster = getObjectDetailsModels().getObjectType();
+                List<DetectedPattern> detectedPatternList = transformDefaultPattern(cluster);
+                PatternDetailsPanel detailsPanel = new PatternDetailsPanel(((PageBase) getPage()).getMainPopupBodyId(),
+                        Model.of("Analyzed members details panel"), detectedPatternList, cluster) {
+                    @Override
+                    public void onLoadPerform(AjaxRequestTarget ajaxRequestTarget, IModel<DetectedPattern> rowModel) {
+                        getPageBase().hideMainPopup(ajaxRequestTarget);
+                        analysePattern = rowModel.getObject();
+                        updateMiningTable(ajaxRequestTarget, true);
+                    }
+                };
+
+                getPageBase().showMainPopup(detailsPanel, target);
+            }
         };
     }
 
-    public MiningRoleBasedTable generateMiningRoleBasedTable(double minFrequency, DetectedPattern intersection,
-            double maxFrequency) {
+    public RoleAnalysisRoleBasedTable generateMiningRoleBasedTable(DetectedPattern intersection) {
 
-        return new MiningRoleBasedTable(ID_DATATABLE,
+        return new RoleAnalysisRoleBasedTable(ID_DATATABLE,
                 miningOperationChunk,
-                minFrequency / 100, maxFrequency / 100,
                 intersection,
-                reductionObjects,
                 roleAnalysisSortMode, getObjectWrapperObject()) {
             @Override
             public void resetTable(AjaxRequestTarget target) {
@@ -257,38 +256,35 @@ protected void onPerform(AjaxRequestTarget ajaxRequestTarget) {
                 updateMiningTable(ajaxRequestTarget, false);
                 ajaxRequestTarget.add(this);
             }
-        };
-    }
 
-    public Component generateTableIntersection(String id, List<DetectedPattern> miningSets) {
-
-        MiningIntersectionTable components = new MiningIntersectionTable(id, miningSets, processMode) {
             @Override
-            protected void onLoad(AjaxRequestTarget ajaxRequestTarget, IModel<DetectedPattern> rowModel) {
-                detectedPattern = rowModel.getObject();
-
-                updateMiningTable(ajaxRequestTarget, true);
+            protected void showDetectedPatternPanel(AjaxRequestTarget target) {
+                RoleAnalysisClusterType cluster = getObjectDetailsModels().getObjectType();
+                List<DetectedPattern> detectedPatternList = transformDefaultPattern(cluster);
+                PatternDetailsPanel detailsPanel = new PatternDetailsPanel(((PageBase) getPage()).getMainPopupBodyId(),
+                        Model.of("Analyzed members details panel"), detectedPatternList, cluster) {
+                    @Override
+                    public void onLoadPerform(AjaxRequestTarget ajaxRequestTarget, IModel<DetectedPattern> rowModel) {
+                        getPageBase().hideMainPopup(ajaxRequestTarget);
+                        analysePattern = rowModel.getObject();
+                        updateMiningTable(ajaxRequestTarget, true);
+                    }
+                };
+
+                getPageBase().showMainPopup(detailsPanel, target);
             }
         };
-
-        components.setOutputMarkupId(true);
-        return components;
     }
 
-    protected Component getIntersectionTable() {
-        return get(((PageBase) getPage()).createComponentPath(ID_MAIN_PANEL, ID_DATATABLE_INTERSECTIONS));
+    protected RoleAnalysisRoleBasedTable getMiningRoleBasedTable() {
+        return (RoleAnalysisRoleBasedTable) get(((PageBase) getPage()).createComponentPath(ID_MAIN_PANEL, ID_DATATABLE));
     }
 
-    protected MiningRoleBasedTable getMiningRoleBasedTable() {
-        return (MiningRoleBasedTable) get(((PageBase) getPage()).createComponentPath(ID_MAIN_PANEL, ID_DATATABLE));
-    }
-
-    protected MiningUserBasedTable getMiningUserBasedTable() {
-        return (MiningUserBasedTable) get(((PageBase) getPage()).createComponentPath(ID_MAIN_PANEL, ID_DATATABLE));
+    protected RoleAnalysisUserBasedTable getMiningUserBasedTable() {
+        return (RoleAnalysisUserBasedTable) get(((PageBase) getPage()).createComponentPath(ID_MAIN_PANEL, ID_DATATABLE));
     }
 
     public PageBase getPageBase() {
         return ((PageBase) getPage());
     }
-
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PatternDetailsPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PatternDetailsPanel.html
new file mode 100644
index 00000000000..280585ec1ab
--- /dev/null
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PatternDetailsPanel.html
@@ -0,0 +1,15 @@
+<!--
+  ~ Copyright (C) 2010-2023 Evolveum and contributors
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+
+    <div wicket:id="panel"></div>
+
+</wicket:panel>
+</html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PatternDetailsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PatternDetailsPanel.java
new file mode 100644
index 00000000000..db3a271a035
--- /dev/null
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PatternDetailsPanel.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2010-2023 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+package com.evolveum.midpoint.gui.impl.page.admin.role.mining.page.panel.cluster;
+
+import java.util.List;
+
+import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleAnalysisClusterType;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.StringResourceModel;
+
+import com.evolveum.midpoint.common.mining.objects.detection.DetectedPattern;
+import com.evolveum.midpoint.gui.api.component.BasePanel;
+import com.evolveum.midpoint.gui.impl.page.admin.role.mining.tables.RoleAnalysisDetectedPatternTable;
+import com.evolveum.midpoint.web.component.dialog.Popupable;
+
+public class PatternDetailsPanel extends BasePanel<String> implements Popupable {
+
+    private static final String ID_PANEL = "panel";
+
+    public PatternDetailsPanel(String id, IModel<String> messageModel, List<DetectedPattern> detection, RoleAnalysisClusterType cluster) {
+        super(id, messageModel);
+
+        initLayout(detection, cluster);
+    }
+
+    public void initLayout(List<DetectedPattern> detection, RoleAnalysisClusterType cluster) {
+        RoleAnalysisDetectedPatternTable components = new RoleAnalysisDetectedPatternTable(ID_PANEL, new LoadableDetachableModel<List<DetectedPattern>>() {
+            @Override
+            protected List<DetectedPattern> load() {
+                return detection;
+            }
+        }, true, cluster) {
+            @Override
+            protected void onLoad(AjaxRequestTarget ajaxRequestTarget, IModel<DetectedPattern> rowModel) {
+                onLoadPerform(ajaxRequestTarget, rowModel);
+            }
+        };
+
+        components.setOutputMarkupId(true);
+        add(components);
+    }
+
+    public void onLoadPerform(AjaxRequestTarget ajaxRequestTarget, IModel<DetectedPattern> rowModel) {
+
+    }
+
+    public void onClose(AjaxRequestTarget ajaxRequestTarget) {
+        getPageBase().hideMainPopup(ajaxRequestTarget);
+    }
+
+    @Override
+    public int getWidth() {
+        return 60;
+    }
+
+    @Override
+    public int getHeight() {
+        return 50;
+    }
+
+    @Override
+    public String getWidthUnit() {
+        return "%";
+    }
+
+    @Override
+    public String getHeightUnit() {
+        return "%";
+    }
+
+    @Override
+    public Component getContent() {
+        return this;
+    }
+
+    @Override
+    public StringResourceModel getTitle() {
+        //TODO
+        return null;
+    }
+}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/experimental/ProgressStatus.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/experimental/ProgressStatus.java
index 3e4c925e248..3d108e69f6d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/experimental/ProgressStatus.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/experimental/ProgressStatus.java
@@ -20,7 +20,7 @@
 import org.apache.wicket.model.StringResourceModel;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 import com.evolveum.midpoint.web.component.dialog.Popupable;
 
 public class ProgressStatus extends BasePanel<String> implements Popupable {
@@ -86,7 +86,7 @@ public boolean isActive() {
         return false;
     }
 
-    public Handler getHandler() {
+    public RoleAnalysisProgressIncrement getHandler() {
         return null;
     }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/session/ClustersPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/session/ClustersPanel.java
index d90a2c728e6..aff0c88e256 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/session/ClustersPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/session/ClustersPanel.java
@@ -60,7 +60,6 @@
 @PanelInstance(
         identifier = "clusters",
         applicableForType = RoleAnalysisSessionType.class,
-        defaultPanel = true,
         display = @PanelDisplay(
                 label = "RoleAnalysisSessionType.roleAnalysisClusterRef",
                 icon = GuiStyleConstants.CLASS_CIRCLE_FULL,
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/wizard/ProcessModeChoiceStepPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/wizard/ProcessModeChoiceStepPanel.java
index 485ddd9abf3..b2deb6c714c 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/wizard/ProcessModeChoiceStepPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/wizard/ProcessModeChoiceStepPanel.java
@@ -34,7 +34,7 @@
 @PanelInstance(identifier = "rm-process",
         applicableForType = RoleAnalysisSessionType.class,
         applicableForOperation = OperationTypeType.WIZARD,
-        display = @PanelDisplay(label = "PageRoleAnalysisSession.wizard.step.basicInformation", icon = "fa fa-wrench"),
+        display = @PanelDisplay(label = "PageRoleAnalysisSession.wizard.step.choice", icon = "fa fa-wrench"),
         containerPath = "empty")
 public class ProcessModeChoiceStepPanel extends EnumWizardChoicePanel<ProcessModeChoiceStepPanel.ProcessMode, AssignmentHolderDetailsModel<RoleAnalysisSessionType>> {
 
@@ -126,12 +126,12 @@ protected String getPanelType() {
 
     @Override
     protected IModel<String> getTextModel() {
-        return createStringResource("PageRoleAnalysisSession.wizard.step.basicInformation.text");
+        return createStringResource("PageRoleAnalysisSession.wizard.step.choice.text");
     }
 
     @Override
     protected IModel<String> getSubTextModel() {
-        return createStringResource("PageRoleAnalysisSession.wizard.step.basicInformation.subText");
+        return createStringResource("PageRoleAnalysisSession.wizard.step.choice.subText");
     }
 
     @Override
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningIntersectionTable.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningIntersectionTable.java
deleted file mode 100644
index 1b8e7ae1063..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningIntersectionTable.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- * Copyright (C) 2010-2023 Evolveum and contributors
- *
- * This work is dual-licensed under the Apache License 2.0
- * and European Union Public License. See LICENSE file for details.
- */
-
-package com.evolveum.midpoint.gui.impl.page.admin.role.mining.tables;
-
-import static com.evolveum.midpoint.common.mining.utils.RoleAnalysisUtils.getRolesOidAssignment;
-import static com.evolveum.midpoint.web.component.data.column.ColumnUtils.createStringResource;
-
-import java.io.Serial;
-import java.util.*;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.export.AbstractExportableColumn;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.EmptyPanel;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.StringResourceModel;
-import org.apache.wicket.model.util.ListModel;
-
-import com.evolveum.midpoint.common.mining.objects.detection.DetectedPattern;
-import com.evolveum.midpoint.gui.api.model.LoadableModel;
-import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.gui.impl.prism.panel.PrismPropertyHeaderPanel;
-import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
-import com.evolveum.midpoint.prism.Containerable;
-import com.evolveum.midpoint.prism.PrismContainerDefinition;
-import com.evolveum.midpoint.prism.path.ItemPath;
-import com.evolveum.midpoint.repo.api.RepositoryService;
-import com.evolveum.midpoint.schema.GetOperationOptionsBuilder;
-import com.evolveum.midpoint.schema.ResultHandler;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.web.component.AjaxButton;
-import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
-import com.evolveum.midpoint.web.component.data.column.IconColumn;
-import com.evolveum.midpoint.web.component.util.RoleMiningProvider;
-import com.evolveum.midpoint.web.model.PrismPropertyWrapperHeaderModel;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-
-public class MiningIntersectionTable extends Panel {
-
-    private static final String ID_DATATABLE = "datatable_extra";
-
-    private final RoleAnalysisProcessModeType roleAnalysisProcessModeType;
-
-    public MiningIntersectionTable(String id, List<DetectedPattern> detectedPatternList,
-            RoleAnalysisProcessModeType roleAnalysisProcessModeType) {
-        super(id);
-        this.roleAnalysisProcessModeType = roleAnalysisProcessModeType;
-
-        RoleMiningProvider<DetectedPattern> provider = new RoleMiningProvider<>(
-                this, new ListModel<>(detectedPatternList) {
-
-            @Serial private static final long serialVersionUID = 1L;
-
-            @Override
-            public void setObject(List<DetectedPattern> object) {
-                super.setObject(object);
-            }
-
-        }, true);
-
-        provider.setSort(DetectedPattern.F_METRIC, SortOrder.DESCENDING);
-
-        BoxedTablePanel<DetectedPattern> table = new BoxedTablePanel<>(
-                ID_DATATABLE, provider, initColumns());
-        table.setOutputMarkupId(true);
-        table.getDataTable().setItemsPerPage(10);
-        table.enableSavePageSize();
-
-        add(table);
-    }
-
-    public List<IColumn<DetectedPattern, String>> initColumns() {
-
-        LoadableModel<PrismContainerDefinition<RoleAnalysisDetectionPatternType>> containerDefinitionModel
-                = WebComponentUtil.getContainerDefinitionModel(RoleAnalysisDetectionPatternType.class);
-
-        List<IColumn<DetectedPattern, String>> columns = new ArrayList<>();
-
-        columns.add(new IconColumn<>(null) {
-            @Serial private static final long serialVersionUID = 1L;
-
-            @Override
-            protected DisplayType getIconDisplayType(IModel<DetectedPattern> rowModel) {
-                return GuiDisplayTypeUtil.createDisplayType(IconAndStylesUtil.createDefaultBlackIcon(RoleType.COMPLEX_TYPE));
-            }
-        });
-
-        columns.add(new AbstractColumn<>(getHeaderTitle("metric")) {
-
-            @Override
-            public String getSortProperty() {
-                return DetectedPattern.F_METRIC;
-            }
-
-            @Override
-            public boolean isSortable() {
-                return true;
-            }
-
-            @Override
-            public void populateItem(Item<ICellPopulator<DetectedPattern>> item, String componentId,
-                    IModel<DetectedPattern> rowModel) {
-                if (rowModel.getObject() != null) {
-                    item.add(new Label(componentId, rowModel.getObject().getClusterMetric()));
-                }
-            }
-
-            @Override
-            public Component getHeader(String componentId) {
-                return createColumnHeader(componentId, containerDefinitionModel,
-                        RoleAnalysisDetectionPatternType.F_CLUSTER_METRIC);
-
-            }
-
-        });
-
-        columns.add(new AbstractColumn<>(createStringResource("")) {
-
-            @Override
-            public String getSortProperty() {
-                return DetectedPattern.F_METRIC;
-            }
-
-            @Override
-            public boolean isSortable() {
-                return true;
-            }
-
-            @Override
-            public void populateItem(Item<ICellPopulator<DetectedPattern>> item, String componentId,
-                    IModel<DetectedPattern> rowModel) {
-
-                if (rowModel.getObject() != null && rowModel.getObject().getUsers() != null) {
-                    item.add(new Label(componentId, rowModel.getObject().getUsers().size()));
-                } else {
-                    item.add(new EmptyPanel(componentId));
-                }
-            }
-
-            @Override
-            public Component getHeader(String componentId) {
-                return new Label(componentId, createStringResource("RoleMining.cluster.table.column.header.user.occupation"));
-            }
-
-        });
-
-        columns.add(new AbstractColumn<>(createStringResource("")) {
-
-            @Override
-            public String getSortProperty() {
-                return DetectedPattern.F_METRIC;
-            }
-
-            @Override
-            public boolean isSortable() {
-                return true;
-            }
-
-            @Override
-            public void populateItem(Item<ICellPopulator<DetectedPattern>> item, String componentId,
-                    IModel<DetectedPattern> rowModel) {
-
-                if (rowModel.getObject() != null && rowModel.getObject().getRoles() != null) {
-                    item.add(new Label(componentId, rowModel.getObject().getRoles().size()));
-                } else {
-                    item.add(new EmptyPanel(componentId));
-                }
-            }
-
-            @Override
-            public Component getHeader(String componentId) {
-                return new Label(componentId, createStringResource("RoleMining.cluster.table.column.header.role.occupation"));
-            }
-
-        });
-
-        columns.add(new AbstractExportableColumn<>(createStringResource("")) {
-
-            @Override
-            public String getSortProperty() {
-                return DetectedPattern.F_METRIC;
-            }
-
-            @Override
-            public IModel<?> getDataModel(IModel<DetectedPattern> iModel) {
-                return null;
-            }
-
-            @Override
-            public boolean isSortable() {
-                return true;
-            }
-
-            @Override
-            public void populateItem(Item<ICellPopulator<DetectedPattern>> item, String componentId,
-                    IModel<DetectedPattern> rowModel) {
-
-                if (rowModel.getObject() == null) {
-                    item.add(new EmptyPanel(componentId));
-                } else {
-                    AjaxButton ajaxButton = new AjaxButton(componentId,
-                            createStringResource("RoleMining.button.title.compute")) {
-                        @Override
-                        public void onClick(AjaxRequestTarget ajaxRequestTarget) {
-                            DetectedPattern rowModelObject = rowModel.getObject();
-
-                            Set<String> resolveFullOverlap = resolveTotalOccupancy(
-                                    roleAnalysisProcessModeType,
-                                    rowModelObject,
-                                    new OperationResult("resolveFullOverlap"),
-                                    (PageBase) getPage());
-
-                            if (!resolveFullOverlap.isEmpty()) {
-                                this.setDefaultModel(Model.of(resolveFullOverlap.size() + " (recompute)"));
-                            }
-
-                            item.setOutputMarkupId(true);
-                            ajaxRequestTarget.add(item);
-                        }
-                    };
-
-                    ajaxButton.setOutputMarkupId(true);
-                    ajaxButton.setEnabled(true);
-                    ajaxButton.add(AttributeAppender.replace("class", " btn btn-primary btn-sm d-flex "
-                            + "justify-content-center align-items-center"));
-                    ajaxButton.add(new AttributeAppender("style", " width:120px; "));
-
-                    item.add(ajaxButton);
-                }
-
-            }
-
-            @Override
-            public Component getHeader(String componentId) {
-                return new Label(componentId, createStringResource("RoleMining.button.title.compute"));
-            }
-
-        });
-
-        columns.add(new AbstractExportableColumn<>(getHeaderTitle("display")) {
-
-            @Override
-            public String getSortProperty() {
-                return DetectedPattern.F_METRIC;
-            }
-
-            @Override
-            public IModel<?> getDataModel(IModel<DetectedPattern> iModel) {
-                return null;
-            }
-
-            @Override
-            public boolean isSortable() {
-                return false;
-            }
-
-            @Override
-            public void populateItem(Item<ICellPopulator<DetectedPattern>> item, String componentId,
-                    IModel<DetectedPattern> rowModel) {
-                if (rowModel.getObject() == null) {
-                    item.add(new EmptyPanel(componentId));
-                } else {
-                    AjaxButton ajaxButton = new AjaxButton(componentId,
-                            createStringResource("RoleMining.button.title.load")) {
-                        @Override
-                        public void onClick(AjaxRequestTarget ajaxRequestTarget) {
-                            onLoad(ajaxRequestTarget, rowModel);
-                        }
-                    };
-
-                    ajaxButton.add(AttributeAppender.replace("class", " btn btn-primary btn-sm d-flex "
-                            + "justify-content-center align-items-center"));
-                    ajaxButton.add(new AttributeAppender("style", " width:100px; "));
-                    ajaxButton.setOutputMarkupId(true);
-
-                    item.add(ajaxButton);
-                }
-
-            }
-
-            @Override
-            public Component getHeader(String componentId) {
-                return new Label(componentId, getHeaderTitle("display"));
-            }
-
-        });
-
-        return columns;
-    }
-
-    public PageBase getPageBase() {
-        return ((PageBase) getPage());
-    }
-
-    protected DataTable<?, ?> getDataTable() {
-        return ((BoxedTablePanel<?>) get(((PageBase) getPage()).createComponentPath(ID_DATATABLE))).getDataTable();
-    }
-
-    protected BoxedTablePanel<?> getTable() {
-        return ((BoxedTablePanel<?>) get(((PageBase) getPage()).createComponentPath(ID_DATATABLE)));
-    }
-
-    protected StringResourceModel getHeaderTitle(String identifier) {
-        return createStringResource("RoleMining.cluster.table.column.header." + identifier);
-    }
-
-    protected void onLoad(AjaxRequestTarget ajaxRequestTarget, IModel<DetectedPattern> rowModel) {
-
-    }
-
-    private Set<String> resolveTotalOccupancy(RoleAnalysisProcessModeType roleAnalysisProcessModeType, DetectedPattern detectedPattern,
-            OperationResult result, PageBase pageBase) {
-
-        Set<String> membersOidList = new HashSet<>();
-        Set<String> detectedProperties = detectedPattern.getRoles();
-
-        if (roleAnalysisProcessModeType.equals(RoleAnalysisProcessModeType.USER)) {
-            ResultHandler<UserType> resultHandler = (object, parentResult) -> {
-                try {
-                    List<String> properties = getRolesOidAssignment(object.asObjectable());
-                    if (new HashSet<>(properties).containsAll(detectedProperties)) {
-                        membersOidList.add(object.getOid());
-                    }
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-                return true;
-            };
-            GetOperationOptionsBuilder optionsBuilder = pageBase.getSchemaService().getOperationOptionsBuilder();
-
-            RepositoryService repositoryService = pageBase.getRepositoryService();
-            try {
-                repositoryService.searchObjectsIterative(UserType.class, null, resultHandler, optionsBuilder.build(),
-                        true, result);
-            } catch (SchemaException e) {
-                throw new RuntimeException(e);
-            }
-
-        } else {
-            ListMultimap<String, String> roleToUserMap = ArrayListMultimap.create();
-
-            ResultHandler<UserType> resultHandler = (object, parentResult) -> {
-                try {
-                    UserType properties = object.asObjectable();
-                    List<String> members = getRolesOidAssignment(properties);
-                    for (String roleId : members) {
-                        roleToUserMap.putAll(roleId, Collections.singletonList(properties.getOid()));
-                    }
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-                return true;
-            };
-
-            GetOperationOptionsBuilder optionsBuilder = pageBase.getSchemaService().getOperationOptionsBuilder();
-            RepositoryService repositoryService = pageBase.getRepositoryService();
-
-            try {
-                repositoryService.searchObjectsIterative(UserType.class, null, resultHandler, optionsBuilder.build(),
-                        true, result);
-            } catch (SchemaException e) {
-                throw new RuntimeException(e);
-            }
-            for (String member : roleToUserMap.keySet()) {
-                List<String> properties = roleToUserMap.get(member);
-
-                if (new HashSet<>(properties).containsAll(detectedProperties)) {
-                    membersOidList.add(member);
-                }
-            }
-
-        }
-
-        return membersOidList;
-    }
-
-    private <C extends Containerable> PrismPropertyHeaderPanel<?> createColumnHeader(String componentId,
-            LoadableModel<PrismContainerDefinition<C>> containerDefinitionModel,
-            ItemPath itemPath) {
-
-        return new PrismPropertyHeaderPanel<>(componentId, new PrismPropertyWrapperHeaderModel<>(
-                containerDefinitionModel,
-                itemPath,
-                (PageBase) getPage())) {
-
-            @Override
-            protected boolean isAddButtonVisible() {
-                return false;
-            }
-
-            @Override
-            protected boolean isButtonEnabled() {
-                return false;
-            }
-        };
-    }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningIntersectionTable.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisDetectedPatternTable.html
similarity index 100%
rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningIntersectionTable.html
rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisDetectedPatternTable.html
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisDetectedPatternTable.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisDetectedPatternTable.java
new file mode 100644
index 00000000000..94bd8e07059
--- /dev/null
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisDetectedPatternTable.java
@@ -0,0 +1,543 @@
+/*
+ * Copyright (C) 2010-2023 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+package com.evolveum.midpoint.gui.impl.page.admin.role.mining.tables;
+
+import static com.evolveum.midpoint.common.mining.utils.RoleAnalysisUtils.getRolesOidAssignment;
+import static com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil.createDisplayType;
+import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.RoleAnalysisObjectUtils.*;
+
+import java.io.Serial;
+import java.util.*;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.export.AbstractExportableColumn;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.EmptyPanel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
+import org.apache.wicket.model.util.ListModel;
+
+import com.evolveum.midpoint.common.mining.objects.detection.DetectedPattern;
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.gui.api.component.BasePanel;
+import com.evolveum.midpoint.gui.api.model.LoadableModel;
+import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.gui.impl.component.AjaxCompositedIconButton;
+import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
+import com.evolveum.midpoint.gui.impl.component.icon.LayeredIconCssStyle;
+import com.evolveum.midpoint.gui.impl.page.admin.role.PageRole;
+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.page.admin.role.mining.page.panel.cluster.MembersDetailsPanel;
+import com.evolveum.midpoint.gui.impl.prism.panel.PrismPropertyHeaderPanel;
+import com.evolveum.midpoint.prism.Containerable;
+import com.evolveum.midpoint.prism.PrismContainerDefinition;
+import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.repo.api.RepositoryService;
+import com.evolveum.midpoint.schema.GetOperationOptionsBuilder;
+import com.evolveum.midpoint.schema.ResultHandler;
+import com.evolveum.midpoint.schema.constants.ObjectTypes;
+import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
+import com.evolveum.midpoint.util.exception.SchemaException;
+import com.evolveum.midpoint.web.component.AjaxCompositedIconSubmitButton;
+import com.evolveum.midpoint.web.component.AjaxIconButton;
+import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
+import com.evolveum.midpoint.web.component.data.column.IconColumn;
+import com.evolveum.midpoint.web.component.util.RoleMiningProvider;
+import com.evolveum.midpoint.web.model.PrismPropertyWrapperHeaderModel;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+
+public class RoleAnalysisDetectedPatternTable extends BasePanel<String> {
+
+    OperationResult result = new OperationResult("LoadRoleAnalysisDetectedPatternTable");
+    boolean isOperationEnable;
+    private static final String ID_DATATABLE = "datatable_extra";
+
+    public RoleAnalysisDetectedPatternTable(String id, LoadableDetachableModel<List<DetectedPattern>> detectedPatternList,
+            boolean isOperationEnable, RoleAnalysisClusterType cluster) {
+        super(id);
+
+        this.isOperationEnable = isOperationEnable;
+        RoleMiningProvider<DetectedPattern> provider = new RoleMiningProvider<>(
+                this, new ListModel<>(detectedPatternList.getObject()) {
+
+            @Serial private static final long serialVersionUID = 1L;
+
+            @Override
+            public void setObject(List<DetectedPattern> object) {
+                super.setObject(object);
+            }
+
+        }, true);
+
+        provider.setSort(DetectedPattern.F_METRIC, SortOrder.DESCENDING);
+
+        BoxedTablePanel<DetectedPattern> table = new BoxedTablePanel<>(
+                ID_DATATABLE, provider, initColumns(cluster)) {
+            @Override
+            protected WebMarkupContainer createButtonToolbar(String id) {
+                AjaxIconButton refreshIcon = new AjaxIconButton(id, new Model<>(GuiStyleConstants.CLASS_RECONCILE),
+                        createStringResource("MainObjectListPanel.refresh")) {
+
+                    @Serial private static final long serialVersionUID = 1L;
+
+                    @Override
+                    public void onClick(AjaxRequestTarget target) {
+                        onRefresh(target);
+                    }
+                };
+                refreshIcon.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
+                return refreshIcon;
+            }
+        };
+        table.setOutputMarkupId(true);
+        table.getDataTable().setItemsPerPage(10);
+        table.enableSavePageSize();
+
+        add(table);
+    }
+
+    public List<IColumn<DetectedPattern, String>> initColumns(RoleAnalysisClusterType cluster) {
+
+        LoadableModel<PrismContainerDefinition<RoleAnalysisDetectionPatternType>> containerDefinitionModel
+                = WebComponentUtil.getContainerDefinitionModel(RoleAnalysisDetectionPatternType.class);
+
+        List<IColumn<DetectedPattern, String>> columns = new ArrayList<>();
+
+        columns.add(new IconColumn<>(null) {
+            @Serial private static final long serialVersionUID = 1L;
+
+            @Override
+            protected DisplayType getIconDisplayType(IModel<DetectedPattern> rowModel) {
+
+                return createDisplayType(GuiStyleConstants.CLASS_OBJECT_ROLE_ICON, "green", "");
+            }
+        });
+
+        columns.add(new AbstractColumn<>(getHeaderTitle("")) {
+
+            @Override
+            public String getSortProperty() {
+                return DetectedPattern.F_METRIC;
+            }
+
+            @Override
+            public boolean isSortable() {
+                return true;
+            }
+
+            @Override
+            public void populateItem(Item<ICellPopulator<DetectedPattern>> item, String componentId,
+                    IModel<DetectedPattern> rowModel) {
+                if (rowModel.getObject() != null) {
+                    item.add(new Label(componentId, rowModel.getObject().getClusterMetric()));
+                }
+            }
+
+            @Override
+            public Component getHeader(String componentId) {
+                return createColumnHeader(componentId, containerDefinitionModel
+                );
+
+            }
+
+        });
+
+        columns.add(new AbstractColumn<>(createStringResource("")) {
+
+            @Override
+            public boolean isSortable() {
+                return false;
+            }
+
+            @Override
+            public void populateItem(Item<ICellPopulator<DetectedPattern>> item, String componentId,
+                    IModel<DetectedPattern> rowModel) {
+
+                if (rowModel.getObject() != null && rowModel.getObject().getRoles() != null) {
+                    int rolesCount = rowModel.getObject().getRoles().size();
+
+                    CompositedIconBuilder iconBuilder = new CompositedIconBuilder()
+                            .setBasicIcon(GuiStyleConstants.CLASS_OBJECT_ROLE_ICON, LayeredIconCssStyle.IN_ROW_STYLE);
+
+                    AjaxCompositedIconButton objectButton = new AjaxCompositedIconButton(componentId, iconBuilder.build(),
+                            Model.of(String.valueOf(rolesCount))) {
+
+                        @Serial private static final long serialVersionUID = 1L;
+
+                        @Override
+                        public void onClick(AjaxRequestTarget target) {
+                            List<PrismObject<FocusType>> objects = new ArrayList<>();
+                            Set<String> roles = rowModel.getObject().getRoles();
+
+                            for (String s : roles) {
+                                objects.add(getFocusTypeObject(getPageBase(), s, result));
+                            }
+                            MembersDetailsPanel detailsPanel = new MembersDetailsPanel(((PageBase) getPage()).getMainPopupBodyId(),
+                                    Model.of("Analyzed members details panel"), objects, RoleAnalysisProcessModeType.ROLE) {
+                                @Override
+                                public void onClose(AjaxRequestTarget ajaxRequestTarget) {
+                                    super.onClose(ajaxRequestTarget);
+                                }
+                            };
+                            ((PageBase) getPage()).showMainPopup(detailsPanel, target);
+                        }
+
+                    };
+                    objectButton.titleAsLabel(true);
+                    objectButton.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
+                    objectButton.add(AttributeAppender.append("style", "width:150px"));
+
+                    if (isOperationEnable) {
+                        objectButton.setEnabled(false);
+                    }
+
+                    item.add(objectButton);
+                } else {
+                    item.add(new EmptyPanel(componentId));
+                }
+            }
+
+            @Override
+            public Component getHeader(String componentId) {
+                return new Label(componentId, createStringResource("RoleMining.cluster.table.column.header.role.occupation"));
+            }
+
+        });
+
+        columns.add(new AbstractColumn<>(createStringResource("")) {
+
+            @Override
+            public boolean isSortable() {
+                return false;
+            }
+
+            @Override
+            public void populateItem(Item<ICellPopulator<DetectedPattern>> item, String componentId,
+                    IModel<DetectedPattern> rowModel) {
+
+                if (rowModel.getObject() != null && rowModel.getObject().getUsers() != null) {
+                    int usersCount = rowModel.getObject().getUsers().size();
+
+                    CompositedIconBuilder iconBuilder = new CompositedIconBuilder()
+                            .setBasicIcon(GuiStyleConstants.CLASS_OBJECT_ROLE_ICON, LayeredIconCssStyle.IN_ROW_STYLE);
+
+                    AjaxCompositedIconButton objectButton = new AjaxCompositedIconButton(componentId, iconBuilder.build(),
+                            Model.of(String.valueOf(usersCount))) {
+
+                        @Serial private static final long serialVersionUID = 1L;
+
+                        @Override
+                        public void onClick(AjaxRequestTarget target) {
+
+                            List<PrismObject<FocusType>> objects = new ArrayList<>();
+                            Set<String> users = rowModel.getObject().getUsers();
+
+                            for (String s : users) {
+                                objects.add(getFocusTypeObject(getPageBase(), s, result));
+                            }
+                            MembersDetailsPanel detailsPanel = new MembersDetailsPanel(((PageBase) getPage()).getMainPopupBodyId(),
+                                    Model.of("Analyzed members details panel"), objects, RoleAnalysisProcessModeType.USER) {
+                                @Override
+                                public void onClose(AjaxRequestTarget ajaxRequestTarget) {
+                                    super.onClose(ajaxRequestTarget);
+                                }
+                            };
+                            ((PageBase) getPage()).showMainPopup(detailsPanel, target);
+                        }
+
+                    };
+                    objectButton.titleAsLabel(true);
+                    objectButton.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
+                    objectButton.add(AttributeAppender.append("style", "width:150px"));
+
+                    if (isOperationEnable) {
+                        objectButton.setEnabled(false);
+                    }
+
+                    item.add(objectButton);
+                } else {
+                    item.add(new EmptyPanel(componentId));
+                }
+
+            }
+
+            @Override
+            public Component getHeader(String componentId) {
+                return new Label(componentId, createStringResource("RoleMining.cluster.table.column.header.user.occupation"));
+            }
+
+        });
+
+        if (isOperationEnable) {
+            columns.add(new AbstractExportableColumn<>(getHeaderTitle("display")) {
+
+                @Override
+                public IModel<?> getDataModel(IModel<DetectedPattern> iModel) {
+                    return null;
+                }
+
+                @Override
+                public boolean isSortable() {
+                    return false;
+                }
+
+                @Override
+                public void populateItem(Item<ICellPopulator<DetectedPattern>> item, String componentId,
+                        IModel<DetectedPattern> rowModel) {
+                    if (rowModel.getObject() == null) {
+                        item.add(new EmptyPanel(componentId));
+                    } else {
+
+                        CompositedIconBuilder iconBuilder = new CompositedIconBuilder().setBasicIcon(GuiStyleConstants.CLASS_ICON_SEARCH,
+                                LayeredIconCssStyle.IN_ROW_STYLE);
+                        AjaxCompositedIconSubmitButton exploreButton = new AjaxCompositedIconSubmitButton(componentId,
+                                iconBuilder.build(),
+                                createStringResource("RoleMining.button.title.load")) {
+                            @Serial private static final long serialVersionUID = 1L;
+
+                            @Override
+                            protected void onSubmit(AjaxRequestTarget target) {
+                                onLoad(target, rowModel);
+                            }
+
+                            @Override
+                            protected void onError(AjaxRequestTarget target) {
+                                target.add(((PageBase) getPage()).getFeedbackPanel());
+                            }
+                        };
+                        exploreButton.titleAsLabel(true);
+                        exploreButton.setOutputMarkupId(true);
+                        exploreButton.add(AttributeAppender.append("class", "btn btn-success btn-sm"));
+
+                        item.add(exploreButton);
+
+                    }
+
+                }
+
+                @Override
+                public Component getHeader(String componentId) {
+                    return new Label(componentId, getHeaderTitle("display"));
+                }
+
+            });
+        } else {
+            columns.add(new AbstractExportableColumn<>(getHeaderTitle("display")) {
+
+                @Override
+                public IModel<?> getDataModel(IModel<DetectedPattern> iModel) {
+                    return null;
+                }
+
+                @Override
+                public boolean isSortable() {
+                    return false;
+                }
+
+                @Override
+                public void populateItem(Item<ICellPopulator<DetectedPattern>> item, String componentId,
+                        IModel<DetectedPattern> rowModel) {
+
+                    if (rowModel.getObject() == null) {
+                        item.add(new EmptyPanel(componentId));
+                    } else {
+                        CompositedIconBuilder iconBuilder = new CompositedIconBuilder().setBasicIcon(GuiStyleConstants.CLASS_PLUS_CIRCLE,
+                                LayeredIconCssStyle.IN_ROW_STYLE);
+                        AjaxCompositedIconSubmitButton migrationButton = new AjaxCompositedIconSubmitButton(componentId,
+                                iconBuilder.build(),
+                                createStringResource("RoleMining.button.title.process")) {
+                            @Serial private static final long serialVersionUID = 1L;
+
+                            @Override
+                            protected void onSubmit(AjaxRequestTarget target) {
+
+                                OperationResult operationResult = new OperationResult("PerformPatternCreation");
+
+                                Set<String> roles = rowModel.getObject().getRoles();
+                                Set<String> users = rowModel.getObject().getUsers();
+
+                                List<AssignmentType> roleAssignments = new ArrayList<>();
+
+                                for (String roleOid : roles) {
+                                    PrismObject<RoleType> roleObject = getRoleTypeObject(getPageBase(), roleOid, operationResult);
+                                    if (roleObject != null) {
+                                        roleAssignments.add(ObjectTypeUtil.createAssignmentTo(roleOid, ObjectTypes.ROLE));
+                                    }
+                                }
+
+                                PrismObject<RoleType> businessRole = generateBusinessRole((PageBase) getPage(), roleAssignments, "");
+
+                                List<BusinessRoleDto> roleApplicationDtos = new ArrayList<>();
+
+                                for (String userOid : users) {
+                                    PrismObject<UserType> userObject = getUserTypeObject(getPageBase(), userOid, operationResult);
+                                    if (userObject != null) {
+                                        roleApplicationDtos.add(new BusinessRoleDto(userObject,
+                                                businessRole, getPageBase()));
+                                    }
+                                }
+
+                                PrismObject<RoleAnalysisClusterType> prismObjectCluster = cluster.asPrismObject();
+
+                                BusinessRoleApplicationDto operationData = new BusinessRoleApplicationDto(prismObjectCluster, businessRole, roleApplicationDtos);
+
+                                PageRole pageRole = new PageRole(operationData.getBusinessRole(), operationData);
+                                setResponsePage(pageRole);
+                            }
+
+                            @Override
+                            protected void onError(AjaxRequestTarget target) {
+                                target.add(((PageBase) getPage()).getFeedbackPanel());
+                            }
+                        };
+                        migrationButton.titleAsLabel(true);
+                        migrationButton.setOutputMarkupId(true);
+                        migrationButton.add(AttributeAppender.append("class", "btn btn-success btn-sm"));
+
+                        item.add(migrationButton);
+                    }
+
+                }
+
+                @Override
+                public Component getHeader(String componentId) {
+                    return new Label(componentId, getHeaderTitle("display"));
+                }
+
+            });
+
+        }
+        return columns;
+    }
+
+    public PageBase getPageBase() {
+        return ((PageBase) getPage());
+    }
+
+    protected DataTable<?, ?> getDataTable() {
+        return ((BoxedTablePanel<?>) get(((PageBase) getPage()).createComponentPath(ID_DATATABLE))).getDataTable();
+    }
+
+    protected BoxedTablePanel<?> getTable() {
+        return ((BoxedTablePanel<?>) get(((PageBase) getPage()).createComponentPath(ID_DATATABLE)));
+    }
+
+    protected StringResourceModel getHeaderTitle(String identifier) {
+        return createStringResource("RoleMining.cluster.table.column.header." + identifier);
+    }
+
+    protected void onLoad(AjaxRequestTarget ajaxRequestTarget, IModel<DetectedPattern> rowModel) {
+
+    }
+
+    private Set<String> resolveTotalOccupancy(RoleAnalysisProcessModeType roleAnalysisProcessModeType, DetectedPattern detectedPattern,
+            OperationResult result, PageBase pageBase) {
+
+        Set<String> membersOidList = new HashSet<>();
+        Set<String> detectedProperties = detectedPattern.getRoles();
+
+        if (roleAnalysisProcessModeType.equals(RoleAnalysisProcessModeType.USER)) {
+            ResultHandler<UserType> resultHandler = (object, parentResult) -> {
+                try {
+                    List<String> properties = getRolesOidAssignment(object.asObjectable());
+                    if (new HashSet<>(properties).containsAll(detectedProperties)) {
+                        membersOidList.add(object.getOid());
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+                return true;
+            };
+            GetOperationOptionsBuilder optionsBuilder = pageBase.getSchemaService().getOperationOptionsBuilder();
+
+            RepositoryService repositoryService = pageBase.getRepositoryService();
+            try {
+                repositoryService.searchObjectsIterative(UserType.class, null, resultHandler, optionsBuilder.build(),
+                        true, result);
+            } catch (SchemaException e) {
+                throw new RuntimeException(e);
+            }
+
+        } else {
+            ListMultimap<String, String> roleToUserMap = ArrayListMultimap.create();
+
+            ResultHandler<UserType> resultHandler = (object, parentResult) -> {
+                try {
+                    UserType properties = object.asObjectable();
+                    List<String> members = getRolesOidAssignment(properties);
+                    for (String roleId : members) {
+                        roleToUserMap.putAll(roleId, Collections.singletonList(properties.getOid()));
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+                return true;
+            };
+
+            GetOperationOptionsBuilder optionsBuilder = pageBase.getSchemaService().getOperationOptionsBuilder();
+            RepositoryService repositoryService = pageBase.getRepositoryService();
+
+            try {
+                repositoryService.searchObjectsIterative(UserType.class, null, resultHandler, optionsBuilder.build(),
+                        true, result);
+            } catch (SchemaException e) {
+                throw new RuntimeException(e);
+            }
+            for (String member : roleToUserMap.keySet()) {
+                List<String> properties = roleToUserMap.get(member);
+
+                if (new HashSet<>(properties).containsAll(detectedProperties)) {
+                    membersOidList.add(member);
+                }
+            }
+
+        }
+
+        return membersOidList;
+    }
+
+    private <C extends Containerable> PrismPropertyHeaderPanel<?> createColumnHeader(String componentId,
+            LoadableModel<PrismContainerDefinition<C>> containerDefinitionModel) {
+
+        return new PrismPropertyHeaderPanel<>(componentId, new PrismPropertyWrapperHeaderModel<>(
+                containerDefinitionModel,
+                RoleAnalysisDetectionPatternType.F_CLUSTER_METRIC,
+                (PageBase) getPage())) {
+
+            @Override
+            protected boolean isAddButtonVisible() {
+                return false;
+            }
+
+            @Override
+            protected boolean isButtonEnabled() {
+                return false;
+            }
+        };
+    }
+
+    protected void onRefresh(AjaxRequestTarget target) {
+
+    }
+}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningRoleBasedTable.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisRoleBasedTable.html
similarity index 100%
rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningRoleBasedTable.html
rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisRoleBasedTable.html
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningRoleBasedTable.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisRoleBasedTable.java
similarity index 69%
rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningRoleBasedTable.java
rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisRoleBasedTable.java
index 52664132edf..8df56458b6a 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningRoleBasedTable.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisRoleBasedTable.java
@@ -12,7 +12,6 @@
 import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.table.TableCellFillOperation.updateRoleBasedTableData;
 import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.table.Tools.applySquareTableCell;
 import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.table.Tools.getScaleScript;
-import static com.evolveum.midpoint.web.component.data.column.ColumnUtils.createStringResource;
 
 import java.io.Serial;
 import java.util.ArrayList;
@@ -25,81 +24,104 @@
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.util.ListModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningOperationChunk;
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningRoleTypeChunk;
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningUserTypeChunk;
 import com.evolveum.midpoint.common.mining.objects.detection.DetectedPattern;
+import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisChunkMode;
 import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisOperationMode;
 import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisSortMode;
-import com.evolveum.midpoint.gui.api.model.LoadableModel;
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
+import com.evolveum.midpoint.gui.impl.component.AjaxCompositedIconButton;
+import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
+import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
+import com.evolveum.midpoint.gui.impl.component.icon.LayeredIconCssStyle;
 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.page.admin.role.mining.page.panel.cluster.MembersDetailsPanel;
+import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
 import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
-import com.evolveum.midpoint.web.component.data.SpecialBoxedTablePanel;
+import com.evolveum.midpoint.web.component.AjaxCompositedIconSubmitButton;
+import com.evolveum.midpoint.web.component.AjaxIconButton;
+import com.evolveum.midpoint.web.component.data.RoleAnalysisTable;
 import com.evolveum.midpoint.web.component.data.column.AjaxLinkPanel;
 import com.evolveum.midpoint.web.component.data.column.AjaxLinkTruncatePanelAction;
 import com.evolveum.midpoint.web.component.data.column.IconColumn;
 import com.evolveum.midpoint.web.component.data.column.LinkIconPanelStatus;
 import com.evolveum.midpoint.web.component.util.RoleMiningProvider;
+import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-public class MiningRoleBasedTable extends Panel {
+public class RoleAnalysisRoleBasedTable extends BasePanel<String> {
 
     private static final String ID_DATATABLE = "datatable_extra";
     private final OperationResult result = new OperationResult("loadMiningTableObject");
-
     private String valueTitle = null;
+    private int currentPageView = 0;
     private int columnPageCount = 100;
     private int fromCol;
     private int toCol;
-    private final int specialColumnCount;
-
+    private int specialColumnCount;
     private final MiningOperationChunk miningOperationChunk;
-    private final PrismObject<RoleAnalysisClusterType> cluster;
+    double minFrequency;
+    double maxFrequency;
+    DetectedPattern analysedPattern;
+    RoleAnalysisSortMode roleAnalysisSortMode;
 
-    public MiningRoleBasedTable(String id,
+    public RoleAnalysisRoleBasedTable(String id,
             MiningOperationChunk miningOperationChunk,
-            double minFrequency, double maxFrequency,
-            DetectedPattern intersection, List<ObjectReferenceType> reductionObjects,
+            DetectedPattern analysedPattern,
             RoleAnalysisSortMode roleAnalysisSortMode,
-            PrismObject<RoleAnalysisClusterType> cluster) {
+            @NotNull PrismObject<RoleAnalysisClusterType> cluster) {
         super(id);
 
-        this.cluster = cluster;
+        this.roleAnalysisSortMode = roleAnalysisSortMode;
+        this.analysedPattern = analysedPattern;
         this.miningOperationChunk = miningOperationChunk;
 
+        RoleAnalysisClusterType clusterObject = cluster.asObjectable();
+        RoleAnalysisDetectionOptionType detectionOption = clusterObject.getDetectionOption();
+        RangeType frequencyRange = detectionOption.getFrequencyRange();
+
+        if (frequencyRange != null) {
+            this.minFrequency = frequencyRange.getMin() / 100;
+            this.maxFrequency = frequencyRange.getMax() / 100;
+        }
+
+        initLayout(cluster);
+    }
+
+    private void initLayout(PrismObject<RoleAnalysisClusterType> cluster) {
+        List<ObjectReferenceType> resolvedPattern = cluster.asObjectable().getResolvedPattern();
+
         List<MiningUserTypeChunk> users = miningOperationChunk.getMiningUserTypeChunks(roleAnalysisSortMode);
         List<MiningRoleTypeChunk> roles = miningOperationChunk.getMiningRoleTypeChunks(roleAnalysisSortMode);
 
-        fromCol = 1;
-        toCol = 100;
-        specialColumnCount = roles.size();
+        this.fromCol = 1;
+        this.toCol = 100;
+        this.specialColumnCount = roles.size();
 
         if (specialColumnCount < toCol) {
-            toCol = specialColumnCount;
+            this.toCol = specialColumnCount;
         }
 
-        initLayout(minFrequency, maxFrequency, intersection, reductionObjects, roleAnalysisSortMode, users, roles);
-    }
-
-    private void initLayout(double minFrequency, double maxFrequency, DetectedPattern intersection,
-            List<ObjectReferenceType> reductionObjects, RoleAnalysisSortMode roleAnalysisSortMode,
-            List<MiningUserTypeChunk> users, List<MiningRoleTypeChunk> roles) {
-
         RoleMiningProvider<MiningUserTypeChunk> provider = new RoleMiningProvider<>(
                 this, new ListModel<>(users) {
 
@@ -111,28 +133,66 @@ public void setObject(List<MiningUserTypeChunk> object) {
             }
         }, false);
 
-        SpecialBoxedTablePanel<MiningUserTypeChunk> table = generateTable(provider, roles, minFrequency,
-                intersection, maxFrequency, reductionObjects, roleAnalysisSortMode);
+        RoleAnalysisTable<MiningUserTypeChunk> table = generateTable(provider, roles, resolvedPattern, cluster);
         add(table);
     }
 
-    public SpecialBoxedTablePanel<MiningUserTypeChunk> generateTable(RoleMiningProvider<MiningUserTypeChunk> provider,
-            List<MiningRoleTypeChunk> roles,
-            double frequency, DetectedPattern intersection,
-            double maxFrequency, List<ObjectReferenceType> reductionObjects,
-            RoleAnalysisSortMode roleAnalysisSortMode) {
+    public RoleAnalysisTable<MiningUserTypeChunk> generateTable(RoleMiningProvider<MiningUserTypeChunk> provider,
+            List<MiningRoleTypeChunk> roles, List<ObjectReferenceType> reductionObjects,
+            PrismObject<RoleAnalysisClusterType> cluster) {
+
+        RoleAnalysisTable<MiningUserTypeChunk> table = new RoleAnalysisTable<>(
+                ID_DATATABLE, provider, initColumns(roles, reductionObjects),
+                null, true, specialColumnCount, roleAnalysisSortMode) {
+            @Override
+            protected WebMarkupContainer createButtonToolbar(String id) {
+
+                RepeatingView repeatingView = new RepeatingView(id);
+                repeatingView.setOutputMarkupId(true);
+
+                CompositedIconBuilder iconBuilder = new CompositedIconBuilder().setBasicIcon("fa fa-search", LayeredIconCssStyle.IN_ROW_STYLE);
+
+                AjaxCompositedIconButton detectionPanel = new AjaxCompositedIconButton(repeatingView.newChildId(), iconBuilder.build(),
+                        createStringResource("")) {
+
+                    @Serial private static final long serialVersionUID = 1L;
+
+                    @Override
+                    public void onClick(AjaxRequestTarget target) {
+
+                        showDetectedPatternPanel(target);
+                    }
+
+                };
+                detectionPanel.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
+
+                repeatingView.add(detectionPanel);
+
+                AjaxIconButton refreshIcon = new AjaxIconButton(repeatingView.newChildId(), new Model<>(GuiStyleConstants.CLASS_RECONCILE),
+                        createStringResource("MainObjectListPanel.refresh")) {
+
+                    @Serial private static final long serialVersionUID = 1L;
+
+                    @Override
+                    public void onClick(AjaxRequestTarget target) {
+                        onRefresh(cluster);
+                    }
+                };
+                refreshIcon.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
+
+                repeatingView.add(refreshIcon);
+
+                return repeatingView;
+            }
 
-        SpecialBoxedTablePanel<MiningUserTypeChunk> table = new SpecialBoxedTablePanel<>(
-                ID_DATATABLE, provider, initColumns(roles, frequency, intersection, maxFrequency, reductionObjects),
-                null, true, true, specialColumnCount, roleAnalysisSortMode) {
             @Override
-            public void onChange(String value, AjaxRequestTarget target) {
+            public void onChange(String value, AjaxRequestTarget target, int currentPage) {
+                currentPageView = currentPage;
                 valueTitle = value;
                 String[] rangeParts = value.split(" - ");
                 fromCol = Integer.parseInt(rangeParts[0]);
                 toCol = Integer.parseInt(rangeParts[1]);
-                getTable().replaceWith(generateTable(provider, roles, frequency, intersection, maxFrequency, reductionObjects,
-                        roleAnalysisSortMode));
+                getTable().replaceWith(generateTable(provider, roles, reductionObjects, cluster));
                 target.add(getTable().setOutputMarkupId(true));
             }
 
@@ -180,8 +240,9 @@ public BusinessRoleApplicationDto getOperationData() {
             }
 
             @Override
-            public void onChangeSortMode(RoleAnalysisSortMode roleAnalysisSortMode, AjaxRequestTarget target) {
+            public void onChangeSortMode(RoleAnalysisSortMode sortMode, AjaxRequestTarget target) {
 
+                roleAnalysisSortMode = sortMode;
                 List<MiningRoleTypeChunk> roles = miningOperationChunk.getMiningRoleTypeChunks(roleAnalysisSortMode);
                 List<MiningUserTypeChunk> users = miningOperationChunk.getMiningUserTypeChunks(roleAnalysisSortMode);
                 RoleMiningProvider<MiningUserTypeChunk> provider = new RoleMiningProvider<>(
@@ -195,24 +256,22 @@ public void setObject(List<MiningUserTypeChunk> object) {
                     }
                 }, false);
 
-                getTable().replaceWith(generateTable(provider, roles, frequency, intersection, maxFrequency, reductionObjects,
-                        roleAnalysisSortMode));
+                getTable().replaceWith(generateTable(provider, roles, reductionObjects, cluster));
                 target.add(getTable().setOutputMarkupId(true));
                 target.appendJavaScript(getScaleScript());
             }
 
             @Override
-            public int onChangeSize(int value, AjaxRequestTarget target) {
+            public void onChangeSize(int value, AjaxRequestTarget target) {
+                currentPageView = 0;
                 columnPageCount = value;
                 fromCol = 1;
                 toCol = Math.min(value, specialColumnCount);
                 valueTitle = "0 - " + toCol;
 
-                getTable().replaceWith(generateTable(provider, roles, frequency, intersection, maxFrequency,
-                        reductionObjects, roleAnalysisSortMode));
+                getTable().replaceWith(generateTable(provider, roles, reductionObjects, cluster));
                 target.add(getTable().setOutputMarkupId(true));
                 target.appendJavaScript(getScaleScript());
-                return value;
             }
 
             @Override
@@ -224,6 +283,11 @@ public String getColumnPagingTitle() {
                 }
             }
 
+            @Override
+            protected int getCurrentPage() {
+                return currentPageView;
+            }
+
             @Override
             public int getColumnPageCount() {
                 return columnPageCount;
@@ -236,8 +300,8 @@ public int getColumnPageCount() {
         return table;
     }
 
-    public List<IColumn<MiningUserTypeChunk, String>> initColumns(List<MiningRoleTypeChunk> roles, double minFrequency,
-            DetectedPattern intersection, double maxFrequency, List<ObjectReferenceType> reductionObjects) {
+    public List<IColumn<MiningUserTypeChunk, String>> initColumns(List<MiningRoleTypeChunk> roles,
+            List<ObjectReferenceType> reductionObjects) {
 
         List<IColumn<MiningUserTypeChunk, String>> columns = new ArrayList<>();
 
@@ -307,25 +371,56 @@ public void onClose(AjaxRequestTarget ajaxRequestTarget) {
 
             @Override
             public Component getHeader(String componentId) {
-                AjaxLinkPanel ajaxLinkPanel = new AjaxLinkPanel(componentId, new LoadableModel<>() {
+
+                CompositedIconBuilder iconBuilder = new CompositedIconBuilder().setBasicIcon("fa fa-expand",
+                        LayeredIconCssStyle.IN_ROW_STYLE);
+                AjaxCompositedIconSubmitButton compressButton = new AjaxCompositedIconSubmitButton(componentId,
+                        iconBuilder.build(),
+                        new LoadableDetachableModel<>() {
+                            @Override
+                            protected String load() {
+                                if (RoleAnalysisChunkMode.valueOf(getCompressStatus()).equals(RoleAnalysisChunkMode.COMPRESS)) {
+                                    return getString("RoleMining.operation.panel.expand.button.title");
+                                } else {
+                                    return getString("RoleMining.operation.panel.compress.button.title");
+                                }
+                            }
+                        }) {
+                    @Serial private static final long serialVersionUID = 1L;
+
                     @Override
-                    protected Object load() {
-                        return Model.of(getCompressStatus());
+                    public CompositedIcon getIcon() {
+
+                        CompositedIconBuilder iconBuilder;
+                        if (RoleAnalysisChunkMode.valueOf(getCompressStatus()).equals(RoleAnalysisChunkMode.COMPRESS)) {
+                            iconBuilder = new CompositedIconBuilder().setBasicIcon("fa fa-expand",
+                                    LayeredIconCssStyle.IN_ROW_STYLE);
+                        } else {
+                            iconBuilder = new CompositedIconBuilder().setBasicIcon("fa fa-compress",
+                                    LayeredIconCssStyle.IN_ROW_STYLE);
+                        }
+
+                        return iconBuilder.build();
                     }
-                }) {
+
                     @Override
-                    public void onClick(AjaxRequestTarget target) {
+                    protected void onSubmit(AjaxRequestTarget target) {
                         onPerform(target);
                         target.add(this);
                     }
+
+                    @Override
+                    protected void onError(AjaxRequestTarget target) {
+                        target.add(((PageBase) getPage()).getFeedbackPanel());
+                    }
                 };
-                ajaxLinkPanel.setOutputMarkupId(true);
-                ajaxLinkPanel.setOutputMarkupPlaceholderTag(true);
-                add(ajaxLinkPanel);
+                compressButton.titleAsLabel(true);
+                compressButton.setOutputMarkupId(true);
+                compressButton.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
+                compressButton.add(AttributeAppender.append("style",
+                        "  writing-mode: vertical-lr;  -webkit-transform: rotate(90deg);"));
 
-                return ajaxLinkPanel.add(
-                        new AttributeAppender("style",
-                                "  writing-mode: vertical-lr;  -webkit-transform: rotate(45deg);"));
+                return compressButton;
             }
 
             @Override
@@ -398,7 +493,7 @@ public void populateItem(Item<ICellPopulator<MiningUserTypeChunk>> cellItem,
                     List<String> rowRoles = model.getObject().getRoles();
                     RoleAnalysisOperationMode colRoleAnalysisOperationMode = roleChunk.getStatus();
                     updateRoleBasedTableData(cellItem, componentId, model, rowRoles,
-                            colRoleAnalysisOperationMode, colRoles, intersection, roleChunk);
+                            colRoleAnalysisOperationMode, colRoles, analysedPattern, roleChunk);
 
                 }
 
@@ -482,11 +577,11 @@ public PageBase getPageBase() {
     }
 
     public DataTable<?, ?> getDataTable() {
-        return ((SpecialBoxedTablePanel<?>) get(((PageBase) getPage()).createComponentPath(ID_DATATABLE))).getDataTable();
+        return ((RoleAnalysisTable<?>) get(((PageBase) getPage()).createComponentPath(ID_DATATABLE))).getDataTable();
     }
 
-    protected SpecialBoxedTablePanel<?> getTable() {
-        return ((SpecialBoxedTablePanel<?>) get(((PageBase) getPage()).createComponentPath(ID_DATATABLE)));
+    protected RoleAnalysisTable<?> getTable() {
+        return ((RoleAnalysisTable<?>) get(((PageBase) getPage()).createComponentPath(ID_DATATABLE)));
     }
 
     protected void resetTable(AjaxRequestTarget target) {
@@ -499,4 +594,18 @@ protected String getCompressStatus() {
 
     protected void onPerform(AjaxRequestTarget ajaxRequestTarget) {
     }
+
+    protected void showDetectedPatternPanel(AjaxRequestTarget target) {
+
+    }
+
+    private void onRefresh(PrismObject<RoleAnalysisClusterType> cluster) {
+        PageParameters parameters = new PageParameters();
+        parameters.add(OnePageParameterEncoder.PARAMETER, cluster.getOid());
+        parameters.add("panelId", "clusterDetails");
+        Class<? extends PageBase> detailsPageClass = DetailsPageUtil
+                .getObjectDetailsPage(RoleAnalysisClusterType.class);
+        getPageBase().navigateToNext(detailsPageClass, parameters);
+    }
+
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningUserBasedTable.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisUserBasedTable.html
similarity index 100%
rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningUserBasedTable.html
rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisUserBasedTable.html
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningUserBasedTable.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisUserBasedTable.java
similarity index 70%
rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningUserBasedTable.java
rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisUserBasedTable.java
index 941877755b7..7b874feec25 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/MiningUserBasedTable.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisUserBasedTable.java
@@ -18,6 +18,19 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisChunkMode;
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.gui.impl.component.AjaxCompositedIconButton;
+import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
+import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
+import com.evolveum.midpoint.gui.impl.component.icon.LayeredIconCssStyle;
+
+import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
+import com.evolveum.midpoint.web.component.AjaxCompositedIconSubmitButton;
+import com.evolveum.midpoint.web.component.AjaxIconButton;
+
+import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
@@ -25,8 +38,10 @@
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.Model;
@@ -49,7 +64,7 @@
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
-import com.evolveum.midpoint.web.component.data.SpecialBoxedTablePanel;
+import com.evolveum.midpoint.web.component.data.RoleAnalysisTable;
 import com.evolveum.midpoint.web.component.data.column.AjaxLinkPanel;
 import com.evolveum.midpoint.web.component.data.column.AjaxLinkTruncatePanelAction;
 import com.evolveum.midpoint.web.component.data.column.IconColumn;
@@ -57,27 +72,58 @@
 import com.evolveum.midpoint.web.component.util.RoleMiningProvider;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-public class MiningUserBasedTable extends Panel {
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+public class RoleAnalysisUserBasedTable extends Panel {
 
     private static final String ID_DATATABLE = "datatable_extra";
     private final OperationResult result = new OperationResult("GetObject");
 
     private String valueTitle = null;
+    private int currentPageView = 0;
+
     private int columnPageCount = 100;
     private int fromCol;
     private int toCol;
-    private final int specialColumnCount;
-    private final PrismObject<RoleAnalysisClusterType> cluster;
+    private int specialColumnCount;
 
     private final MiningOperationChunk miningOperationChunk;
 
-    public MiningUserBasedTable(String id, MiningOperationChunk miningOperationChunk, double minFrequency, DetectedPattern intersection,
-            double maxFrequency, List<ObjectReferenceType> reductionObjects, RoleAnalysisSortMode roleAnalysisSortMode,
+    double minFrequency;
+    double maxFrequency;
+    DetectedPattern analysedPattern;
+    RoleAnalysisSortMode roleAnalysisSortMode;
+
+    public RoleAnalysisUserBasedTable(String id,
+            MiningOperationChunk miningOperationChunk,
+            DetectedPattern intersection,
+            RoleAnalysisSortMode roleAnalysisSortMode,
             PrismObject<RoleAnalysisClusterType> cluster) {
         super(id);
 
-        this.cluster = cluster;
+        this.roleAnalysisSortMode = roleAnalysisSortMode;
+        this.analysedPattern = intersection;
+
+        RoleAnalysisClusterType clusterObject = cluster.asObjectable();
+
+        RoleAnalysisDetectionOptionType detectionOption = clusterObject.getDetectionOption();
+
+        RangeType frequencyRange = detectionOption.getFrequencyRange();
+
+        if (frequencyRange != null) {
+            this.minFrequency = frequencyRange.getMin() / 100;
+            this.maxFrequency = frequencyRange.getMax() / 100;
+        }
+
         this.miningOperationChunk = miningOperationChunk;
+
+        initLayout(cluster);
+    }
+
+    private void initLayout(PrismObject<RoleAnalysisClusterType> cluster) {
+
+        List<ObjectReferenceType> resolvedPattern = cluster.asObjectable().getResolvedPattern();
+
         List<MiningUserTypeChunk> users = miningOperationChunk.getMiningUserTypeChunks(roleAnalysisSortMode);
         List<MiningRoleTypeChunk> roles = miningOperationChunk.getMiningRoleTypeChunks(roleAnalysisSortMode);
 
@@ -89,13 +135,6 @@ public MiningUserBasedTable(String id, MiningOperationChunk miningOperationChunk
             toCol = specialColumnCount;
         }
 
-        initLayout(minFrequency, intersection, maxFrequency, reductionObjects, roleAnalysisSortMode, users, roles);
-    }
-
-    private void initLayout(double minFrequency, DetectedPattern intersection, double maxFrequency,
-            List<ObjectReferenceType> reductionObjects, RoleAnalysisSortMode roleAnalysisSortMode,
-            List<MiningUserTypeChunk> users, List<MiningRoleTypeChunk> roles) {
-
         RoleMiningProvider<MiningRoleTypeChunk> provider = new RoleMiningProvider<>(
                 this, new ListModel<>(roles) {
 
@@ -107,29 +146,68 @@ public void setObject(List<MiningRoleTypeChunk> object) {
             }
         }, false);
 
-        SpecialBoxedTablePanel<MiningRoleTypeChunk> table = generateTable(provider, users, minFrequency, maxFrequency,
-                intersection, reductionObjects, roleAnalysisSortMode);
+        RoleAnalysisTable<MiningRoleTypeChunk> table = generateTable(provider, users,
+                resolvedPattern, cluster);
 
         add(table);
     }
 
-    public SpecialBoxedTablePanel<MiningRoleTypeChunk> generateTable(RoleMiningProvider<MiningRoleTypeChunk> provider,
-            List<MiningUserTypeChunk> users,
-            double minFrequency, double maxFrequency,
-            DetectedPattern intersection, List<ObjectReferenceType> reductionObjects,
-            RoleAnalysisSortMode roleAnalysisSortMode) {
+    public RoleAnalysisTable<MiningRoleTypeChunk> generateTable(RoleMiningProvider<MiningRoleTypeChunk> provider,
+            List<MiningUserTypeChunk> users, List<ObjectReferenceType> reductionObjects, PrismObject<RoleAnalysisClusterType> cluster) {
+
+        RoleAnalysisTable<MiningRoleTypeChunk> table = new RoleAnalysisTable<>(
+                ID_DATATABLE, provider, initColumns(users, reductionObjects),
+                null, true, specialColumnCount, roleAnalysisSortMode) {
+
+            @Override
+            protected WebMarkupContainer createButtonToolbar(String id) {
+
+                RepeatingView repeatingView = new RepeatingView(id);
+                repeatingView.setOutputMarkupId(true);
+
+                CompositedIconBuilder iconBuilder = new CompositedIconBuilder().setBasicIcon("fa fa-search", LayeredIconCssStyle.IN_ROW_STYLE);
+
+                AjaxCompositedIconButton createNewObjectButton = new AjaxCompositedIconButton(repeatingView.newChildId(), iconBuilder.build(),
+                        createStringResource("")) {
+
+                    @Serial private static final long serialVersionUID = 1L;
+
+                    @Override
+                    public void onClick(AjaxRequestTarget target) {
+
+                        showDetectedPatternPanel(target);
+                    }
+
+                };
+                createNewObjectButton.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
+
+                repeatingView.add(createNewObjectButton);
+
+                AjaxIconButton refreshIcon = new AjaxIconButton(repeatingView.newChildId(), new Model<>(GuiStyleConstants.CLASS_RECONCILE),
+                        createStringResource("MainObjectListPanel.refresh")) {
+
+                    @Serial private static final long serialVersionUID = 1L;
+
+                    @Override
+                    public void onClick(AjaxRequestTarget target) {
+                        onRefresh(cluster);
+                    }
+                };
+                refreshIcon.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
+
+                repeatingView.add(refreshIcon);
+
+                return repeatingView;
+            }
 
-        SpecialBoxedTablePanel<MiningRoleTypeChunk> table = new SpecialBoxedTablePanel<>(
-                ID_DATATABLE, provider, initColumns(users, minFrequency, intersection, maxFrequency, reductionObjects),
-                null, true, true, specialColumnCount, roleAnalysisSortMode) {
             @Override
-            public void onChange(String value, AjaxRequestTarget target) {
+            public void onChange(String value, AjaxRequestTarget target, int currentPage) {
+                currentPageView = currentPage;
                 String[] rangeParts = value.split(" - ");
                 valueTitle = value;
                 fromCol = Integer.parseInt(rangeParts[0]);
                 toCol = Integer.parseInt(rangeParts[1]);
-                getTable().replaceWith(generateTable(provider, users, minFrequency, maxFrequency, intersection, reductionObjects,
-                        roleAnalysisSortMode));
+                getTable().replaceWith(generateTable(provider, users, reductionObjects, cluster));
                 target.add(getTable().setOutputMarkupId(true));
                 target.appendJavaScript(getScaleScript());
             }
@@ -193,24 +271,29 @@ public void setObject(List<MiningRoleTypeChunk> object) {
                     }
                 }, false);
 
-                getTable().replaceWith(generateTable(provider, users, minFrequency, maxFrequency, intersection,
-                        reductionObjects, sortMode));
+                getTable().replaceWith(generateTable(provider, users,
+                        reductionObjects, cluster));
                 target.add(getTable().setOutputMarkupId(true));
                 target.appendJavaScript(getScaleScript());
             }
 
             @Override
-            public int onChangeSize(int value, AjaxRequestTarget target) {
+            public void onChangeSize(int value, AjaxRequestTarget target) {
+                currentPageView = 0;
                 columnPageCount = value;
                 fromCol = 1;
                 toCol = Math.min(value, specialColumnCount);
                 valueTitle = "0 - " + toCol;
 
-                getTable().replaceWith(generateTable(provider, users, minFrequency, maxFrequency, intersection,
-                        reductionObjects, roleAnalysisSortMode));
+                getTable().replaceWith(generateTable(provider, users,
+                        reductionObjects, cluster));
                 target.add(getTable().setOutputMarkupId(true));
                 target.appendJavaScript(getScaleScript());
-                return value;
+            }
+
+            @Override
+            protected int getCurrentPage() {
+                return currentPageView;
             }
 
             @Override
@@ -233,8 +316,8 @@ public String getColumnPagingTitle() {
         return table;
     }
 
-    public List<IColumn<MiningRoleTypeChunk, String>> initColumns(List<MiningUserTypeChunk> users, double minFrequency,
-            DetectedPattern intersection, double maxFrequency, List<ObjectReferenceType> reductionObjects) {
+    public List<IColumn<MiningRoleTypeChunk, String>> initColumns(List<MiningUserTypeChunk> users,
+            List<ObjectReferenceType> reductionObjects) {
 
         List<IColumn<MiningRoleTypeChunk, String>> columns = new ArrayList<>();
 
@@ -312,25 +395,55 @@ public void onClose(AjaxRequestTarget ajaxRequestTarget) {
             @Override
             public Component getHeader(String componentId) {
 
-                AjaxLinkPanel ajaxLinkPanel = new AjaxLinkPanel(componentId, new LoadableModel<>() {
+                CompositedIconBuilder iconBuilder = new CompositedIconBuilder().setBasicIcon("fa fa-expand",
+                        LayeredIconCssStyle.IN_ROW_STYLE);
+                AjaxCompositedIconSubmitButton compressButton = new AjaxCompositedIconSubmitButton(componentId,
+                        iconBuilder.build(),
+                        new LoadableDetachableModel<>() {
+                            @Override
+                            protected String load() {
+                                if (RoleAnalysisChunkMode.valueOf(getCompressStatus()).equals(RoleAnalysisChunkMode.COMPRESS)) {
+                                    return getString("RoleMining.operation.panel.expand.button.title");
+                                } else {
+                                    return getString("RoleMining.operation.panel.compress.button.title");
+                                }
+                            }
+                        }) {
+                    @Serial private static final long serialVersionUID = 1L;
+
                     @Override
-                    protected Object load() {
-                        return Model.of(getCompressStatus());
+                    public CompositedIcon getIcon() {
+
+                        CompositedIconBuilder iconBuilder;
+                        if (RoleAnalysisChunkMode.valueOf(getCompressStatus()).equals(RoleAnalysisChunkMode.COMPRESS)) {
+                            iconBuilder = new CompositedIconBuilder().setBasicIcon("fa fa-expand",
+                                    LayeredIconCssStyle.IN_ROW_STYLE);
+                        } else {
+                            iconBuilder = new CompositedIconBuilder().setBasicIcon("fa fa-compress",
+                                    LayeredIconCssStyle.IN_ROW_STYLE);
+                        }
+
+                        return iconBuilder.build();
                     }
-                }) {
+
                     @Override
-                    public void onClick(AjaxRequestTarget target) {
+                    protected void onSubmit(AjaxRequestTarget target) {
                         onPerform(target);
                         target.add(this);
                     }
+
+                    @Override
+                    protected void onError(AjaxRequestTarget target) {
+                        target.add(((PageBase) getPage()).getFeedbackPanel());
+                    }
                 };
-                ajaxLinkPanel.setOutputMarkupId(true);
-                ajaxLinkPanel.setOutputMarkupPlaceholderTag(true);
-                add(ajaxLinkPanel);
+                compressButton.titleAsLabel(true);
+                compressButton.setOutputMarkupId(true);
+                compressButton.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
+                compressButton.add(AttributeAppender.append("style",
+                        "  writing-mode: vertical-lr;  -webkit-transform: rotate(90deg);"));
 
-                return ajaxLinkPanel.add(
-                        new AttributeAppender("style",
-                                " writing-mode: vertical-lr;  -webkit-transform: rotate(45deg);"));
+                return compressButton;
             }
 
             @Override
@@ -402,7 +515,8 @@ public void populateItem(Item<ICellPopulator<MiningRoleTypeChunk>> cellItem,
                     applySquareTableCell(cellItem);
                     List<String> rowUsers = model.getObject().getUsers();
                     RoleAnalysisOperationMode colRoleAnalysisOperationMode = userChunk.getStatus();
-                    updateUserBasedTableData(cellItem, componentId, model, rowUsers, colUsers, intersection, colRoleAnalysisOperationMode, userChunk);
+                    updateUserBasedTableData(cellItem, componentId, model, rowUsers, colUsers, analysedPattern,
+                            colRoleAnalysisOperationMode, userChunk);
                 }
 
                 @Override
@@ -470,11 +584,11 @@ public PageBase getPageBase() {
     }
 
     public DataTable<?, ?> getDataTable() {
-        return ((SpecialBoxedTablePanel<?>) get(((PageBase) getPage()).createComponentPath(ID_DATATABLE))).getDataTable();
+        return ((RoleAnalysisTable<?>) get(((PageBase) getPage()).createComponentPath(ID_DATATABLE))).getDataTable();
     }
 
-    protected SpecialBoxedTablePanel<?> getTable() {
-        return ((SpecialBoxedTablePanel<?>) get(((PageBase) getPage()).createComponentPath(ID_DATATABLE)));
+    protected RoleAnalysisTable<?> getTable() {
+        return ((RoleAnalysisTable<?>) get(((PageBase) getPage()).createComponentPath(ID_DATATABLE)));
     }
 
     protected void resetTable(AjaxRequestTarget target) {
@@ -488,4 +602,17 @@ protected String getCompressStatus() {
     protected void onPerform(AjaxRequestTarget ajaxRequestTarget) {
     }
 
+    protected void showDetectedPatternPanel(AjaxRequestTarget target) {
+
+    }
+
+    private void onRefresh(PrismObject<RoleAnalysisClusterType> cluster) {
+        PageParameters parameters = new PageParameters();
+        parameters.add(OnePageParameterEncoder.PARAMETER, cluster.getOid());
+        parameters.add("panelId", "clusterDetails");
+        Class<? extends PageBase> detailsPageClass = DetailsPageUtil
+                .getObjectDetailsPage(RoleAnalysisClusterType.class);
+        getPageBase().navigateToNext(detailsPageClass, parameters);
+    }
+
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/MiningStructure.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/MiningStructure.java
index bd4b46a398c..56779458b26 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/MiningStructure.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/MiningStructure.java
@@ -7,7 +7,7 @@
 
 package com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.chunk;
 
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.schema.result.OperationResult;
 
@@ -20,12 +20,12 @@
 
 public interface MiningStructure {
     MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler handler, Task task);
+            OperationResult result, RoleAnalysisProgressIncrement handler, Task task);
     MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler handler, Task task);
+            OperationResult result, RoleAnalysisProgressIncrement handler, Task task);
     MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler state, Task task);
+            OperationResult result, RoleAnalysisProgressIncrement state, Task task);
     MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler handler, Task task);
+            OperationResult result, RoleAnalysisProgressIncrement handler, Task task);
 
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareChunkStructure.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareChunkStructure.java
index d80516f0b7b..24e12275ea1 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareChunkStructure.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareChunkStructure.java
@@ -15,7 +15,7 @@
 import java.io.Serializable;
 import java.util.*;
 
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 
 import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisOperationMode;
 
@@ -35,7 +35,7 @@
 
 public class PrepareChunkStructure implements MiningStructure, Serializable {
 
-    Handler handler = new Handler("Data Preparation", 4);
+    RoleAnalysisProgressIncrement handler = new RoleAnalysisProgressIncrement("Data Preparation", 4);
 
     public MiningOperationChunk executeOperation(@NotNull RoleAnalysisClusterType cluster, boolean fullProcess,
             RoleAnalysisProcessModeType mode, ModelService modelService, OperationResult result, Task task) {
@@ -72,7 +72,7 @@ private MiningOperationChunk resolveFullChunkStructures(@NotNull RoleAnalysisClu
 
     @Override
     public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler handler, Task task) {
+            OperationResult result, RoleAnalysisProgressIncrement handler, Task task) {
 
         Map<String, PrismObject<RoleType>> roleExistCache = new HashMap<>();
 
@@ -173,7 +173,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
     @Override
     public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler handler, Task task) {
+            OperationResult result, RoleAnalysisProgressIncrement handler, Task task) {
 
         Map<String, PrismObject<UserType>> userExistCache = new HashMap<>();
         Map<String, PrismObject<RoleType>> roleExistCache = new HashMap<>();
@@ -277,7 +277,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
 
     @Override
     public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalysisClusterType cluster,
-            ModelService modelService, OperationResult result, Handler handler, Task task) {
+            ModelService modelService, OperationResult result, RoleAnalysisProgressIncrement handler, Task task) {
 
         Map<String, PrismObject<UserType>> userExistCache = new HashMap<>();
         Map<String, PrismObject<RoleType>> roleExistCache = new HashMap<>();
@@ -351,7 +351,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
 
     @Override
     public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalysisClusterType cluster,
-            ModelService modelService, OperationResult result, Handler handler, Task task) {
+            ModelService modelService, OperationResult result, RoleAnalysisProgressIncrement handler, Task task) {
         Map<String, PrismObject<UserType>> userExistCache = new HashMap<>();
         Map<String, PrismObject<RoleType>> roleExistCache = new HashMap<>();
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareExpandStructure.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareExpandStructure.java
index ca27e5f6929..7c48fdcd9cf 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareExpandStructure.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/utils/chunk/PrepareExpandStructure.java
@@ -15,7 +15,7 @@
 import java.io.Serializable;
 import java.util.*;
 
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 
 import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisOperationMode;
 
@@ -35,7 +35,7 @@
 
 public class PrepareExpandStructure implements MiningStructure, Serializable {
 
-    Handler handler = new Handler("Data Preparation", 3);
+    RoleAnalysisProgressIncrement handler = new RoleAnalysisProgressIncrement("Data Preparation", 3);
 
     public MiningOperationChunk executeOperation(@NotNull RoleAnalysisClusterType cluster, boolean fullProcess,
             RoleAnalysisProcessModeType mode, ModelService modelService, OperationResult result, Task task) {
@@ -73,7 +73,7 @@ private MiningOperationChunk resolveFullStructures(@NotNull RoleAnalysisClusterT
 
     @Override
     public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler handler, Task task) {
+            OperationResult result, RoleAnalysisProgressIncrement handler, Task task) {
 
         Map<String, PrismObject<UserType>> userExistCache = new HashMap<>();
         Map<String, PrismObject<RoleType>> roleExistCache = new HashMap<>();
@@ -149,7 +149,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
     @Override
     public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler handler, Task task) {
+            OperationResult result, RoleAnalysisProgressIncrement handler, Task task) {
 
         Map<String, PrismObject<UserType>> userExistCache = new HashMap<>();
         Map<String, PrismObject<RoleType>> roleExistCache = new HashMap<>();
@@ -230,7 +230,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
 
     @Override
     public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalysisClusterType cluster,
-            ModelService modelService, OperationResult result, Handler handler, Task task) {
+            ModelService modelService, OperationResult result, RoleAnalysisProgressIncrement handler, Task task) {
 
         Map<String, PrismObject<UserType>> userExistCache = new HashMap<>();
         Map<String, PrismObject<RoleType>> roleExistCache = new HashMap<>();
@@ -303,7 +303,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
 
     @Override
     public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalysisClusterType cluster,
-            ModelService modelService, OperationResult result, Handler handler, Task task) {
+            ModelService modelService, OperationResult result, RoleAnalysisProgressIncrement handler, Task task) {
         Map<String, PrismObject<UserType>> userExistCache = new HashMap<>();
         Map<String, PrismObject<RoleType>> roleExistCache = new HashMap<>();
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxCompositedIconSubmitButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxCompositedIconSubmitButton.java
index d7191cbeebf..679e6f17139 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxCompositedIconSubmitButton.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxCompositedIconSubmitButton.java
@@ -68,7 +68,7 @@ protected void onInitialize() {
     public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) {
         StringBuilder sb = new StringBuilder();
 
-        CompositedIcon icon = this.icon;
+        CompositedIcon icon = getIcon();
         if (icon.hasBasicIcon()) {
             String margin = titleAsLabel ? "mr-1" : "";
             sb.append("<i class=\"" + margin + " ").append(icon.getBasicIcon() != null ? icon.getBasicIcon().trim() : "").append("\"");
@@ -113,4 +113,9 @@ public AjaxCompositedIconSubmitButton titleAsLabel(boolean titleAsLabel) {
         this.titleAsLabel = titleAsLabel;
         return this;
     }
+
+    public CompositedIcon getIcon() {
+        return this.icon;
+
+    }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SpecialBoxedTablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleAnalysisTable.html
similarity index 77%
rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SpecialBoxedTablePanel.html
rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleAnalysisTable.html
index 3d4e324e80b..41fa9858048 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SpecialBoxedTablePanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleAnalysisTable.html
@@ -20,13 +20,11 @@
 
 
 <wicket:fragment wicket:id="pagingFooterHeader">
-    <div class="d-flex  flex-wrap gap-2">
-        <div class="d-flex" wicket:id="buttonToolbar"/>
-
 
-        <div class="d-flex row flex-wrap gap-2" wicket:id="footerContainer">
+        <div class="d-flex justify-content-between align-items-center flex-wrap gap-2" wicket:id="footerContainer">
 
             <div class="d-flex">
+
                 <form class="mr-3" wicket:id="form_bs_process">
                     <div
                             wicket:id="process_selections_id" style="width: 150px"></div>
@@ -38,30 +36,33 @@
 
             </div>
 
-            <div class="d-flex">
+            <div class="d-flex align-items-center flex-wrap gap-2">
 
-                <div class="mr-3">
+                <div class="text-nowrap mr-2">
                     <span class="align-middle" wicket:id="label_dropdown"/>
                 </div>
                 <form class="mr-3" wicket:id="form">
-                    <select class="btn btn-default dropdown-toggle btn-sm mr-3" wicket:id="colCountOnPage" style="width: 100px"></select>
+                    <select class="form-control form-control-sm" wicket:id="colCountOnPage"></select>
                 </form>
 
                 <div class="mr-3">
                     <span class="align-middle" wicket:id="count"/>
                 </div>
 
-                <form class="mr-3" wicket:id="form_current_page">
-                    <select class="btn btn-default dropdown-toggle btn-sm mr-3" wicket:id="pageSize" style="width: 200px"></select>
-                </form>
+                <div wicket:id="paging"/>
+
             </div>
-        </div>
+
+
     </div>
+
 </wicket:fragment>
 
 <wicket:fragment wicket:id="pagingFooter">
     <div class="d-flex justify-content-between align-items-center flex-wrap gap-2">
+        <div class="d-flex">
         <div class="d-flex" wicket:id="buttonToolbar"/>
+        </div>
         <div class="d-flex align-items-center flex-wrap gap-2" wicket:id="footerContainer">
             <form class="mr-3" wicket:id="form">
                 <div wicket:id="pageSize"/>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SpecialBoxedTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleAnalysisTable.java
similarity index 66%
rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SpecialBoxedTablePanel.java
rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleAnalysisTable.java
index 524fb5ac23d..382e31f2ec8 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SpecialBoxedTablePanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleAnalysisTable.java
@@ -7,17 +7,13 @@
 
 package com.evolveum.midpoint.web.component.data;
 
+import static com.evolveum.midpoint.gui.impl.page.admin.role.mining.utils.table.Tools.getScaleScript;
+
 import java.io.Serial;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 
-import com.evolveum.midpoint.gui.api.GuiStyleConstants;
-import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
-import com.evolveum.midpoint.gui.impl.component.icon.LayeredIconCssStyle;
-import com.evolveum.midpoint.web.component.AjaxCompositedIconSubmitButton;
-
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -38,118 +34,80 @@
 import org.apache.wicket.model.Model;
 
 import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisSortMode;
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.component.BasePanel;
+import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.component.data.provider.SelectableBeanContainerDataProvider;
+import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
+import com.evolveum.midpoint.gui.impl.component.icon.LayeredIconCssStyle;
 import com.evolveum.midpoint.gui.impl.page.admin.role.PageRole;
 import com.evolveum.midpoint.gui.impl.page.admin.role.mining.model.BusinessRoleApplicationDto;
 import com.evolveum.midpoint.prism.query.ObjectPaging;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.web.component.AjaxButton;
+import com.evolveum.midpoint.web.component.AjaxCompositedIconSubmitButton;
 import com.evolveum.midpoint.web.component.data.paging.NavigatorPanel;
 import com.evolveum.midpoint.web.component.form.MidpointForm;
+import com.evolveum.midpoint.web.component.util.RoleAnalysisTablePageable;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.security.MidPointAuthWebSession;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 
-public class SpecialBoxedTablePanel<T> extends BasePanel<T> implements Table {
+public class RoleAnalysisTable<T> extends BasePanel<T> implements Table {
 
     @Serial private static final long serialVersionUID = 1L;
 
     private static final String ID_HEADER_FOOTER = "headerFooter";
     private static final String ID_HEADER_PAGING = "pagingFooterHeader";
-
     private static final String ID_HEADER = "header";
     private static final String ID_FOOTER = "footer";
     private static final String ID_TABLE = "table";
     private static final String ID_TABLE_CONTAINER = "tableContainer";
 
     private static final String ID_PAGING_FOOTER = "pagingFooter";
-
     private static final String ID_PAGING = "paging";
     private static final String ID_COUNT = "count";
     private static final String ID_PAGE_SIZE = "pageSize";
     private static final String ID_FOOTER_CONTAINER = "footerContainer";
     private static final String ID_BUTTON_TOOLBAR = "buttonToolbar";
     private static final String ID_FORM = "form";
-
-    private boolean showAsCard = true;
-    private UserProfileStorage.TableId tableId;
-    private boolean showPaging;
+    private final boolean showAsCard = true;
+    private final UserProfileStorage.TableId tableId;
     private String additionalBoxCssClasses = null;
-    private boolean isRefreshEnabled;
+    int columnCount;
     static boolean isRoleMining = false;
-    private List<IColumn<T, String>> columns;
-
     RoleAnalysisSortMode roleAnalysisSortModeMode;
 
-    //interval in seconds
-    private static final int DEFAULT_REFRESH_INTERVAL = 60;
-
-    public SpecialBoxedTablePanel(String id, ISortableDataProvider provider, List<IColumn<T, String>> columns) {
-        this(id, provider, columns, null);
-    }
-
-    public SpecialBoxedTablePanel(String id, ISortableDataProvider provider, List<IColumn<T, String>> columns,
-            UserProfileStorage.TableId tableId) {
-        this(id, provider, columns, tableId, false, false, 0, RoleAnalysisSortMode.NONE);
-    }
 
-    public SpecialBoxedTablePanel(String id, ISortableDataProvider provider, List<IColumn<T, String>> columns,
-            UserProfileStorage.TableId tableId, boolean isRoleMining) {
-        this(id, provider, columns, tableId, false, isRoleMining, 0, RoleAnalysisSortMode.NONE);
-    }
-
-    int columnCount;
-
-    public SpecialBoxedTablePanel(String id, ISortableDataProvider provider, List<IColumn<T, String>> columns,
-            UserProfileStorage.TableId tableId, boolean isRefreshEnabled, boolean isRoleMining, int columnCount, RoleAnalysisSortMode roleAnalysisSortModeMode) {
+    public RoleAnalysisTable(String id, ISortableDataProvider<T,?> provider, List<IColumn<T, String>> columns,
+            UserProfileStorage.TableId tableId, boolean isRoleMining, int columnCount, RoleAnalysisSortMode roleAnalysisSortModeMode) {
         super(id);
         this.tableId = tableId;
-        this.isRefreshEnabled = isRefreshEnabled;
-        SpecialBoxedTablePanel.isRoleMining = isRoleMining;
+        RoleAnalysisTable.isRoleMining = isRoleMining;
         this.columnCount = columnCount;
         this.roleAnalysisSortModeMode = roleAnalysisSortModeMode;
         initLayout(columns, provider, columnCount);
     }
-
-    public void goToLastPage() {
-        long size = getDataTable().getDataProvider().size();
-        int itemsPerPage = getItemsPerPage();
-
-        long page = size / itemsPerPage;
-        if (size % itemsPerPage != 0) {
-            page++;
-        }
-
-        setCurrentPage(page);
-    }
-
-    public void setShowAsCard(boolean showAsCard) {
-        this.showAsCard = showAsCard;
-    }
-
     @Override
     public void renderHead(IHeaderResponse response) {
         response.render(OnDomReadyHeaderItem.forScript("MidPointTheme.initResponsiveTable();"));
     }
 
-    private void initLayout(List<IColumn<T, String>> columns, ISortableDataProvider provider, int colSize) {
+    private void initLayout(List<IColumn<T, String>> columns, ISortableDataProvider<T,?> provider, int colSize) {
         setOutputMarkupId(true);
         add(AttributeAppender.prepend("class", () -> showAsCard ? "card" : ""));
-        add(AttributeAppender.append("class", () -> getAdditionalBoxCssClasses()));
+        add(AttributeAppender.append("class", this::getAdditionalBoxCssClasses));
 
         WebMarkupContainer tableContainer = new WebMarkupContainer(ID_TABLE_CONTAINER);
         tableContainer.setOutputMarkupId(true);
 
         int pageSize = getItemsPerPage(tableId);
-        DataTable<T, String> table = new SelectableDataTable<T>(ID_TABLE, columns, provider, pageSize) {
-            private static final long serialVersionUID = 1L;
+        DataTable<T, String> table = new SelectableDataTable<>(ID_TABLE, columns, provider, pageSize) {
+            @Serial private static final long serialVersionUID = 1L;
 
             @Override
             protected Item<T> newRowItem(String id, int index, IModel<T> rowModel) {
                 Item<T> item = super.newRowItem(id, index, rowModel);
-                return customizeNewRowItem(item, rowModel);
+                return customizeNewRowItem(item);
             }
         };
         table.setOutputMarkupId(true);
@@ -157,7 +115,7 @@ protected Item<T> newRowItem(String id, int index, IModel<T> rowModel) {
         add(tableContainer);
 
         if (!isRoleMining) {
-            TableHeadersToolbar headersTop = new TableHeadersToolbar(table, provider) {
+            TableHeadersToolbar<?> headersTop = new TableHeadersToolbar<>(table, provider) {
 
                 @Override
                 protected void refreshTable(AjaxRequestTarget target) {
@@ -169,7 +127,7 @@ protected void refreshTable(AjaxRequestTarget target) {
             headersTop.setOutputMarkupId(true);
             table.addTopToolbar(headersTop);
         } else {
-            RoleMiningTableHeadersToolbar headersTop = new RoleMiningTableHeadersToolbar(table, provider) {
+            RoleAnalysisTableHeadersToolbar<?> headersTop = new RoleAnalysisTableHeadersToolbar<>(table, provider) {
 
                 @Override
                 protected void refreshTable(AjaxRequestTarget target) {
@@ -183,31 +141,15 @@ protected void refreshTable(AjaxRequestTarget target) {
 
         }
         add(createHeader(ID_HEADER));
-        WebMarkupContainer footer = createFooter(ID_FOOTER);
+        WebMarkupContainer footer = createFooter();
         footer.add(new VisibleBehaviour(() -> !hideFooterIfSinglePage() || provider.size() > pageSize));
 
-        WebMarkupContainer footer2 = createHeaderPaging(ID_HEADER_FOOTER);
+        WebMarkupContainer footer2 = createHeaderPaging();
         footer2.add(new VisibleBehaviour(() -> !hideFooterIfSinglePage() || colSize > pageSize));
         add(footer2);
         add(footer);
     }
 
-    private int computeRefreshInterval() {
-        int refreshInterval = getAutoRefreshInterval();
-        if (refreshInterval != 0) {
-            return refreshInterval;
-        }
-        return DEFAULT_REFRESH_INTERVAL;
-    }
-
-    public int getAutoRefreshInterval() {
-        return 0;
-    }
-
-    public boolean isAutoRefreshEnabled() {
-        return false;
-    }
-
     public String getAdditionalBoxCssClasses() {
         return additionalBoxCssClasses;
     }
@@ -216,8 +158,7 @@ public void setAdditionalBoxCssClasses(String boxCssClasses) {
         this.additionalBoxCssClasses = boxCssClasses;
     }
 
-    // TODO better name?
-    protected Item<T> customizeNewRowItem(Item<T> item, IModel<T> model) {
+    protected Item<T> customizeNewRowItem(Item<T> item) {
         return item;
     }
 
@@ -226,12 +167,8 @@ protected boolean hideFooterIfSinglePage() {
     }
 
     @Override
-    public DataTable getDataTable() {
-        return (DataTable) get(ID_TABLE_CONTAINER).get(ID_TABLE);
-    }
-
-    public WebMarkupContainer getDataTableContainer() {
-        return (WebMarkupContainer) get(ID_TABLE_CONTAINER);
+    public DataTable<?,?> getDataTable() {
+        return (DataTable<?,?>) get(ID_TABLE_CONTAINER).get(ID_TABLE);
     }
 
     @Override
@@ -265,9 +202,6 @@ private int getItemsPerPage(UserProfileStorage.TableId tableId) {
 
     @Override
     public void setShowPaging(boolean show) {
-        // todo make use of this [lazyman]
-        this.showPaging = show;
-
         if (!show) {
             setItemsPerPage(Integer.MAX_VALUE);
         } else {
@@ -292,32 +226,32 @@ protected Component createHeader(String headerId) {
         return header;
     }
 
-    protected WebMarkupContainer createFooter(String footerId) {
-        return new PagingFooter(footerId, ID_PAGING_FOOTER, this, this) {
+    protected WebMarkupContainer createFooter() {
+        return new PagingFooter(RoleAnalysisTable.ID_FOOTER, ID_PAGING_FOOTER, this, this) {
 
             @Override
             protected String getPaginationCssClass() {
-                return SpecialBoxedTablePanel.this.getPaginationCssClass();
+                return RoleAnalysisTable.this.getPaginationCssClass();
             }
 
             @Override
             protected boolean isPagingVisible() {
-                return SpecialBoxedTablePanel.this.isPagingVisible();
+                return RoleAnalysisTable.this.isPagingVisible();
             }
         };
     }
 
-    protected WebMarkupContainer createHeaderPaging(String footerId) {
-        return new PagingFooterColumn(footerId, ID_HEADER_PAGING, this, this) {
+    protected WebMarkupContainer createHeaderPaging() {
+        return new PagingFooterColumn(RoleAnalysisTable.ID_HEADER_FOOTER, ID_HEADER_PAGING, this) {
 
             @Override
             protected String getPaginationCssClass() {
-                return SpecialBoxedTablePanel.this.getPaginationCssClass();
+                return RoleAnalysisTable.this.getPaginationCssClass();
             }
 
             @Override
             protected boolean isPagingVisible() {
-                return SpecialBoxedTablePanel.this.isPagingVisible();
+                return RoleAnalysisTable.this.isPagingVisible();
             }
         };
     }
@@ -330,22 +264,6 @@ protected String getPaginationCssClass() {
         return "pagination-sm";
     }
 
-    public Component getFooterButtonToolbar() {
-        return ((PagingFooter) getFooter()).getFooterButtonToolbar();
-    }
-
-    public Component getFooterMenu() {
-        return ((PagingFooter) getFooter()).getFooterMenu();
-    }
-
-    public Component getFooterCountLabel() {
-        return ((PagingFooter) getFooter()).getFooterCountLabel();
-    }
-
-    public Component getFooterPaging() {
-        return ((PagingFooter) getFooter()).getFooterPaging();
-    }
-
     @Override
     public void setCurrentPage(ObjectPaging paging) {
         WebComponentUtil.setCurrentPage(this, paging);
@@ -362,21 +280,21 @@ protected WebMarkupContainer createButtonToolbar(String id) {
 
     private static class PagingFooter extends Fragment {
 
-        public PagingFooter(String id, String markupId, SpecialBoxedTablePanel markupProvider, Table table) {
+        public PagingFooter(String id, String markupId, RoleAnalysisTable markupProvider, Table table) {
             super(id, markupId, markupProvider);
             setOutputMarkupId(true);
 
             initLayout(markupProvider, table);
         }
 
-        private void initLayout(final SpecialBoxedTablePanel boxedTablePanel, final Table table) {
+        private void initLayout(final RoleAnalysisTable<?> boxedTablePanel, final Table table) {
             WebMarkupContainer buttonToolbar = boxedTablePanel.createButtonToolbar(ID_BUTTON_TOOLBAR);
             add(buttonToolbar);
 
-            final DataTable dataTable = table.getDataTable();
+            final DataTable<?,?> dataTable = table.getDataTable();
             WebMarkupContainer footerContainer = new WebMarkupContainer(ID_FOOTER_CONTAINER);
             footerContainer.setOutputMarkupId(true);
-            footerContainer.add(new VisibleBehaviour(() -> isPagingVisible()));
+            footerContainer.add(new VisibleBehaviour(this::isPagingVisible));
 
             final Label count = new Label(ID_COUNT, () -> CountToolbar.createCountString(dataTable));
             count.setOutputMarkupId(true);
@@ -387,24 +305,26 @@ private void initLayout(final SpecialBoxedTablePanel boxedTablePanel, final Tabl
                 @Override
                 protected void onPageChanged(AjaxRequestTarget target, long page) {
                     target.add(count);
+                    target.appendJavaScript(getScaleScript());
+
                 }
 
                 @Override
                 protected boolean isCountingDisabled() {
                     if (dataTable.getDataProvider() instanceof SelectableBeanContainerDataProvider) {
-                        return !((SelectableBeanContainerDataProvider) dataTable.getDataProvider()).isUseObjectCounting();
+                        return !((SelectableBeanContainerDataProvider<?>) dataTable.getDataProvider()).isUseObjectCounting();
                     }
                     return super.isCountingDisabled();
                 }
 
                 @Override
                 protected String getPaginationCssClass() {
-                    return SpecialBoxedTablePanel.PagingFooter.this.getPaginationCssClass();
+                    return RoleAnalysisTable.PagingFooter.this.getPaginationCssClass();
                 }
             };
             footerContainer.add(nb2);
 
-            Form form = new MidpointForm(ID_FORM);
+            Form<?> form = new MidpointForm<>(ID_FORM);
             footerContainer.add(form);
             PagingSizePanel menu = new PagingSizePanel(ID_PAGE_SIZE) {
 
@@ -423,11 +343,12 @@ protected void onPageSizeChangePerformed(AjaxRequestTarget target) {
                     UserProfileStorage.TableId tableId = table.getTableId();
 
                     if (tableId != null && table.enableSavePageSize()) {
-                        Integer pageSize = (int) getPageBase().getItemsPerPage(tableId);
+                        int pageSize = (int) getPageBase().getItemsPerPage(tableId);
 
                         table.setItemsPerPage(pageSize);
                     }
-                    target.add(findParent(SpecialBoxedTablePanel.PagingFooter.class));
+                    target.appendJavaScript(getScaleScript());
+                    target.add(findParent(RoleAnalysisTable.PagingFooter.class));
                     target.add((Component) table);
                 }
             };
@@ -437,22 +358,6 @@ protected void onPageSizeChangePerformed(AjaxRequestTarget target) {
             add(footerContainer);
         }
 
-        public Component getFooterButtonToolbar() {
-            return get(ID_BUTTON_TOOLBAR);
-        }
-
-        public Component getFooterMenu() {
-            return get(ID_FOOTER_CONTAINER).get(ID_PAGE_SIZE);
-        }
-
-        public Component getFooterCountLabel() {
-            return get(ID_FOOTER_CONTAINER).get(ID_COUNT);
-        }
-
-        public Component getFooterPaging() {
-            return get(ID_FOOTER_CONTAINER).get(ID_PAGING);
-        }
-
         protected String getPaginationCssClass() {
             return "pagination-sm";
         }
@@ -464,22 +369,24 @@ protected boolean isPagingVisible() {
 
     private class PagingFooterColumn extends Fragment {
 
-        public PagingFooterColumn(String id, String markupId, SpecialBoxedTablePanel markupProvider, Table table) {
+        public PagingFooterColumn(String id, String markupId, RoleAnalysisTable markupProvider) {
             super(id, markupId, markupProvider);
             setOutputMarkupId(true);
 
-            initLayout(markupProvider, table);
+            initLayout(markupProvider);
         }
 
         int pagingSize = getColumnPageCount();
+        long pages = 0;
+
+        private void initLayout(final RoleAnalysisTable<?> boxedTablePanel) {
 
-        private void initLayout(final SpecialBoxedTablePanel boxedTablePanel, final Table table) {
             WebMarkupContainer buttonToolbar = boxedTablePanel.createButtonToolbar(ID_BUTTON_TOOLBAR);
             add(buttonToolbar);
 
             WebMarkupContainer footerContainer = new WebMarkupContainer(ID_FOOTER_CONTAINER);
             footerContainer.setOutputMarkupId(true);
-            footerContainer.add(new VisibleBehaviour(() -> isPagingVisible()));
+            footerContainer.add(new VisibleBehaviour(this::isPagingVisible));
 
             Form<?> form = new MidpointForm<>(ID_FORM);
             footerContainer.add(form);
@@ -487,7 +394,7 @@ private void initLayout(final SpecialBoxedTablePanel boxedTablePanel, final Tabl
             Form<?> formBsProcess = new MidpointForm<>("form_bs_process");
             footerContainer.add(formBsProcess);
 
-            CompositedIconBuilder iconBuilder = new CompositedIconBuilder().setBasicIcon(GuiStyleConstants.CLASS_OBJECT_TASK_ICON,
+            CompositedIconBuilder iconBuilder = new CompositedIconBuilder().setBasicIcon(GuiStyleConstants.CLASS_PLUS_CIRCLE,
                     LayeredIconCssStyle.IN_ROW_STYLE);
             AjaxCompositedIconSubmitButton migrationButton = new AjaxCompositedIconSubmitButton("process_selections_id",
                     iconBuilder.build(),
@@ -512,7 +419,7 @@ protected void onError(AjaxRequestTarget target) {
             };
             migrationButton.titleAsLabel(true);
             migrationButton.setOutputMarkupId(true);
-            migrationButton.add(AttributeAppender.append("class", "btn btn-primary btn-sm"));
+            migrationButton.add(AttributeAppender.append("class", "btn btn-success btn-sm"));
 
             formBsProcess.add(migrationButton);
 
@@ -521,32 +428,35 @@ protected void onError(AjaxRequestTarget target) {
 
             ChoiceRenderer<RoleAnalysisSortMode> renderer = new ChoiceRenderer<>("displayString");
 
-            DropDownChoice<RoleAnalysisSortMode> modeSelector = new DropDownChoice<>(
+            DropDownChoice<RoleAnalysisSortMode> sortModeSelector = new DropDownChoice<>(
                     "modeSelector", Model.of(roleAnalysisSortModeMode),
                     new ArrayList<>(EnumSet.allOf(RoleAnalysisSortMode.class)), renderer);
-            modeSelector.add(new AjaxFormComponentUpdatingBehavior("change") {
+            sortModeSelector.add(new AjaxFormComponentUpdatingBehavior("change") {
                 @Override
                 protected void onUpdate(AjaxRequestTarget target) {
-                    onChangeSortMode(modeSelector.getModelObject(), target);
+                    onChangeSortMode(sortModeSelector.getModelObject(), target);
                 }
             });
-
-            modeSelector.setOutputMarkupId(true);
-            formSortMode.add(modeSelector);
+            sortModeSelector.setOutputMarkupId(true);
+            formSortMode.add(sortModeSelector);
 
             Form<?> formCurrentPage = new MidpointForm<>("form_current_page");
             footerContainer.add(formCurrentPage);
             List<Integer> integers = List.of(new Integer[] { 100, 200, 400 });
-            DropDownChoice<Integer> colCountOnPage = new DropDownChoice<>("colCountOnPage",
+            DropDownChoice<Integer> colPerPage = new DropDownChoice<>("colCountOnPage",
                     new Model<>(getColumnPageCount()), integers);
-            colCountOnPage.add(new AjaxFormComponentUpdatingBehavior("change") {
+            colPerPage.add(new AjaxFormComponentUpdatingBehavior("change") {
                 @Override
                 protected void onUpdate(AjaxRequestTarget target) {
-                    onChangeSize(colCountOnPage.getModelObject(), target);
+                    onChangeSize(colPerPage.getModelObject(), target);
                 }
             });
-            colCountOnPage.setOutputMarkupId(true);
-            form.add(colCountOnPage);
+            colPerPage.setOutputMarkupId(true);
+            form.add(colPerPage);
+
+            Label colPerPageLabel = new Label("label_dropdown", Model.of("Cols per page"));
+            colPerPageLabel.setOutputMarkupId(true);
+            footerContainer.add(colPerPageLabel);
 
             int from = 1;
             int to = getColumnPageCount();
@@ -555,7 +465,6 @@ protected void onUpdate(AjaxRequestTarget target) {
             List<String> navigation = new ArrayList<>();
 
             if (columnCount <= to) {
-                to = columnCount;
                 navigation.add(from + separator + columnCount);
             } else {
                 while (columnCount > to) {
@@ -576,36 +485,37 @@ protected void onUpdate(AjaxRequestTarget target) {
             count.setOutputMarkupId(true);
             footerContainer.add(count);
 
-            Label label = new Label("label_dropdown", Model.of("Cols per page"));
-            label.setOutputMarkupId(true);
-            footerContainer.add(label);
-            DropDownChoice<String> menu = new DropDownChoice<>(ID_PAGE_SIZE, new Model<>(getColumnPagingTitle()), navigation);
-            menu.add(new AjaxFormComponentUpdatingBehavior("change") {
+            RoleAnalysisTablePageable<?> roleAnalysisTablePageable = new RoleAnalysisTablePageable<>(navigation.size(),
+                    getCurrentPage());
+
+            NavigatorPanel colNavigator = new NavigatorPanel(ID_PAGING, roleAnalysisTablePageable, true) {
+
                 @Override
-                protected void onUpdate(AjaxRequestTarget target) {
-                    onChange(menu.getModelObject(), target);
+                protected boolean isComponent() {
+                    return false;
                 }
-            });
-            menu.setOutputMarkupId(true);
-            formCurrentPage.add(menu);
-
-            add(footerContainer);
-        }
 
-        public Component getFooterButtonToolbar() {
-            return get(ID_BUTTON_TOOLBAR);
-        }
+                @Override
+                protected void onPageChanged(AjaxRequestTarget target, long page) {
+                    pages = page;
+                    String newPageRange = navigation.get((int) page);
+                    target.add(this);
+                    onChange(newPageRange, target, (int) page);
+                }
 
-        public Component getFooterMenu() {
-            return get(ID_FOOTER_CONTAINER).get(ID_PAGE_SIZE);
-        }
+                @Override
+                protected boolean isCountingDisabled() {
+                    return super.isCountingDisabled();
+                }
 
-        public Component getFooterCountLabel() {
-            return get(ID_FOOTER_CONTAINER).get(ID_COUNT);
-        }
+                @Override
+                protected String getPaginationCssClass() {
+                    return RoleAnalysisTable.PagingFooterColumn.this.getPaginationCssClass();
+                }
+            };
+            footerContainer.add(colNavigator);
 
-        public Component getFooterPaging() {
-            return get(ID_FOOTER_CONTAINER).get(ID_PAGING);
+            add(footerContainer);
         }
 
         protected String getPaginationCssClass() {
@@ -617,28 +527,32 @@ protected boolean isPagingVisible() {
         }
     }
 
-    public void onChange(String value, AjaxRequestTarget target) {
+    public void onChange(String value, AjaxRequestTarget target, int currentPage) {
     }
 
     public void onChangeSortMode(RoleAnalysisSortMode roleAnalysisSortModeMode, AjaxRequestTarget target) {
     }
 
-    public BusinessRoleApplicationDto getOperationData() {
+    protected BusinessRoleApplicationDto getOperationData() {
         return null;
     }
 
-    public int onChangeSize(int value, AjaxRequestTarget target) {
-        return value;
+    protected void onChangeSize(int value, AjaxRequestTarget target) {
     }
 
-    public String getColumnPagingTitle() {
+    protected String getColumnPagingTitle() {
         if (columnCount < getColumnPageCount()) {
             return "0 - " + columnCount;
         }
         return "0 - " + getColumnPageCount();
     }
 
-    public int getColumnPageCount() {
+    protected int getCurrentPage() {
+        return 0;
+    }
+
+    protected int getColumnPageCount() {
         return 100;
     }
+
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleMiningTableHeadersToolbar.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleAnalysisTableHeadersToolbar.html
similarity index 100%
rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleMiningTableHeadersToolbar.html
rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleAnalysisTableHeadersToolbar.html
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleMiningTableHeadersToolbar.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleAnalysisTableHeadersToolbar.java
similarity index 93%
rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleMiningTableHeadersToolbar.java
rename to gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleAnalysisTableHeadersToolbar.java
index bf3493640ce..6790c8a3d09 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleMiningTableHeadersToolbar.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RoleAnalysisTableHeadersToolbar.java
@@ -21,9 +21,9 @@
 import org.apache.wicket.markup.repeater.data.IDataProvider;
 import org.apache.wicket.util.string.Strings;
 
-public class RoleMiningTableHeadersToolbar<T> extends AjaxFallbackHeadersToolbar<String> {
+public class RoleAnalysisTableHeadersToolbar<T> extends AjaxFallbackHeadersToolbar<String> {
 
-    public RoleMiningTableHeadersToolbar(DataTable<T, String> table, ISortStateLocator stateLocator) {
+    public RoleAnalysisTableHeadersToolbar(DataTable<T, String> table, ISortStateLocator stateLocator) {
         super(table, stateLocator);
     }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
index aa98f7c42eb..ff5a46834ef 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
@@ -248,16 +248,22 @@ private void nextPerformed(AjaxRequestTarget target) {
     private void changeCurrentPage(AjaxRequestTarget target, long page) {
         pageable.setCurrentPage(page);
 
-        Component container = ((Component) pageable);
-        while (container instanceof AbstractRepeater) {
-            container = container.getParent();
+        if (isComponent()) {
+            Component container = ((Component) pageable);
+            while (container instanceof AbstractRepeater) {
+                container = container.getParent();
+            }
+            target.add(container);
         }
-        target.add(container);
         target.add(this);
 
         onPageChanged(target, page);
     }
 
+    protected boolean isComponent() {
+        return true;
+    }
+
     private void pageLinkPerformed(AjaxRequestTarget target, long page) {
         changeCurrentPage(target, page);
     }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/RoleAnalysisTablePageable.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/RoleAnalysisTablePageable.java
new file mode 100644
index 00000000000..9ab7639a17e
--- /dev/null
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/RoleAnalysisTablePageable.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2010-2023 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+package com.evolveum.midpoint.web.component.util;
+
+import org.apache.wicket.markup.html.navigation.paging.IPageable;
+
+import java.io.Serializable;
+
+public class RoleAnalysisTablePageable<T extends Serializable> extends SelectableBeanImpl<T> implements IPageable {
+
+    int pageCount;
+    long currentPage;
+
+    public RoleAnalysisTablePageable(int pageCount, int currentPage) {
+        this.pageCount = pageCount;
+        this.currentPage = currentPage;
+    }
+
+    @Override
+    public long getCurrentPage() {
+        return currentPage;
+    }
+
+    @Override
+    public void setCurrentPage(long page) {
+        this.currentPage = page;
+    }
+
+    @Override
+    public long getPageCount() {
+        return pageCount;
+    }
+}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/RoleMiningProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/RoleMiningProvider.java
index b291cf85fe6..171847ea164 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/RoleMiningProvider.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/RoleMiningProvider.java
@@ -11,8 +11,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import com.evolveum.midpoint.gui.impl.component.data.provider.BaseSortableDataProvider;
-
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.Validate;
@@ -21,36 +19,15 @@
 import org.apache.wicket.model.IModel;
 
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.gui.impl.component.data.provider.BaseSortableDataProvider;
 import com.evolveum.midpoint.util.exception.SystemException;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
 public class RoleMiningProvider<T extends Serializable> extends BaseSortableDataProvider<T> {
 
     private final IModel<List<T>> model;
     private final boolean sortable;
-
-    public static final String F_NAME_ROLE = "roleObject";
-    public static final String F_NAME_USER = "userObject";
-    public static final String F_NAME_USER_TYPE = "userObjectType";
-    public static final String F_NAME_ROLE_TYPE = "roleObjectType";
-
-    public static final String F_RATION = "groupOverlapRation";
-
-    public static final String F_GROUP = "groupIdentifier";
-
-    public static final String F_USER_SIZE = "users";
-
-    public static final String F_ID = "id";
-
-
     public static final String F_METRIC = "metric";
 
-    public static final String F_TYPE = "type";
-
-
-
     public RoleMiningProvider(Component component, IModel<List<T>> model, boolean sortable) {
         super(component);
         Validate.notNull(model);
@@ -88,100 +65,15 @@ public Iterator<? extends T> internalIterator(long first, long count) {
     protected <V extends Comparable<V>> void sort(List<T> list) {
         SortParam<String> sortParam = getSort();
         String propertyName = sortParam.getProperty();
-        if (F_NAME_USER.equals(propertyName)) {
-            list.sort((o1, o2) -> {
-
-                String prop3, prop4;
-                try {
-                    PrismObject<UserType> object1 = (PrismObject<UserType>) PropertyUtils.getProperty(o1, propertyName);
-                    prop3 = String.valueOf(object1.getName());
-                    PrismObject<UserType> object2 = (PrismObject<UserType>) PropertyUtils.getProperty(o2, propertyName);
-                    prop4 = String.valueOf(object2.getName());
-
-                } catch (RuntimeException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-                    throw new SystemException("Couldn't sort the object list: " + e.getMessage(), e);
-                }
-                int comparison = ObjectUtils.compare(prop3, prop4, true);
-                return sortParam.isAscending() ? comparison : -comparison;
-
-            });
-        } else if (F_ID.equals(propertyName) || F_TYPE.equals(propertyName)) {
-            list.sort((o1, o2) -> {
-
-                String prop3, prop4;
-                try {
-
-                    prop3 = String.valueOf(PropertyUtils.getProperty(o1, propertyName));
-                    prop4 = String.valueOf(PropertyUtils.getProperty(o2, propertyName));
-
-                } catch (RuntimeException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-                    throw new SystemException("Couldn't sort the object list: " + e.getMessage(), e);
-                }
-                int comparison = ObjectUtils.compare(prop3, prop4, true);
-                return sortParam.isAscending() ? comparison : -comparison;
-
-            });
-        } else if (F_GROUP.equals(propertyName) || F_RATION.equals(propertyName) || F_USER_SIZE.equals(propertyName) ||F_METRIC.equals(propertyName)) {
+        if (F_METRIC.equals(propertyName)) {
             list.sort((o1, o2) -> {
 
                 double prop3, prop4;
                 try {
-                    if (F_USER_SIZE.equals(propertyName)) {
-                        List<PrismObject<UserType>> object1 = (List<PrismObject<UserType>>) PropertyUtils.getProperty(o1, propertyName);
-                        List<PrismObject<UserType>> object2 = (List<PrismObject<UserType>>) PropertyUtils.getProperty(o2, propertyName);
-                        prop3 = Double.parseDouble(String.valueOf(object1.size()));
-                        prop4 = Double.parseDouble(String.valueOf(object2.size()));
-                    } else {
-                        prop3 = Double.parseDouble(String.valueOf(PropertyUtils.getProperty(o1, propertyName)));
-                        prop4 = Double.parseDouble(String.valueOf(PropertyUtils.getProperty(o2, propertyName)));
-                    }
-                } catch (RuntimeException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-                    throw new SystemException("Couldn't sort the object list: " + e.getMessage(), e);
-                }
-                int comparison = ObjectUtils.compare(prop3, prop4, true);
-                return sortParam.isAscending() ? comparison : -comparison;
 
-            });
-        } else if (F_NAME_USER_TYPE.equals(propertyName)) {
-            list.sort((o1, o2) -> {
+                    prop3 = Double.parseDouble(String.valueOf(PropertyUtils.getProperty(o1, propertyName)));
+                    prop4 = Double.parseDouble(String.valueOf(PropertyUtils.getProperty(o2, propertyName)));
 
-                String prop3, prop4;
-                try {
-                    UserType object1 = (UserType) PropertyUtils.getProperty(o1, propertyName);
-                    prop3 = String.valueOf(object1.getName());
-                    UserType object2 = (UserType) PropertyUtils.getProperty(o2, propertyName);
-                    prop4 = String.valueOf(object2.getName());
-                } catch (RuntimeException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-                    throw new SystemException("Couldn't sort the object list: " + e.getMessage(), e);
-                }
-                int comparison = ObjectUtils.compare(prop3, prop4, true);
-                return sortParam.isAscending() ? comparison : -comparison;
-
-            });
-        } else if (F_NAME_ROLE.equals(propertyName)) {
-            list.sort((o1, o2) -> {
-                String prop3, prop4;
-                try {
-                    PrismObject<RoleType> object1 = (PrismObject<RoleType>) PropertyUtils.getProperty(o1, propertyName);
-                    prop3 = String.valueOf(object1.getName());
-                    PrismObject<RoleType> object2 = (PrismObject<RoleType>) PropertyUtils.getProperty(o2, propertyName);
-                    prop4 = String.valueOf(object2.getName());
-                } catch (RuntimeException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-                    throw new SystemException("Couldn't sort the object list: " + e.getMessage(), e);
-                }
-                int comparison = ObjectUtils.compare(prop3, prop4, true);
-                return sortParam.isAscending() ? comparison : -comparison;
-
-            });
-        } else if (F_NAME_ROLE_TYPE.equals(propertyName)) {
-            list.sort((o1, o2) -> {
-
-                String prop3, prop4;
-                try {
-                    RoleType object1 = (RoleType) PropertyUtils.getProperty(o1, propertyName);
-                    prop3 = String.valueOf(object1.getName());
-                    RoleType object2 = (RoleType) PropertyUtils.getProperty(o2, propertyName);
-                    prop4 = String.valueOf(object2.getName());
                 } catch (RuntimeException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
                     throw new SystemException("Couldn't sort the object list: " + e.getMessage(), e);
                 }
diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/Handler.java b/infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/RoleAnalysisProgressIncrement.java
similarity index 92%
rename from infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/Handler.java
rename to infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/RoleAnalysisProgressIncrement.java
index 93d23dc8bd6..96a027a770e 100644
--- a/infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/Handler.java
+++ b/infra/common/src/main/java/com/evolveum/midpoint/common/mining/objects/handler/RoleAnalysisProgressIncrement.java
@@ -17,12 +17,10 @@
 
 /**
  * Keeps the state of the role-mining activity (clustering, pattern detection, etc).
- *
- * TODO rename
  */
-public class Handler implements Serializable {
+public class RoleAnalysisProgressIncrement implements Serializable {
 
-    private static final Trace LOGGER = TraceManager.getTrace(Handler.class);
+    private static final Trace LOGGER = TraceManager.getTrace(RoleAnalysisProgressIncrement.class);
 
     private String title;
     private String subTitle;
@@ -58,11 +56,11 @@ public String getDuration() {
                 .toLowerCase();
     }
 
-    public Handler(String title, int stepsCount) {
+    public RoleAnalysisProgressIncrement(String title, int stepsCount) {
         this(title, stepsCount, null);
     }
 
-    public Handler(String title, int stepsCount, @Nullable Runnable progressIncrementer) {
+    public RoleAnalysisProgressIncrement(String title, int stepsCount, @Nullable Runnable progressIncrementer) {
         this.startTime = System.currentTimeMillis();
         this.endTime = System.currentTimeMillis();
         this.title = title;
diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/mining/utils/ExtractPatternUtils.java b/infra/common/src/main/java/com/evolveum/midpoint/common/mining/utils/ExtractPatternUtils.java
index d6390ea04e3..1d6202de19d 100644
--- a/infra/common/src/main/java/com/evolveum/midpoint/common/mining/utils/ExtractPatternUtils.java
+++ b/infra/common/src/main/java/com/evolveum/midpoint/common/mining/utils/ExtractPatternUtils.java
@@ -68,10 +68,7 @@ private static boolean isEmptyDetectionPattern(List<RoleAnalysisDetectionPattern
 
         if (defaultDetection.size() == 1) {
             RoleAnalysisDetectionPatternType detectionPatternType = defaultDetection.get(0);
-            if (detectionPatternType == null || detectionPatternType.getClusterMetric() == null) {
-                return true;
-            }
-            return true;
+            return detectionPatternType == null || detectionPatternType.getClusterMetric() == null;
         } else {
             return false;
         }
diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/mining/utils/algorithm/JaccardSorter.java b/infra/common/src/main/java/com/evolveum/midpoint/common/mining/utils/algorithm/JaccardSorter.java
index 3bf4006ae7f..4abc2223163 100644
--- a/infra/common/src/main/java/com/evolveum/midpoint/common/mining/utils/algorithm/JaccardSorter.java
+++ b/infra/common/src/main/java/com/evolveum/midpoint/common/mining/utils/algorithm/JaccardSorter.java
@@ -11,7 +11,7 @@
 import java.util.Comparator;
 import java.util.List;
 
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -34,7 +34,7 @@ public class JaccardSorter {
 
     public static List<MiningUserTypeChunk> jaccardUserBasedSorter(List<MiningUserTypeChunk> dataPoints) {
 
-        Handler handler = new Handler("Jaccard Sort", 1);
+        RoleAnalysisProgressIncrement handler = new RoleAnalysisProgressIncrement("Jaccard Sort", 1);
         handler.enterNewStep("Sorting");
         handler.setActive(true);
 
@@ -96,7 +96,7 @@ > jacquardSimilarity(sorted.get(0).getRoles(),
 
     public static List<MiningRoleTypeChunk> jaccardRoleBasedSorter(List<MiningRoleTypeChunk> dataPoints) {
 
-        Handler handler = new Handler("Jaccard Sort", 1);
+        RoleAnalysisProgressIncrement handler = new RoleAnalysisProgressIncrement("Jaccard Sort", 1);
         handler.enterNewStep("Sorting");
         handler.setActive(true);
 
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-mining-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-mining-3.xsd
index e8948224c06..2e6dcb19bc2 100644
--- a/infra/schema/src/main/resources/xml/ns/public/common/common-mining-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/common-mining-3.xsd
@@ -280,9 +280,7 @@
                 <xsd:annotation>
                     <xsd:documentation>
                         <p>
-                            Number of members in the cluster.
-                            In the case of USER MODE, it is the count of users. (members = users)
-                            In the case of ROLE MODE, it is the count of roles. (members = roles)
+                            Number of users in the cluster.
                         </p>
                     </xsd:documentation>
                 </xsd:annotation>
@@ -292,10 +290,7 @@
                 <xsd:annotation>
                     <xsd:documentation>
                         <p>
-                            Number of the properties (objects) according to which the "members" were included
-                            in the given group.
-                            In the case of USER MODE, it is the count of roles. (roles = properties, members = users)
-                            In the case of ROLE MODE, it is the count of users. (users = properties, members = roles)
+                            Number of roles in the cluster.
                         </p>
                     </xsd:documentation>
                 </xsd:annotation>
@@ -345,7 +340,7 @@
                 <xsd:annotation>
                     <xsd:documentation>
                         <p>
-
+                            Number of relationships value when applying the largest pattern found.
                         </p>
                     </xsd:documentation>
                 </xsd:annotation>
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/chunk/MiningStructure.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/chunk/MiningStructure.java
index 5889c32dc1e..e8803b691f8 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/chunk/MiningStructure.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/chunk/MiningStructure.java
@@ -10,7 +10,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningOperationChunk;
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
@@ -18,12 +18,12 @@
 
 public interface MiningStructure {
     MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler handler, Task task);
+            OperationResult result, RoleAnalysisProgressIncrement handler, Task task);
     MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler handler, Task task);
+            OperationResult result, RoleAnalysisProgressIncrement handler, Task task);
     MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler state, Task task);
+            OperationResult result, RoleAnalysisProgressIncrement state, Task task);
     MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler handler, Task task);
+            OperationResult result, RoleAnalysisProgressIncrement handler, Task task);
 
 }
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/chunk/PrepareChunkStructure.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/chunk/PrepareChunkStructure.java
index 113bdb27d03..f0d8e2c9af2 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/chunk/PrepareChunkStructure.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/chunk/PrepareChunkStructure.java
@@ -24,7 +24,7 @@
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningOperationChunk;
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningRoleTypeChunk;
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningUserTypeChunk;
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisOperationMode;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.prism.PrismObject;
@@ -34,7 +34,7 @@
 
 public class PrepareChunkStructure implements MiningStructure, Serializable {
 
-    Handler handler = new Handler("Data Preparation", 4);
+    RoleAnalysisProgressIncrement handler = new RoleAnalysisProgressIncrement("Data Preparation", 4);
 
     public MiningOperationChunk executeOperation(@NotNull RoleAnalysisClusterType cluster, boolean fullProcess,
             RoleAnalysisProcessModeType mode, ModelService modelService, OperationResult result, Task task) {
@@ -71,7 +71,7 @@ private MiningOperationChunk resolveFullChunkStructures(@NotNull RoleAnalysisClu
 
     @Override
     public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler handler, Task task) {
+            OperationResult result, RoleAnalysisProgressIncrement handler, Task task) {
 
         Map<String, PrismObject<RoleType>> roleExistCache = new HashMap<>();
 
@@ -172,7 +172,7 @@ public MiningOperationChunk prepareRoleBasedStructure(@NotNull RoleAnalysisClust
 
     @Override
     public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClusterType cluster, ModelService modelService,
-            OperationResult result, Handler handler, Task task) {
+            OperationResult result, RoleAnalysisProgressIncrement handler, Task task) {
 
         Map<String, PrismObject<UserType>> userExistCache = new HashMap<>();
         Map<String, PrismObject<RoleType>> roleExistCache = new HashMap<>();
@@ -276,7 +276,7 @@ public MiningOperationChunk prepareUserBasedStructure(@NotNull RoleAnalysisClust
 
     @Override
     public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalysisClusterType cluster,
-            ModelService modelService, OperationResult result, Handler handler, Task task) {
+            ModelService modelService, OperationResult result, RoleAnalysisProgressIncrement handler, Task task) {
 
         Map<String, PrismObject<UserType>> userExistCache = new HashMap<>();
         Map<String, PrismObject<RoleType>> roleExistCache = new HashMap<>();
@@ -350,7 +350,7 @@ public MiningOperationChunk preparePartialRoleBasedStructure(@NotNull RoleAnalys
 
     @Override
     public MiningOperationChunk preparePartialUserBasedStructure(@NotNull RoleAnalysisClusterType cluster,
-            ModelService modelService, OperationResult result, Handler handler, Task task) {
+            ModelService modelService, OperationResult result, RoleAnalysisProgressIncrement handler, Task task) {
         Map<String, PrismObject<UserType>> userExistCache = new HashMap<>();
         Map<String, PrismObject<RoleType>> roleExistCache = new HashMap<>();
 
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/Clusterable.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/Clusterable.java
index a73b17d34b2..4e11ff65e94 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/Clusterable.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/Clusterable.java
@@ -9,7 +9,7 @@
 
 import java.util.List;
 
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 import com.evolveum.midpoint.model.api.ModelService;
 
 import com.evolveum.midpoint.task.api.Task;
@@ -23,5 +23,5 @@
 
 public interface Clusterable {
     List<PrismObject<RoleAnalysisClusterType>> executeClustering(@NotNull RoleAnalysisSessionType session,
-            OperationResult result, ModelService modelService, Handler handler, Task task);
+            OperationResult result, ModelService modelService, RoleAnalysisProgressIncrement handler, Task task);
 }
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/ClusteringAction.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/ClusteringAction.java
index c2617300f32..4c9aa4a39d1 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/ClusteringAction.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/ClusteringAction.java
@@ -9,18 +9,17 @@
 
 import static com.evolveum.midpoint.model.impl.mining.utils.RoleAnalysisObjectUtils.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.model.impl.ModelBeans;
-
 import com.evolveum.midpoint.model.impl.mining.algorithm.BaseAction;
+
 import com.evolveum.midpoint.repo.common.activity.run.AbstractActivityRun;
 
 import org.jetbrains.annotations.NotNull;
 
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -34,7 +33,7 @@ public class ClusteringAction extends BaseAction {
 
     private Clusterable clusterable;
 
-    private final Handler handler = new Handler("Density Clustering", 7, this::incrementProgress);
+    private final RoleAnalysisProgressIncrement handler = new RoleAnalysisProgressIncrement("Density Clustering", 7, this::incrementProgress);
 
     public ClusteringAction(@NotNull AbstractActivityRun<?, ?, ?> activityRun) {
         super(activityRun);
@@ -61,7 +60,10 @@ public void execute(String sessionOid, @NotNull OperationResult result) {
             List<PrismObject<RoleAnalysisClusterType>> clusterObjects =
                     clusterable.executeClustering(session, result, modelService, handler, task);
 
-            importObjects(clusterObjects, session, modelService, task, result);
+            if (clusterObjects != null && !clusterObjects.isEmpty()) {
+                importObjects(clusterObjects, session, modelService, task, result);
+            }
+
         }
     }
 
@@ -70,7 +72,6 @@ private void importObjects(
             @NotNull RoleAnalysisSessionType session,
             ModelService modelService,
             Task task, OperationResult result) {
-        List<ObjectReferenceType> roleAnalysisClusterRef = new ArrayList<>();
         String sessionOid = session.getOid();
 
         ObjectReferenceType sessionRef = new ObjectReferenceType();
@@ -103,7 +104,6 @@ private void importObjects(
             ObjectReferenceType objectReferenceType = new ObjectReferenceType();
             objectReferenceType.setOid(clusterTypePrismObject.getOid());
             objectReferenceType.setType(complexType);
-            roleAnalysisClusterRef.add(objectReferenceType);
 
             importRoleAnalysisClusterObject(result, task, modelService,
                     clusterTypePrismObject,
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/RoleBasedClustering.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/RoleBasedClustering.java
index f844a749b41..690655d2b06 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/RoleBasedClustering.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/RoleBasedClustering.java
@@ -15,7 +15,7 @@
 import com.google.common.collect.ListMultimap;
 import org.jetbrains.annotations.NotNull;
 
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.model.impl.mining.algorithm.cluster.mechanism.*;
 import com.evolveum.midpoint.model.impl.mining.utils.RoleAnalysisAlgorithmUtils;
@@ -31,7 +31,7 @@ public class RoleBasedClustering implements Clusterable {
 
     @Override
     public List<PrismObject<RoleAnalysisClusterType>> executeClustering(@NotNull RoleAnalysisSessionType session,
-            OperationResult result, ModelService modelService, Handler handler, Task task) {
+            OperationResult result, ModelService modelService, RoleAnalysisProgressIncrement handler, Task task) {
 
         RoleAnalysisSessionOptionType sessionOptionType = session.getRoleModeOptions();
 
@@ -44,6 +44,10 @@ public List<PrismObject<RoleAnalysisClusterType>> executeClustering(@NotNull Rol
                 minUserOccupancy, maxUserOccupancy, sessionOptionType.getQuery(), task);
         handler.iterateActualStatus();
 
+        if (chunkMap.isEmpty()) {
+            return null;
+        }
+
         handler.enterNewStep("Prepare Data");
         handler.setOperationCountToProcess(1);
         List<DataPoint> dataPoints = prepareDataPoints(chunkMap);
@@ -61,7 +65,7 @@ public List<PrismObject<RoleAnalysisClusterType>> executeClustering(@NotNull Rol
 
         DistanceMeasure distanceMeasure = new JaccardDistancesMeasure(minUsersOverlap);
         DensityBasedClustering<DataPoint> dbscan = new DensityBasedClustering<>(
-                similarityDifference, minRolesCount, distanceMeasure);
+                similarityDifference, minRolesCount, distanceMeasure, minUsersOverlap);
 
         List<Cluster<DataPoint>> clusters = dbscan.cluster(dataPoints, handler);
 
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/UserBasedClustering.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/UserBasedClustering.java
index 9c18d339341..34bdc88d68f 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/UserBasedClustering.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/action/UserBasedClustering.java
@@ -10,7 +10,7 @@
 import java.util.List;
 import java.util.Set;
 
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.model.impl.mining.algorithm.cluster.mechanism.*;
 import com.evolveum.midpoint.model.impl.mining.utils.RoleAnalysisAlgorithmUtils;
@@ -34,7 +34,7 @@ public class UserBasedClustering implements Clusterable {
     //TODO add progress handler
     @Override
     public List<PrismObject<RoleAnalysisClusterType>> executeClustering(@NotNull RoleAnalysisSessionType session,
-            OperationResult result, ModelService modelService, Handler handler, Task task) {
+            OperationResult result, ModelService modelService, RoleAnalysisProgressIncrement handler, Task task) {
 
         UserAnalysisSessionOptionType sessionOptionType = session.getUserModeOptions();
 
@@ -48,6 +48,10 @@ public List<PrismObject<RoleAnalysisClusterType>> executeClustering(@NotNull Rol
                 minRolesOccupancy, maxRolesOccupancy, sessionOptionType.getQuery(), task);
         handler.iterateActualStatus();
 
+        if (chunkMap.isEmpty()) {
+            return null;
+        }
+
         handler.enterNewStep("Prepare Data");
         handler.setOperationCountToProcess(1);
         List<DataPoint> dataPoints = prepareDataPoints(chunkMap);
@@ -65,7 +69,7 @@ public List<PrismObject<RoleAnalysisClusterType>> executeClustering(@NotNull Rol
 
         DistanceMeasure distanceMeasure = new JaccardDistancesMeasure(minRolesOverlap);
         DensityBasedClustering<DataPoint> dbscan = new DensityBasedClustering<>(similarityDifference,
-                minUsersCount, distanceMeasure);
+                minUsersCount, distanceMeasure, minRolesOverlap);
         List<Cluster<DataPoint>> clusters = dbscan.cluster(dataPoints, handler);
 
         return new RoleAnalysisAlgorithmUtils().processClusters(modelService, task, result, dataPoints, clusters, session, handler);
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/mechanism/Clusterer.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/mechanism/Clusterer.java
index f4061e76e5a..ca68dccca78 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/mechanism/Clusterer.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/mechanism/Clusterer.java
@@ -1,6 +1,6 @@
 package com.evolveum.midpoint.model.impl.mining.algorithm.cluster.mechanism;
 
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 
 import java.util.Collection;
 import java.util.List;
@@ -14,7 +14,7 @@ protected Clusterer(DistanceMeasure measure) {
         this.measure = measure;
     }
 
-    public abstract List<? extends Cluster<T>> cluster(Collection<T> var1, Handler handler);
+    public abstract List<? extends Cluster<T>> cluster(Collection<T> var1, RoleAnalysisProgressIncrement handler);
 
     protected double distance(Clusterable p1, Clusterable p2) {
         return this.measure.compute(p1.getPoint(), p2.getPoint());
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/mechanism/DensityBasedClustering.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/mechanism/DensityBasedClustering.java
index d8ff96f8fe1..98bc774da27 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/mechanism/DensityBasedClustering.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/cluster/mechanism/DensityBasedClustering.java
@@ -1,6 +1,6 @@
 package com.evolveum.midpoint.model.impl.mining.algorithm.cluster.mechanism;
 
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 
 import java.util.*;
 
@@ -9,8 +9,9 @@
 public class DensityBasedClustering<T extends Clusterable> extends Clusterer<T> {
     private double eps;
     private int minPts;
+    int minPropertiesOverlap;
 
-    public DensityBasedClustering(double eps, int minPts, DistanceMeasure measure) {
+    public DensityBasedClustering(double eps, int minPts, DistanceMeasure measure, int minRolesOverlap) {
         super(measure);
 
         if (eps < 0.0) {
@@ -25,9 +26,12 @@ public DensityBasedClustering(double eps, int minPts, DistanceMeasure measure) {
             LOGGER.info("Updated parameters: eps={} and minPts={}. New values: eps={} and minPts={}.",
                     eps, minPts, this.eps, this.minPts);
         }
+
+        this.minPropertiesOverlap = minRolesOverlap;
+
     }
 
-    public List<Cluster<T>> cluster(Collection<T> points, Handler handler) {
+    public List<Cluster<T>> cluster(Collection<T> points, RoleAnalysisProgressIncrement handler) {
         List<Cluster<T>> clusters = new ArrayList<>();
         Map<Clusterable, PointStatus> visited = new HashMap<>();
 
@@ -40,7 +44,8 @@ public List<Cluster<T>> cluster(Collection<T> points, Handler handler) {
             if (visited.get(point) == null) {
                 List<T> neighbors = this.getNeighbors(point, points);
                 int neighborsSize = getNeightborsSize(neighbors);
-                if (neighborsSize >= this.minPts || point.getMembersCount() >= this.minPts) {
+
+                if (neighborsSize >= this.minPts || (point.getMembersCount() >= this.minPts && point.getPoint().size() >= minPropertiesOverlap)) {
                     Cluster<T> cluster = new Cluster<>();
                     clusters.add(this.expandCluster(cluster, point, neighbors, points, visited));
                 } else {
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DefaultPatternResolver.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DefaultPatternResolver.java
index 259e7b0a082..42ca186e454 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DefaultPatternResolver.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DefaultPatternResolver.java
@@ -31,7 +31,7 @@
 
 public class DefaultPatternResolver {
 
-    private static final int MAX_PATTERN_INIT = 10;
+    private static final int MAX_PATTERN_INIT = 30;
     private final RoleAnalysisProcessModeType roleAnalysisProcessModeType;
 
     public DefaultPatternResolver(@NotNull RoleAnalysisProcessModeType roleAnalysisProcessModeType) {
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutor.java
index a024c62f395..e6692bbbb2b 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutor.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutor.java
@@ -14,13 +14,13 @@
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningUserTypeChunk;
 import com.evolveum.midpoint.common.mining.objects.detection.DetectedPattern;
 import com.evolveum.midpoint.common.mining.objects.detection.DetectionOption;
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleAnalysisProcessModeType;
 
 public class DetectionActionExecutor implements Serializable {
     private final DetectionOperation detectionType;
 
-    private final Handler handler = new Handler("Pattern Detection", 6);
+    private final RoleAnalysisProgressIncrement handler = new RoleAnalysisProgressIncrement("Pattern Detection", 6);
 
     private final DetectionOption detectionOption;
 
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutorNew.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutorNew.java
index 78e30a7d740..83753221b01 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutorNew.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionActionExecutorNew.java
@@ -11,7 +11,6 @@
 import static com.evolveum.midpoint.model.impl.mining.algorithm.detection.DefaultPatternResolver.loadTopPatterns;
 import static com.evolveum.midpoint.model.impl.mining.utils.RoleAnalysisObjectUtils.*;
 
-import java.io.Serializable;
 import java.util.List;
 
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningOperationChunk;
@@ -19,7 +18,7 @@
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningUserTypeChunk;
 import com.evolveum.midpoint.common.mining.objects.detection.DetectedPattern;
 import com.evolveum.midpoint.common.mining.objects.detection.DetectionOption;
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisSortMode;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.model.impl.ModelBeans;
@@ -39,7 +38,7 @@
 public class DetectionActionExecutorNew extends BaseAction {
 
     private final DetectionOperation detectionType;
-    private final Handler handler = new Handler("Pattern Detection", 6, this::incrementProgress);
+    private final RoleAnalysisProgressIncrement handler = new RoleAnalysisProgressIncrement("Pattern Detection", 6, this::incrementProgress);
     private final String clusterOid;
     private final ModelService modelService;
 
@@ -116,7 +115,7 @@ private List<DetectedPattern> executeDetection(List<MiningRoleTypeChunk> miningR
         return null;
     }
 
-    public Handler getHandler() {
+    public RoleAnalysisProgressIncrement getHandler() {
         return handler;
     }
 
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionOperation.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionOperation.java
index 6e34b61ac4c..efaebf91af0 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionOperation.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/DetectionOperation.java
@@ -11,7 +11,7 @@
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningUserTypeChunk;
 import com.evolveum.midpoint.common.mining.objects.detection.DetectedPattern;
 import com.evolveum.midpoint.common.mining.objects.detection.DetectionOption;
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 
 import java.util.List;
 
@@ -20,9 +20,9 @@
 public interface DetectionOperation {
 
     List<DetectedPattern> performUserBasedDetection(List<MiningRoleTypeChunk> miningRoleTypeChunks,
-            DetectionOption roleAnalysisDetectionOptionType, Handler handler);
+            DetectionOption roleAnalysisDetectionOptionType, RoleAnalysisProgressIncrement handler);
 
     List<DetectedPattern> performRoleBasedDetection(List<MiningUserTypeChunk> miningRoleTypeChunks,
-            DetectionOption roleAnalysisDetectionOptionType, Handler handler);
+            DetectionOption roleAnalysisDetectionOptionType, RoleAnalysisProgressIncrement handler);
 
 }
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/PatternResolver.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/PatternResolver.java
index 93e5e64c7a9..5bc2e28c6f9 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/PatternResolver.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/algorithm/detection/PatternResolver.java
@@ -11,7 +11,7 @@
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningUserTypeChunk;
 import com.evolveum.midpoint.common.mining.objects.detection.DetectedPattern;
 import com.evolveum.midpoint.common.mining.objects.detection.DetectionOption;
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 
 import java.io.Serializable;
 import java.util.*;
@@ -22,7 +22,7 @@ public class PatternResolver implements DetectionOperation, Serializable {
 
     @Override
     public List<DetectedPattern> performUserBasedDetection(List<MiningRoleTypeChunk> miningRoleTypeChunks,
-            DetectionOption detectionOption, Handler handler) {
+            DetectionOption detectionOption, RoleAnalysisProgressIncrement handler) {
 
         handler.enterNewStep("Data Preparation");
         handler.setActive(true);
@@ -148,7 +148,7 @@ public List<DetectedPattern> performUserBasedDetection(List<MiningRoleTypeChunk>
 
     @Override
     public List<DetectedPattern> performRoleBasedDetection(List<MiningUserTypeChunk> miningUserTypeChunks,
-            DetectionOption roleAnalysisSessionDetectionOptionType, Handler handler) {
+            DetectionOption roleAnalysisSessionDetectionOptionType, RoleAnalysisProgressIncrement handler) {
 
         handler.enterNewStep("Data Preparation");
         handler.setActive(true);
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/utils/RoleAnalysisAlgorithmUtils.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/utils/RoleAnalysisAlgorithmUtils.java
index a71f0d2b53b..1b57a751cce 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/utils/RoleAnalysisAlgorithmUtils.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/mining/utils/RoleAnalysisAlgorithmUtils.java
@@ -18,7 +18,7 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import com.evolveum.midpoint.common.mining.objects.handler.Handler;
+import com.evolveum.midpoint.common.mining.objects.handler.RoleAnalysisProgressIncrement;
 import com.evolveum.midpoint.common.mining.objects.statistic.ClusterStatistic;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.model.impl.mining.algorithm.cluster.mechanism.Cluster;
@@ -35,7 +35,7 @@ public class RoleAnalysisAlgorithmUtils {
     @NotNull
     public List<PrismObject<RoleAnalysisClusterType>> processClusters(ModelService modelService, Task task, OperationResult result,
             List<DataPoint> dataPoints, List<Cluster<DataPoint>> clusters,
-            @NotNull RoleAnalysisSessionType session, Handler handler) {
+            @NotNull RoleAnalysisSessionType session, RoleAnalysisProgressIncrement handler) {
 
         Integer sessionTypeObjectCount = getSessionTypeObjectCount(modelService, result, task);
 
@@ -56,18 +56,21 @@ public List<PrismObject<RoleAnalysisClusterType>> processClusters(ModelService m
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
 
-        handler.enterNewStep("Prepare Outliers");
-        handler.setOperationCountToProcess(dataPoints.size());
-        PrismObject<RoleAnalysisClusterType> clusterTypePrismObject = prepareOutlierClusters(modelService, task, result,
-                dataPoints, complexType, session.getProcessMode(), handler, sessionTypeObjectCount);
-        clusterTypeObjectWithStatistic.add(clusterTypePrismObject);
+         if (!dataPoints.isEmpty()) {
+             handler.enterNewStep("Prepare Outliers");
+             handler.setOperationCountToProcess(dataPoints.size());
+             PrismObject<RoleAnalysisClusterType> clusterTypePrismObject = prepareOutlierClusters(modelService, task, result,
+                     dataPoints, complexType, session.getProcessMode(), handler, sessionTypeObjectCount);
+             clusterTypeObjectWithStatistic.add(clusterTypePrismObject);
+
+         }
         return clusterTypeObjectWithStatistic;
     }
 
     @NotNull
     public List<PrismObject<RoleAnalysisClusterType>> processExactMatch(ModelService modelService, Task task, OperationResult result,
             List<DataPoint> dataPoints,
-            @NotNull RoleAnalysisSessionType session, Handler handler) {
+            @NotNull RoleAnalysisSessionType session, RoleAnalysisProgressIncrement handler) {
 
         Integer sessionTypeObjectCount = getSessionTypeObjectCount(modelService, result, task);
 
@@ -94,11 +97,13 @@ public List<PrismObject<RoleAnalysisClusterType>> processExactMatch(ModelService
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
 
-        handler.enterNewStep("Prepare Outliers");
-        handler.setOperationCountToProcess(dataPoints.size());
-        PrismObject<RoleAnalysisClusterType> clusterTypePrismObject = prepareOutlierClusters(modelService, task, result, dataPoints,
-                processedObjectComplexType, session.getProcessMode(), handler, sessionTypeObjectCount);
-        clusterTypeObjectWithStatistic.add(clusterTypePrismObject);
+        if (!dataPoints.isEmpty()) {
+            handler.enterNewStep("Prepare Outliers");
+            handler.setOperationCountToProcess(dataPoints.size());
+            PrismObject<RoleAnalysisClusterType> clusterTypePrismObject = prepareOutlierClusters(modelService, task, result, dataPoints,
+                    processedObjectComplexType, session.getProcessMode(), handler, sessionTypeObjectCount);
+            clusterTypeObjectWithStatistic.add(clusterTypePrismObject);
+        }
         return clusterTypeObjectWithStatistic;
     }
 
@@ -246,7 +251,7 @@ private PrismObject<RoleAnalysisClusterType> prepareClusters(ModelService modelS
 
     private PrismObject<RoleAnalysisClusterType> prepareOutlierClusters(ModelService modelService, Task task,
             OperationResult result, List<DataPoint> dataPoints, QName complexType,
-            RoleAnalysisProcessModeType processMode, Handler handler, Integer sessionTypeObjectCount) {
+            RoleAnalysisProcessModeType processMode, RoleAnalysisProgressIncrement handler, Integer sessionTypeObjectCount) {
 
         int minVectorPoint = Integer.MAX_VALUE;
         int maxVectorPoint = -1;

From 84d32db2630813bf3183c371c911989388266fef Mon Sep 17 00:00:00 2001
From: tchrapovic <chrapovic.tadeas@gmail.com>
Date: Mon, 4 Sep 2023 17:50:14 +0200
Subject: [PATCH 14/14] Fix incorrect update of components 1. Fix
 compress/expand table action button (role-mining operation table)

---
 .../cluster/PageClusterOperationsPanel.java   |  1 -
 .../wizard/ProcessModeChoiceStepPanel.java    |  4 +--
 .../tables/RoleAnalysisRoleBasedTable.java    |  1 -
 .../tables/RoleAnalysisUserBasedTable.java    | 28 ++++++++-----------
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PageClusterOperationsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PageClusterOperationsPanel.java
index bbf7a2218ab..e30beacf75e 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PageClusterOperationsPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/panel/cluster/PageClusterOperationsPanel.java
@@ -211,7 +211,6 @@ protected void onPerform(AjaxRequestTarget ajaxRequestTarget) {
                 compress = !compress;
                 loadMiningTableData();
                 updateMiningTable(ajaxRequestTarget, false);
-                ajaxRequestTarget.add(this);
             }
 
             @Override
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/wizard/ProcessModeChoiceStepPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/wizard/ProcessModeChoiceStepPanel.java
index b2deb6c714c..30049c02663 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/wizard/ProcessModeChoiceStepPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/page/wizard/ProcessModeChoiceStepPanel.java
@@ -81,8 +81,8 @@ protected void onTileClickPerformed(ProcessMode value, AjaxRequestTarget target)
 
 
     public enum ProcessMode implements TileEnum {
-        ROLE(CLASS_OBJECT_ROLE_ICON),
-        USER(CLASS_OBJECT_USER_ICON);
+        USER(CLASS_OBJECT_USER_ICON),
+        ROLE(CLASS_OBJECT_ROLE_ICON);
 
         private final String icon;
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisRoleBasedTable.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisRoleBasedTable.java
index 8df56458b6a..1d963c5242a 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisRoleBasedTable.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisRoleBasedTable.java
@@ -406,7 +406,6 @@ public CompositedIcon getIcon() {
                     @Override
                     protected void onSubmit(AjaxRequestTarget target) {
                         onPerform(target);
-                        target.add(this);
                     }
 
                     @Override
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisUserBasedTable.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisUserBasedTable.java
index 7b874feec25..0f8320cd4df 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisUserBasedTable.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/mining/tables/RoleAnalysisUserBasedTable.java
@@ -18,19 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisChunkMode;
-import com.evolveum.midpoint.gui.api.GuiStyleConstants;
-import com.evolveum.midpoint.gui.impl.component.AjaxCompositedIconButton;
-import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
-import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
-import com.evolveum.midpoint.gui.impl.component.icon.LayeredIconCssStyle;
-
-import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
-import com.evolveum.midpoint.web.component.AjaxCompositedIconSubmitButton;
-import com.evolveum.midpoint.web.component.AjaxIconButton;
-
-import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
-
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
@@ -46,34 +33,42 @@
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.util.ListModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningOperationChunk;
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningRoleTypeChunk;
 import com.evolveum.midpoint.common.mining.objects.chunk.MiningUserTypeChunk;
 import com.evolveum.midpoint.common.mining.objects.detection.DetectedPattern;
+import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisChunkMode;
 import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisOperationMode;
 import com.evolveum.midpoint.common.mining.utils.values.RoleAnalysisSortMode;
-import com.evolveum.midpoint.gui.api.model.LoadableModel;
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
+import com.evolveum.midpoint.gui.impl.component.AjaxCompositedIconButton;
+import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
+import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
+import com.evolveum.midpoint.gui.impl.component.icon.LayeredIconCssStyle;
 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.page.admin.role.mining.page.panel.cluster.MembersDetailsPanel;
+import com.evolveum.midpoint.gui.impl.util.DetailsPageUtil;
 import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
+import com.evolveum.midpoint.web.component.AjaxCompositedIconSubmitButton;
+import com.evolveum.midpoint.web.component.AjaxIconButton;
 import com.evolveum.midpoint.web.component.data.RoleAnalysisTable;
 import com.evolveum.midpoint.web.component.data.column.AjaxLinkPanel;
 import com.evolveum.midpoint.web.component.data.column.AjaxLinkTruncatePanelAction;
 import com.evolveum.midpoint.web.component.data.column.IconColumn;
 import com.evolveum.midpoint.web.component.data.column.LinkIconPanelStatus;
 import com.evolveum.midpoint.web.component.util.RoleMiningProvider;
+import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
 public class RoleAnalysisUserBasedTable extends Panel {
 
     private static final String ID_DATATABLE = "datatable_extra";
@@ -429,7 +424,6 @@ public CompositedIcon getIcon() {
                     @Override
                     protected void onSubmit(AjaxRequestTarget target) {
                         onPerform(target);
-                        target.add(this);
                     }
 
                     @Override