From 642e5fce92a3058afe0a78127e8b7146b786c74b Mon Sep 17 00:00:00 2001
From: Steven Clark <steven.clark@hashicorp.com>
Date: Wed, 25 Sep 2024 16:43:26 -0400
Subject: [PATCH] Implementing PR feedback from the UI team

---
 ui/app/models/pki/tidy.js                     | 17 +++++++---------
 ui/lib/pki/addon/components/pki-tidy-form.hbs | 20 +++++++------------
 ui/lib/pki/addon/components/pki-tidy-form.ts  |  2 --
 .../components/pki/pki-tidy-form-test.js      |  5 +++--
 4 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/ui/app/models/pki/tidy.js b/ui/app/models/pki/tidy.js
index 0b5d8cf3275d..f339448a4108 100644
--- a/ui/app/models/pki/tidy.js
+++ b/ui/app/models/pki/tidy.js
@@ -58,11 +58,11 @@ export default class PkiTidyModel extends Model {
     hideToggle: true,
     formatTtl: true,
   })
-  minStartupBackoffDuration; // auto-tidy only 
+  minStartupBackoffDuration; // auto-tidy only
 
   @attr('string', {
-      label: 'Maximum startup backoff duration',
-      defaultValue: '15m'
+    label: 'Maximum startup backoff duration',
+    defaultValue: '15m',
     editType: 'ttl',
     helperTextEnabled:
       'Sets the max_startup_backoff_duration field which forces the maximum delay after Vault startup auto-tidy can run',
@@ -154,18 +154,15 @@ export default class PkiTidyModel extends Model {
 
   get allGroups() {
     const groups = [
-      { autoTidy: ['enabled', 'intervalDuration', 'minStartupBackoffDuration', 'maxStartupBackoffDuration'] },
+      { autoTidy: ['enabled', 'intervalDuration', ...this.autoTidyConfigFields] },
       ...this.sharedFields,
     ];
     return this._expandGroups(groups);
   }
 
-  // fields that are specific to auto-tidy, which should only show up when enabled.
-  get autoTidyEnabledFields() {
-    const enabledFields = [
-      { 'Auto Tidy Startup Backoff': ['minStartupBackoffDuration', 'maxStartupBackoffDuration'] },
-    ];
-    return this._expandGroups(enabledFields);
+  // fields that are specific to auto-tidy
+  get autoTidyConfigFields() {
+    return ['minStartupBackoffDuration', 'maxStartupBackoffDuration'];
   }
 
   // shared between auto and manual tidy operations
diff --git a/ui/lib/pki/addon/components/pki-tidy-form.hbs b/ui/lib/pki/addon/components/pki-tidy-form.hbs
index 42694f39e73e..5edc547eeb1e 100644
--- a/ui/lib/pki/addon/components/pki-tidy-form.hbs
+++ b/ui/lib/pki/addon/components/pki-tidy-form.hbs
@@ -13,7 +13,7 @@
 <MessageError @errorMessage={{this.errorBanner}} class="has-top-margin-s" />
 
 <form class="has-bottom-margin-s" {{on "submit" (perform this.save)}} data-test-tidy-form={{@tidyType}}>
-  {{#if (and (eq @tidyType "auto") this.intervalDurationAttr)}}
+  {{#if (eq @tidyType "auto")}}
     {{#let this.intervalDurationAttr as |attr|}}
       <TtlPicker
         data-test-input={{attr.name}}
@@ -26,19 +26,13 @@
         @initialValue={{get @tidy attr.name}}
       />
     {{/let}}
+
+    {{#if @tidy.enabled}}
+      {{#each @tidy.autoTidyConfigFields as |field|}}
+        <FormField @attr={{get @tidy.allByKey field}} @model={{@tidy}} />
+      {{/each}}
+    {{/if}}
   {{/if}}
-  {{#each @tidy.autoTidyEnabledFields as |fieldGroup|}}
-    {{#each-in fieldGroup as |group fields|}}
-      {{#if (and (eq @tidyType "auto") @tidy.enabled)}}
-        <h2 class="title is-size-5 has-border-bottom-light page-header" data-test-tidy-header={{group}}>
-          {{group}}
-        </h2>
-        {{#each fields as |attr|}}
-          <FormField @attr={{attr}} @model={{@tidy}} />
-        {{/each}}
-      {{/if}}
-    {{/each-in}}
-  {{/each}}
   {{#each @tidy.formFieldGroups as |fieldGroup|}}
     {{#each-in fieldGroup as |group fields|}}
       {{#if (or (eq @tidyType "manual") @tidy.enabled)}}
diff --git a/ui/lib/pki/addon/components/pki-tidy-form.ts b/ui/lib/pki/addon/components/pki-tidy-form.ts
index f83e2d959c94..a5a290ad821e 100644
--- a/ui/lib/pki/addon/components/pki-tidy-form.ts
+++ b/ui/lib/pki/addon/components/pki-tidy-form.ts
@@ -24,8 +24,6 @@ interface Args {
 
 interface PkiTidyTtls {
   intervalDuration: string;
-  minStartupBackoffDuration: string;
-  maxStartupBackoffDuration: string;
   acmeAccountSafetyBuffer: string;
 }
 interface PkiTidyBooleans {
diff --git a/ui/tests/integration/components/pki/pki-tidy-form-test.js b/ui/tests/integration/components/pki/pki-tidy-form-test.js
index 19be4cf8f916..1861781a4e51 100644
--- a/ui/tests/integration/components/pki/pki-tidy-form-test.js
+++ b/ui/tests/integration/components/pki/pki-tidy-form-test.js
@@ -34,7 +34,6 @@ module('Integration | Component | pki tidy form', function (hooks) {
   test('it hides or shows fields depending on auto-tidy toggle', async function (assert) {
     assert.expect(47);
     const sectionHeaders = [
-      'Auto Tidy Startup Backoff',
       'Universal operations',
       'ACME operations',
       'Issuer operations',
@@ -183,7 +182,7 @@ module('Integration | Component | pki tidy form', function (hooks) {
   });
 
   test('it should change the attributes on the model', async function (assert) {
-    assert.expect(11);
+    assert.expect(12);
     this.server.post('/pki-auto-tidy/config/auto-tidy', (schema, req) => {
       assert.propEqual(
         JSON.parse(req.requestBody),
@@ -249,6 +248,8 @@ module('Integration | Component | pki tidy form', function (hooks) {
       pauseDuration: 30,
       revocationQueueSafetyBuffer: 40,
       safetyBuffer: 50,
+      minStartupBackoffDuration: 300,
+      maxStartupBackoffDuration: 900,
     };
     this.autoTidy.eachAttribute(async (attr, { type }) => {
       const skipFields = ['enabled', 'tidyAcme', 'intervalDuration', 'acmeAccountSafetyBuffer']; // combined with duration ttl or asserted separately