solidus_admin 0.4.1 → 0.5.0

data/app/components/solidus_admin/users/store_credits/edit_amount/component.html.erb

@@ -1,13 +1,12 @@
-<%= 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 @store_credit, url: form_url, method: :put, html: { id: form_id } do |f| %>
+    <%= solidus_form_for @store_credit, url: form_url, method: :put, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
-        <%= render component("ui/forms/field").text_field(f, :amount, class: "required") %>
-        <%= render component("ui/forms/field").select(
-          f,
+        <%= f.text_field(:amount, class: "required") %>
+        <%= f.select(
           :store_credit_reason_id,
-          store_credit_reasons_select_options.html_safe,
-          include_blank: t('spree.choose_reason'),
+          @store_credit_reasons.map { [_1.name, _1.id] },
+          include_blank: t('.choose_reason'),
           html: { required: true }
         ) %>
       </div>
@@ -15,7 +14,7 @@
         <form method="dialog">
           <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
         </form>
-        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+        <%= f.submit %>
       <% end %>
     <% end %>
   <% end %>

data/app/components/solidus_admin/users/store_credits/edit_amount/component.rb

@@ -14,9 +14,4 @@ class SolidusAdmin::Users::StoreCredits::EditAmount::Component < SolidusAdmin::R
   def form_url
     solidus_admin.update_amount_user_store_credit_path(@user, @store_credit, **search_filter_params)
   end
-
-  def store_credit_reasons_select_options
-    # Placeholder + Store Credit Reasons
-    "<option value>#{t('.choose_reason')}</option>" + options_from_collection_for_select(@store_credit_reasons, :id, :name)
-  end
 end

data/app/components/solidus_admin/users/store_credits/edit_amount/component.yml

@@ -1,5 +1,4 @@
 en:
   title: Edit Store Credit Amount
   cancel: Cancel
-  submit: Update Store Credit
   choose_reason: Choose Reason For Changing Amount

data/app/components/solidus_admin/users/store_credits/edit_memo/component.html.erb

@@ -1,14 +1,14 @@
-<%= 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 @store_credit, url: form_url, method: :put, html: { id: form_id } do |f| %>
+    <%= solidus_form_for @store_credit, url: form_url, method: :put, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
-        <%= render component("ui/forms/field").text_field(f, :memo) %>
+        <%= f.text_field(:memo) %>
       </div>
       <% modal.with_actions do %>
         <form method="dialog">
           <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
         </form>
-        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+        <%= f.submit %>
       <% end %>
     <% end %>
   <% end %>

data/app/components/solidus_admin/users/store_credits/edit_memo/component.yml

@@ -1,4 +1,3 @@
 en:
   title: Edit Store Credit Memo
   cancel: Cancel
-  submit: Update Store Credit

data/app/components/solidus_admin/users/store_credits/edit_validity/component.html.erb

@@ -1,12 +1,11 @@
-<%= 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 @store_credit, url: form_url, method: :put, html: { id: form_id } do |f| %>
+    <%= solidus_form_for @store_credit, url: form_url, method: :put, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
-        <%= render component("ui/forms/field").select(
-          f,
+        <%= f.select(
           :store_credit_reason_id,
-          store_credit_reasons_select_options.html_safe,
-          include_blank: t('spree.choose_reason'),
+          @store_credit_reasons.map { [_1.name, _1.id] },
+          include_blank: t('.choose_reason'),
           html: { required: true }
         ) %>
       </div>
@@ -14,7 +13,7 @@
         <form method="dialog">
           <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
         </form>
-        <%= render component("ui/button").new(form: form_id, scheme: :danger, type: :submit, text: t('.submit')) %>
+        <%= f.submit(text: t('.submit'), scheme: :danger) %>
       <% end %>
     <% end %>
   <% end %>

data/app/components/solidus_admin/users/store_credits/edit_validity/component.rb

@@ -14,9 +14,4 @@ class SolidusAdmin::Users::StoreCredits::EditValidity::Component < SolidusAdmin:
   def form_url
     solidus_admin.invalidate_user_store_credit_path(@user, @store_credit, **search_filter_params)
   end
-
-  def store_credit_reasons_select_options
-    # Placeholder + Store Credit Reasons
-    "<option value>#{t('.choose_reason')}</option>" + options_from_collection_for_select(@store_credit_reasons, :id, :name)
-  end
 end

data/app/components/solidus_admin/users/store_credits/index/component.html.erb

@@ -8,7 +8,7 @@
         tag: :a,
         href: new_store_credit_path,
         data: {
-          turbo_frame: :resource_modal
+          turbo_frame: :resource_form
         },
         text: t(".add_store_credit"),
         icon: "add-line"
@@ -17,9 +17,7 @@
   <% end %>
 
   <%= page_header do %>
-    <% tabs.each do |tab| %>
-      <%= render(component("ui/button").new(tag: :a, scheme: :ghost, text: tab[:text], 'aria-current': tab[:current], href: tab[:href])) %>
-    <% end %>
+    <%= render component("users/edit/tabs").new(user: @user, current: :store_credits) %>
   <% end %>
 
   <%= page_with_sidebar do %>
@@ -47,7 +45,7 @@
           <%= render component("ui/button").new(
             tag: :a,
             data: {
-              turbo_frame: :resource_modal
+              turbo_frame: :resource_form
             },
             href: new_store_credit_path,
             text: t(".create_one"),
@@ -61,5 +59,5 @@
     <% end %>
   <% end %>
 
-  <%= turbo_frame_tag :resource_modal, target: "_top" %>
+  <%= turbo_frame_tag :resource_form, target: "_top" %>
 <% end %>

data/app/components/solidus_admin/users/store_credits/index/component.rb

@@ -12,36 +12,6 @@ class SolidusAdmin::Users::StoreCredits::Index::Component < SolidusAdmin::BaseCo
     Spree::StoreCredit
   end
 
-  def tabs
-    [
-      {
-        text: t('.account'),
-        href: solidus_admin.user_path(@user),
-        current: false,
-      },
-      {
-        text: t('.addresses'),
-        href: solidus_admin.addresses_user_path(@user),
-        current: false,
-      },
-      {
-        text: t('.order_history'),
-        href: solidus_admin.orders_user_path(@user),
-        current: false,
-      },
-      {
-        text: t('.items'),
-        href: spree.items_admin_user_path(@user),
-        current: false,
-      },
-      {
-        text: t('.store_credit'),
-        href: solidus_admin.user_store_credits_path(@user),
-        current: true,
-      },
-    ]
-  end
-
   def rows
     @store_credits
   end
@@ -58,54 +28,54 @@ class SolidusAdmin::Users::StoreCredits::Index::Component < SolidusAdmin::BaseCo
     [
       {
         header: :credited,
-        col: { class: "w-[12%]" },
+        col: {class: "w-[12%]"},
         data: ->(store_credit) do
           link_to store_credit.display_amount.to_html, show_path(store_credit), class: "body-link text-sm"
         end
       },
       {
         header: :authorized,
-        col: { class: "w-[13%]" },
+        col: {class: "w-[13%]"},
         data: ->(store_credit) do
           link_to store_credit.display_amount_authorized.to_html, show_path(store_credit), class: "body-link text-sm"
         end
       },
       {
         header: :used,
-        col: { class: "w-[9%]" },
+        col: {class: "w-[9%]"},
         data: ->(store_credit) do
           link_to store_credit.display_amount_used.to_html, show_path(store_credit), class: "body-link text-sm"
         end
       },
       {
         header: :type,
-        col: { class: "w-[13%]" },
+        col: {class: "w-[13%]"},
         data: ->(store_credit) do
-          component('ui/badge').new(name: store_credit.credit_type.name, color: :blue)
+          component("ui/badge").new(name: store_credit.credit_type.name, color: :blue)
         end
       },
       {
         header: :created_by,
-        col: { class: "w-[22%]" },
+        col: {class: "w-[22%]"},
         data: ->(store_credit) do
           content_tag :div, store_credit.created_by_email, class: "text-sm"
         end
       },
       {
         header: :issued_on,
-        col: { class: "w-[16%]" },
+        col: {class: "w-[16%]"},
         data: ->(store_credit) do
           content_tag :span, I18n.l(store_credit.created_at.to_date), class: "text-sm"
         end
       },
       {
         header: :invalidated,
-        col: { class: "w-[15%]" },
+        col: {class: "w-[15%]"},
         data: ->(store_credit) do
           if store_credit.invalidated?
-            component('ui/badge').new(name: :yes, color: :red, size: :m)
+            component("ui/badge").new(name: :yes, color: :red, size: :m)
           else
-            component('ui/badge').new(name: :no, color: :green, size: :m)
+            component("ui/badge").new(name: :no, color: :green, size: :m)
           end
         end
       }

data/app/components/solidus_admin/users/store_credits/index/component.yml

@@ -1,12 +1,6 @@
 en:
   title: "Users / %{email} / Store Credit"
-  account: Account
-  addresses: Addresses
-  order_history: Order History
-  items: Items
   store_credit: Store Credit
-  last_active: Last Active
   add_store_credit: Add Store Credit
   no_credits_found: No Store Credits found.
   create_one: Create One
-  back: Back

data/app/components/solidus_admin/users/store_credits/new/component.html.erb

@@ -1,29 +1,28 @@
-<%= 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 @store_credit, url: form_url, method: :post, html: { id: form_id } do |f| %>
+    <%= solidus_form_for @store_credit, url: form_url, method: :post, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
-        <%= render component("ui/forms/field").text_field(f, :amount, class: "required") %>
-        <%= render component("ui/forms/field").select(
-          f,
+        <%= f.text_field(:amount, class: "required") %>
+        <%= f.select(
           :currency,
-          currency_select_options.html_safe,
-          include_blank: t("spree.currency"),
+          Spree::Config.available_currencies.map { [_1.iso_code, _1.iso_code] },
+          placeholder: t("spree.currency"),
+          value: Spree::Config.currency,
           html: { required: true }
         ) %>
-        <%= render component("ui/forms/field").select(
-          f,
+        <%= f.select(
           :category_id,
-          store_credit_categories_select_options.html_safe,
-          include_blank: t("spree.category"),
+          @store_credit_categories.map { [_1.name, _1.id] },
+          include_blank: t(".choose_category"),
           html: { required: true }
         ) %>
-        <%= render component("ui/forms/field").text_field(f, :memo) %>
+        <%= f.text_field(:memo) %>
       </div>
       <% modal.with_actions do %>
         <form method="dialog">
           <%= render component("ui/button").new(scheme: :secondary, text: t(".cancel")) %>
         </form>
-        <%= render component("ui/button").new(form: form_id, type: :submit, text: t(".submit")) %>
+        <%= f.submit %>
       <% end %>
     <% end %>
   <% end %>

data/app/components/solidus_admin/users/store_credits/new/component.rb

@@ -10,13 +10,4 @@ class SolidusAdmin::Users::StoreCredits::New::Component < SolidusAdmin::Resource
   def form_url
     solidus_admin.user_store_credits_path(@user, **search_filter_params)
   end
-
-  def currency_select_options
-    options_from_collection_for_select(Spree::Config.available_currencies, :iso_code, :iso_code, Spree::Config.currency)
-  end
-
-  def store_credit_categories_select_options
-    # Placeholder + Store Credit Categories
-    "<option value>#{t('.choose_category')}</option>" + options_from_collection_for_select(@store_credit_categories, :id, :name)
-  end
 end

data/app/components/solidus_admin/users/store_credits/new/component.yml

@@ -1,5 +1,4 @@
 en:
   title: New Store Credit
   cancel: Cancel
-  submit: Create
   choose_category: Choose Store Credit Category

data/app/components/solidus_admin/users/store_credits/show/component.html.erb

@@ -5,9 +5,7 @@
   <% end %>
 
   <%= page_header do %>
-    <% tabs.each do |tab| %>
-      <%= render(component("ui/button").new(tag: :a, scheme: :ghost, text: tab[:text], 'aria-current': tab[:current], href: tab[:href])) %>
-    <% end %>
+    <%= render component("users/edit/tabs").new(user: @user, current: :store_credits) %>
   <% end %>
 
   <%= page_with_sidebar do %>
@@ -31,7 +29,7 @@
                 tag: :a,
                 scheme: :danger,
                 data: {
-                  turbo_frame: :resource_modal
+                  turbo_frame: :resource_form
                 },
                 href: edit_validity_url,
                 text: t(".invalidate"),
@@ -41,7 +39,7 @@
             <%= render component("ui/button").new(
               tag: :a,
               data: {
-                turbo_frame: :resource_modal
+                turbo_frame: :resource_form
               },
               href: edit_memo_url,
               text: t(".edit_memo"),
@@ -51,7 +49,7 @@
               <%= render component("ui/button").new(
                 tag: :a,
                 data: {
-                  turbo_frame: :resource_modal
+                  turbo_frame: :resource_form
                 },
                 href: edit_amount_url,
                 text: t(".edit_amount"),
@@ -79,5 +77,5 @@
     <% end %>
   <% end %>
 
-  <%= turbo_frame_tag :resource_modal, target: "_top" %>
+  <%= turbo_frame_tag :resource_form, target: "_top" %>
 <% end %>

data/app/components/solidus_admin/users/store_credits/show/component.rb

@@ -18,36 +18,6 @@ class SolidusAdmin::Users::StoreCredits::Show::Component < SolidusAdmin::BaseCom
     Spree::StoreCreditEvent
   end
 
-  def tabs
-    [
-      {
-        text: t('.account'),
-        href: solidus_admin.user_path(@user),
-        current: false,
-      },
-      {
-        text: t('.addresses'),
-        href: solidus_admin.addresses_user_path(@user),
-        current: false,
-      },
-      {
-        text: t('.order_history'),
-        href: solidus_admin.orders_user_path(@user),
-        current: false,
-      },
-      {
-        text: t('.items'),
-        href: spree.items_admin_user_path(@user),
-        current: false,
-      },
-      {
-        text: t('.store_credit'),
-        href: solidus_admin.user_store_credits_path(@user),
-        current: true,
-      },
-    ]
-  end
-
   def form_id
     @form_id ||= "#{stimulus_id}--form-#{@store_credit.id}"
   end
@@ -68,53 +38,53 @@ class SolidusAdmin::Users::StoreCredits::Show::Component < SolidusAdmin::BaseCom
     [
       {
         header: :date,
-        col: { class: "w-[15%]" },
+        col: {class: "w-[15%]"},
         data: ->(event) do
           content_tag :span, I18n.l(event.created_at, format: :short), class: "text-sm"
         end
       },
       {
         header: :action,
-        col: { class: "w-[10%]" },
+        col: {class: "w-[10%]"},
         data: ->(event) do
           content_tag :span, store_credit_event_admin_action_name(event), class: "text-sm"
         end
       },
       {
         header: :credited,
-        col: { class: "w-[10%]" },
+        col: {class: "w-[10%]"},
         data: ->(event) do
           content_tag :span, event.display_amount, class: "text-sm"
         end
       },
       {
         header: :created_by,
-        col: { class: "w-[20%]" },
+        col: {class: "w-[20%]"},
         data: ->(event) do
           content_tag :span, store_credit_event_originator_link(event), class: "body-link text-sm"
         end
       },
       {
         header: :total_amount,
-        col: { class: "w-[10%]" },
+        col: {class: "w-[10%]"},
         data: ->(event) do
           content_tag :span, event.display_user_total_amount, class: "text-sm"
         end
       },
       {
         header: :total_unused,
-        col: { class: "w-[10%]" },
+        col: {class: "w-[10%]"},
         data: ->(event) do
           content_tag :span, event.display_remaining_amount, class: "text-sm"
         end
       },
       {
         header: :reason_for_updating,
-        col: { class: "w-[25%]" },
+        col: {class: "w-[25%]"},
         data: ->(event) do
           content_tag :span, event.store_credit_reason&.name, class: "text-sm"
         end
-      },
+      }
     ]
   end
 end

data/app/components/solidus_admin/users/store_credits/show/component.yml

@@ -1,11 +1,6 @@
 en:
   title: "Users / %{email} / Store Credit / %{amount}"
-  account: Account
-  addresses: Addresses
-  order_history: Order History
-  items: Items
   store_credit: Store Credit
-  last_active: Last Active
   add_store_credit: Add Store Credit
   edit_amount: Edit Amount
   edit_memo: Edit Memo
@@ -15,4 +10,3 @@ en:
   created_by: Created By
   type: Type
   memo: Memo
-  back: Back

data/app/components/solidus_admin/users_and_roles/component.rb

@@ -3,7 +3,7 @@
 class SolidusAdmin::UsersAndRoles::Component < SolidusAdmin::UI::Pages::Index::Component
   def title
     page_header_title safe_join([
-      tag.div(t(".title")),
+      tag.div(t(".title"))
     ])
   end
 
@@ -12,13 +12,13 @@ class SolidusAdmin::UsersAndRoles::Component < SolidusAdmin::UI::Pages::Index::C
       {
         text: Spree.user_class.model_name.human(count: 2),
         href: solidus_admin.users_path,
-        current: model_class == Spree.user_class,
+        current: model_class == Spree.user_class
       },
       {
         text: Spree::Role.model_name.human(count: 2),
         href: solidus_admin.roles_path,
-        current: model_class == Spree::Role,
-      },
+        current: model_class == Spree::Role
+      }
     ]
   end
 end

data/app/components/solidus_admin/zones/edit/component.html.erb

@@ -0,0 +1 @@
+<%= render component("zones/form").new(zone: @zone, form_url:, form_id:) %>

data/app/components/solidus_admin/zones/edit/component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Zones::Edit::Component < SolidusAdmin::Resources::Edit::Component
+end

data/app/components/solidus_admin/zones/form/component.html.erb

@@ -0,0 +1,47 @@
+<%= turbo_frame_tag :resource_form, target: "_top" do %>
+  <%= render component("ui/modal").new(title:) do |modal| %>
+    <%= solidus_form_for @zone, url: @form_url, html: { id: @form_id, **stimulus_controller, **stimulus_value(name: :kind, value: @zone.kind) } do |f| %>
+      <div class="flex flex-col gap-6 pb-4">
+        <%= f.text_field(:name, class: "required") %>
+
+        <%= tag.div(class: "hidden", **stimulus_target("countriesWrapper")) do %>
+          <%= f.select(
+            :country_ids,
+            country_select_options,
+            multiple: true,
+            class: "required",
+            **stimulus_target("countriesSelect")
+          ) %>
+        <% end %>
+
+        <%= tag.div(class: "hidden", **stimulus_target("statesWrapper")) do %>
+          <%= f.select(
+            :state_ids,
+            selected_state_select_options,
+            multiple: true,
+            class: "required",
+            src: solidus_admin.states_url(view: :state_with_country),
+            "data-query-param": "q[name_or_country_name_cont]",
+            **stimulus_target("statesSelect")
+          ) %>
+        <% end %>
+
+        <%= f.text_field(:description, class: "required") %>
+
+        <%= f.select(
+          :kind,
+          [[t(".kinds.country"), :country], [t(".kinds.state"), :state]],
+          value: @zone.kind || default_zone_kind,
+          **stimulus_action("toggleKind", on: "change")
+        ) %>
+      </div>
+
+      <% modal.with_actions do %>
+        <form method="dialog">
+          <%= render component("ui/button").cancel %>
+        </form>
+        <%= render component("ui/button").submit(resource: @zone, form: @form_id) %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/solidus_admin/zones/form/component.js

@@ -0,0 +1,32 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["countriesWrapper", "statesWrapper", "countriesSelect", "statesSelect"]
+  static values = {
+    kind: { type: String, default: "state" }
+  }
+
+  connect() {
+    this.toggleSelectsVisibility();
+    this.toggleSelectDisabled();
+  }
+
+  toggleKind(event) {
+    if (!event.target.value) return;
+
+    this.kindValue = event.target.value;
+
+    this.toggleSelectsVisibility();
+    this.toggleSelectDisabled();
+  }
+
+  toggleSelectsVisibility() {
+    this.countriesWrapperTarget.classList.toggle("hidden", this.kindValue === "state");
+    this.statesWrapperTarget.classList.toggle("hidden", this.kindValue === "country");
+  }
+
+  toggleSelectDisabled() {
+    this.countriesSelectTarget.disabled = this.kindValue === "state";
+    this.statesSelectTarget.disabled = this.kindValue === "country";
+  }
+}

data/app/components/solidus_admin/zones/form/component.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Zones::Form::Component < SolidusAdmin::BaseComponent
+  def initialize(zone:, form_url:, form_id:)
+    @zone = zone
+    @form_url = form_url
+    @form_id = form_id
+  end
+
+  def title
+    @zone.new_record? ? t(".title.new") : t(".title.edit")
+  end
+
+  def country_select_options
+    Spree::Country.order(:name).map { |c| [c.name, c.id] }
+  end
+
+  def default_zone_kind = :state
+
+  def selected_state_select_options
+    Spree::State.where(id: @zone.state_ids).map { |s| [s.state_with_country, s.id] }
+  end
+end

data/app/components/solidus_admin/zones/form/component.yml

@@ -0,0 +1,7 @@
+en:
+  kinds:
+    country: "Country based"
+    state: "State based"
+  title:
+    edit: "Edit Zone"
+    new: "New Zone"