fix: reset page number on sorting

devansh-webkul · Aug 30, 2023 · a434f58 · a434f58
1 parent ec17aca
commit a434f58
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/packages/Webkul/Admin/src/Resources/views/components/datagrid/index.blade.php b/packages/Webkul/Admin/src/Resources/views/components/datagrid/index.blade.php
@@ -275,6 +275,11 @@
                             order: this.applied.sort.order === 'asc' ? 'desc' : 'asc',
                         };
 
+                        /**
+                         * When the sorting changes, we need to reset the page.
+                         */
+                        this.applied.pagination.page = 1;
+
                         this.get();
                     }
                 },
@@ -579,7 +584,12 @@
                                     indices: this.applied.massActions.indices
                                 })
                                 .then(response => {
+                                    this.$emitter.emit('add-flash', { type: 'success', message: response.data.data.message });
+
                                     this.get();
+                                })
+                                .catch((error) => {
+                                    this.$emitter.emit('add-flash', { type: 'error', message: error.response.data.data.message });
                                 });
 
                             break;

diff --git a/packages/Webkul/Shop/src/Resources/views/components/datagrid/index.blade.php b/packages/Webkul/Shop/src/Resources/views/components/datagrid/index.blade.php
@@ -277,6 +277,11 @@
                             order: this.applied.sort.order === 'asc' ? 'desc' : 'asc',
                         };
 
+                        /**
+                         * When the sorting changes, we need to reset the page.
+                         */
+                        this.applied.pagination.page = 1;
+
                         this.get();
                     }
                 },