From a85d3b46169aea0828071c0623b87d3b23d60a0a Mon Sep 17 00:00:00 2001
From: Chris <chris@example.com>
Date: Fri, 7 Nov 2025 14:36:19 -0800
Subject: [PATCH] nest the forms more

---
 .../_buildpack_fields.html.erb                | 149 +++++++++---------
 .../_dockerfile_fields.html.erb               |  48 +++---
 .../build_configurations/_form.html.erb       |   2 +-
 3 files changed, 104 insertions(+), 95 deletions(-)

diff --git a/app/views/projects/build_configurations/_buildpack_fields.html.erb b/app/views/projects/build_configurations/_buildpack_fields.html.erb
index 923ca239..0495d042 100644
--- a/app/views/projects/build_configurations/_buildpack_fields.html.erb
+++ b/app/views/projects/build_configurations/_buildpack_fields.html.erb
@@ -1,82 +1,87 @@
-<div data-controller="buildpack-fields" data-buildpack-fields-packs-value="<%= BuildConfiguration.available_buildpacks.to_json %>">
-  <div class="form-control mt-1 mb-2 w-full max-w-md">
-    <label class="label">
-      <span class="label-text">Base Builder</span>
-    </label>
-    <%= bc_form.select(
-      :buildpack_base_builder,
-      options_for_select(
-        [
-          ["heroku/builder-classic:22", "heroku/builder-classic:22"],
-          ["heroku/builder:22", "heroku/builder:22"],
-          ["heroku/builder:24", "heroku/builder:24"],
-          ["heroku/buildpacks:18", "heroku/buildpacks:18"],
-          ["heroku/buildpacks:20", "heroku/buildpacks:20"],
-          ["paketobuildpacks/builder-jammy-full:latest", "paketobuildpacks/builder-jammy-full:latest"],
-          ["paketobuildpacks/builder:full", "paketobuildpacks/builder:full"]
-        ],
-        selected: build_configuration.buildpack_base_builder || "heroku/buildpacks:20"
-      ),
-      { include_blank: "Select a base builder..." },
-      { class: "select select-bordered w-full", data: { buildpack_fields_target: "baseBuilder" } }
-    ) %>
-    <label class="label">
-      <span class="label-text-alt">Select the base builder image for Cloud Native Buildpacks</span>
-    </label>
-  </div>
 
-  <div class="form-control mt-1 mb-2 w-full max-w-md">
-    <label class="label">
-      <span class="label-text">Buildpacks</span>
-    </label>
-    <div data-buildpack-fields-target="list" class="space-y-2">
-      <% build_configuration.build_packs.each do |build_pack| %>
-        <%= render "projects/build_configurations/buildpack_item", build_pack: build_pack %>
-      <% end %>
+<div class="flex flex-row gap-6">
+  <div class="flex-shrink my-4 border-l-2 border-base-300 pl-4">
+  </div>
+  <div data-controller="buildpack-fields" data-buildpack-fields-packs-value="<%= BuildConfiguration.available_buildpacks.to_json %>">
+    <div class="form-control mt-1 mb-2 w-full max-w-md">
+      <label class="label">
+        <span class="label-text">Base Builder</span>
+      </label>
+      <%= bc_form.select(
+        :buildpack_base_builder,
+        options_for_select(
+          [
+            ["heroku/builder-classic:22", "heroku/builder-classic:22"],
+            ["heroku/builder:22", "heroku/builder:22"],
+            ["heroku/builder:24", "heroku/builder:24"],
+            ["heroku/buildpacks:18", "heroku/buildpacks:18"],
+            ["heroku/buildpacks:20", "heroku/buildpacks:20"],
+            ["paketobuildpacks/builder-jammy-full:latest", "paketobuildpacks/builder-jammy-full:latest"],
+            ["paketobuildpacks/builder:full", "paketobuildpacks/builder:full"]
+          ],
+          selected: build_configuration.buildpack_base_builder || "heroku/buildpacks:20"
+        ),
+        { include_blank: "Select a base builder..." },
+        { class: "select select-bordered w-full", data: { buildpack_fields_target: "baseBuilder" } }
+      ) %>
+      <label class="label">
+        <span class="label-text-alt">Select the base builder image for Cloud Native Buildpacks</span>
+      </label>
     </div>
-    <button type="button" class="btn btn-outline btn-primary mt-2" data-action="click->buildpack-fields#openModal">
-      <iconify-icon icon="mdi:plus" width="20" height="20"></iconify-icon>
-      Add Buildpack
-    </button>
-  </div>
 
-  <template data-buildpack-fields-target="template">
-    <%= render "projects/build_configurations/buildpack_item" %>
-  </template>
+    <div class="form-control mt-1 mb-2 w-full max-w-md">
+      <label class="label">
+        <span class="label-text">Buildpacks</span>
+      </label>
+      <div data-buildpack-fields-target="list" class="space-y-2">
+        <% build_configuration.build_packs.each do |build_pack| %>
+          <%= render "projects/build_configurations/buildpack_item", build_pack: build_pack %>
+        <% end %>
+      </div>
+      <button type="button" class="btn btn-outline btn-primary mt-2" data-action="click->buildpack-fields#openModal">
+        <iconify-icon icon="mdi:plus" width="20" height="20"></iconify-icon>
+        Add Buildpack
+      </button>
+    </div>
 
-  <dialog data-buildpack-fields-target="modal" class="modal">
-    <div class="modal-box w-11/12 max-w-5xl">
-      <h3 class="font-bold text-lg">Add Buildpacks</h3>
-      <p class="py-2 text-sm text-gray-600">Select buildpacks to add to your build configuration.</p>
+    <template data-buildpack-fields-target="template">
+      <%= render "projects/build_configurations/buildpack_item" %>
+    </template>
 
-      <div class="space-y-4 mt-4">
-        <div>
-          <h4 class="font-semibold mb-2">Selected Buildpacks</h4>
-          <div data-buildpack-fields-target="selectedBuildpacks" class="border border-base-300 rounded-lg max-h-48 overflow-y-auto">
-            <div class="text-sm text-gray-500 p-4 text-center">No buildpacks selected</div>
+    <dialog data-buildpack-fields-target="modal" class="modal">
+      <div class="modal-box w-11/12 max-w-5xl">
+        <h3 class="font-bold text-lg">Add Buildpacks</h3>
+        <p class="py-2 text-sm text-gray-600">Select buildpacks to add to your build configuration.</p>
+
+        <div class="space-y-4 mt-4">
+          <div>
+            <h4 class="font-semibold mb-2">Selected Buildpacks</h4>
+            <div data-buildpack-fields-target="selectedBuildpacks" class="border border-base-300 rounded-lg max-h-48 overflow-y-auto">
+              <div class="text-sm text-gray-500 p-4 text-center">No buildpacks selected</div>
+            </div>
+          </div>
+
+          <div>
+            <h4 class="font-semibold mb-2">Official Buildpacks</h4>
+            <div data-buildpack-fields-target="availableBuildpacks" class="border border-base-300 rounded-lg max-h-64 overflow-y-auto">
+              <!-- Official buildpacks will be rendered here -->
+            </div>
+          </div>
+
+          <div>
+            <h4 class="font-semibold mb-2">Search Registry</h4>
+            <%= render "build_packs/search" %>
+            <div data-buildpack-fields-target="searchResults" class="border border-base-300 rounded-lg max-h-64 overflow-y-auto mt-2">
+              <!-- Search results will be rendered here -->
+            </div>
           </div>
         </div>
 
-        <div>
-          <h4 class="font-semibold mb-2">Official Buildpacks</h4>
-          <div data-buildpack-fields-target="availableBuildpacks" class="border border-base-300 rounded-lg max-h-64 overflow-y-auto">
-            <!-- Official buildpacks will be rendered here -->
-          </div>
-        </div>
-
-        <div>
-          <h4 class="font-semibold mb-2">Search Registry</h4>
-          <%= render "build_packs/search" %>
-          <div data-buildpack-fields-target="searchResults" class="border border-base-300 rounded-lg max-h-64 overflow-y-auto mt-2">
-            <!-- Search results will be rendered here -->
-          </div>
+        <div class="modal-action">
+          <button type="button" class="btn btn-ghost" data-action="click->buildpack-fields#closeModal">Cancel</button>
+          <button type="button" class="btn btn-primary" data-action="click->buildpack-fields#addSelectedBuildpacks">Add Selected</button>
         </div>
       </div>
-
-      <div class="modal-action">
-        <button type="button" class="btn btn-ghost" data-action="click->buildpack-fields#closeModal">Cancel</button>
-        <button type="button" class="btn btn-primary" data-action="click->buildpack-fields#addSelectedBuildpacks">Add Selected</button>
-      </div>
-    </div>
-  </dialog>
-</div>
+    </dialog>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/projects/build_configurations/_dockerfile_fields.html.erb b/app/views/projects/build_configurations/_dockerfile_fields.html.erb
index 6260a683..43e23cc6 100644
--- a/app/views/projects/build_configurations/_dockerfile_fields.html.erb
+++ b/app/views/projects/build_configurations/_dockerfile_fields.html.erb
@@ -1,25 +1,29 @@
-<div>
-  <div class="form-control mt-1 mb-2 w-full max-w-md">
-    <label class="label">
-      <span class="label-text">Dockerfile path</span>
-    </label>
-    <%= bc_form.text_field(
-      :dockerfile_path,
-      class: "input input-bordered w-full focus:outline-offset-0",
-      value: build_configuration.dockerfile_path
-    ) %>
-    <label class="label">
-      <span class="label-text-alt">* Required</span>
-    </label>
+<div class="flex flex-row gap-6">
+  <div class="flex-shrink my-4 border-l-2 border-base-300 pl-4">
   </div>
-  <div class="form-control mt-1 mb-2 w-full max-w-md">
-    <label class="label">
-      <span class="label-text">Build context directory</span>
-    </label>
-    <%= bc_form.text_field(
-      :context_directory,
-      class: "input input-bordered w-full focus:outline-offset-0",
-      value: build_configuration.context_directory
-    ) %>
+  <div class="w-full">
+    <div class="form-control mt-1 mb-2 w-full max-w-md">
+      <label class="label">
+        <span class="label-text">Dockerfile path</span>
+      </label>
+      <%= bc_form.text_field(
+        :dockerfile_path,
+        class: "input input-bordered w-full focus:outline-offset-0",
+        value: build_configuration.dockerfile_path
+      ) %>
+      <label class="label">
+        <span class="label-text-alt">* Required</span>
+      </label>
+    </div>
+    <div class="form-control mt-1 mb-2 w-full max-w-md">
+      <label class="label">
+        <span class="label-text">Build context directory</span>
+      </label>
+      <%= bc_form.text_field(
+        :context_directory,
+        class: "input input-bordered w-full focus:outline-offset-0",
+        value: build_configuration.context_directory
+      ) %>
+    </div>
   </div>
 </div>
diff --git a/app/views/projects/build_configurations/_form.html.erb b/app/views/projects/build_configurations/_form.html.erb
index 35cfa089..59ded3be 100644
--- a/app/views/projects/build_configurations/_form.html.erb
+++ b/app/views/projects/build_configurations/_form.html.erb
@@ -49,7 +49,7 @@
           { class: "select select-bordered w-full" }
         ) %>
         <label class="label">
-          <span class="label-text-alt">Select a provider with a container registry</span>
+          <span class="label-text-alt">Select a credential that gives access to a container registry</span>
         </label>
       </div>
       <div class="form-control mt-1 mb-2 w-full max-w-md">