Merge pull request #12351 from richard-cox/fix-expires-sort-rder

Ensure harvester cloud creds with expiration date of 0 are sorted correctly
rancher · Oct 25, 2024 · d5024a1 · d5024a1
2 parents ec2f92a + b7326da
commit d5024a1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/shell/models/cloudcredential.js b/shell/models/cloudcredential.js
@@ -241,9 +241,9 @@ export default class CloudCredential extends NormanModel {
   }
 
   get expiresForSort() {
-    // Why not just `expires`? Ensures the correct sort order of 'no expiration' --> 'expired' --> 'expiring'
-    // (instead of expired --> expiring --> no expiration)
-    return this.expires || Number.MAX_SAFE_INTEGER;
+    // Why not just `expires`? Ensures the correct sort order of expired --> expiring --> never expires
+    // (instead of 'never expired' --> 'expired' --> 'expiring')
+    return this.expires !== undefined ? this.expires : Number.MAX_SAFE_INTEGER;
   }
 
   get expires() {