From 276713697ae0695ed1c2e5e91fbc4e6126623706 Mon Sep 17 00:00:00 2001
From: Dharini Jeeva <dharini@hashicorp.com>
Date: Fri, 12 Jan 2024 17:20:30 -0800
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20move=20overridable=20ne?=
 =?UTF-8?q?xt=20to=20select=20(#2092)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: 🤖 move overridable next to select

* fix: 🐛 lint
---
 .../form/policy/policy-selection/index.hbs    | 26 +++++++++----------
 ui/admin/app/styles/app.scss                  |  8 ++++++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ui/admin/app/components/form/policy/policy-selection/index.hbs b/ui/admin/app/components/form/policy/policy-selection/index.hbs
index 85aef453a..cb96fa533 100644
--- a/ui/admin/app/components/form/policy/policy-selection/index.hbs
+++ b/ui/admin/app/components/form/policy/policy-selection/index.hbs
@@ -10,7 +10,7 @@
       name={{@name}}
       disabled={{or @disabled this.isDeleteDisable}}
       aria-label={{t (concat 'resources.policy.form.' @name '.label')}}
-      @width='80%'
+      @width='70%'
       {{on 'change' this.handlePolicyTypeSelection}}
       as |F|
     >
@@ -28,7 +28,17 @@
       </F.Options>
 
     </Hds::Form::Select::Field>
-
+    {{#if @model.scope.isGlobal}}
+      <Hds::Form::Toggle::Field
+        checked={{this.isOverridable}}
+        disabled={{@disabled}}
+        name={{@customInputName}}
+        {{on 'change' this.handleOverridableToggle}}
+        as |F|
+      >
+        <F.Label>{{t 'resources.policy.form.overridable.label'}}</F.Label>
+      </Hds::Form::Toggle::Field>
+    {{/if}}
   </F.Control>
 </Hds::Form::Fieldset>
 {{#if this.showCustomInput}}
@@ -54,17 +64,7 @@
           />
         </S.Generic>
       </Hds::SegmentedGroup>
-      {{#if @model.scope.isGlobal}}
-        <Hds::Form::Toggle::Field
-          checked={{this.isOverridable}}
-          disabled={{@disabled}}
-          name={{@customInputName}}
-          {{on 'change' this.handleOverridableToggle}}
-          as |F|
-        >
-          <F.Label>{{t 'resources.policy.form.overridable.label'}}</F.Label>
-        </Hds::Form::Toggle::Field>
-      {{/if}}
+
     </F.Control>
 
   </Hds::Form::Field>
diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss
index 676e5df4e..b50576e82 100644
--- a/ui/admin/app/styles/app.scss
+++ b/ui/admin/app/styles/app.scss
@@ -955,6 +955,14 @@
 // storage policies
 .policy {
   margin-bottom: 0;
+
+  .hds-form-field--layout-vertical {
+    width: 50%;
+  }
+
+  .hds-form-group__control-fields-wrapper {
+    flex-direction: row;
+  }
 }
 
 .policy-custom-input {