Filter Secret Engine List view by engineType and/or name #20481
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ```release-note:improvement | ||
| ui: Add filtering by engine type and engine name to the Secret Engine list view. | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,9 @@ import { computed } from '@ember/object'; // eslint-disable-line | |
| import { equal } from '@ember/object/computed'; // eslint-disable-line | ||
| import { withModelValidations } from 'vault/decorators/model-validations'; | ||
| import { withExpandedAttributes } from 'vault/decorators/model-expanded-attributes'; | ||
| import { supportedSecretBackends } from 'vault/helpers/supported-secret-backends'; | ||
|
|
||
| const LINKED_BACKENDS = supportedSecretBackends(); | ||
|
|
||
| // identity will be managed separately and the inclusion | ||
| // of the system backend is an implementation detail | ||
|
|
@@ -143,6 +146,27 @@ export default class SecretEngineModel extends Model { | |
| return !LIST_EXCLUDED_BACKENDS.includes(this.engineType); | ||
| } | ||
|
|
||
| get isSupportedBackend() { | ||
| return LINKED_BACKENDS.includes(this.engineType); | ||
| } | ||
|
|
||
| get backendLink() { | ||
| if (this.engineType === 'kmip') { | ||
| return 'vault.cluster.secrets.backend.kmip.scopes'; | ||
| } | ||
| if (this.engineType === 'database') { | ||
| return 'vault.cluster.secrets.backend.overview'; | ||
| } | ||
| return 'vault.cluster.secrets.backend.list-root'; | ||
| } | ||
|
|
||
| get accessor() { | ||
| if (this.version === 2) { | ||
| return `v2 ${this.accessor}`; | ||
| } | ||
| return this.accessor; | ||
| } | ||
|
|
||
| get localDisplay() { | ||
| return this.local ? 'local' : 'replicated'; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,106 +7,115 @@ | |
| </PageHeader> | ||
|
|
||
| <Toolbar> | ||
| <ToolbarFilters> | ||
| <SearchSelect | ||
| @id="filter-by-engine-type" | ||
| @options={{this.secretEngineArrayByType}} | ||
| @selectLimit="1" | ||
| @disallowNewItems={{true}} | ||
| @fallbackComponent="input-search" | ||
| @onChange={{this.filterEngineType}} | ||
| @placeholder={{"Filter by engine type"}} | ||
| @displayInherit={{true}} | ||
| @inputValue={{if this.selectedEngineType (array this.selectedEngineType)}} | ||
| @disabled={{if this.selectedEngineName true false}} | ||
| class="is-marginless" | ||
| /> | ||
| <SearchSelect | ||
| @id="filter-by-engine-name" | ||
| @options={{this.secretEngineArrayByName}} | ||
| @selectLimit="1" | ||
| @disallowNewItems={{true}} | ||
| @fallbackComponent="input-search" | ||
| @onChange={{this.filterEngineName}} | ||
| @placeholder={{"Filter by engine name"}} | ||
| @displayInherit={{true}} | ||
| @inputValue={{if this.selectedEngineName (array this.selectedEngineName)}} | ||
| class="is-marginless has-left-padding-s" | ||
| /> | ||
| </ToolbarFilters> | ||
| <ToolbarActions> | ||
| <ToolbarLink @route="vault.cluster.settings.mount-secret-backend" @type="add" data-test-enable-engine> | ||
| Enable new engine | ||
| </ToolbarLink> | ||
| </ToolbarActions> | ||
| </Toolbar> | ||
| {{#each this.sortedDisplayableBackends as |backend|}} | ||
| <LinkedBlock | ||
| @params={{array backend.backendLink backend.id}} | ||
| class="list-item-row linkable-item is-no-underline" | ||
| data-test-auth-backend-link={{backend.id}} | ||
| @disabled={{if backend.isSupportedBackend false true}} | ||
| > | ||
| <div class="linkable-item-content" data-test-linkable-item-content> | ||
| <div class="has-text-grey"> | ||
| {{#if backend.icon}} | ||
| <ToolTip @horizontalPosition="left" as |T|> | ||
| <T.Trigger> | ||
| <Icon @name={{backend.icon}} class="has-text-grey-light" data-test-linkable-item-glyph /> | ||
| </T.Trigger> | ||
| <T.Content @defaultClass="tool-tip"> | ||
| <div class="box"> | ||
| {{or backend.engineType backend.path}} | ||
| </div> | ||
| </T.Content> | ||
| </ToolTip> | ||
| {{/if}} | ||
| {{#if backend.path}} | ||
| {{#if backend.isSupportedBackend}} | ||
| <LinkTo | ||
| @route={{backend.backendLink}} | ||
| @model={{backend.id}} | ||
| class="has-text-black has-text-weight-semibold" | ||
| data-test-secret-path | ||
| > | ||
| {{backend.path}} | ||
| </LinkTo> | ||
| {{else}} | ||
| <span data-test-secret-path>{{backend.path}}</span> | ||
| {{/if}} | ||
| {{/if}} | ||
| </div> | ||
| {{#if backend.accessor}} | ||
| <code class="has-text-grey is-size-8" data-test-linkable-item-accessor> | ||
| {{backend.accessor}} | ||
| </code> | ||
| {{/if}} | ||
| {{#if backend.description}} | ||
| <ReadMore data-test-linkable-item-description> | ||
| {{backend.description}} | ||
| </ReadMore> | ||
| {{/if}} | ||
| {{yield}} | ||
| </div> | ||
| {{! meatball sandwich menu }} | ||
| <div class="linkable-item-menu" data-test-linkable-item-menu={{backend.path}}> | ||
| <PopupMenu @name="engine-menu"> | ||
| <Confirm as |c|> | ||
| <nav class="menu" aria-label="{{if backend.isSupportedBackend 'supported' 'unsupported'}} secrets engine menu"> | ||
| <ul class="menu-list"> | ||
| <li class="action"> | ||
| <LinkTo @route="vault.cluster.secrets.backend.configuration" @model={{backend.id}} data-test-engine-config> | ||
| View configuration | ||
| </LinkTo> | ||
| </li> | ||
| {{#if (not-eq backend.type "cubbyhole")}} | ||
| <li class="action"> | ||
| <c.Message | ||
| @id={{backend.id}} | ||
| @triggerText="Disable" | ||
| @message="Any data in this engine will be permanently deleted." | ||
| @title="Disable engine?" | ||
| @confirmButtonText="Disable" | ||
| @onConfirm={{perform this.disableEngine backend}} | ||
| data-test-engine-disable="true" | ||
| /> | ||
| </li> | ||
| {{/if}} | ||
| </ul> | ||
| </nav> | ||
| </Confirm> | ||
| </PopupMenu> | ||
| </div> | ||
| </LinkedBlock> | ||
| {{/each}} | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
open to suggestions on ways to make this cleaner, but for context here is the flow:
optionsparam passed into the SearchSelect components.