From 8b126987807be3593f70ffd8b49b2d90406d7aea Mon Sep 17 00:00:00 2001
From: claire bontempo <68122737+hellobontempo@users.noreply.github.com>
Date: Thu, 21 Sep 2023 14:05:32 -0700
Subject: [PATCH] UI: Adds tidy_revoked_certs and revoked_cert_deleted_count to
 PKI tidy status page  (#23232)

* add missing params

* add changelog
---
 changelog/23232.txt                           |  3 ++
 .../addon/components/page/pki-tidy-status.hbs |  8 ++++-
 .../addon/components/page/pki-tidy-status.ts  | 35 +++++++++++--------
 3 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 changelog/23232.txt

diff --git a/changelog/23232.txt b/changelog/23232.txt
new file mode 100644
index 0000000000..8084391cc7
--- /dev/null
+++ b/changelog/23232.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: Adds tidy_revoked_certs to PKI tidy status page
+```
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/page/pki-tidy-status.hbs b/ui/lib/pki/addon/components/page/pki-tidy-status.hbs
index ae19692fcb..3bf43cace6 100644
--- a/ui/lib/pki/addon/components/page/pki-tidy-status.hbs
+++ b/ui/lib/pki/addon/components/page/pki-tidy-status.hbs
@@ -67,6 +67,12 @@
     />
   {{/each}}
 
+  {{#if this.isEnterprise}}
+    {{#each this.crossClusterOperation.status as |attr|}}
+      <InfoTableRow @label={{humanize (dasherize attr)}} @value={{get @tidyStatus attr}} @alwaysRender={{true}} />
+    {{/each}}
+  {{/if}}
+
   <h2 class="title is-4 has-bottom-margin-xs has-top-margin-l has-border-bottom-light has-bottom-padding-s">
     {{if (eq this.tidyState "Running") "Current" "Last"}}
     tidy settings
@@ -81,7 +87,7 @@
   {{/each}}
 
   {{#if this.isEnterprise}}
-    {{#each this.crossClusterOperation as |attr|}}
+    {{#each this.crossClusterOperation.config as |attr|}}
       <InfoTableRow
         @label={{humanize (dasherize attr)}}
         @value={{get @tidyStatus attr}}
diff --git a/ui/lib/pki/addon/components/page/pki-tidy-status.ts b/ui/lib/pki/addon/components/page/pki-tidy-status.ts
index 21da0fb03e..aead00c39c 100644
--- a/ui/lib/pki/addon/components/page/pki-tidy-status.ts
+++ b/ui/lib/pki/addon/components/page/pki-tidy-status.ts
@@ -23,25 +23,28 @@ interface Args {
 }
 
 interface TidyStatusParams {
-  safety_buffer: number;
-  tidy_cert_store: boolean;
-  tidy_revoked_certs: boolean;
+  // tidy banner
   state: string;
   error: string;
+  message: string;
+  // tidy status
   time_started: string | null;
   time_finished: string | null;
-  message: string;
   cert_store_deleted_count: number;
   revoked_cert_deleted_count: number;
   missing_issuer_cert_count: number;
+  revocation_queue_deleted_count: number; // enterprise only
+  cross_revoked_cert_deleted_count: number; // enterprise only
+  // tidy settings
+  tidy_cert_store: boolean;
+  tidy_revoked_certs: boolean;
   tidy_expired_issuers: boolean;
-  issuer_safety_buffer: string;
+  safety_buffer: number;
   tidy_move_legacy_ca_bundle: boolean;
-  tidy_revocation_queue: boolean;
-  revocation_queue_deleted_count: number;
-  tidy_cross_cluster_revoked_certs: boolean;
-  cross_revoked_cert_deleted_count: number;
-  revocation_queue_safety_buffer: string;
+  issuer_safety_buffer: string;
+  tidy_revocation_queue: boolean; // enterprise only
+  tidy_cross_cluster_revoked_certs: boolean; // enterprise only
+  revocation_queue_safety_buffer: string; // enterprise only
 }
 
 export default class PkiTidyStatusComponent extends Component<Args> {
@@ -57,16 +60,14 @@ export default class PkiTidyStatusComponent extends Component<Args> {
   tidyStatusGeneralFields = [
     'time_started',
     'time_finished',
-    'last_auto_tidy_finished',
     'cert_store_deleted_count',
+    'revoked_cert_deleted_count',
     'missing_issuer_cert_count',
-    'revocation_queue_deleted_count',
   ];
 
   tidyStatusConfigFields = [
     'tidy_cert_store',
-    'tidy_revocation_queue',
-    'tidy_cross_cluster_revoked_certs',
+    'tidy_revoked_certs',
     'safety_buffer',
     'pause_duration',
     'tidy_expired_issuers',
@@ -74,7 +75,11 @@ export default class PkiTidyStatusComponent extends Component<Args> {
     'issuer_safety_buffer',
   ];
 
-  crossClusterOperation = ['tidy_revocation_queue', 'revocation_queue_safety_buffer'];
+  // enterprise only
+  crossClusterOperation = {
+    status: ['revocation_queue_deleted_count', 'cross_revoked_cert_deleted_count'],
+    config: ['tidy_revocation_queue', 'tidy_cross_cluster_revoked_certs', 'revocation_queue_safety_buffer'],
+  };
 
   get isEnterprise() {
     return this.version.isEnterprise;