diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js index d5addd0a18..b81b4d9011 100644 --- a/shell/config/table-headers.js +++ b/shell/config/table-headers.js @@ -416,7 +416,7 @@ export const USER_LAST_LOGIN = { export const USER_DISABLED_IN = { name: 'user-disabled-in', labelKey: 'tableHeaders.userDisabledIn', - value: 'userDisabledIn', + value: 'userDisabledInDisplay', formatter: 'LiveDate', formatterOpts: { isCountdown: true }, sort: 'userDisabledIn', diff --git a/shell/models/management.cattle.io.user.js b/shell/models/management.cattle.io.user.js index f2141196d8..505e4656d9 100644 --- a/shell/models/management.cattle.io.user.js +++ b/shell/models/management.cattle.io.user.js @@ -116,6 +116,14 @@ export default class User extends HybridModel { return this.metadata?.labels?.['cattle.io/disable-after'] * 1000; } + /** + * Provides a display value for the userDisabledIn date based on the user + * state. + */ + get userDisabledInDisplay() { + return this.state === 'inactive' ? null : this.userDisabledIn; + } + /** * Gets the delete-after label in milliseconds * @returns {number} @@ -260,7 +268,7 @@ export default class User extends HybridModel { label: this.t('tableHeaders.userDisabledIn'), formatter: 'LiveDate', formatterOpts: { isCountdown: true }, - content: this.userDisabledIn, + content: this.userDisabledInDisplay, }, { label: this.t('tableHeaders.userDeletedIn'),