[pull] main from solidusio:main

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"

admin/app/components/solidus_admin/properties/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 @property, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">

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

@@ -22,15 +22,15 @@ def edit_path(property)
   end
 
   def turbo_frames
-    %w[resource_modal]
+    %w[resource_form]
   end
 
   def page_actions
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
       href: solidus_admin.new_property_path(**search_filter_params),
-      data: { turbo_frame: :resource_modal },
+      data: { turbo_frame: :resource_form },
       icon: "add-line",
     )
   end
@@ -58,7 +58,7 @@ def name_column
       header: :name,
       data: ->(property) do
         link_to property.name, edit_path(property),
-          data: { turbo_frame: :resource_modal },
+          data: { turbo_frame: :resource_form },
           class: 'body-link'
       end
     }
@@ -69,7 +69,7 @@ def presentation_column
       header: :presentation,
       data: ->(property) do
         link_to property.presentation, edit_path(property),
-          data: { turbo_frame: :resource_modal },
+          data: { turbo_frame: :resource_form },
           class: 'body-link'
       end
     }

admin/app/components/solidus_admin/properties/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 @property, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">

admin/app/components/solidus_admin/refund_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 @refund_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">

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

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

admin/app/components/solidus_admin/refund_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 @refund_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">

admin/app/components/solidus_admin/return_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 @return_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">

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

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

admin/app/components/solidus_admin/return_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 @return_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">

admin/app/components/solidus_admin/roles/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 @role, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">

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

@@ -22,14 +22,14 @@ def page_actions
       tag: :a,
       text: t('.add'),
       href: solidus_admin.new_role_path(**search_filter_params),
-      data: { turbo_frame: :resource_modal },
+      data: { turbo_frame: :resource_form },
       icon: "add-line",
     )
   end
 
   def turbo_frames
     %w[
-      resource_modal
+      resource_form
     ]
   end
 
@@ -61,15 +61,15 @@ def columns
         header: :role,
         data: ->(role) do
           link_to role.name, edit_path(role),
-            data: { turbo_frame: :resource_modal },
+            data: { turbo_frame: :resource_form },
             class: "body-link"
         end,
       },
       {
         header: :description,
         data: ->(role) do
           link_to_if role.description, role.description, edit_path(role),
-            data: { turbo_frame: :resource_modal },
+            data: { turbo_frame: :resource_form },
             class: "body-link"
         end
       }

admin/app/components/solidus_admin/roles/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 @role, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">

admin/app/components/solidus_admin/shipping_categories/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 @shipping_category, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">

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

@@ -10,15 +10,15 @@ def page_actions
       tag: :a,
       text: t('.add'),
       href: solidus_admin.new_shipping_category_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
 
@@ -51,7 +51,7 @@ def columns
         header: :name,
         data: ->(shipping_category) do
           link_to shipping_category.name, edit_url(shipping_category),
-            data: { turbo_frame: :resource_modal },
+            data: { turbo_frame: :resource_form },
             class: "body-link"
         end
       },

admin/app/components/solidus_admin/shipping_categories/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 @shipping_category, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">

admin/app/components/solidus_admin/stock_items/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 @stock_item, url: form_url, html: { id: form_id } do |f| %>
       <div

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

@@ -91,7 +91,7 @@ def name_column
       header: :name,
       data: ->(stock_item) do
         link_to stock_item.variant.name, edit_path(stock_item),
-          data: { turbo_frame: :resource_modal },
+          data: { turbo_frame: :resource_form },
           class: 'body-link'
       end
     }
@@ -102,7 +102,7 @@ def sku_column
       header: :sku,
       data: ->(stock_item) do
         link_to stock_item.variant.sku, edit_path(stock_item),
-          data: { turbo_frame: :resource_modal },
+          data: { turbo_frame: :resource_form },
           class: 'body-link'
       end
     }
@@ -172,6 +172,6 @@ def count_on_hand_column
   end
 
   def turbo_frames
-    %w[resource_modal]
+    %w[resource_form]
   end
 end

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

@@ -0,0 +1,16 @@
+<%= page id: :resource_form do %>
+  <%= page_header do %>
+    <%= page_header_back(back_url) %>
+    <%= page_header_title(t('.title')) %>
+    <%= page_header_actions do %>
+      <%= render component("ui/button").discard(path: back_url) %>
+      <%= render component("ui/button").save(form: form_id) %>
+    <% end %>
+  <% end %>
+
+  <%= render component("stock_locations/form").new(stock_location: @stock_location, url: form_url, id: form_id) %>
+
+  <%= page_footer do %>
+    <%= render component("ui/button").save(form: form_id) %>
+  <% end %>
+<% end %>

admin/app/components/solidus_admin/stock_locations/edit/component.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::StockLocations::Edit::Component < SolidusAdmin::Resources::Edit::Component
+  include SolidusAdmin::Layout::PageHelpers
+end

admin/app/components/solidus_admin/stock_locations/edit/component.yml

@@ -0,0 +1,2 @@
+en:
+  title: "Edit Stock Location"