scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-30 10:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport of UI: fix browser console formatting into release/1.13.x (#20088)

Browse Source 
* backport of commit 7e09f991a8

* UI/add prettier ignore for ui console file (#20094)

* fix template-lintrc file

* add prettier ignore

---------

Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com>
This commit is contained in:
hc-github-team-secure-vault-core
2023-04-12 14:08:52 -04:00
committed by GitHub
parent 4c89e21a9a
commit ac3b4e42bc
5 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/20064.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
ui: fixes browser console formatting for help command output
```

2
ui/app/templates/components/console/log-command.hbs
View File

@@ -1,2 +1,2 @@
{{! using Icon here instead of Chevron because two nested tagless components results in a rendered line break between the tags breaking the layout in the <pre> }} {{! using Icon here instead of Chevron because two nested tagless components results in a rendered line break between the tags breaking the layout in the <pre> }}
<pre class="console-ui-command"><Icon @name="chevron-right" />{{@content}}</pre> <p class="console-ui-command is-font-mono"><Icon @name="chevron-right" />{{@content}}</p>

24
ui/app/templates/components/console/log-help.hbs
View File

@@ -1,8 +1,20 @@
{{! template-lint-disable no-whitespace-for-layout }}
{{! prettier-ignore }}
<div class="console-ui-alert has-text-grey"> <div class="console-ui-alert has-text-grey">
<Icon @name="info" /> <Icon @name="info" />
<pre>Usage: vault &lt;command&gt; [args] Commands: read Read data and retrieves secrets write Write data, configuration, <pre>Usage: vault &lt;command&gt; [args]
and secrets delete Delete secrets and configuration list List data or secrets Web CLI Commands: api Navigate to the Vault
API explorer. Use 'api [filter]' to prefilter the list. clear Clear output from the log clearall Clear output and command Commands:
history fullscreen Toggle fullscreen display refresh Refresh the data on the current screen under the CLI window read Read data and retrieves secrets
</pre> write Write data, configuration, and secrets
delete Delete secrets and configuration
list List data or secrets
Web CLI Commands:
api Navigate to the Vault API explorer. Use 'api [filter]' to prefilter the list.
clear Clear output from the log
clearall Clear output and command history
fullscreen Toggle fullscreen display
refresh Refresh the data on the current screen under the CLI window
</pre>
</div> </div>

6
ui/app/templates/components/console/log-list.hbs
View File

@@ -1,8 +1,10 @@
<div class="console-ui-output has-copy-button"> <div class="console-ui-output has-copy-button">
<pre>Keys <pre>
Keys
{{#each this.list as |item|}} {{#each this.list as |item|}}
{{item}} {{item}}
{{/each}}</pre> {{/each}}
</pre>
<HoverCopyButton @copyValue={{multi-line-join this.list}} /> <HoverCopyButton @copyValue={{multi-line-join this.list}} />
</div> </div>

3
ui/tests/integration/components/console/log-command-test.js
View File

@@ -11,7 +11,6 @@ module('Integration | Component | console/log command', function (hooks) {
this.set('content', commandText); this.set('content', commandText);
await render(hbs`{{console/log-command content=this.content}}`); await render(hbs`{{console/log-command content=this.content}}`);
assert.dom('p').includesText(commandText);
assert.dom('pre').includesText(commandText);
}); });
}); });