Merge remote-tracking branch 'origin/master'

Evolveum · Sep 23, 2022 · b90ac92 · b90ac92
2 parents ef6fdca + 1fe4a23
commit b90ac92
Show file tree

Hide file tree

Showing 35 changed files with 138 additions and 193 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
@@ -6,20 +6,10 @@
  */
 package com.evolveum.midpoint.gui.impl.component;
 
-import java.lang.reflect.Constructor;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.gui.api.GuiStyleConstants;
-import com.evolveum.midpoint.gui.impl.component.menu.PageTypes;
-import com.evolveum.midpoint.gui.impl.component.table.WidgetTableHeader;
-import com.evolveum.midpoint.web.application.PanelType;
-import com.evolveum.midpoint.web.component.AjaxIconButton;
-import com.evolveum.midpoint.web.page.admin.configuration.PageImportObject;
-
-import com.evolveum.midpoint.web.session.ObjectDetailsStorage;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -44,6 +34,7 @@
 import org.apache.wicket.util.visit.IVisitor;
 import org.jetbrains.annotations.NotNull;
 
+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.model.ReadOnlyModel;
@@ -52,6 +43,7 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.gui.impl.component.search.*;
+import com.evolveum.midpoint.gui.impl.component.table.WidgetTableHeader;
 import com.evolveum.midpoint.gui.impl.page.admin.report.PageReport;
 import com.evolveum.midpoint.gui.impl.util.GuiImplUtil;
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
@@ -78,6 +70,7 @@
 import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.component.AjaxIconButton;
 import com.evolveum.midpoint.web.component.CompositedIconButtonDto;
 import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
 import com.evolveum.midpoint.web.component.data.ISelectableDataProvider;
@@ -211,16 +204,17 @@ public Search<C> load() {
                     }
                 }
 
+                // todo this should not be here! Search model doesn't handle paging, only query. Paging is handled by table (which technically doesn't care about specific query)
                 if (isCollectionViewPanel()) {
                     CompiledObjectCollectionView view = getObjectCollectionView();
                     if (view == null) {
                         getPageBase().redirectToNotFoundPage();
                     }
-//                    search.setCollectionSearchItem(new ObjectCollectionSearchItem(search, view));
-//                    search.setCollectionItemVisible(isCollectionViewPanelForWidget());
+
                     if (isCollectionViewPanelForWidget()) {
                         search.getItems().add(new ObjectCollectionSearchItemWrapper(view));
                     }
+
                     if (storage != null && view.getPaging() != null) {
                         ObjectPaging paging = ObjectQueryUtil.convertToObjectPaging(view.getPaging(), getPrismContext());
                         if (storage.getPaging() == null) {
@@ -232,6 +226,7 @@ public Search<C> load() {
                         }
                     }
                 }
+
                 if (storage != null) {
                     storage.setSearch(search);
                 }
@@ -338,6 +333,11 @@ protected boolean isPagingVisible() {
             }
         };
         itemTable.setOutputMarkupId(true);
+
+        if (getTableId() != null) {
+            itemTable.setItemsPerPage(getSession().getSessionStorage().getUserProfile().getPagingSize(getTableId()));
+        }
+
         if (getPageStorage() != null) {
             ObjectPaging pageStorage = getPageStorage().getPaging();
             if (pageStorage != null) {

diff --git a/...dpoint/gui/impl/page/admin/systemconfiguration/component/ClassLoggersMenuLinkCounter.java b/...dpoint/gui/impl/page/admin/systemconfiguration/component/ClassLoggersMenuLinkCounter.java
@@ -8,6 +8,7 @@
 package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.component;
 
 import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.impl.factory.wrapper.ProfilingClassLoggerWrapperFactoryImpl;
 import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.AssignmentHolderDetailsModel;
 import com.evolveum.midpoint.web.application.SimpleCounter;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.LoggingConfigurationType;
@@ -27,7 +28,11 @@ public int count(AssignmentHolderDetailsModel<SystemConfigurationType> model, Pa
         SystemConfigurationType object = model.getObjectType();
         LoggingConfigurationType lg = object.getLogging();
 
-        return lg != null ? lg.getClassLogger().size() : 0;
+        if (lg == null) {
+            return 0;
+        }
+
+        return (int) lg.getClassLogger().stream().filter(l -> !ProfilingClassLoggerWrapperFactoryImpl.LOGGER_PROFILING.equals(l.getPackage())).count();
     }
 }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
@@ -145,7 +145,7 @@ private ImportResult importObject(PrismObject<? extends ObjectType> object,
             LOGGER.info("Starting initial import of file {}.", fileName);
             model.executeChanges(
                     MiscUtil.createCollection(delta),
-                    ModelExecuteOptions.create().setIsImport().preAuthorized().overwrite(overwrite),
+                    ModelExecuteOptions.create().setIsImport().overwrite(overwrite),
                     task,
                     result);
             result.recordSuccess();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/ProvisioningInitialSetup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/ProvisioningInitialSetup.java
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/SimpleRoleSelector.html b/...-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/SimpleRoleSelector.html
@@ -8,21 +8,17 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <div>
-        <div class="row">
-            <span class="col-xs-10">
-                <div class="list-group">
-                    <div wicket:id="list">
-                        <a class="list-group-item" wicket:id="item"/>
-                    </div>
-                </div>
-            </span>
-            <span class="col-xs-2">
-                <div class="btn-group-vertical" role="group">
-                    <a class="btn btn-default btn-small" wicket:id="buttonReset"/>
-                </div>
-            </span>
-        </div>
+    <div class="row">
+        <span class="col-xs-10">
+            <div class="list-group">
+                <wicket:container wicket:id="list">
+                    <a class="list-group-item" wicket:id="item"/>
+                </wicket:container>
+            </div>
+        </span>
+        <span class="col-xs-2">
+            <a class="btn btn-default ml-2" wicket:id="buttonReset"/>
+        </span>
     </div>
 </wicket:panel>
 </html>