fix: update positions on sort

bedita · Jul 4, 2023 · 8bedca6 · 8bedca6
1 parent eeb4e9d
commit 8bedca6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/resources/js/app/components/relation-view/relation-view.js b/resources/js/app/components/relation-view/relation-view.js
@@ -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
@@ -90,9 +90,9 @@ export const PaginatedContentMixin = {
                             if (order.indexOf('position') >= 0) {
                                 const ascending = order === 'position';
                                 const { count, page_size, page } = json.meta.pagination;
-                                let i = ascending ?
-                                    (page_size * (page - 1) + 1) :
-                                    (count - (page_size * (page - 1)));
+                                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;