moving paging from report to view

Evolveum · May 3, 2021 · e36a6d2 · e36a6d2
1 parent 1afbcb9
commit e36a6d2
Show file tree

Hide file tree

Showing 18 changed files with 142 additions and 59 deletions.
diff --git a/config/initial-objects/130-report-certification-definitions.xml b/config/initial-objects/130-report-certification-definitions.xml
@@ -115,12 +115,12 @@
                     </expression>
                 </export>
             </column>
+            <paging>
+                <orderDirection>ascending</orderDirection>
+                <orderBy>name</orderBy>
+            </paging>
             <type>AccessCertificationDefinitionType</type>
         </view>
-        <paging>
-            <orderDirection>ascending</orderDirection>
-            <orderBy>name</orderBy>
-        </paging>
         <subreport>
             <name>campaigns</name>
             <type>AccessCertificationCampaignType</type>

diff --git a/config/initial-objects/140-report-certification-campaigns.xml b/config/initial-objects/140-report-certification-campaigns.xml
@@ -163,13 +163,13 @@
                     </expression>
                 </export>
             </column>
+            <paging>
+                <orderDirection>ascending</orderDirection>
+                <orderBy>name</orderBy>
+            </paging>
             <type>AccessCertificationCampaignType</type>
         </view>
         <useOnlyReportView>true</useOnlyReportView>
-        <paging>
-            <orderDirection>ascending</orderDirection>
-            <orderBy>name</orderBy>
-        </paging>
         <parameter>
             <name>alsoClosedCampaigns</name>
             <type>boolean</type>

diff --git a/config/initial-objects/160-report-certification-decisions.xml b/config/initial-objects/160-report-certification-decisions.xml
@@ -138,11 +138,11 @@
                     </expression>
                 </export>
             </column>
+            <paging>
+                <orderBy>objectRef/@/name</orderBy>
+            </paging>
             <type>c:AccessCertificationCaseType</type>
         </view>
-        <paging>
-            <orderBy>objectRef/@/name</orderBy>
-        </paging>
         <parameter>
             <name>campaignName</name>
             <type>c:ObjectReferenceType</type>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
@@ -12,9 +12,22 @@
 import java.util.List;
 import java.util.function.Supplier;
 
+import com.evolveum.midpoint.prism.path.ItemName;
+import com.evolveum.midpoint.prism.query.ObjectPaging;
+import com.evolveum.midpoint.schema.util.ObjectQueryUtil;
+import com.evolveum.midpoint.web.component.search.*;
+
+import com.evolveum.prism.xml.ns._public.query_3.OrderDirectionType;
+
+import com.evolveum.prism.xml.ns._public.query_3.PagingType;
+
+import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.string.StringValue;
@@ -36,10 +49,6 @@
 import com.evolveum.midpoint.web.component.data.column.ColumnUtils;
 import com.evolveum.midpoint.web.component.data.column.ObjectNameColumn;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
-import com.evolveum.midpoint.web.component.search.ContainerTypeSearchItem;
-import com.evolveum.midpoint.web.component.search.Search;
-import com.evolveum.midpoint.web.component.search.SearchFactory;
-import com.evolveum.midpoint.web.component.search.SearchValue;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.SerializableSupplier;
 import com.evolveum.midpoint.web.session.PageStorage;
@@ -121,8 +130,18 @@ protected ObjectQuery getCustomizeContentQuery() {
         return null;
     }
 
-    protected void setDefaultSorting(ISelectableDataProvider<O, SelectableBean<O>> provider){
-        //should be overrided if needed
+    protected void setDefaultSorting(SelectableBeanObjectDataProvider<O> provider){
+            if (isCollectionViewPanel() && getObjectCollectionView().getPaging() != null
+                    && getObjectCollectionView().getPaging().getOrderBy() != null) {
+            PagingType paging = getObjectCollectionView().getPaging();
+            boolean ascending = !OrderDirectionType.DESCENDING.equals(paging.getOrderDirection());
+            ItemPath orderBy = paging.getOrderBy().getItemPath();
+            ItemName name = orderBy.lastName();
+            if (name == null) {
+                return;
+            }
+            provider.setSort(new SortParam(name.getLocalPart(), ascending));
+        }
     }
 
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -2413,11 +2413,12 @@ public static void setCurrentPage(Table table, ObjectPaging paging) {
             return;
         }
 
-        if (paging == null) {
+        if (paging == null || paging.getOffset() == null) {
             table.getDataTable().setCurrentPage(0);
             return;
         }
 
+
         long itemsPerPage = table.getDataTable().getItemsPerPage();
         long page = ((paging.getOffset() + itemsPerPage) / itemsPerPage) - 1;
         if (page < 0) {

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
@@ -62,6 +62,7 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
+import com.evolveum.midpoint.schema.util.ObjectQueryUtil;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.*;
@@ -185,8 +186,19 @@ public Search<C> load() {
 
 
                 if (isCollectionViewPanel()) {
-                    search.setCollectionSearchItem(new ObjectCollectionSearchItem(search, getObjectCollectionView()));
+                    CompiledObjectCollectionView view = getObjectCollectionView();
+                    search.setCollectionSearchItem(new ObjectCollectionSearchItem(search, view));
                     search.setCollectionItemVisible(isCollectionViewPanelForWidget());
+                    if (storage != null && view.getPaging() != null) {
+                        ObjectPaging paging = ObjectQueryUtil.convertToObjectPaging(view.getPaging(), getPrismContext());
+                        if (storage.getPaging() == null) {
+                            storage.setPaging(paging);
+                        }
+                        if (getTableId() != null && paging.getMaxSize() != null
+                                && !getPageBase().getSessionStorage().getUserProfile().isExistPagingSize(getTableId())) {
+                            getPageBase().getSessionStorage().getUserProfile().setPagingSize(getTableId(), paging.getMaxSize());
+                        }
+                    }
                 }
                 if (storage != null) {
                     storage.setSearch(search);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
@@ -118,6 +118,14 @@ public void setPagingSize(TableId key, Integer size) {
         setPagingSize(key.name(), size);
     }
 
+    public boolean isExistPagingSize(TableId key) {
+        Validate.notNull(key, "TableId must not be null.");
+        Validate.notNull(key.name(), "TableId.name() must not be null.");
+
+        Integer size = tables.get(key.name());
+        return size != null;
+    }
+
     public void setPagingSize(String key, Integer size) {
         Validate.notNull(key, "Key must not be null.");
 

diff --git a/gui/admin-gui/src/main/resources/initial-objects/130-report-certification-definitions.xml b/gui/admin-gui/src/main/resources/initial-objects/130-report-certification-definitions.xml
@@ -115,12 +115,12 @@
                     </expression>
                 </export>
             </column>
+            <paging>
+                <orderDirection>ascending</orderDirection>
+                <orderBy>name</orderBy>
+            </paging>
             <type>AccessCertificationDefinitionType</type>
         </view>
-        <paging>
-            <orderDirection>ascending</orderDirection>
-            <orderBy>name</orderBy>
-        </paging>
         <subreport>
             <name>campaigns</name>
             <type>AccessCertificationCampaignType</type>

diff --git a/gui/admin-gui/src/main/resources/initial-objects/140-report-certification-campaigns.xml b/gui/admin-gui/src/main/resources/initial-objects/140-report-certification-campaigns.xml
@@ -163,13 +163,13 @@
                     </expression>
                 </export>
             </column>
+            <paging>
+                <orderDirection>ascending</orderDirection>
+                <orderBy>name</orderBy>
+            </paging>
             <type>AccessCertificationCampaignType</type>
         </view>
         <useOnlyReportView>true</useOnlyReportView>
-        <paging>
-            <orderDirection>ascending</orderDirection>
-            <orderBy>name</orderBy>
-        </paging>
         <parameter>
             <name>alsoClosedCampaigns</name>
             <type>boolean</type>

diff --git a/gui/admin-gui/src/main/resources/initial-objects/160-report-certification-decisions.xml b/gui/admin-gui/src/main/resources/initial-objects/160-report-certification-decisions.xml
@@ -138,11 +138,11 @@
                     </expression>
                 </export>
             </column>
+            <paging>
+                <orderBy>objectRef/@/name</orderBy>
+            </paging>
             <type>c:AccessCertificationCaseType</type>
         </view>
-        <paging>
-            <orderBy>objectRef/@/name</orderBy>
-        </paging>
         <parameter>
             <name>campaignName</name>
             <type>c:ObjectReferenceType</type>

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
@@ -10,6 +10,8 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
+import com.evolveum.prism.xml.ns._public.query_3.PagingType;
+
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.prism.ItemProcessing;
@@ -520,6 +522,24 @@ public static void mergeDisplay(DisplayType viewDisplay, DisplayType archetypeDi
         }
     }
 
+    public static void mergePaging(PagingType existPaging, PagingType newPaging) {
+        if (existPaging.getMaxSize() == null) {
+            existPaging.setMaxSize(newPaging.getMaxSize());
+        }
+        if (existPaging.getGroupBy() == null) {
+            existPaging.setGroupBy(newPaging.getGroupBy());
+        }
+        if (existPaging.getOffset() == null) {
+            existPaging.setOffset(newPaging.getOffset());
+        }
+        if (existPaging.getOrderBy() == null) {
+            existPaging.setOrderBy(newPaging.getOrderBy());
+        }
+        if (existPaging.getOrderDirection() == null) {
+            existPaging.setOrderDirection(newPaging.getOrderDirection());
+        }
+    }
+
     /*
    the ordering algorithm is: the first level is occupied by
    the column which previousColumn == null || "" || notExistingColumnNameValue.

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -25619,18 +25619,6 @@
                             </xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
-                    <xsd:element name="paging" type="q:PagingType" minOccurs="0" maxOccurs="1">
-                        <xsd:annotation>
-                            <xsd:documentation>
-                                Paging for query.
-                            </xsd:documentation>
-                            <xsd:appinfo>
-                                <a:experimental>true</a:experimental>
-                                <a:since>4.4</a:since>
-                                <a:displayName>ObjectCollectionReportEngineConfigurationType.paging</a:displayName>
-                            </xsd:appinfo>
-                        </xsd:annotation>
-                    </xsd:element>
                 </xsd:sequence>
             </xsd:extension>
         </xsd:complexContent>
@@ -26456,6 +26444,18 @@
                                </xsd:appinfo>
                            </xsd:annotation>
                        </xsd:element>
+                       <xsd:element name="paging" type="q:PagingType" minOccurs="0" maxOccurs="1">
+                           <xsd:annotation>
+                               <xsd:documentation>
+                                   Paging for query.
+                               </xsd:documentation>
+                               <xsd:appinfo>
+                                   <a:experimental>true</a:experimental>
+                                   <a:since>4.4</a:since>
+                                   <a:displayName>GuiObjectListPanelConfigurationType.paging</a:displayName>
+                               </xsd:appinfo>
+                           </xsd:annotation>
+                       </xsd:element>
                        <!-- TODO: number of results per page (MID-1931) -->
                        <!-- TODO: later: export settings (GuiExportSettingsType) -->
                    </xsd:sequence>

diff --git a/...ain/java/com/evolveum/midpoint/model/api/authentication/CompiledObjectCollectionView.java b/...ain/java/com/evolveum/midpoint/model/api/authentication/CompiledObjectCollectionView.java
@@ -15,10 +15,13 @@
 
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.PrismContext;
+import com.evolveum.midpoint.prism.query.ObjectPaging;
 import com.evolveum.midpoint.schema.GetOperationOptions;
 import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
+import com.evolveum.prism.xml.ns._public.query_3.PagingType;
+
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.prism.query.ObjectFilter;
@@ -54,6 +57,7 @@ public class CompiledObjectCollectionView implements DebugDumpable, Serializable
     private Integer refreshInterval;
     private Collection<SelectorOptions<GetOperationOptions>> options;
     private Collection<SelectorOptions<GetOperationOptions>> domainOptions;
+    private PagingType paging;
 
     private String objectCollectionDescription;
 
@@ -242,6 +246,14 @@ public void setObjectCollectionDescription(String objectCollectionDescription) {
         this.objectCollectionDescription = objectCollectionDescription;
     }
 
+    public void setPaging(PagingType paging) {
+        this.paging = paging;
+    }
+
+    public PagingType getPaging() {
+        return paging;
+    }
+
     @Override
     public String debugDump(int indent) {
         StringBuilder sb = DebugUtil.createTitleStringBuilderLn(CompiledObjectCollectionView.class, indent);
@@ -260,6 +272,7 @@ public String debugDump(int indent) {
         DebugUtil.debugDumpWithLabel(sb, "displayOrder", displayOrder, indent + 1);
         DebugUtil.debugDumpWithLabel(sb, "refreshInterval", refreshInterval, indent + 1);
         DebugUtil.debugDumpWithLabel(sb, "objectCollectionDescription", objectCollectionDescription, indent + 1);
+        DebugUtil.debugDumpWithLabelToStringLn(sb, "paging", paging, indent + 1);
         return sb.toString();
     }
 
@@ -281,6 +294,7 @@ public GuiObjectListViewType toGuiObjectListViewType() {
         viewType.setSearchBoxConfiguration(getSearchBoxConfiguration());
         viewType.setDisplayOrder(getDisplayOrder());
         viewType.setRefreshInterval(getRefreshInterval());
+        viewType.setPaging(getPaging());
         return viewType;
     }
 

diff --git a/...l-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/CollectionProcessor.java b/...l-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/CollectionProcessor.java
@@ -11,6 +11,8 @@
 import java.util.List;
 import javax.xml.namespace.QName;
 
+import com.evolveum.prism.xml.ns._public.query_3.PagingType;
+
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -443,6 +445,7 @@ private void compileView(CompiledObjectCollectionView existingView, GuiObjectLis
             compileDisplayOrder(existingView, objectListViewType, replaceIfExist);
             compileSearchBox(existingView, objectListViewType, replaceIfExist);
             compileRefreshInterval(existingView, objectListViewType, replaceIfExist);
+            compilePaging(existingView, objectListViewType, replaceIfExist);
         }
     }
 
@@ -590,4 +593,16 @@ private void compileSearchBox(CompiledObjectCollectionView existingView, GuiObje
             existingView.setSearchBoxConfiguration(newSearchBoxConfig);
         }
     }
+
+    private void compilePaging(CompiledObjectCollectionView existingView, GuiObjectListViewType objectListViewType, boolean replaceIfExist) {
+        PagingType newPaging = objectListViewType.getPaging();
+        if (newPaging == null) {
+            return;
+        }
+        if (existingView.getPaging() == null) {
+            existingView.setPaging(newPaging);
+        } else if (replaceIfExist) {
+            MiscSchemaUtil.mergePaging(existingView.getPaging(), newPaging);
+        }
+    }
 }
diff --git a/...rc/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java b/...rc/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
@@ -1945,7 +1945,7 @@ public <O extends ObjectType> List<StringLimitationResult> validateValue(Protect
 
     @Override
     public void processObjectsFromCollection(CollectionRefSpecificationType collectionConfig, QName typeForFilter, Predicate<PrismContainer> handler,
-            Collection<SelectorOptions<GetOperationOptions>> defaultOptions, ObjectPaging paging, VariablesMap variables, Task task, OperationResult result, boolean recordProgress)
+            Collection<SelectorOptions<GetOperationOptions>> defaultOptions, ObjectPaging usedPaging, VariablesMap variables, Task task, OperationResult result, boolean recordProgress)
             throws SchemaException, ObjectNotFoundException, SecurityViolationException, CommunicationException, ConfigurationException, ExpressionEvaluationException {
         Class<? extends Containerable> type = null;
 
@@ -1966,7 +1966,7 @@ public void processObjectsFromCollection(CollectionRefSpecificationType collecti
         }
 
         ObjectQuery query = prismContext.queryFactory().createQuery();
-        query.setPaging(paging);
+        query.setPaging(usedPaging == null ? ObjectQueryUtil.convertToObjectPaging(compiledCollection.getPaging(), prismContext) : usedPaging);
         query.setFilter(filter);
 
         if (compiledCollection.getTargetClass(prismContext) == null) {