Merge pull request #6160 from chaimann/admin-stock-locations-form

Admin stock locations form

Author: tvdeyen

admin/app/components/solidus_admin/adjustment_reasons/edit/component.html.erb

@@ -1,4 +1,4 @@
-<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+<%= turbo_frame_tag :resource_form, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
     <%= form_for @adjustment_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">

admin/app/components/solidus_admin/adjustment_reasons/index/component.rb

@@ -18,15 +18,15 @@ def page_actions
       tag: :a,
       text: t('.add'),
       href: solidus_admin.new_adjustment_reason_path(**search_filter_params),
-      data: { turbo_frame: :resource_modal },
+      data: { turbo_frame: :resource_form },
       icon: "add-line",
       class: "align-self-end w-full",
     )
   end
 
   def turbo_frames
     %w[
-      resource_modal
+      resource_form
     ]
   end
 
@@ -52,15 +52,15 @@ def columns
         data: ->(adjustment_reason) do
           link_to adjustment_reason.name, edit_path(adjustment_reason),
             class: 'body-link',
-            data: { turbo_frame: :resource_modal }
+            data: { turbo_frame: :resource_form }
         end
       },
       {
         header: :code,
         data: ->(adjustment_reason) do
           link_to adjustment_reason.code, edit_path(adjustment_reason),
             class: 'body-link',
-            data: { turbo_frame: :resource_modal }
+            data: { turbo_frame: :resource_form }
         end
       },
       {

admin/app/components/solidus_admin/adjustment_reasons/new/component.html.erb

@@ -1,4 +1,4 @@
-<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+<%= turbo_frame_tag :resource_form, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
     <%= form_for @adjustment_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">

admin/app/components/solidus_admin/layout/page_helpers.rb

@@ -13,13 +13,7 @@ def page_header_actions(&block)
   end
 
   def page_header_back(back_path)
-    render component("ui/button").new(
-      tag: :a,
-      title: t(".back"),
-      icon: "arrow-left-line",
-      scheme: :secondary,
-      href: back_path
-    )
+    render component("ui/button").back(path: back_path)
   end
 
   def page_header_title(title, &block)

admin/app/components/solidus_admin/orders/show/address/component.html.erb

@@ -50,11 +50,7 @@
           ) %>
         </form>
 
-        <%= render component("ui/button").new(
-          tag: :button,
-          text: t(".save"),
-          form: form_id
-        ) %>
+        <%= render component("ui/button").save(form: form_id) %>
       <% end %>
     <% end %>
   <% end %>

admin/app/components/solidus_admin/orders/show/address/component.yml

@@ -1,5 +1,4 @@
 en:
-  save: Save
   cancel: Cancel
   back: Back
   select_address: Select address

admin/app/components/solidus_admin/orders/show/component.html.erb

@@ -3,8 +3,8 @@
     <%= page_header_back(solidus_admin.orders_path) %>
     <%= page_header_title(t('.title', number: @order.number)) %>
     <%= page_header_actions do %>
-      <%= render component("ui/button").new(tag: :button, scheme: :secondary, text: t(".discard"), form: form_id) %>
-      <%= render component("ui/button").new(tag: :button, text: t(".save"), form: form_id) %>
+      <%= render component("ui/button").discard(path: solidus_admin.orders_path) %>
+      <%= render component("ui/button").save(form: form_id) %>
     <% end %>
   <% end %>
 

admin/app/components/solidus_admin/orders/show/component.yml

@@ -1,11 +1,8 @@
 en:
-  save: Save
-  discard: Discard
   title: "Order %{number}"
   customer: Customer
   no_name: No name available
   order_email: Order contact email
-  back: Back to orders
   same_as_shipping: Same as shipping address
 
   edit_email: "Edit order email"

admin/app/components/solidus_admin/products/show/component.html.erb

@@ -19,7 +19,7 @@
         target: :_blank,
         scheme: :ghost
       ) %>
-      <%= render component("ui/button").new(tag: :button, text: t(".save"), form: form_id) %>
+      <%= render component("ui/button").save(form: form_id) %>
     <% end %>
   <% end %>
 

admin/app/components/solidus_admin/products/show/component.yml

@@ -1,6 +1,4 @@
 en:
-  save: "Save"
-  back: "Back"
   duplicate: "Duplicate"
   view: "View online"
   delete: "Delete"