fix(datatables): saved orderBy was always overridden by the default one (#3052)

app/docker/components/datatables/containers-datatable/containersDatatableController.js

@@ -172,6 +172,7 @@ function ($scope, $controller, DatatableService, EndpointProvider) {
     this.setDefaults();
     this.prepareTableFromDataset();
 
+    this.state.orderBy = this.orderBy;
     var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
     if (storedOrder !== null) {
       this.state.reverseOrder = storedOrder.reverse;
@@ -203,6 +204,5 @@ function ($scope, $controller, DatatableService, EndpointProvider) {
       this.columnVisibility = storedColumnVisibility;
       this.columnVisibility.state.open = false;
     }
-    this.state.orderBy = this.orderBy;
   };
 }]);

app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js

@@ -108,6 +108,7 @@ angular.module('portainer.docker')
         this.setDefaults();
         this.prepareTableFromDataset();
 
+        this.state.orderBy = this.orderBy;
         var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
         if (storedOrder !== null) {
           this.state.reverseOrder = storedOrder.reverse;
@@ -135,7 +136,6 @@ angular.module('portainer.docker')
           this.settings.open = false;
         }
         this.onSettingsRepeaterChange();
-        this.state.orderBy = this.orderBy;
       };
     }
   ]);

app/docker/components/datatables/images-datatable/imagesDatatableController.js

@@ -39,6 +39,7 @@ function ($scope, $controller, DatatableService) {
     this.setDefaults();
     this.prepareTableFromDataset();
 
+    this.state.orderBy = this.orderBy;
     var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
     if (storedOrder !== null) {
       this.state.reverseOrder = storedOrder.reverse;
@@ -66,6 +67,5 @@ function ($scope, $controller, DatatableService) {
     }
 
     this.onSettingsRepeaterChange();
-    this.state.orderBy = this.orderBy;
   };
 }]);

app/docker/components/datatables/networks-datatable/networksDatatableController.js

@@ -19,6 +19,7 @@ angular.module('portainer.docker')
         this.setDefaults();
         this.prepareTableFromDataset();
 
+        this.state.orderBy = this.orderBy;
         var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
         if (storedOrder !== null) {
           this.state.reverseOrder = storedOrder.reverse;
@@ -45,7 +46,6 @@ angular.module('portainer.docker')
           this.settings.open = false;
         }
         this.onSettingsRepeaterChange();
-        this.state.orderBy = this.orderBy;
       };
   }
 ]);

app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatableController.js

@@ -61,6 +61,7 @@ angular.module('portainer.docker')
         this.setDefaults();
         this.prepareTableFromDataset();
 
+        this.state.orderBy = this.orderBy;
         var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
         if (storedOrder !== null) {
           this.state.reverseOrder = storedOrder.reverse;
@@ -87,7 +88,6 @@ angular.module('portainer.docker')
           this.settings.open = false;
         }
         this.onSettingsRepeaterChange();
-        this.state.orderBy = this.orderBy;
       };
     }
 ]);

app/docker/components/datatables/services-datatable/servicesDatatableController.js

@@ -68,6 +68,7 @@ function ($scope, $controller, DatatableService, EndpointProvider) {
     this.setDefaults();
     this.prepareTableFromDataset();
 
+    this.state.orderBy = this.orderBy;
     var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
     if (storedOrder !== null) {
       this.state.reverseOrder = storedOrder.reverse;
@@ -99,6 +100,5 @@ function ($scope, $controller, DatatableService, EndpointProvider) {
       this.settings.open = false;
     }
     this.onSettingsRepeaterChange();
-    this.state.orderBy = this.orderBy;
   };
 }]);

app/docker/components/datatables/tasks-datatable/tasksDatatableController.js

@@ -16,6 +16,7 @@ function ($scope, $controller, DatatableService) {
     this.setDefaults();
     this.prepareTableFromDataset();
 
+    this.state.orderBy = this.orderBy;
     var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
     if (storedOrder !== null) {
       this.state.reverseOrder = storedOrder.reverse;
@@ -42,6 +43,5 @@ function ($scope, $controller, DatatableService) {
       this.settings.open = false;
     }
     this.onSettingsRepeaterChange();
-    this.state.orderBy = this.orderBy;
   };
 }]);

app/docker/components/datatables/volumes-datatable/volumesDatatableController.js

@@ -39,6 +39,7 @@ function ($scope, $controller, DatatableService) {
     this.setDefaults();
     this.prepareTableFromDataset();
 
+    this.state.orderBy = this.orderBy;
     var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
     if (storedOrder !== null) {
       this.state.reverseOrder = storedOrder.reverse;
@@ -65,6 +66,5 @@ function ($scope, $controller, DatatableService) {
       this.settings.open = false;
     }
     this.onSettingsRepeaterChange();
-    this.state.orderBy = this.orderBy;
   };
 }]);

app/integrations/storidge/components/drives-datatable/storidgeDrivesDatatableController.js

@@ -11,6 +11,7 @@ angular.module('portainer.docker')
         this.setDefaults();
         this.prepareTableFromDataset();
 
+        this.state.orderBy = this.orderBy;
         var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
         if (storedOrder !== null) {
           this.state.reverseOrder = storedOrder.reverse;
@@ -37,7 +38,6 @@ angular.module('portainer.docker')
           this.settings.open = false;
         }
         this.onSettingsRepeaterChange();
-        this.state.orderBy = this.orderBy;
       };
   }
 ]);

app/integrations/storidge/components/nodes-datatable/storidgeNodesDatatableController.js

@@ -25,6 +25,7 @@ function($scope, $controller, clipboard, Notifications, StoridgeNodeService, Dat
     this.setDefaults();
     this.prepareTableFromDataset();
 
+    this.state.orderBy = this.orderBy;
     var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
     if (storedOrder !== null) {
       this.state.reverseOrder = storedOrder.reverse;
@@ -51,6 +52,5 @@ function($scope, $controller, clipboard, Notifications, StoridgeNodeService, Dat
       this.settings.open = false;
     }
     this.onSettingsRepeaterChange();
-    this.state.orderBy = this.orderBy;
   };
 }]);

app/portainer/components/access-datatable/accessDatatableController.js

@@ -15,6 +15,7 @@ angular.module('portainer.app')
         this.setDefaults();
         this.prepareTableFromDataset();
 
+        this.state.orderBy = this.orderBy;
         var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
         if (storedOrder !== null) {
           this.state.reverseOrder = storedOrder.reverse;
@@ -41,7 +42,6 @@ angular.module('portainer.app')
           this.settings.open = false;
         }
         this.onSettingsRepeaterChange();
-        this.state.orderBy = this.orderBy;
       };
   }
 ]);

app/portainer/components/datatables/genericDatatableController.js

@@ -119,6 +119,7 @@ function ($interval, PaginationService, DatatableService, PAGINATION_MAX_ITEMS)
     this.setDefaults();
     this.prepareTableFromDataset();
 
+    this.state.orderBy = this.orderBy;
     var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
     if (storedOrder !== null) {
       this.state.reverseOrder = storedOrder.reverse;
@@ -145,7 +146,6 @@ function ($interval, PaginationService, DatatableService, PAGINATION_MAX_ITEMS)
       this.settings.open = false;
     }
     this.onSettingsRepeaterChange();
-    this.state.orderBy = this.orderBy;
   };
   
   /**

app/portainer/components/datatables/schedules-datatable/schedulesDatatableController.js

@@ -15,6 +15,7 @@ angular.module('portainer.app')
         this.setDefaults();
         this.prepareTableFromDataset();
 
+        this.state.orderBy = this.orderBy;
         var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
         if (storedOrder !== null) {
           this.state.reverseOrder = storedOrder.reverse;
@@ -41,7 +42,6 @@ angular.module('portainer.app')
           this.settings.open = false;
         }
         this.onSettingsRepeaterChange();
-        this.state.orderBy = this.orderBy;
       };
   }
 ]);

app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js

@@ -15,6 +15,7 @@ function ($scope, $controller, DatatableService) {
     this.setDefaults();
     this.prepareTableFromDataset();
 
+    this.state.orderBy = this.orderBy;
     var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
     if (storedOrder !== null) {
       this.state.reverseOrder = storedOrder.reverse;
@@ -41,7 +42,6 @@ function ($scope, $controller, DatatableService) {
       this.settings.open = false;
     }
     this.onSettingsRepeaterChange();
-    this.state.orderBy = this.orderBy;
   };
 
 }]);