From e6623c965427877a15e4a36fb10f90d98c53c78f Mon Sep 17 00:00:00 2001 From: "clairebontempo@gmail.com" Date: Mon, 10 Apr 2023 10:14:44 -0700 Subject: [PATCH 01/11] fix console formatting for help output --- ui/app/templates/components/console/log-command.hbs | 2 +- ui/app/templates/components/console/log-help.hbs | 1 + ui/app/templates/components/console/log-list.hbs | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ui/app/templates/components/console/log-command.hbs b/ui/app/templates/components/console/log-command.hbs index 4a75ec88c3a8..e282e32cbc4f 100644 --- a/ui/app/templates/components/console/log-command.hbs +++ b/ui/app/templates/components/console/log-command.hbs @@ -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 
 }}
-
{{@content}}

\ No newline at end of file
+
{{@content}}

\ No newline at end of file
diff --git a/ui/app/templates/components/console/log-help.hbs b/ui/app/templates/components/console/log-help.hbs
index ea9ead3d70a9..98a774a3ed60 100644
--- a/ui/app/templates/components/console/log-help.hbs
+++ b/ui/app/templates/components/console/log-help.hbs
@@ -1,3 +1,4 @@
+{{! template-lint-disable }}
 

   
   
Usage: vault <command> [args] Commands: read Read data and retrieves secrets write Write data, configuration,
diff --git a/ui/app/templates/components/console/log-list.hbs b/ui/app/templates/components/console/log-list.hbs
index b9ebd68a6e17..600d413b8b8f 100644
--- a/ui/app/templates/components/console/log-list.hbs
+++ b/ui/app/templates/components/console/log-list.hbs
@@ -1,8 +1,10 @@
 

-  
Keys
+  
+    Keys
     {{#each this.list as |item|}}
       {{item}}
 
-    {{/each}}

+    {{/each}}
+  

   
 

\ No newline at end of file

From d4466f0cc5d830e8ddd41e334bbdfac5624c53b9 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" 
Date: Mon, 10 Apr 2023 10:19:18 -0700
Subject: [PATCH 02/11] fix again

---
 ui/app/templates/components/console/log-help.hbs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/app/templates/components/console/log-help.hbs b/ui/app/templates/components/console/log-help.hbs
index 98a774a3ed60..89b7212fe148 100644
--- a/ui/app/templates/components/console/log-help.hbs
+++ b/ui/app/templates/components/console/log-help.hbs
@@ -1,6 +1,7 @@
-{{! template-lint-disable }}
+{{! template-lint-disable  }}
 

   
+  {{! template-lint-disable no-whitespace-for-layout }}
   
Usage: vault <command> [args] Commands: read Read data and retrieves secrets 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

From cf0f63299b1adffd390c69d91eb216582e359b81 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" 
Date: Mon, 10 Apr 2023 10:22:15 -0700
Subject: [PATCH 03/11] fix again

---
 .../templates/components/console/log-help.hbs | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/ui/app/templates/components/console/log-help.hbs b/ui/app/templates/components/console/log-help.hbs
index 89b7212fe148..8717b3f044fa 100644
--- a/ui/app/templates/components/console/log-help.hbs
+++ b/ui/app/templates/components/console/log-help.hbs
@@ -1,10 +1,20 @@
-{{! template-lint-disable  }}
+{{!-- template-lint-disable  --}}
 

-  
-  {{! template-lint-disable no-whitespace-for-layout }}
-  
Usage: vault <command> [args] Commands: read Read data and retrieves secrets 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
-  

+
+{{!-- template-lint-disable no-whitespace-for-layout --}}
+
Usage: vault <command> [args]
+
+Commands:
+  read        Read data and retrieves secrets
+  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
+

 

\ No newline at end of file

From aa1a15f92c107be316d64eb0576e5f6cb3df390f Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" 
Date: Mon, 10 Apr 2023 10:28:10 -0700
Subject: [PATCH 04/11] fix, add to ignore

---
 ui/.template-lintrc.js                        |  2 +-
 .../templates/components/console/log-help.hbs | 25 ++++++-------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/ui/.template-lintrc.js b/ui/.template-lintrc.js
index 3540521890a8..22916af8a194 100644
--- a/ui/.template-lintrc.js
+++ b/ui/.template-lintrc.js
@@ -47,7 +47,7 @@ module.exports = {
     },
     'require-input-label': 'off',
   },
-  ignore: ['lib/story-md', 'tests/**'],
+  ignore: ['lib/story-md', 'tests/**', 'console/*'],
   // ember language server vscode extension does not currently respect the ignore field
   // override all rules manually as workaround to align with cli
   overrides: [
diff --git a/ui/app/templates/components/console/log-help.hbs b/ui/app/templates/components/console/log-help.hbs
index 8717b3f044fa..59ae05688870 100644
--- a/ui/app/templates/components/console/log-help.hbs
+++ b/ui/app/templates/components/console/log-help.hbs
@@ -1,20 +1,9 @@
-{{!-- template-lint-disable  --}}
+{{! template-lint-disable no-whitespace-for-layout }}
 

-
-{{!-- template-lint-disable no-whitespace-for-layout --}}
-
Usage: vault <command> [args]
-
-Commands:
-  read        Read data and retrieves secrets
-  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
-

+  
+  
Usage: vault <command> [args] Commands: read Read data and retrieves secrets 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
+  

 

\ No newline at end of file

From fa738b136d532f010d2ddc4607c58bdde93c0801 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" 
Date: Mon, 10 Apr 2023 10:28:28 -0700
Subject: [PATCH 05/11] fix, add to ignore

---
 ui/app/templates/components/console/log-help.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/templates/components/console/log-help.hbs b/ui/app/templates/components/console/log-help.hbs
index 59ae05688870..98a774a3ed60 100644
--- a/ui/app/templates/components/console/log-help.hbs
+++ b/ui/app/templates/components/console/log-help.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-whitespace-for-layout }}
+{{! template-lint-disable }}
 

   
   
Usage: vault <command> [args] Commands: read Read data and retrieves secrets write Write data, configuration,

From 971bb80687309ded7bc9fae5e68d4b917a7c4295 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" 
Date: Mon, 10 Apr 2023 10:29:14 -0700
Subject: [PATCH 06/11] add to ignore file

---
 ui/.template-lintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/.template-lintrc.js b/ui/.template-lintrc.js
index 22916af8a194..7bb9d6e36ecd 100644
--- a/ui/.template-lintrc.js
+++ b/ui/.template-lintrc.js
@@ -47,7 +47,7 @@ module.exports = {
     },
     'require-input-label': 'off',
   },
-  ignore: ['lib/story-md', 'tests/**', 'console/*'],
+  ignore: ['lib/story-md', 'tests/**', 'app/templates/components/console/*'],
   // ember language server vscode extension does not currently respect the ignore field
   // override all rules manually as workaround to align with cli
   overrides: [

From ef931f135d03db1433d7abd988709e91aa840338 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" 
Date: Mon, 10 Apr 2023 10:32:31 -0700
Subject: [PATCH 07/11] fix formatting, no verify

---
 .../templates/components/console/log-help.hbs | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/ui/app/templates/components/console/log-help.hbs b/ui/app/templates/components/console/log-help.hbs
index 98a774a3ed60..63f1aa3f7dd2 100644
--- a/ui/app/templates/components/console/log-help.hbs
+++ b/ui/app/templates/components/console/log-help.hbs
@@ -1,9 +1,19 @@
-{{! template-lint-disable }}
+{{!-- template-lint-disable  --}}
 

-  
-  
Usage: vault <command> [args] Commands: read Read data and retrieves secrets 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
-  

+
+
Usage: vault <command> [args]
+
+Commands:
+  read        Read data and retrieves secrets
+  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
+

 

\ No newline at end of file

From 22311f75b1d69d7bae823b76df5a4e226323c0e5 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" 
Date: Mon, 10 Apr 2023 10:36:41 -0700
Subject: [PATCH 08/11] remove lib/story.md

---
 ui/.template-lintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/.template-lintrc.js b/ui/.template-lintrc.js
index 7bb9d6e36ecd..f48b04e39a0e 100644
--- a/ui/.template-lintrc.js
+++ b/ui/.template-lintrc.js
@@ -47,7 +47,7 @@ module.exports = {
     },
     'require-input-label': 'off',
   },
-  ignore: ['lib/story-md', 'tests/**', 'app/templates/components/console/*'],
+  ignore: ['tests/**', 'app/templates/components/console/*'],
   // ember language server vscode extension does not currently respect the ignore field
   // override all rules manually as workaround to align with cli
   overrides: [

From ec23c9dc3d788ba051d8305628b285912ec4ff78 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" 
Date: Mon, 10 Apr 2023 10:39:27 -0700
Subject: [PATCH 09/11] add changelog

---
 changelog/20064.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelog/20064.txt

diff --git a/changelog/20064.txt b/changelog/20064.txt
new file mode 100644
index 000000000000..c539119f713d
--- /dev/null
+++ b/changelog/20064.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: fixes browser console formatting for help command output
+```
\ No newline at end of file

From 29851b1e09e942ee5f4dc893e4f9df70259fc1e4 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" 
Date: Mon, 10 Apr 2023 12:03:58 -0700
Subject: [PATCH 10/11] hold off updating ignore list for separate ticket

---
 ui/.template-lintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/.template-lintrc.js b/ui/.template-lintrc.js
index f48b04e39a0e..7bb9d6e36ecd 100644
--- a/ui/.template-lintrc.js
+++ b/ui/.template-lintrc.js
@@ -47,7 +47,7 @@ module.exports = {
     },
     'require-input-label': 'off',
   },
-  ignore: ['tests/**', 'app/templates/components/console/*'],
+  ignore: ['lib/story-md', 'tests/**', 'app/templates/components/console/*'],
   // ember language server vscode extension does not currently respect the ignore field
   // override all rules manually as workaround to align with cli
   overrides: [

From d216a996c26abe8fb7f8fffd9741e7a82f1ac5f3 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" 
Date: Mon, 10 Apr 2023 13:42:22 -0700
Subject: [PATCH 11/11] fix test

---
 ui/tests/integration/components/console/log-command-test.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/tests/integration/components/console/log-command-test.js b/ui/tests/integration/components/console/log-command-test.js
index f13f8b67674d..9797f2d85eef 100644
--- a/ui/tests/integration/components/console/log-command-test.js
+++ b/ui/tests/integration/components/console/log-command-test.js
@@ -16,7 +16,6 @@ module('Integration | Component | console/log command', function (hooks) {
     this.set('content', commandText);
 
     await render(hbs`{{console/log-command content=this.content}}`);
-
-    assert.dom('pre').includesText(commandText);
+    assert.dom('p').includesText(commandText);
   });
 });