Merge pull request #1022 from bedita/fix-paginated-position

Fix paginated position
bedita · Jul 4, 2023 · 745efa6 · 745efa6
2 parents 5612a42 + 8bedca6
commit 745efa6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/resources/js/app/components/relation-view/relation-view.js b/resources/js/app/components/relation-view/relation-view.js
@@ -201,12 +201,12 @@ export default {
         },
 
         objects(newObjects) {
-            this.positions = newObjects.reduce((positions, object, index) => {
-                positions[object.id] = index + 1;
+            this.positions = newObjects.reduce((positions, object) => {
+                positions[object.id] = object.meta?.relation?.position || '';
                 return positions;
             }, {});
             this.priorities = newObjects.reduce((priorities, object) => {
-                priorities[object.id] = object?.meta?.relation?.priority || '';
+                priorities[object.id] = object.meta?.relation?.priority || '';
                 return priorities;
             }, {});
         },
@@ -341,8 +341,10 @@ export default {
             this.objects.splice(newIndex, 0, this.objects.splice(oldIndex, 1)[0]);
 
             this.objects = this.objects.map((object, index) => {
-                object.meta.relation.position = ascending ? index + 1 : this.pagination.count - index;
-                object.meta.relation.position += this.pagination.page_size * (this.pagination.page - 1);
+                const { count, page_size, page } = this.pagination;
+                object.meta.relation.position = ascending
+                    ? (page_size * (page - 1) + 1 + index)
+                    : (count - (page_size * (page - 1)) - index);
                 this.modifyRelation(object);
 
                 return object;

diff --git a/resources/js/app/mixins/paginated-content.js b/resources/js/app/mixins/paginated-content.js
@@ -89,7 +89,10 @@ export const PaginatedContentMixin = {
                             }
                             if (order.indexOf('position') >= 0) {
                                 const ascending = order === 'position';
-                                let i = ascending ? 1 : json.meta.pagination.count;
+                                const { count, page_size, page } = json.meta.pagination;
+                                let i = ascending
+                                    ? (page_size * (page - 1) + 1)
+                                    : (count - (page_size * (page - 1)));
                                 for (let obj of objects) {
                                     obj.meta.relation.position = i;
                                     i = ascending ? i+1 : i-1;