scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 19:17:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

secret-list/item partial removed (#11710)

Browse Source 
* secret-list/item partial removed

* remove all partials and I'm sure break many things.

* changing props types and breaking more things

* cleanup

* fix options for backend

* fix transform list item test
This commit is contained in:
Angel Garbarino
2021-06-02 08:59:31 -06:00
committed by GitHub
parent 8d515fec2b
commit f7ac6bb97f
15 changed files with 166 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
ui/app/components/database-list-item.js → ui/app/components/secret-list/database-list-item.js
View File

0
ui/app/components/transform-list-item.js → ui/app/components/secret-list/transform-list-item.js
View File

18
ui/app/helpers/options-for-backend.js
View File

@@ -8,7 +8,7 @@ const DEFAULT_DISPLAY = {
create: 'Create secret', create: 'Create secret',
navigateTree: true, navigateTree: true,
editComponent: 'secret-edit', editComponent: 'secret-edit',
listItemPartial: 'partials/secret-list/item', listItemPartial: 'secret-list/item',
}; };
const SECRET_BACKENDS = { const SECRET_BACKENDS = {
aws: { aws: {
@@ -18,12 +18,12 @@ const SECRET_BACKENDS = {
create: 'Create role', create: 'Create role',
navigateTree: false, navigateTree: false,
editComponent: 'role-aws-edit', editComponent: 'role-aws-edit',
listItemPartial: 'partials/secret-list/aws-role-item', listItemPartial: 'secret-list/aws-role-item',
}, },
pki: { pki: {
displayName: 'PKI', displayName: 'PKI',
navigateTree: false, navigateTree: false,
listItemPartial: 'partials/secret-list/pki-role-item', listItemPartial: 'secret-list/pki-role-item',
tabs: [ tabs: [
{ {
name: 'roles', name: 'roles',
@@ -41,7 +41,7 @@ const SECRET_BACKENDS = {
item: 'certificates', item: 'certificates',
create: 'Create role', create: 'Create role',
tab: 'certs', tab: 'certs',
listItemPartial: 'partials/secret-list/pki-cert-item', listItemPartial: 'secret-list/pki-cert-item',
editComponent: 'pki-cert-show', editComponent: 'pki-cert-show',
}, },
], ],
@@ -53,12 +53,12 @@ const SECRET_BACKENDS = {
create: 'Create role', create: 'Create role',
navigateTree: false, navigateTree: false,
editComponent: 'role-ssh-edit', editComponent: 'role-ssh-edit',
listItemPartial: 'partials/secret-list/ssh-role-item', listItemPartial: 'secret-list/ssh-role-item',
}, },
database: { database: {
displayName: 'Database', displayName: 'Database',
navigateTree: false, navigateTree: false,
listItemPartial: 'partials/secret-list/database-list-item', listItemPartial: 'secret-list/database-list-item',
hasOverview: true, hasOverview: true,
tabs: [ tabs: [
{ {
@@ -86,7 +86,7 @@ const SECRET_BACKENDS = {
transform: { transform: {
displayName: 'Transformation', displayName: 'Transformation',
navigateTree: false, navigateTree: false,
listItemPartial: 'partials/secret-list/transform-list-item', listItemPartial: 'secret-list/transform-list-item',
tabs: [ tabs: [
{ {
name: 'transformations', name: 'transformations',
@@ -95,7 +95,7 @@ const SECRET_BACKENDS = {
item: 'transformation', item: 'transformation',
create: 'Create transformation', create: 'Create transformation',
editComponent: 'transformation-edit', editComponent: 'transformation-edit',
listItemPartial: 'partials/secret-list/transform-transformation-item', listItemPartial: 'secret-list/transform-transformation-item',
}, },
{ {
name: 'role', name: 'role',
@@ -135,7 +135,7 @@ const SECRET_BACKENDS = {
create: 'Create encryption key', create: 'Create encryption key',
navigateTree: false, navigateTree: false,
editComponent: 'transit-edit', editComponent: 'transit-edit',
listItemPartial: 'partials/secret-list/item', listItemPartial: 'secret-list/item',
}, },
}; };

34
ui/app/templates/partials/secret-list/aws-role-item.hbs → ui/app/templates/components/secret-list/aws-role-item.hbs
View File

@@ -2,22 +2,22 @@
(concat (concat
"vault.cluster.secrets.backend." "vault.cluster.secrets.backend."
"credentials" "credentials"
(unless item.id "-root") (unless @item.id "-root")
) )
item.id @item.id
class="list-item-row" class="list-item-row"
data-test-secret-link=item.id data-test-secret-link=@item.id
encode=true encode=true
}} }}
<div class="columns is-mobile"> <div class="columns is-mobile">
<div class="column is-10"> <div class="column is-10">
<LinkTo @route={{concat "vault.cluster.secrets.backend." "credentials" (unless item.id "-root") }} @model={{item.id}} class="has-text-black has-text-weight-semibold"> <LinkTo @route={{concat "vault.cluster.secrets.backend." "credentials" (unless @item.id "-root") }} @model={{@item.id}} class="has-text-black has-text-weight-semibold">
<Icon <Icon
@glyph="user-square-outline" @glyph="user-square-outline"
class="has-text-grey-light is-pulled-left" class="has-text-grey-light is-pulled-left"
/> />
<div class="role-item-details"> <div class="role-item-details">
<span class="is-underline">{{if (eq item.id ' ') '(self)' (or item.keyWithoutParent item.id)}}</span> <span class="is-underline">{{if (eq @item.id ' ') '(self)' (or @item.keyWithoutParent @item.id)}}</span>
</div> </div>
</LinkTo> </LinkTo>
</div> </div>
@@ -26,20 +26,20 @@
<Confirm as |c|> <Confirm as |c|>
<nav class="menu"> <nav class="menu">
<ul class="menu-list"> <ul class="menu-list">
{{#if item.generatePath.isPending}} {{#if @item.generatePath.isPending}}
<li class="action"> <li class="action">
<button disabled type="button" class="link button is-loading is-transparent"> <button disabled type="button" class="link button is-loading is-transparent">
loading loading
</button> </button>
</li> </li>
{{else if item.canGenerate}} {{else if @item.canGenerate}}
<li class="action"> <li class="action">
<LinkTo @route="vault.cluster.secrets.backend.credentials" @model={{item.id}} data-test-role-aws-link="generate"> <LinkTo @route="vault.cluster.secrets.backend.credentials" @model={{@item.id}} data-test-role-aws-link="generate">
Generate credentials Generate credentials
</LinkTo> </LinkTo>
</li> </li>
{{/if}} {{/if}}
{{#if item.updatePath.isPending}} {{#if @item.updatePath.isPending}}
<li class="action"> <li class="action">
<button disabled type="button" class="link button is-loading is-transparent"> <button disabled type="button" class="link button is-loading is-transparent">
loading loading
@@ -51,26 +51,26 @@
</button> </button>
</li> </li>
{{else}} {{else}}
{{#if item.canRead}} {{#if @item.canRead}}
<li class="action"> <li class="action">
<LinkTo @route="vault.cluster.secrets.backend.show" @model={{item.id}} data-test-role-ssh-link="show"> <LinkTo @route="vault.cluster.secrets.backend.show" @model={{@item.id}} data-test-role-ssh-link="show">
Details Details
</LinkTo> </LinkTo>
</li> </li>
{{/if}} {{/if}}
{{#if item.canEdit}} {{#if @item.canEdit}}
<li class="action"> <li class="action">
<LinkTo @route="vault.cluster.secrets.backend.edit" @model={{item.id}} data-test-role-ssh-link="edit"> <LinkTo @route="vault.cluster.secrets.backend.edit" @model={{@item.id}} data-test-role-ssh-link="edit">
Edit Edit
</LinkTo> </LinkTo>
</li> </li>
{{/if}} {{/if}}
{{#if item.canDelete}} {{#if @item.canDelete}}
<li class="action"> <li class="action">
<c.Message <c.Message
@id={{item.id}} @id={{@item.id}}
@onConfirm={{action "delete" item}} @onConfirm={{@delete}}
data-test-aws-role-delete={{item.id}}/> data-test-aws-role-delete={{@item.id}}/>
</li> </li>
{{/if}} {{/if}}
{{/if}} {{/if}}

12
ui/app/templates/components/database-list-item.hbs → ui/app/templates/components/secret-list/database-list-item.hbs
View File

@@ -1,14 +1,14 @@
{{#linked-block {{#linked-block
"vault.cluster.secrets.backend.show" "vault.cluster.secrets.backend.show"
(if keyTypeValue (concat 'role/' @item.id) @item.id) (if this.keyTypeValue (concat 'role/' @item.id) @item.id)
class="list-item-row" class="list-item-row"
data-test-secret-link=item.id data-test-secret-link=@item.id
encode=true encode=true
queryParams=(secret-query-params backendType) queryParams=(secret-query-params @backendType)
}} }}
<div class="columns is-mobile"> <div class="columns is-mobile">
<div class="column is-10"> <div class="column is-10">
<LinkTo @route={{concat "vault.cluster.secrets.backend.show" }} @model={{if keyTypeValue (concat 'role/' @item.id) @item.id}} class="has-text-black has-text-weight-semibold"> <LinkTo @route={{concat "vault.cluster.secrets.backend.show" }} @model={{if this.keyTypeValue (concat 'role/' @item.id) @item.id}} class="has-text-black has-text-weight-semibold">
<Icon <Icon
@glyph="user-square-outline" @glyph="user-square-outline"
class="has-text-grey-light is-pulled-left" class="has-text-grey-light is-pulled-left"
@@ -45,7 +45,7 @@
{{/if}} {{/if}}
{{#if @item.canReset}} {{#if @item.canReset}}
<li class="action"> <li class="action">
<button type="button" class="link" onclick={{action "resetConnection" @item.id}}> <button type="button" class="link" {{on "click" (fn this.resetConnection @item.id)}}>
Reset connection Reset connection
</button> </button>
</li> </li>
@@ -59,7 +59,7 @@
{{/if}} {{/if}}
{{#if @item.canRotateRoot}} {{#if @item.canRotateRoot}}
<li class="action"> <li class="action">
<button type="button" class="link" onclick={{action "rotateRootCred" @item.id}}> <button type="button" class="link" {{on "click" (fn this.rotateRootCred @item.id)}}>
Rotate root credentials Rotate root credentials
</button> </button>
</li> </li>

50
ui/app/templates/partials/secret-list/item.hbs → ui/app/templates/components/secret-list/item.hbs
View File

@@ -1,26 +1,24 @@
{{#linked-block {{#linked-block
(concat (concat
"vault.cluster.secrets.backend." "vault.cluster.secrets.backend."
(if item.isFolder "list" "show") (if @item.isFolder "list" "show")
(unless item.id "-root") (unless @item.id "-root")
) )
item.id @item.id
class="list-item-row" class="list-item-row"
data-test-secret-link=item.id data-test-secret-link=@item.id
encode=true encode=true
queryParams=(secret-query-params backendModel.type) queryParams=(secret-query-params @backendModel.type)
}} }}
<div class="columns is-mobile"> <div class="columns is-mobile">
<div class="column is-10"> <div class="column is-10">
<SecretLink <SecretLink
@mode={{if item.isFolder "list" "show" }} @mode={{if @item.isFolder "list" "show" }}
@secret={{item.id}} @secret={{@item.id}}
@queryParams={{if (eq backendModel.type "transit") (query-params tab="actions") ""}} @queryParams={{if (eq @backendModel.type "transit") (query-params tab="actions") ""}}
@class="has-text-black has-text-weight-semibold"><Icon @class="has-text-black has-text-weight-semibold"><Icon
@glyph={{if item.isFolder 'folder-outline' 'file-outline' }} @glyph={{if @item.isFolder 'folder-outline' 'file-outline' }}
@class="has-text-grey-light"/>{{if (eq item.id ' ') '(self)' (or item.keyWithoutParent item.id)}} @class="has-text-grey-light"/>{{if (eq @item.id ' ') '(self)' (or @item.keyWithoutParent @item.id)}}
</SecretLink> </SecretLink>
</div> </div>
<div class="column has-text-right"> <div class="column has-text-right">
@@ -28,61 +26,61 @@
<Confirm as |c|> <Confirm as |c|>
<nav class="menu"> <nav class="menu">
<ul class="menu-list"> <ul class="menu-list">
{{#if item.isFolder}} {{#if @item.isFolder}}
<SecretLink <SecretLink
@mode="list" @mode="list"
@secret={{item.id}} @secret={{@item.id}}
@class="has-text-black has-text-weight-semibold"> @class="has-text-black has-text-weight-semibold">
Contents Contents
</SecretLink> </SecretLink>
{{else}} {{else}}
{{#if (or item.versionPath.isLoading item.secretPath.isLoading)}} {{#if (or @item.versionPath.isLoading @item.secretPath.isLoading)}}
<li class="action"> <li class="action">
<button disabled type="button" class="link button is-loading is-transparent"> <button disabled type="button" class="link button is-loading is-transparent">
loading loading
</button> </button>
</li> </li>
{{else}} {{else}}
{{#if item.canRead}} {{#if @item.canRead}}
<li class="action"> <li class="action">
<SecretLink <SecretLink
@mode="show" @mode="show"
@secret={{item.id}} @secret={{@item.id}}
@class="has-text-black has-text-weight-semibold"> @class="has-text-black has-text-weight-semibold">
Details Details
</SecretLink> </SecretLink>
</li> </li>
{{#if backendModel.isV2KV}} {{#if @backendModel.isV2KV}}
<li class="action"> <li class="action">
<SecretLink <SecretLink
@mode="versions" @mode="versions"
@secret={{item.id}} @secret={{@item.id}}
@class="has-text-black has-text-weight-semibold"> @class="has-text-black has-text-weight-semibold">
View version history View version history
</SecretLink> </SecretLink>
</li> </li>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if item.canEdit}} {{#if @item.canEdit}}
<li class="action"> <li class="action">
<SecretLink <SecretLink
@mode="edit" @mode="edit"
@secret={{item.id}} @secret={{@item.id}}
@class="has-text-black has-text-weight-semibold"> @class="has-text-black has-text-weight-semibold">
{{if backendModel.isV2KV {{if @backendModel.isV2KV
"Create new version" "Create new version"
"Edit" "Edit"
}} }}
</SecretLink> </SecretLink>
</li> </li>
{{/if}} {{/if}}
{{#if item.canDelete}} {{#if @item.canDelete}}
<li class="action"> <li class="action">
<c.Message <c.Message
@id={{item.id}} @id={{@item.id}}
@triggerText={{if backendModel.isV2KV "Permanently delete" "Delete"}} @triggerText={{if @backendModel.isV2KV "Permanently delete" "Delete"}}
@message="This will permanently delete this secret and all its versions." @message="This will permanently delete this secret and all its versions."
@onConfirm={{action "delete" item "secret"}}/> @onConfirm={{@delete}}/>
</li> </li>
{{/if}} {{/if}}
{{/if}} {{/if}}

12
ui/app/templates/partials/secret-list/pki-cert-item.hbs → ui/app/templates/components/secret-list/pki-cert-item.hbs
View File

@@ -2,28 +2,28 @@
(concat (concat
"vault.cluster.secrets.backend." "vault.cluster.secrets.backend."
"show" "show"
(unless item.id "-root") (unless @item.id "-root")
) )
item.idForNav @item.idForNav
class="list-item-row" class="list-item-row"
data-test-secret-link=item.id data-test-secret-link=@item.id
tagName="div" tagName="div"
encode=true encode=true
}} }}
<div class="columns is-mobile"> <div class="columns is-mobile">
<div class="column is-10"> <div class="column is-10">
<LinkTo @route={{concat "vault.cluster.secrets.backend." "show" (unless item.id "-root") }} @model={{item.idForNav}} class="has-text-black has-text-weight-semibold"> <LinkTo @route={{concat "vault.cluster.secrets.backend." "show" (unless @item.id "-root") }} @model={{@item.idForNav}} class="has-text-black has-text-weight-semibold">
<Icon <Icon
@glyph="file-outline" @glyph="file-outline"
class="has-text-grey-light is-pulled-left" class="has-text-grey-light is-pulled-left"
/> />
<div class="role-item-details"> <div class="role-item-details">
<span class="is-underline">{{if (eq item.id " ") "(self)" (or item.keyWithoutParent item.id)}}</span> <span class="is-underline">{{if (eq @item.id " ") "(self)" (or @item.keyWithoutParent @item.id)}}</span>
</div> </div>
</LinkTo> </LinkTo>
</div> </div>
<div class="column has-text-right"> <div class="column has-text-right">
<PkiCertPopup @item={{item}} /> <PkiCertPopup @item={{@item}} />
</div> </div>
</div> </div>
{{/linked-block}} {{/linked-block}}

42
ui/app/templates/partials/secret-list/pki-role-item.hbs → ui/app/templates/components/secret-list/pki-role-item.hbs
View File

@@ -2,25 +2,25 @@
(concat (concat
"vault.cluster.secrets.backend." "vault.cluster.secrets.backend."
"credentials" "credentials"
(unless item.id "-root") (unless @item.id "-root")
) )
item.backend @item.backend
item.id @item.id
queryParams=(hash action="issue") queryParams=(hash action="issue")
class="list-item-row" class="list-item-row"
data-test-secret-link=item.id data-test-secret-link=@item.id
tagName="div" tagName="div"
encode=true encode=true
}} }}
<div class="columns is-mobile"> <div class="columns is-mobile">
<div class="column is-10"> <div class="column is-10">
<LinkTo @route={{concat "vault.cluster.secrets.backend." "credentials" (unless item.id "-root") }} @model={{item.id}} @query={{hash action="issue"}} class="has-text-black has-text-weight-semibold"> <LinkTo @route={{concat "vault.cluster.secrets.backend." "credentials" (unless @item.id "-root") }} @model={{@item.id}} @query={{hash action="issue"}} class="has-text-black has-text-weight-semibold">
<Icon <Icon
@glyph="user-square-outline" @glyph="user-square-outline"
class="has-text-grey-light is-pulled-left" class="has-text-grey-light is-pulled-left"
/> />
<div class="role-item-details"> <div class="role-item-details">
<span class="is-underline">{{if (eq item.id " ") "(self)" (or item.keyWithoutParent item.id)}}</span> <span class="is-underline">{{if (eq @item.id " ") "(self)" (or @item.keyWithoutParent @item.id)}}</span>
</div> </div>
</LinkTo> </LinkTo>
</div> </div>
@@ -28,7 +28,7 @@
<PopupMenu @name="role-aws-nav"> <PopupMenu @name="role-aws-nav">
<Confirm as |c|> <Confirm as |c|>
<nav class="menu"> <nav class="menu">
{{#if (or item.generatePath.isPending item.signPath.isPending)}} {{#if (or @item.generatePath.isPending @item.signPath.isPending)}}
<ul class="menu-list"> <ul class="menu-list">
<li class="action"> <li class="action">
<button disabled type="button" class="link button is-loading is-transparent"> <button disabled type="button" class="link button is-loading is-transparent">
@@ -36,18 +36,18 @@
</button> </button>
</li> </li>
</ul> </ul>
{{else if (or item.canGenerate item.canSign)}} {{else if (or @item.canGenerate @item.canSign)}}
<ul class="menu-list"> <ul class="menu-list">
{{#if item.canGenerate}} {{#if @item.canGenerate}}
<li class="action"> <li class="action">
<LinkTo @route="vault.cluster.secrets.backend.credentials" @model={{item.id}} @query={{hash action="issue"}} data-test-role-pki-link="generate-certificate"> <LinkTo @route="vault.cluster.secrets.backend.credentials" @model={{@item.id}} @query={{hash action="issue"}} data-test-role-pki-link="generate-certificate">
Generate certificate Generate certificate
</LinkTo> </LinkTo>
</li> </li>
{{/if}} {{/if}}
{{#if item.canSign}} {{#if @item.canSign}}
<li class="action"> <li class="action">
<LinkTo @route="vault.cluster.secrets.backend.credentials" @model={{item.id}} @query={{hash action="sign"}} data-test-role-pki-link="sign-certificate"> <LinkTo @route="vault.cluster.secrets.backend.credentials" @model={{@item.id}} @query={{hash action="sign"}} data-test-role-pki-link="sign-certificate">
Sign certificate Sign certificate
</LinkTo> </LinkTo>
</li> </li>
@@ -55,7 +55,7 @@
</ul> </ul>
{{/if}} {{/if}}
<ul class="menu-list"> <ul class="menu-list">
{{#if item.updatePath.isPending}} {{#if @item.updatePath.isPending}}
<li class="action"> <li class="action">
<button disabled type="button" class="link button is-loading is-transparent"> <button disabled type="button" class="link button is-loading is-transparent">
loading loading
@@ -67,26 +67,26 @@
</button> </button>
</li> </li>
{{else}} {{else}}
{{#if item.canRead}} {{#if @item.canRead}}
<li class="action"> <li class="action">
<LinkTo @route="vault.cluster.secrets.backend.show" @model={{item.id}} data-test-role-pki-link="show"> <LinkTo @route="vault.cluster.secrets.backend.show" @model={{@item.id}} data-test-role-pki-link="show">
Details Details
</LinkTo> </LinkTo>
</li> </li>
{{/if}} {{/if}}
{{#if item.canEdit}} {{#if @item.canEdit}}
<li class="action"> <li class="action">
<LinkTo @route="vault.cluster.secrets.backend.edit" @model={{item.id}} data-test-role-pki-link="edit"> <LinkTo @route="vault.cluster.secrets.backend.edit" @model={{@item.id}} data-test-role-pki-link="edit">
Edit Edit
</LinkTo> </LinkTo>
</li> </li>
{{/if}} {{/if}}
{{#if item.canDelete}} {{#if @item.canDelete}}
<li class="action"> <li class="action">
<c.Message <c.Message
@id={{item.id}} @id={{@item.id}}
@onConfirm={{action "delete" item}} @onConfirm={{@delete}}
data-test-pki-role-delete={{item.id}}/> data-test-pki-role-delete={{@item.id}}/>
</li> </li>
{{/if}} {{/if}}
{{/if}} {{/if}}

64
ui/app/templates/partials/secret-list/ssh-role-item.hbs → ui/app/templates/components/secret-list/ssh-role-item.hbs
View File

@@ -1,71 +1,71 @@
{{#linked-block {{#linked-block
(concat (concat
"vault.cluster.secrets.backend." "vault.cluster.secrets.backend."
(if (eq item.keyType "ca") "sign" "credentials") (if (eq @item.keyType "ca") "sign" "credentials")
(unless item.id "-root") (unless @item.id "-root")
) )
item.id @item.id
class="list-item-row" class="list-item-row"
data-test-secret-link=item.id data-test-secret-link=@item.id
encode=true encode=true
}} }}
<div class="columns is-mobile"> <div class="columns is-mobile">
<div class="column is-10"> <div class="column is-10">
<LinkTo @route={{concat "vault.cluster.secrets.backend." (if (eq item.keyType "ca") "sign" "credentials") (unless item.id "-root") }} @model={{item.id}} class="has-text-black has-text-weight-semibold"> <LinkTo @route={{concat "vault.cluster.secrets.backend." (if (eq @item.keyType "ca") "sign" "credentials") (unless @item.id "-root") }} @model={{@item.id}} class="has-text-black has-text-weight-semibold">
<Icon <Icon
@glyph="user-square-outline" @glyph="user-square-outline"
class="has-text-grey-light is-pulled-left" class="has-text-grey-light is-pulled-left"
/> />
<div class="role-item-details"> <div class="role-item-details">
<span class="is-underline">{{if (eq item.id ' ') '(self)' (or item.keyWithoutParent item.id)}}</span> <span class="is-underline">{{if (eq @item.id ' ') '(self)' (or @item.keyWithoutParent @item.id)}}</span>
<br> <br>
<span class="tag has-text-grey-dark">{{item.keyType}}</span> <span class="tag has-text-grey-dark">{{@item.keyType}}</span>
{{#if item.zeroAddress}} {{#if @item.zeroAddress}}
<span class="has-text-grey is-size-7">Zero-Address</span> <span class="has-text-grey is-size-7">Zero-Address</span>
{{/if}} {{/if}}
</div> </div>
</LinkTo> </LinkTo>
</div> </div>
<div class="column has-text-right"> <div class="column has-text-right">
{{#if (eq backendType 'ssh')}} {{#if (eq @backendType 'ssh')}}
<PopupMenu @name="role-ssh-nav"> <PopupMenu @name="role-ssh-nav">
<Confirm as |c|> <Confirm as |c|>
<nav class="menu"> <nav class="menu">
<ul class="menu-list"> <ul class="menu-list">
{{#if (eq item.keyType 'otp')}} {{#if (eq @item.keyType 'otp')}}
{{#if item.generatePath.isPending}} {{#if @item.generatePath.isPending}}
<li class="action"> <li class="action">
<button disabled type="button" class="link button is-loading is-transparent"> <button disabled type="button" class="link button is-loading is-transparent">
loading loading
</button> </button>
</li> </li>
{{else if item.canGenerate}} {{else if @item.canGenerate}}
<li class="action"> <li class="action">
<LinkTo @route="vault.cluster.secrets.backend.credentials" @model={{item.id}} data-test-role-ssh-link="generate"> <LinkTo @route="vault.cluster.secrets.backend.credentials" @model={{@item.id}} data-test-role-ssh-link="generate">
Generate Credentials Generate Credentials
</LinkTo> </LinkTo>
</li> </li>
{{/if}} {{/if}}
{{else if (eq item.keyType 'ca')}} {{else if (eq @item.keyType 'ca')}}
{{#if item.signPath.isPending}} {{#if @item.signPath.isPending}}
<li class="action"> <li class="action">
<button disabled type="button" class="link button is-loading is-transparent"> <button disabled type="button" class="link button is-loading is-transparent">
loading loading
</button> </button>
</li> </li>
{{else if item.canGenerate}} {{else if @item.canGenerate}}
<li class="action"> <li class="action">
<LinkTo @route="vault.cluster.secrets.backend.sign" @model={{item.id}} data-test-role-ssh-link="generate"> <LinkTo @route="vault.cluster.secrets.backend.sign" @model={{@item.id}} data-test-role-ssh-link="generate">
Sign Keys Sign Keys
</LinkTo> </LinkTo>
</li> </li>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if item.canEditZeroAddress}} {{#if @item.canEditZeroAddress}}
{{#if item.zeroAddress}} {{#if @item.zeroAddress}}
<li class="action"> <li class="action">
<button type="button" disabled={{get this (concat "loading-" item.id)}} class="link button is-transparent <button type="button" disabled={{get this (concat "loading-" @item.id)}} class="link button is-transparent
{{if (get this (concat "loading-" item.id)) 'is-loading'}} " {{action "toggleZeroAddress" item backendModel}}> {{if (get this (concat "loading-" @item.id)) 'is-loading'}} " {{on "click" @toggleZeroAddress}}>
Disable Zero Address Disable Zero Address
</button> </button>
</li> </li>
@@ -73,16 +73,16 @@
<li class="action"> <li class="action">
<button <button
type="button" type="button"
disabled={{get this (concat "loading-" item.id)}} disabled={{get this (concat "loading-" @item.id)}}
class="link button is-transparent {{if (get this (concat "loading-" item.id)) 'is-loading'}}" class="link button is-transparent {{if (get this (concat "loading-" @item.id)) 'is-loading'}}"
{{action "toggleZeroAddress" item backendModel}} {{on "click" @toggleZeroAddress}}
> >
Enable Zero Address Enable Zero Address
</button> </button>
</li> </li>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if item.updatePath.isPending}} {{#if @item.updatePath.isPending}}
<li class="action"> <li class="action">
<button disabled type="button" class="link button is-loading is-transparent"> <button disabled type="button" class="link button is-loading is-transparent">
loading loading
@@ -94,25 +94,25 @@
</button> </button>
</li> </li>
{{else}} {{else}}
{{#if item.canRead}} {{#if @item.canRead}}
<li class="action"> <li class="action">
<LinkTo @route="vault.cluster.secrets.backend.show" @model={{item.id}} data-test-role-ssh-link="show"> <LinkTo @route="vault.cluster.secrets.backend.show" @model={{@item.id}} data-test-role-ssh-link="show">
Details Details
</LinkTo> </LinkTo>
</li> </li>
{{/if}} {{/if}}
{{#if item.canEdit}} {{#if @item.canEdit}}
<li class="action"> <li class="action">
<LinkTo @route="vault.cluster.secrets.backend.edit" @model={{item.id}} data-test-role-ssh-link="edit"> <LinkTo @route="vault.cluster.secrets.backend.edit" @model={{@item.id}} data-test-role-ssh-link="edit">
Edit Edit
</LinkTo> </LinkTo>
</li> </li>
{{/if}} {{/if}}
{{#if item.canDelete}} {{#if @item.canDelete}}
<li class="action"> <li class="action">
<c.Message <c.Message
@id={{item.id}} @id={{@item.id}}
@onConfirm={{action "delete" item}} @onConfirm={{@delete}}
data-test-ssh-role-delete/> data-test-ssh-role-delete/>
</li> </li>
{{/if}} {{/if}}

33
ui/app/templates/components/transform-list-item.hbs → ui/app/templates/components/secret-list/transform-list-item.hbs
View File

@@ -1,45 +1,45 @@
{{#if (and item.updatePath.canRead (not isBuiltin))}} {{#if (and @item.updatePath.canRead (not this.isBuiltin))}}
{{#linked-block {{#linked-block
"vault.cluster.secrets.backend.show" "vault.cluster.secrets.backend.show"
itemPath @itemPath
class="list-item-row" class="list-item-row"
data-test-secret-link=itemPath data-test-secret-link=@itemPath
encode=true encode=true
queryParams=(secret-query-params backendType) queryParams=(secret-query-params @backendType)
}} }}
<div class="columns is-mobile"> <div class="columns is-mobile">
<div class="column is-10"> <div class="column is-10">
<SecretLink <SecretLink
@mode="show" @mode="show"
@secret={{itemPath}} @secret={{@itemPath}}
@queryParams={{query-params type=modelType}} @queryParams={{query-params type=@modelType}}
@class="has-text-black has-text-weight-semibold"> @class="has-text-black has-text-weight-semibold">
<Icon <Icon
@glyph='file-outline' @glyph='file-outline'
@class="has-text-grey-light"/> @class="has-text-grey-light"/>
{{if (eq item.id ' ') '(self)' (or item.keyWithoutParent item.id)}} {{if (eq @item.id ' ') '(self)' (or @item.keyWithoutParent @item.id)}}
</SecretLink> </SecretLink>
</div> </div>
<div class="column has-text-right"> <div class="column has-text-right">
{{#if (or item.updatePath.canRead item.updatePath.canUpdate)}} {{#if (or @item.updatePath.canRead @item.updatePath.canUpdate)}}
<PopupMenu name="secret-menu"> <PopupMenu name="secret-menu">
<nav class="menu"> <nav class="menu">
<ul class="menu-list"> <ul class="menu-list">
{{#if item.updatePath.canRead}} {{#if @item.updatePath.canRead}}
<li class="action"> <li class="action">
<SecretLink <SecretLink
@mode="show" @mode="show"
@secret={{itemPath}} @secret={{@itemPath}}
@class="has-text-black has-text-weight-semibold"> @class="has-text-black has-text-weight-semibold">
Details Details
</SecretLink> </SecretLink>
</li> </li>
{{/if}} {{/if}}
{{#if item.updatePath.canUpdate}} {{#if @item.updatePath.canUpdate}}
<li class="action"> <li class="action">
<SecretLink <SecretLink
@mode="edit" @mode="edit"
@secret={{itemPath}} @secret={{@itemPath}}
@class="has-text-black has-text-weight-semibold"> @class="has-text-black has-text-weight-semibold">
Edit Edit
</SecretLink> </SecretLink>
@@ -59,24 +59,25 @@
<Icon <Icon
@glyph='file-outline' @glyph='file-outline'
@class="has-text-grey-light"/> @class="has-text-grey-light"/>
{{#if isBuiltin}} {{#if this.isBuiltin}}
<ToolTip <ToolTip
@verticalPosition="above" @verticalPosition="above"
@horizontalPosition="left" @horizontalPosition="left"
as |T|> as |T|>
<T.trigger @tabindex=false> <T.trigger @tabindex=false>
{{item.id}} {{@item.id}}
</T.trigger> </T.trigger>
<T.content @class="tool-tip"> <T.content @class="tool-tip">
<div class="box"> <div class="box">
This is a built-in HashiCorp {{itemType}}. It can't be viewed or edited. This is a built-in HashiCorp {{@itemType}}. It can't be viewed or edited.
</div> </div>
</T.content> </T.content>
</ToolTip> </ToolTip>
{{else}} {{else}}
{{item.id}} {{@item.id}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
</div> </div>
{{/if}} {{/if}}

28
ui/app/templates/partials/secret-list/transform-transformation-item.hbs → ui/app/templates/components/secret-list/transform-transformation-item.hbs
View File

@@ -1,53 +1,53 @@
{{!-- CBS TODO do not let click if !canRead --}} {{!-- CBS TODO do not let click if !canRead --}}
{{#if (eq options.item "transformation")}} {{#if (eq @options.item "transformation")}}
{{#linked-block {{#linked-block
"vault.cluster.secrets.backend.show" "vault.cluster.secrets.backend.show"
item.id @item.id
class="list-item-row" class="list-item-row"
data-test-secret-link=item.id data-test-secret-link=@item.id
encode=true encode=true
queryParams=(secret-query-params backendModel.type) queryParams=(secret-query-params @backendModel.type)
}} }}
<div class="columns is-mobile"> <div class="columns is-mobile">
<div class="column is-10"> <div class="column is-10">
<SecretLink <SecretLink
@mode="show" @mode="show"
@secret={{item.id}} @secret={{@item.id}}
@queryParams={{if (eq backendModel.type "transform") (query-params tab="actions") ""}} @queryParams={{if (eq @backendModel.type "transform") (query-params tab="actions") ""}}
@class="has-text-black has-text-weight-semibold"> @class="has-text-black has-text-weight-semibold">
<Icon <Icon
@glyph='file-outline' @glyph='file-outline'
@class="has-text-grey-light"/> @class="has-text-grey-light"/>
{{if (eq item.id ' ') '(self)' (or item.keyWithoutParent item.id)}} {{if (eq @item.id ' ') '(self)' (or @item.keyWithoutParent @item.id)}}
</SecretLink> </SecretLink>
</div> </div>
<div class="column has-text-right"> <div class="column has-text-right">
{{#if (or item.updatePath.canRead item.updatePath.canUpdate)}} {{#if (or @item.updatePath.canRead @item.updatePath.canUpdate)}}
<PopupMenu name="secret-menu"> <PopupMenu name="secret-menu">
<nav class="menu"> <nav class="menu">
<ul class="menu-list"> <ul class="menu-list">
{{#if (or item.versionPath.isLoading item.secretPath.isLoading)}} {{#if (or @item.versionPath.isLoading @item.secretPath.isLoading)}}
<li class="action"> <li class="action">
<button disabled type="button" class="link button is-loading is-transparent"> <button disabled type="button" class="link button is-loading is-transparent">
loading loading
</button> </button>
</li> </li>
{{else}} {{else}}
{{#if item.updatePath.canRead}} {{#if @item.updatePath.canRead}}
<li class="action"> <li class="action">
<SecretLink <SecretLink
@mode="show" @mode="show"
@secret={{item.id}} @secret={{@item.id}}
@class="has-text-black has-text-weight-semibold"> @class="has-text-black has-text-weight-semibold">
Details Details
</SecretLink> </SecretLink>
</li> </li>
{{/if}} {{/if}}
{{#if item.updatePath.canUpdate}} {{#if @item.updatePath.canUpdate}}
<li class="action"> <li class="action">
<SecretLink <SecretLink
@mode="edit" @mode="edit"
@secret={{item.id}} @secret={{@item.id}}
@class="has-text-black has-text-weight-semibold"> @class="has-text-black has-text-weight-semibold">
Edit Edit
</SecretLink> </SecretLink>
@@ -68,7 +68,7 @@
<Icon <Icon
@glyph='file-outline' @glyph='file-outline'
@class="has-text-grey-light"/> @class="has-text-grey-light"/>
{{if (eq item.id ' ') '(self)' (or item.keyWithoutParent item.id)}} {{if (eq @item.id ' ') '(self)' (or @item.keyWithoutParent @item.id)}}
</div> </div>
</div> </div>
</div> </div>

4
ui/app/templates/partials/secret-list/database-list-item.hbs
View File

@@ -1,4 +0,0 @@
<DatabaseListItem
@item={{item}}
/>

5
ui/app/templates/partials/secret-list/transform-list-item.hbs
View File

@@ -1,5 +0,0 @@
<TransformListItem
@item={{item}}
@itemPath={{concat options.modelPrefix item.id}}
@itemType={{options.item}}
/>

17
ui/app/templates/vault/cluster/secrets/backend/list.hbs
View File

@@ -57,8 +57,21 @@
{{#if model.meta.total}} {{#if model.meta.total}}
{{#each model as |item|}} {{#each model as |item|}}
{{partial options.listItemPartial}} {{!-- Because of the component helper cannot use glimmer nested SecretList::Item --}}
{{else}} {{#let (component options.listItemPartial) as |Component|}}
<Component
@item={{item}}
@backendModel={{backendModel}}
@backendType={{backendType}}
@delete={{action "delete" item "secret"}}
@itemPath={{concat options.modelPrefix item.id}}
@itemType={{options.item}}
@modelType={{@modelType}}
@options={{options}}
@toggleZeroAddress={{action "toggleZeroAddress" item backendModel}}
/>
{{/let}}
{{else}}
<div class="box is-sideless"> <div class="box is-sideless">
{{#if filterFocused}} {{#if filterFocused}}
There are no {{pluralize options.item}} matching <code>{{filter}}</code>, press <kbd>ENTER</kbd> to add one. There are no {{pluralize options.item}} matching <code>{{filter}}</code>, press <kbd>ENTER</kbd> to add one.

10
ui/tests/integration/components/transform-list-item-test.js
View File

@@ -19,7 +19,7 @@ module('Integration | Component | transform-list-item', function(hooks) {
this.set('itemPath', 'role/foo'); this.set('itemPath', 'role/foo');
this.set('itemType', 'role'); this.set('itemType', 'role');
this.set('item', item); this.set('item', item);
await render(hbs`<TransformListItem await render(hbs`<SecretList::TransformListItem
@item={{item}} @item={{item}}
@itemPath={{itemPath}} @itemPath={{itemPath}}
@itemType={{itemType}} @itemType={{itemType}}
@@ -41,7 +41,7 @@ module('Integration | Component | transform-list-item', function(hooks) {
this.set('itemPath', 'template/foo'); this.set('itemPath', 'template/foo');
this.set('itemType', 'template'); this.set('itemType', 'template');
this.set('item', item); this.set('item', item);
await render(hbs`<TransformListItem await render(hbs`<SecretList::TransformListItem
@item={{item}} @item={{item}}
@itemPath={{itemPath}} @itemPath={{itemPath}}
@itemType={{itemType}} @itemType={{itemType}}
@@ -64,7 +64,7 @@ module('Integration | Component | transform-list-item', function(hooks) {
this.set('itemPath', 'alphabet/foo'); this.set('itemPath', 'alphabet/foo');
this.set('itemType', 'alphabet'); this.set('itemType', 'alphabet');
this.set('item', item); this.set('item', item);
await render(hbs`<TransformListItem await render(hbs`<SecretList::TransformListItem
@item={{item}} @item={{item}}
@itemPath={{itemPath}} @itemPath={{itemPath}}
@itemType={{itemType}} @itemType={{itemType}}
@@ -87,7 +87,7 @@ module('Integration | Component | transform-list-item', function(hooks) {
this.set('itemPath', 'template/builtin/foo'); this.set('itemPath', 'template/builtin/foo');
this.set('itemType', 'template'); this.set('itemType', 'template');
this.set('item', item); this.set('item', item);
await render(hbs`<TransformListItem await render(hbs`<SecretList::TransformListItem
@item={{item}} @item={{item}}
@itemPath={{itemPath}} @itemPath={{itemPath}}
@itemType={{itemType}} @itemType={{itemType}}
@@ -109,7 +109,7 @@ module('Integration | Component | transform-list-item', function(hooks) {
this.set('itemPath', 'alphabet/builtin/foo'); this.set('itemPath', 'alphabet/builtin/foo');
this.set('itemType', 'alphabet'); this.set('itemType', 'alphabet');
this.set('item', item); this.set('item', item);
await render(hbs`<TransformListItem await render(hbs`<SecretList::TransformListItem
@item={{item}} @item={{item}}
@itemPath={{itemPath}} @itemPath={{itemPath}}
@itemType={{itemType}} @itemType={{itemType}}