From 80eb4be373849269dbc5f82c27cd906c7d9ab5d1 Mon Sep 17 00:00:00 2001
From: djvs <2954343+djvs@users.noreply.github.com>
Date: Fri, 22 Oct 2021 12:53:31 -0400
Subject: [PATCH 1/5] Vertical resize on .cm-s-hashi.CodeMirror

---
 ui/app/styles/components/console-ui-panel.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/app/styles/components/console-ui-panel.scss b/ui/app/styles/components/console-ui-panel.scss
index 170af92dec9b0..76c1054db293e 100644
--- a/ui/app/styles/components/console-ui-panel.scss
+++ b/ui/app/styles/components/console-ui-panel.scss
@@ -53,6 +53,7 @@
   }
 
   .cm-s-hashi.CodeMirror {
+    resize: vertical;
     background-color: rgba($black, 0.5) !important;
     font-weight: $font-weight-normal;
     margin-left: $console-spacing;

From 54366655245c2c191eb58b15234071a9331d0920 Mon Sep 17 00:00:00 2001
From: djvs <2954343+djvs@users.noreply.github.com>
Date: Fri, 22 Oct 2021 13:02:23 -0400
Subject: [PATCH 2/5] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c7118cbe1633..fcf96fdeacc62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ outstanding dirty pages that were not flushed. [[GH-2093](https://github.com/has
 * ui: Add creation time to KV 2 version history and version view [[GH-12663](https://github.com/hashicorp/vault/pull/12663)]
 * ui: namespace search in client count views [[GH-12577](https://github.com/hashicorp/vault/pull/12577)]
 * ui: updated client tracking config view [[GH-12422](https://github.com/hashicorp/vault/pull/12422)]
+* ui: Added resize for JSON editor [[GH-12906](https://github.com/hashicorp/vault/pull/12906)]
 
 BUG FIXES:
 

From 7629c3e9470ceff516d4af4ffffb8b9aa02065d5 Mon Sep 17 00:00:00 2001
From: djvs <2954343+djvs@users.noreply.github.com>
Date: Fri, 22 Oct 2021 16:21:40 -0400
Subject: [PATCH 3/5] update other file

---
 ui/app/styles/components/codemirror.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/app/styles/components/codemirror.scss b/ui/app/styles/components/codemirror.scss
index aaa6b232b696c..023bed8f78684 100644
--- a/ui/app/styles/components/codemirror.scss
+++ b/ui/app/styles/components/codemirror.scss
@@ -51,6 +51,7 @@ $gutter-grey: #2a2f36;
 .cm-s-hashi {
   &.CodeMirror {
     background-color: $black !important;
+    resize: vertical; 
     color: #cfd2d1 !important;
     border: none;
     font-family: $family-monospace;

From 301f0b3bc0ca86c2cd7d7cf4d2217dd8be38af5f Mon Sep 17 00:00:00 2001
From: djvs <2954343+djvs@users.noreply.github.com>
Date: Fri, 22 Oct 2021 16:22:28 -0400
Subject: [PATCH 4/5] undo other change

---
 ui/app/styles/components/console-ui-panel.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/app/styles/components/console-ui-panel.scss b/ui/app/styles/components/console-ui-panel.scss
index 76c1054db293e..170af92dec9b0 100644
--- a/ui/app/styles/components/console-ui-panel.scss
+++ b/ui/app/styles/components/console-ui-panel.scss
@@ -53,7 +53,6 @@
   }
 
   .cm-s-hashi.CodeMirror {
-    resize: vertical;
     background-color: rgba($black, 0.5) !important;
     font-weight: $font-weight-normal;
     margin-left: $console-spacing;

From 4bcfcc3bf428fc127e5ca812e148f518ebd179c8 Mon Sep 17 00:00:00 2001
From: djvs <2954343+djvs@users.noreply.github.com>
Date: Fri, 22 Oct 2021 16:28:44 -0400
Subject: [PATCH 5/5] fix

---
 CHANGELOG.md        | 1 -
 changelog/12906.txt | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changelog/12906.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcf96fdeacc62..8c7118cbe1633 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,7 +40,6 @@ outstanding dirty pages that were not flushed. [[GH-2093](https://github.com/has
 * ui: Add creation time to KV 2 version history and version view [[GH-12663](https://github.com/hashicorp/vault/pull/12663)]
 * ui: namespace search in client count views [[GH-12577](https://github.com/hashicorp/vault/pull/12577)]
 * ui: updated client tracking config view [[GH-12422](https://github.com/hashicorp/vault/pull/12422)]
-* ui: Added resize for JSON editor [[GH-12906](https://github.com/hashicorp/vault/pull/12906)]
 
 BUG FIXES:
 
diff --git a/changelog/12906.txt b/changelog/12906.txt
new file mode 100644
index 0000000000000..69e96ad3c68fd
--- /dev/null
+++ b/changelog/12906.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: Added resize for JSON editor [[GH-12906](https://github.com/hashicorp/vault/pull/12906)]
+```