Merge remote-tracking branch 'remotes/from/ce/main'

Author: hc-github-team-secure-vault-core

ui/lib/ldap/addon/components/page/libraries.hbs

@@ -16,15 +16,11 @@
     {{/if}}
   </:toolbarFilters>
   <:toolbarActions>
-    {{#if @promptConfig}}
-      <ToolbarLink @route="configure" data-test-toolbar-action="config">
-        Configure LDAP
-      </ToolbarLink>
-    {{else}}
+    {{#unless @promptConfig}}
       <ToolbarLink @route="libraries.create" @type="add" data-test-toolbar-action="library">
         Create library
       </ToolbarLink>
-    {{/if}}
+    {{/unless}}
   </:toolbarActions>
 </LdapHeader>
 

ui/lib/ldap/addon/components/page/overview.hbs

@@ -3,15 +3,7 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<LdapHeader @model={{@backendModel}} @promptConfig={{@promptConfig}} @breadcrumbs={{@breadcrumbs}}>
-  <:toolbarActions>
-    {{#if @promptConfig}}
-      <ToolbarLink @route="configure" data-test-toolbar-action="config">
-        Configure LDAP
-      </ToolbarLink>
-    {{/if}}
-  </:toolbarActions>
-</LdapHeader>
+<LdapHeader @model={{@backendModel}} @promptConfig={{@promptConfig}} @breadcrumbs={{@breadcrumbs}} />
 
 {{#if @promptConfig}}
   <ConfigCta />

ui/lib/ldap/addon/components/page/roles.hbs

@@ -15,15 +15,11 @@
     {{/if}}
   </:toolbarFilters>
   <:toolbarActions>
-    {{#if @promptConfig}}
-      <ToolbarLink @route="configure" data-test-toolbar-action="config">
-        Configure LDAP
-      </ToolbarLink>
-    {{else}}
+    {{#unless @promptConfig}}
       <ToolbarLink @route="roles.create" @type="add" data-test-toolbar-action="role">
         Create role
       </ToolbarLink>
-    {{/if}}
+    {{/unless}}
   </:toolbarActions>
 </LdapHeader>
 

ui/tests/acceptance/secrets/backend/ldap/overview-test.js

@@ -65,10 +65,6 @@ module('Acceptance | ldap | overview', function (hooks) {
     await visitURL('overview', this.backend);
     await click('[data-test-config-cta] a');
     assert.true(isURL('configure', this.backend), 'Transitions to configure route on cta link click');
-
-    await click(`[data-test-breadcrumb="${this.backend}"] a`);
-    await click('[data-test-toolbar-action="config"]');
-    assert.true(isURL('configure', this.backend), 'Transitions to configure route on toolbar link click');
   });
 
   test('it should transition to configuration edit on empty state click', async function (assert) {

ui/tests/integration/components/ldap/page/libraries-test.js

@@ -55,17 +55,13 @@ module('Integration | Component | ldap | Page::Libraries', function (hooks) {
     });
   });
 
-  test('it should render tab page header and config cta', async function (assert) {
+  test('it should render tab page header', async function (assert) {
     this.promptConfig = true;
 
     await this.renderComponent();
 
     assert.dom(GENERAL.icon('folder-users')).hasClass('hds-icon-folder-users', 'LDAP icon renders in title');
     assert.dom(GENERAL.hdsPageHeaderTitle).hasText('ldap-test', 'Mount path renders in title');
-    assert
-      .dom('[data-test-toolbar-action="config"]')
-      .hasText('Configure LDAP', 'Correct toolbar action renders');
-    assert.dom('[data-test-config-cta]').exists('Config cta renders');
   });
 
   test('it should render create libraries cta', async function (assert) {

ui/tests/integration/components/ldap/page/overview-test.js

@@ -81,15 +81,13 @@ module('Integration | Component | ldap | Page::Overview', function (hooks) {
     });
   });
 
-  test('it should render tab page header and config cta', async function (assert) {
+  test('it should render tab page header', async function (assert) {
     this.promptConfig = true;
 
     await this.renderComponent();
 
     assert.dom(GENERAL.icon('folder-users')).hasClass('hds-icon-folder-users', 'LDAP icon renders in title');
     assert.dom(GENERAL.hdsPageHeaderTitle).hasText('ldap-test', 'Mount path renders in title');
-    assert.dom('[data-test-toolbar-action="config"]').hasText('Configure LDAP', 'Toolbar action renders');
-    assert.dom('[data-test-config-cta]').exists('Config cta renders');
   });
 
   test('it should render overview cards', async function (assert) {

ui/tests/integration/components/ldap/page/roles-test.js

@@ -59,17 +59,13 @@ module('Integration | Component | ldap | Page::Roles', function (hooks) {
     };
   });
 
-  test('it should render tab page header and config cta', async function (assert) {
+  test('it should render tab page header', async function (assert) {
     this.promptConfig = true;
 
     await this.renderComponent();
 
     assert.dom(GENERAL.icon('folder-users')).hasClass('hds-icon-folder-users', 'LDAP icon renders in title');
     assert.dom(GENERAL.hdsPageHeaderTitle).hasText('ldap-test', 'Mount path renders in title');
-    assert
-      .dom('[data-test-toolbar-action="config"]')
-      .hasText('Configure LDAP', 'Correct toolbar action renders');
-    assert.dom('[data-test-config-cta]').exists('Config cta renders');
   });
 
   test('it should render create roles cta', async function (assert) {