From c817a94c895ceae10a45d57c8b35d3a3b61bfeef Mon Sep 17 00:00:00 2001
From: "Ella E." <ella@discourse.org>
Date: Thu, 5 Dec 2024 04:24:01 -0700
Subject: [PATCH] UX: Move revoked API key status to dedicated column (#30125)

* DEV: add table heading for status

* UX: Move revoked status to its own column with a badge; remove revoked icon

* UX: Increase text contrast for revoked rows
---
 .../admin/addon/templates/api-keys-index.hbs  | 16 ++++++++++-
 .../stylesheets/common/admin/admin_table.scss | 27 +++++++++++++++++++
 app/assets/stylesheets/common/admin/api.scss  |  6 ++---
 config/locales/client.en.yml                  |  2 ++
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
index b331a95edca..169bf25277a 100644
--- a/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
@@ -14,13 +14,13 @@
         <th>{{i18n "admin.api.user"}}</th>
         <th>{{i18n "admin.api.created"}}</th>
         <th>{{i18n "admin.api.last_used"}}</th>
+        <th>{{i18n "admin.site_settings.table_column_heading.status"}}</th>
         <th>&nbsp;</th>
       </thead>
       <tbody>
         {{#each this.model as |k|}}
           <tr class="d-admin-row__content {{if k.revoked_at 'revoked'}}">
             <td class="d-admin-row__overview key">
-              {{#if k.revoked_at}}{{d-icon "circle-xmark"}}{{/if}}
               {{k.truncatedKey}}
             </td>
             <td class="d-admin-row__detail key-description">
@@ -57,6 +57,20 @@
                 {{i18n "admin.api.never_used"}}
               {{/if}}
             </td>
+            <td class="d-admin-row__detail">
+              <div class="d-admin-row__mobile-label">{{i18n
+                  "admin.site_settings.table_column_heading.status"
+                }}</div>
+              {{#if k.revoked_at}}
+                <div role="status" class="status-label">
+                  <div class="status-label-indicator">
+                  </div>
+                  <div class="status-label-text">
+                    {{i18n "admin.api.revoked"}}
+                  </div>
+                </div>
+              {{/if}}
+            </td>
             <td class="d-admin-row__controls key-controls">
               <DButton
                 @action={{route-action "show" k}}
diff --git a/app/assets/stylesheets/common/admin/admin_table.scss b/app/assets/stylesheets/common/admin/admin_table.scss
index 3b247ca8126..fa5d378b77a 100644
--- a/app/assets/stylesheets/common/admin/admin_table.scss
+++ b/app/assets/stylesheets/common/admin/admin_table.scss
@@ -66,6 +66,33 @@
       }
     }
   }
+
+  .status-label {
+    --d-border-radius: var(--space-4);
+
+    display: flex;
+    flex-wrap: nowrap;
+    width: fit-content;
+    background-color: var(--primary-low);
+    padding: var(--space-1) var(--space-2);
+    border-radius: var(--d-border-radius);
+
+    .status-label-indicator {
+      display: inline-block;
+      width: 6px;
+      height: 6px;
+      border-radius: 50%;
+      background-color: var(--primary-high);
+      flex-shrink: 0;
+      margin-right: var(--space-1);
+      margin-top: 0.4rem;
+    }
+
+    .status-label-text {
+      color: var(--primary-high);
+      font-size: var(--font-down-1);
+    }
+  }
 }
 
 .d-admin-row__overview {
diff --git a/app/assets/stylesheets/common/admin/api.scss b/app/assets/stylesheets/common/admin/api.scss
index 130fc4f6cab..f5ff0697b38 100644
--- a/app/assets/stylesheets/common/admin/api.scss
+++ b/app/assets/stylesheets/common/admin/api.scss
@@ -45,15 +45,15 @@ table.web-hooks.grid {
 
 // Api keys
 
-table.api-keys {
+.d-admin-table.api-keys {
   margin-bottom: 0.25em;
 
   tr.revoked {
-    color: var(--primary-medium);
+    color: var(--primary-high);
   }
 
   .d-admin-row__overview.key {
-    width: 30%;
+    width: 20%;
   }
 }
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 10d6ee82b5d..bea05786a56 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -7095,6 +7095,8 @@ en:
             title: "Upload images"
         selectable_avatars:
           title: "List of avatars users can choose from"
+        table_column_heading:
+          status: "Status" 
         categories:
           all_results: "All"
           required: "Required"