From 57b80cd9ac92a282c0768f12300f2925684c6089 Mon Sep 17 00:00:00 2001
From: Chaim Lev-Ari <chiptus@users.noreply.github.com>
Date: Sun, 10 Dec 2023 10:26:06 +0100
Subject: [PATCH] fix(stacks): sort by date [EE-5766] (#10758)

---
 .../datatables/stacks-datatable/stacksDatatable.html | 12 ++++++------
 app/portainer/models/stack.js                        | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html
index b30adf85d..1625aaccc 100644
--- a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html
+++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html
@@ -144,18 +144,18 @@
                 <table-column-header
                   col-title="'Created'"
                   can-sort="true"
-                  is-sorted="$ctrl.state.orderBy === 'ResourceControl.CreationDate'"
-                  is-sorted-desc="$ctrl.state.orderBy === 'ResourceControl.CreationDate' && $ctrl.state.reverseOrder"
-                  ng-click="$ctrl.changeOrderBy('ResourceControl.CreationDate')"
+                  is-sorted="$ctrl.state.orderBy === 'CreationDate'"
+                  is-sorted-desc="$ctrl.state.orderBy === 'CreationDate' && $ctrl.state.reverseOrder"
+                  ng-click="$ctrl.changeOrderBy('CreationDate')"
                 ></table-column-header>
               </th>
               <th ng-if="$ctrl.columnVisibility.columns.updated.display">
                 <table-column-header
                   col-title="'Updated'"
                   can-sort="true"
-                  is-sorted="$ctrl.state.orderBy === 'ResourceControl.UpdateDate'"
-                  is-sorted-desc="$ctrl.state.orderBy === 'ResourceControl.UpdateDate' && $ctrl.state.reverseOrder"
-                  ng-click="$ctrl.changeOrderBy('ResourceControl.UpdateDate')"
+                  is-sorted="$ctrl.state.orderBy === 'UpdateDate'"
+                  is-sorted-desc="$ctrl.state.orderBy === 'UpdateDate' && $ctrl.state.reverseOrder"
+                  ng-click="$ctrl.changeOrderBy('UpdateDate')"
                 ></table-column-header>
               </th>
               <th>
diff --git a/app/portainer/models/stack.js b/app/portainer/models/stack.js
index 9b5141d1c..d2b42cf1f 100644
--- a/app/portainer/models/stack.js
+++ b/app/portainer/models/stack.js
@@ -13,9 +13,9 @@ export function StackViewModel(data) {
     this.ResourceControl = new ResourceControlViewModel(data.ResourceControl);
   }
   this.Status = data.Status;
-  this.CreationDate = data.CreationDate;
+  this.CreationDate = data.CreationDate || undefined; // set undefined for angular sorting
   this.CreatedBy = data.CreatedBy;
-  this.UpdateDate = data.UpdateDate;
+  this.UpdateDate = data.UpdateDate || undefined; // set undefined for angular sorting
   this.UpdatedBy = data.UpdatedBy;
   this.Regular = true;
   this.External = false;
@@ -30,7 +30,7 @@ export function StackViewModel(data) {
 export function ExternalStackViewModel(name, type, creationDate) {
   this.Name = name;
   this.Type = type;
-  this.CreationDate = creationDate;
+  this.CreationDate = creationDate || undefined; // set undefined for angular sorting
 
   this.Regular = false;
   this.External = true;
@@ -50,9 +50,9 @@ export function OrphanedStackViewModel(data) {
     this.ResourceControl = new ResourceControlViewModel(data.ResourceControl);
   }
   this.Status = data.Status;
-  this.CreationDate = data.CreationDate;
+  this.CreationDate = data.CreationDate || undefined; // set undefined for angular sorting
   this.CreatedBy = data.CreatedBy;
-  this.UpdateDate = data.UpdateDate;
+  this.UpdateDate = data.UpdateDate || undefined; // set undefined for angular sorting
   this.UpdatedBy = data.UpdatedBy;
 
   this.Regular = false;