From b783dec8fdae7f8388beaffd6797b5fa8e7b623e Mon Sep 17 00:00:00 2001 From: hc-github-team-secure-vault-core <82990506+hc-github-team-secure-vault-core@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:26:20 -0400 Subject: [PATCH] backport of commit 8b126987807be3593f70ffd8b49b2d90406d7aea (#23235) Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com> --- 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 000000000..8084391cc --- /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 651f00071..3bea2e2c0 100644 --- a/ui/lib/pki/addon/components/page/pki-tidy-status.hbs +++ b/ui/lib/pki/addon/components/page/pki-tidy-status.hbs @@ -62,6 +62,12 @@ /> {{/each}} + {{#if this.isEnterprise}} + {{#each this.crossClusterOperation.status as |attr|}} + + {{/each}} + {{/if}} +

{{if (eq this.tidyState "Running") "Current" "Last"}} tidy settings @@ -76,7 +82,7 @@ {{/each}} {{#if this.isEnterprise}} - {{#each this.crossClusterOperation as |attr|}} + {{#each this.crossClusterOperation.config as |attr|}} { @@ -57,16 +60,14 @@ export default class PkiTidyStatusComponent extends Component { 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 { '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;