Merge remote-tracking branch 'origin/master' into feature/forgot-user…

…name * origin/master: (140 commits) separated panels for task wizard steps fixing task wizard key adding keys for task wizard help for each step adding some styles for task creation popup task wizard steps toggle checkbox panel impelemtation, task wizard panel,.. continue with resource -> accouts create task functionality MID-8907 improved configuration for request access ui - typo fix MID-8907 improved configuration for request access ui - autocomplete search and result display. MID-8842 ninja - DB schema version skip check option + some logging added (debug level) MID-8907 improved configuration for request access ui - autocomplete search and result display. wip MID-8842 ninja - fixed message for few options MID-8842 ninja - improved parsing and looging, getting rid of few todos MID-8842 ninja - upgrade object action now can update repository. not tested yet. MID-8842 ninja - batch mode support (colored output disabled) MID-8842 ninja - upgrade object action impl, first attempt, now upgrade files. wip MID-8842 ninja - more processor, upgrade item asserter, more tests MID-8842 ninja - sysconfig role management processors MID-8842 ninja - roleCatalogCollections processor fixing build ...
Evolveum · Jul 12, 2023 · 1cc07bc · 1cc07bc
2 parents f811819 + 8fad2f3
commit 1cc07bc
Show file tree

Hide file tree

Showing 673 changed files with 19,885 additions and 8,903 deletions.
diff --git a/config/sql/native-new/postgres-new-audit.sql b/config/sql/native-new/postgres-new-audit.sql
@@ -352,4 +352,6 @@ limit 50;
 
 -- Initializing the last change number used in postgres-new-upgrade.sql.
 -- This is important to avoid applying any change more than once.
+-- Also update SqaleUtils.CURRENT_SCHEMA_AUDIT_CHANGE_NUMBER
+-- repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
 call apply_audit_change(4, $$ SELECT 1 $$, true);
diff --git a/config/sql/native-new/postgres-new-upgrade-audit.sql b/config/sql/native-new/postgres-new-upgrade-audit.sql
@@ -119,3 +119,5 @@ $aa$);
 -- WRITE CHANGES ABOVE ^^
 -- IMPORTANT: update apply_audit_change number at the end of postgres-new-audit.sql
 -- to match the number used in the last change here!
+-- Also update SqaleUtils.CURRENT_SCHEMA_AUDIT_CHANGE_NUMBER
+-- repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
diff --git a/config/sql/native-new/postgres-new-upgrade.sql b/config/sql/native-new/postgres-new-upgrade.sql
@@ -326,3 +326,5 @@ $aa$);
 -- WRITE CHANGES ABOVE ^^
 -- IMPORTANT: update apply_change number at the end of postgres-new.sql
 -- to match the number used in the last change here!
+-- Also update SqaleUtils.CURRENT_SCHEMA_CHANGE_NUMBER
+-- repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
diff --git a/config/sql/native-new/postgres-new.sql b/config/sql/native-new/postgres-new.sql
@@ -2085,4 +2085,6 @@ END $$;
 
 -- Initializing the last change number used in postgres-new-upgrade.sql.
 -- This is important to avoid applying any change more than once.
+-- Also update SqaleUtils.CURRENT_SCHEMA_CHANGE_NUMBER
+-- repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
 call apply_change(15, $$ SELECT 1 $$, true);
diff --git a/gui/admin-gui/package-lock.json b/gui/admin-gui/package-lock.json
diff --git a/gui/admin-gui/package.json b/gui/admin-gui/package.json
@@ -40,6 +40,7 @@
     "tempusdominus-bootstrap-4": "^5.39.2",
     "webpack": "^5.76.0",
     "webpack-cli": "^5.0.0",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^5.8.0",
+    "bootstrap4-toggle" : "^3.6.1"
   }
 }
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -113,32 +113,14 @@
         <dependency>
             <groupId>com.evolveum.commons</groupId>
             <artifactId>util</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.prism</groupId>
             <artifactId>prism-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.prism</groupId>
             <artifactId>prism-impl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -155,12 +137,6 @@
             <groupId>com.evolveum.midpoint.repo</groupId>
             <artifactId>repo-common</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.model</groupId>
@@ -181,12 +157,6 @@
             <groupId>com.evolveum.midpoint.model</groupId>
             <artifactId>model-common</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
@@ -230,12 +200,6 @@
             <artifactId>repo-sql-impl</artifactId>
             <version>${project.version}</version>
             <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
@@ -253,12 +217,6 @@
             <groupId>com.evolveum.midpoint.model</groupId>
             <artifactId>rest-impl</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -335,12 +293,6 @@
             <artifactId>provisioning-impl</artifactId>
             <version>${project.version}</version>
             <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.provisioning</groupId>
@@ -353,12 +305,6 @@
             <artifactId>report-impl</artifactId>
             <version>${project.version}</version>
             <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.model</groupId>
@@ -425,18 +371,6 @@
             <artifactId>wicket-request</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.wicket</groupId>
-            <artifactId>wicket-commons-fileupload</artifactId>
-            <version>${wicket.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-ioc</artifactId>
@@ -450,12 +384,6 @@
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-util</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.wicket</groupId>
@@ -497,6 +425,10 @@
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -610,24 +542,12 @@
             <groupId>com.evolveum.midpoint.infra</groupId>
             <artifactId>test-util</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
             <artifactId>repo-test-util</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
@@ -703,12 +623,6 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -755,7 +669,7 @@
                     <include>**/org.identityconnectors.common.logging</include>
                 </includes>
             </resource>
-            
+
             <resource>
                 <filtering>false</filtering>
                 <directory>src/main/java</directory>

diff --git a/gui/admin-gui/src/frontend/js/vendors.js b/gui/admin-gui/src/frontend/js/vendors.js
@@ -20,6 +20,8 @@ import '../../../node_modules/select2/dist/js/select2';
 
 import '../../../node_modules/sparklines';
 
+import '../../../node_modules/admin-lte/plugins/bootstrap-switch/js/bootstrap-switch';
+
 import '../../../node_modules/ace-builds/src-noconflict/ace';
 
 ace.config.setModuleUrl('ace/theme/eclipse',

diff --git a/gui/admin-gui/src/frontend/scss/vendors.scss b/gui/admin-gui/src/frontend/scss/vendors.scss
@@ -9,6 +9,7 @@
 @import "midpoint-variables";
 
 @import "../../../node_modules/admin-lte/build/scss/adminlte";
+@import "../../../node_modules/admin-lte/build/scss/plugins/bootstrap-switch";
 @import "../../../node_modules/overlayscrollbars/css/OverlayScrollbars.css";
 @import "../../../node_modules/datatables.net-bs4/css/dataTables.bootstrap4";
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -81,13 +81,9 @@ public abstract class MainObjectListPanel<O extends ObjectType> extends ObjectLi
     private static final String OPERATION_DELETE_OBJECT = DOT_CLASS + "deleteObject";
 
     private LoadableModel<ExecuteChangeOptionsDto> executeOptionsModel;
-
+    
     public MainObjectListPanel(String id, Class<O> type) {
-        this(id, type, null);
-    }
-
-    public MainObjectListPanel(String id, Class<O> type, Collection<SelectorOptions<GetOperationOptions>> options) {
-        super(id, type, options);
+        super(id, type);
         executeOptionsModel = new LoadableModel<>(false) {
 
             @Override
@@ -97,8 +93,8 @@ protected ExecuteChangeOptionsDto load() {
         };
     }
 
-    public MainObjectListPanel(String id, Class<O> type, Collection<SelectorOptions<GetOperationOptions>> options, ContainerPanelConfigurationType config) {
-        super(id, type, options, config);
+    public MainObjectListPanel(String id, Class<O> type, ContainerPanelConfigurationType config) {
+        super(id, type, config);
         executeOptionsModel = new LoadableModel<>(false) {
 
             @Override