Merge branch '4.6' into main

ibexa · Oct 10, 2024 · edfa824 · edfa824
2 parents 52b6aff + 08cac67
commit edfa824
Showing 1 changed file with 28 additions and 3 deletions.
diff --git a/src/bundle/ui-dev/src/modules/sub-items/sub.items.module.js b/src/bundle/ui-dev/src/modules/sub-items/sub.items.module.js
@@ -99,6 +99,7 @@ export default class SubItemsModule extends Component {
         this.hideMorePanel = this.hideMorePanel.bind(this);
         this.renderExtraActions = this.renderExtraActions.bind(this);
         this.renderActionBtnWrapper = this.renderActionBtnWrapper.bind(this);
+        this.requestParamsHaveChanged = this.requestParamsHaveChanged.bind(this);
 
         this._refListViewWrapper = React.createRef();
         this._refMainContainerWrapper = React.createRef();
@@ -132,6 +133,7 @@ export default class SubItemsModule extends Component {
             columnsVisibility: this.getColumnsVisibilityFromLocalStorage(),
             morePanelVisible: false,
             morePanelVisibleItemsIndexes: [],
+            queryParams: {},
         };
     }
 
@@ -184,13 +186,23 @@ export default class SubItemsModule extends Component {
 
         const shouldLoadPage = !activePageItems;
 
-        if (shouldLoadPage) {
+        if (shouldLoadPage && this.requestParamsHaveChanged(activePageIndex)) {
             this.loadPage(activePageIndex);
         }
 
         ibexa.helpers.tooltips.parse();
     }
 
+    requestParamsHaveChanged(activePageIndex) {
+        const { queryParams } = this.state;
+
+        return (
+            queryParams.cursor !== this.calculateCursor(activePageIndex) ||
+            queryParams.sortClause !== this.state.sortClause ||
+            queryParams.sortOrder !== this.state.sortOrder
+        );
+    }
+
     componentWillUnmount() {
         document.body.removeChild(this.bulkActionModalContainer);
     }
@@ -240,10 +252,17 @@ export default class SubItemsModule extends Component {
     loadPage(pageIndex) {
         const { limit: itemsPerPage, parentLocationId: locationId, loadLocation, restInfo } = this.props;
         const { sortClause, sortOrder } = this.state;
-        const page = this.state.pages.find(({ number }) => number === pageIndex + 1);
-        const cursor = page ? page.cursor : null;
+        const cursor = this.calculateCursor(pageIndex);
         const queryConfig = { locationId, limit: itemsPerPage, sortClause, sortOrder, cursor };
 
+        this.setState({
+            queryParams: {
+                sortClause,
+                sortOrder,
+                cursor,
+            },
+        });
+
         loadLocation(restInfo, queryConfig, (response) => {
             const { totalCount, pages, edges } = response.data._repository.location.children;
             const activePageItems = edges.map((edge) => edge.node);
@@ -256,6 +275,12 @@ export default class SubItemsModule extends Component {
         });
     }
 
+    calculateCursor(pageIndex) {
+        const page = this.state.pages.find(({ number }) => number === pageIndex + 1);
+
+        return page ? page.cursor : null;
+    }
+
     updateTotalCountState(totalCount) {
         this.setState(() => ({
             totalCount,