From 8c0ced4e24c71e0fea51ad99bcc517338c2fb253 Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Tue, 21 Jan 2025 08:57:17 +0000 Subject: [PATCH] Add last used column for API tokens (#12114) * Add last used column for API tokens * Address PR feedback --- shell/assets/translations/en-us.yaml | 1 + shell/components/formatter/LiveExpiryDate.vue | 6 +++++- shell/config/product/explorer.js | 3 ++- shell/config/table-headers.js | 11 +++++++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml index bc5c8d9950b..dde47ac0177 100644 --- a/shell/assets/translations/en-us.yaml +++ b/shell/assets/translations/en-us.yaml @@ -5764,6 +5764,7 @@ tableHeaders: lastSchedule: Last Schedule lastSeen: Last Seen lastSeenTooltip: The time at which the most recent occurrence of this event was recorded + lastUsed: Last Used loggingOutputProviders: Provider machines: Machines machineNodeName: Node diff --git a/shell/components/formatter/LiveExpiryDate.vue b/shell/components/formatter/LiveExpiryDate.vue index 551a26c0812..c962a640fc9 100644 --- a/shell/components/formatter/LiveExpiryDate.vue +++ b/shell/components/formatter/LiveExpiryDate.vue @@ -12,6 +12,10 @@ export default { type: Object, default: () => {} }, + missingKey: { + type: String, + default: 'generic.never', + } }, data() { @@ -77,7 +81,7 @@ export default { /> diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js index d5e2cece26f..e92087b93b5 100644 --- a/shell/config/product/explorer.js +++ b/shell/config/product/explorer.js @@ -19,7 +19,7 @@ import { USER_ID, USERNAME, USER_DISPLAY_NAME, USER_PROVIDER, USER_LAST_LOGIN, USER_DISABLED_IN, USER_DELETED_IN, WORKLOAD_ENDPOINTS, STORAGE_CLASS_DEFAULT, STORAGE_CLASS_PROVISIONER, PERSISTENT_VOLUME_SOURCE, HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA, - ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS, + ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE, LAST_USED, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS, DURATION, MESSAGE, REASON, LAST_SEEN_TIME, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA } from '@shell/config/table-headers'; @@ -542,6 +542,7 @@ export function init(store) { ACCESS_KEY, DESCRIPTION, SCOPE_NORMAN, + LAST_USED, EXPIRES, AGE_NORMAN ]); diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js index 2d95d0fecf8..e06b0b74740 100644 --- a/shell/config/table-headers.js +++ b/shell/config/table-headers.js @@ -960,6 +960,17 @@ export const EXPIRES = { formatter: 'LiveExpiryDate' }; +export const LAST_USED = { + name: 'lastUsed', + value: 'lastUsedAt', + labelKey: 'tableHeaders.lastUsed', + align: 'left', + sort: ['lastUsedAt'], + width: 200, + formatter: 'LiveExpiryDate', + formatterOpts: { missingKey: 'generic.unknown' }, +}; + export const RESTART = { name: 'restart', labelKey: 'tableHeaders.restart',