Merge pull request solidusio#6238 from chaimann/admin-fix-table-sorting

[Admin] fix table sorting

Author: tvdeyen

admin/app/components/solidus_admin/ui/table/component.js

@@ -32,7 +32,9 @@ export default class extends Controller {
   }
 
   // Determine if sortable should be enabled
-  modeValueChanged() {
+  modeValueChanged(_current, previous) {
+    this.previousMode = previous;
+
     const shouldSetSortable = this.sortableValue && this.modeValue !== "batch" && this.modeValue !== "search"
 
     if (shouldSetSortable) {
@@ -69,27 +71,19 @@ export default class extends Controller {
 
   selectRow(event) {
     if (this.checkboxTargets.some((checkbox) => checkbox.checked)) {
-      this.modeValue = "batch"
-    } else if (this.hasSearchFieldTarget && this.searchFieldTarget.value !== "") {
-      this.modeValue = "search"
-    } else if (this.hasScopesToolbarTarget) {
-      this.modeValue = "scopes"
+      this.modeValue = "batch";
     } else {
-      this.modeValue = "search"
+      this.modeValue = this.previousMode;
     }
 
     this.render()
   }
 
   selectAllRows(event) {
     if (event.target.checked) {
-      this.modeValue = "batch"
-    } else if (this.hasSearchFieldTarget && this.searchFieldTarget.value !== "") {
-      this.modeValue = "search"
-    } else if (this.hasScopesToolbarTarget) {
-      this.modeValue = "scopes"
+      this.modeValue = "batch";
     } else {
-      this.modeValue = "search"
+      this.modeValue = this.previousMode;
     }
 
     this.checkboxTargets.forEach((checkbox) => (checkbox.checked = event.target.checked))

admin/app/components/solidus_admin/ui/table/component.rb

@@ -185,6 +185,8 @@ def initial_mode
   end
 
   def should_enable_sortable?
-    @sortable && @search&.on_default_scope?
+    return false if @sortable.nil?
+    return true if @search.nil?
+    @search.on_default_scope?
   end
 end

admin/app/javascript/solidus_admin/controllers/sortable_controller.js

@@ -4,7 +4,7 @@ import { patch } from '@rails/request.js'
 
 export default class extends Controller {
   static values = {
-    param: { type: String, default: 'postion' },
+    param: { type: String, default: 'position' },
     handle: { type: String, default: null },
     animation: { type: Number, default: 150 },
   }