solidus_admin 0.4.1 → 0.5.0

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

@@ -1,25 +1,17 @@
-<%= 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 @tax_category, url: form_url, html: { id: form_id } do |f| %>
+    <%= solidus_form_for @tax_category, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
-        <%= render component("ui/forms/field").text_field(f, :name) %>
-        <%= render component("ui/forms/field").text_field(f, :tax_code) %>
-        <%= render component("ui/forms/field").text_field(f, :description) %>
-        <label class="flex gap-2 items-center">
-          <%= render component("ui/forms/checkbox").new(
-              name: "#{f.object_name}[is_default]",
-              value: "1",
-              checked: f.object.is_default
-            ) %>
-            <span class="font-semibold text-xs ml-2"><%= Spree::TaxCategory.human_attribute_name :is_default %></span>
-          <%= render component("ui/toggletip").new(text: t(".hints.is_default")) %>
-        </label>
+        <%= f.text_field(:name) %>
+        <%= f.text_field(:tax_code) %>
+        <%= f.text_field(:description) %>
+        <%= f.checkbox(:is_default, hint: t(".hints.is_default")) %>
       </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/tax_categories/edit/component.yml

@@ -3,6 +3,5 @@
 en:
   title: "Edit Tax Category"
   cancel: "Cancel"
-  submit: "Update Tax Category"
   hints:
     is_default: "When checked, this tax category will be selected by default when creating new products or variants."

data/app/components/solidus_admin/tax_categories/index/component.rb

@@ -16,17 +16,17 @@ class SolidusAdmin::TaxCategories::Index::Component < SolidusAdmin::Taxes::Compo
   def page_actions
     render component("ui/button").new(
       tag: :a,
-      text: t('.add'),
+      text: t(".add"),
       href: solidus_admin.new_tax_category_path(**search_filter_params),
-      data: { turbo_frame: :resource_modal },
+      data: {turbo_frame: :resource_form},
       icon: "add-line",
-      class: "align-self-end w-full",
+      class: "align-self-end w-full"
     )
   end
 
   def turbo_frames
     %w[
-      resource_modal
+      resource_form
     ]
   end
 
@@ -37,11 +37,11 @@ class SolidusAdmin::TaxCategories::Index::Component < SolidusAdmin::Taxes::Compo
   def batch_actions
     [
       {
-        label: t('.batch_actions.delete'),
+        label: t(".batch_actions.delete"),
         action: solidus_admin.tax_categories_path(**search_filter_params),
         method: :delete,
-        icon: 'delete-bin-7-line',
-      },
+        icon: "delete-bin-7-line"
+      }
     ]
   end
 
@@ -51,36 +51,36 @@ class SolidusAdmin::TaxCategories::Index::Component < SolidusAdmin::Taxes::Compo
         header: :name,
         data: ->(tax_category) do
           link_to tax_category.name, edit_path(tax_category),
-            data: { turbo_frame: :resource_modal },
-            class: 'body-link'
+            data: {turbo_frame: :resource_form},
+            class: "body-link"
         end
       },
       {
         header: :tax_code,
         data: ->(tax_category) do
           link_to_if tax_category.tax_code, tax_category.tax_code, edit_path(tax_category),
-            data: { turbo_frame: :resource_modal },
-            class: 'body-link'
+            data: {turbo_frame: :resource_form},
+            class: "body-link"
         end
       },
       {
         header: :description,
         data: ->(tax_category) do
           link_to_if tax_category.description, tax_category.description, edit_path(tax_category),
-            data: { turbo_frame: :resource_modal },
-            class: 'body-link'
+            data: {turbo_frame: :resource_form},
+            class: "body-link"
         end
       },
       {
         header: :is_default,
         data: ->(tax_category) {
           if tax_category.is_default?
-            component('ui/badge').yes
+            component("ui/badge").yes
           else
-            component('ui/badge').no
+            component("ui/badge").no
           end
-        },
-      },
+        }
+      }
     ]
   end
 end

data/app/components/solidus_admin/tax_categories/new/component.html.erb

@@ -1,25 +1,17 @@
-<%= 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 @tax_category, url: form_url, html: { id: form_id } do |f| %>
+    <%= solidus_form_for @tax_category, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
-        <%= render component("ui/forms/field").text_field(f, :name) %>
-        <%= render component("ui/forms/field").text_field(f, :tax_code) %>
-        <%= render component("ui/forms/field").text_field(f, :description) %>
-        <label class="flex gap-2 items-center">
-          <%= render component("ui/forms/checkbox").new(
-              name: "#{f.object_name}[is_default]",
-              value: "1",
-              checked: f.object.is_default
-            ) %>
-            <span class="font-semibold text-xs ml-2"><%= Spree::TaxCategory.human_attribute_name :is_default %></span>
-          <%= render component("ui/toggletip").new(text: t(".hints.is_default")) %>
-        </label>
+        <%= f.text_field(:name) %>
+        <%= f.text_field(:tax_code) %>
+        <%= f.text_field(:description) %>
+        <%= f.checkbox(:is_default, hint: t(".hints.is_default")) %>
       </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/tax_categories/new/component.yml

@@ -3,6 +3,5 @@
 en:
   title: "New Tax Category"
   cancel: "Cancel"
-  submit: "Add Tax Category"
   hints:
     is_default: "When checked, this tax category will be selected by default when creating new products or variants."

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

@@ -0,0 +1,12 @@
+<%= 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("tax_rates/form").new(tax_rate: @tax_rate, form_url:, form_id:) %>
+<% end %>

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

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

data/app/components/solidus_admin/tax_rates/edit/component.yml

@@ -0,0 +1,4 @@
+en:
+  discard: "Discard"
+  save: "Save"
+  title: "Edit Tax Rate"

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

@@ -0,0 +1,25 @@
+<%= solidus_form_for @tax_rate, url: @form_url, html: { id: @form_id } do |f| %>
+  <%= page_with_sidebar do %>
+    <%= page_with_sidebar_main do %>
+      <%= render component("ui/panel").new do %>
+        <%= f.text_field(:name) %>
+        <%= f.select(:zone_id, zone_options) %>
+        <%= f.select(:tax_category_ids, tax_category_options, multiple: true) %>
+        <%= f.switch_field(:show_rate_in_label, hint: t(".hints.show_rate_in_label")) %>
+      <% end %>
+
+      <%= render component("ui/panel").new(title: t(".calculation")) do %>
+        <%= f.select(:calculator_type, calculator_options) %>
+        <%= f.text_field(:amount, type: :number, step: 0.01) %>
+        <%= f.select(:level, level_options) %>
+        <%= f.switch_field(:included_in_price, hint: t(".hints.included_in_price")) %>
+      <% end %>
+    <% end %>
+    <%= page_with_sidebar_aside do %>
+      <%= render component("ui/panel").new(title: t(".validity")) do %>
+        <%= f.text_field(:starts_at, type: :date) %>
+        <%= f.text_field(:expires_at, type: :date) %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::TaxRates::Form::Component < SolidusAdmin::BaseComponent
+  include SolidusAdmin::Layout::PageHelpers
+
+  def initialize(tax_rate:, form_url:, form_id:)
+    @tax_rate = tax_rate
+    @form_url = form_url
+    @form_id = form_id
+  end
+
+  private
+
+  def zone_options
+    @zone_options ||= Spree::Zone.order(:name).map { [_1.name, _1.id] }
+  end
+
+  def tax_category_options
+    @tax_category_options ||= Spree::TaxCategory.order(:name).map { [_1.name, _1.id] }
+  end
+
+  def calculator_options
+    @calculator_options ||= Rails.application.config.spree.calculators.tax_rates.map { [_1.description, _1.name] }
+  end
+
+  def level_options
+    @level_options ||= Spree::TaxRate.levels.keys.map { [t(".levels.#{_1}"), _1] }
+  end
+end

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

@@ -0,0 +1,9 @@
+en:
+  calculation: "Calculation"
+  hints:
+    included_in_price: "Enables automatic inclusion of the applicable tax amount within product prices, providing customers with an all-inclusive pricing experience."
+    show_rate_in_label: "Allows users to display the applicable tax rate alongside product prices for transparent and informative pricing."
+  levels:
+    item: "Item level"
+    order: "Order level"
+  validity: "Validity"

data/app/components/solidus_admin/tax_rates/index/component.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class SolidusAdmin::TaxRates::Index::Component < SolidusAdmin::Taxes::Component
-  def row_url(tax_rate)
-    spree.edit_admin_tax_rate_path(tax_rate)
+  def edit_path(tax_rate)
+    solidus_admin.edit_tax_rate_path(tax_rate)
   end
 
   def model_class
@@ -13,13 +13,13 @@ class SolidusAdmin::TaxRates::Index::Component < SolidusAdmin::Taxes::Component
     solidus_admin.tax_rates_path
   end
 
-  def actions
+  def page_actions
     render component("ui/button").new(
       tag: :a,
-      text: t('.add'),
-      href: spree.new_admin_tax_rate_path,
+      text: t(".add"),
+      href: solidus_admin.new_tax_rate_path,
       icon: "add-line",
-      class: "align-self-end w-full",
+      class: "align-self-end w-full"
     )
   end
 
@@ -30,11 +30,11 @@ class SolidusAdmin::TaxRates::Index::Component < SolidusAdmin::Taxes::Component
   def batch_actions
     [
       {
-        label: t('.batch_actions.delete'),
+        label: t(".batch_actions.delete"),
         action: solidus_admin.tax_rates_path,
         method: :delete,
-        icon: 'delete-bin-7-line',
-      },
+        icon: "delete-bin-7-line"
+      }
     ]
   end
 
@@ -44,13 +44,13 @@ class SolidusAdmin::TaxRates::Index::Component < SolidusAdmin::Taxes::Component
         label: Spree::Zone.model_name.human,
         attribute: :zone_id,
         predicate: :eq,
-        options: Spree::Zone.pluck(:name, :id),
+        options: Spree::Zone.pluck(:name, :id)
       },
       {
         label: Spree::TaxCategory.model_name.human,
         attribute: :tax_categories_id,
         predicate: :in,
-        options: Spree::TaxCategory.pluck(:name, :id),
+        options: Spree::TaxCategory.pluck(:name, :id)
       }
     ]
   end
@@ -59,30 +59,48 @@ class SolidusAdmin::TaxRates::Index::Component < SolidusAdmin::Taxes::Component
     [
       {
         header: :zone,
-        data: -> { _1.zone&.name },
+        data: ->(tax_rate) do
+          link_to tax_rate.zone.name, edit_path(tax_rate), class: "body-link" if tax_rate.zone.present?
+        end
+      },
+      {
+        header: :name,
+        data: ->(tax_rate) do
+          link_to tax_rate.name, edit_path(tax_rate), class: "body-link"
+        end
       },
-      :name,
       {
         header: :tax_categories,
-        data: -> { _1.tax_categories.map(&:name).join(', ') },
+        data: ->(tax_rate) do
+          link_to tax_rate.tax_categories.map(&:name).join(", "), edit_path(tax_rate), class: "body-link"
+        end
       },
       {
         header: :amount,
-        data: -> { _1.display_amount },
+        data: ->(tax_rate) do
+          link_to tax_rate.display_amount, edit_path(tax_rate), class: "body-link"
+        end
       },
       {
         header: :included_in_price,
-        data: -> { _1.included_in_price? ? component('ui/badge').yes : component('ui/badge').no },
+        data: -> { _1.included_in_price? ? component("ui/badge").yes : component("ui/badge").no }
       },
       {
         header: :show_rate_in_label,
-        data: -> { _1.show_rate_in_label? ? component('ui/badge').yes : component('ui/badge').no },
+        data: -> { _1.show_rate_in_label? ? component("ui/badge").yes : component("ui/badge").no }
       },
-      :expires_at,
       {
-        header: Spree::Calculator.model_name.human,
-        data: -> { _1.calculator&.class&.model_name&.human }
+        header: :expires_at,
+        data: ->(tax_rate) do
+          link_to tax_rate.expires_at.to_date, edit_path(tax_rate), class: "body-link" if tax_rate.expires_at
+        end
       },
+      {
+        header: Spree::Calculator.model_name.human,
+        data: ->(tax_rate) do
+          link_to tax_rate.calculator&.class&.model_name&.human, edit_path(tax_rate), class: "body-link"
+        end
+      }
     ]
   end
 end

data/app/components/solidus_admin/tax_rates/new/component.html.erb

@@ -0,0 +1,12 @@
+<%= 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("tax_rates/form").new(tax_rate: @tax_rate, form_url:, form_id:) %>
+<% end %>

data/app/components/solidus_admin/tax_rates/new/component.rb

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

data/app/components/solidus_admin/tax_rates/new/component.yml

@@ -0,0 +1,4 @@
+en:
+  discard: "Discard"
+  save: "Save"
+  title: "New Tax Rate"

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

@@ -4,7 +4,7 @@ class SolidusAdmin::Taxes::Component < SolidusAdmin::UI::Pages::Index::Component
   def title
     safe_join([
       tag.div(t(".title")),
-      tag.div(t(".subtitle"), class: "font-normal text-sm text-gray-500"),
+      tag.div(t(".subtitle"), class: "font-normal text-sm text-gray-500")
     ])
   end
 
@@ -13,13 +13,13 @@ class SolidusAdmin::Taxes::Component < SolidusAdmin::UI::Pages::Index::Component
       {
         text: Spree::TaxCategory.model_name.human.pluralize,
         href: solidus_admin.tax_categories_path,
-        current: model_class == Spree::TaxCategory,
+        current: model_class == Spree::TaxCategory
       },
       {
         text: Spree::TaxRate.model_name.human.pluralize,
         href: solidus_admin.tax_rates_path,
-        current: model_class == Spree::TaxRate,
-      },
+        current: model_class == Spree::TaxRate
+      }
     ]
   end
 end

data/app/components/solidus_admin/taxonomies/index/component.rb

@@ -12,33 +12,33 @@ class SolidusAdmin::Taxonomies::Index::Component < SolidusAdmin::UI::Pages::Inde
   def sortable_options
     {
       url: ->(taxonomy) { solidus_admin.move_taxonomy_path(taxonomy) },
-      param: 'position',
+      param: "position"
     }
   end
 
   def page_actions
     render component("ui/button").new(
       tag: :a,
-      text: t('.add'),
+      text: t(".add"),
       href: spree.new_admin_taxonomy_path,
-      icon: "add-line",
+      icon: "add-line"
     )
   end
 
   def batch_actions
     [
       {
-        label: t('.batch_actions.delete'),
+        label: t(".batch_actions.delete"),
         action: solidus_admin.taxonomies_path,
         method: :delete,
-        icon: 'delete-bin-7-line',
-      },
+        icon: "delete-bin-7-line"
+      }
     ]
   end
 
   def columns
     [
-      name_column,
+      name_column
     ]
   end
 

data/app/components/solidus_admin/turbo/target_frame/component.html.erb

@@ -0,0 +1,5 @@
+<%= turbo_frame_tag @id do %>
+  <%= content %>
+  <%= turbo_stream.update(@source, nil) if @source %>
+  <%= turbo_stream.replace :flash_toasts, component("layout/flashes/toasts").new(toasts:) %>
+<% end %>

data/app/components/solidus_admin/turbo/target_frame/component.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Turbo::TargetFrame::Component < SolidusAdmin::BaseComponent
+  def initialize(id, source: nil)
+    @id = id
+    @source = source
+  end
+end

data/app/components/solidus_admin/ui/alert/component.html.erb

@@ -0,0 +1,35 @@
+<div
+  class="
+    flex w-full justify-between min-h-[85px]
+    rounded-lg p-4 border pointer-events-auto
+    transform -translate-y-[150%] opacity-0 duration-500
+    <%= SCHEMES.fetch(@scheme.to_sym).join(' ') %>
+  "
+  data-controller="alert-animation"
+  data-alert-animation-animation-class="-translate-y-[150%] opacity-0"
+  data-alert-animation-transition-value="<%= Rails.env.test? ? 1000 : 500 %>"
+  role="dialog"
+  aria-label="<%= @title %>"
+  aria-live="polite"
+>
+  <div class="flex">
+    <div class="px-2">
+      <%= icon %>
+    </div>
+    <div class="flex flex-col px-2 pt-1 gap-3">
+      <p class="font-semibold text-base text-black leading-none"><%= @title %></p>
+      <p class="font-normal text-sm text-black leading-none"><%= @message.html_safe %></p>
+    </div>
+  </div>
+  <div>
+    <button
+      type="button"
+      title="<%= t(".close") %>"
+      aria-label="<%= t(".close") %>"
+      data-action="alert-animation#close"
+      data-alert-animation-target="closeButton"
+    >
+      <%= icon_tag('close-fill', class: "w-6 h-6 #{ICONS.dig(@scheme.to_sym, :class)}") %>
+    </button>
+  </div>
+</div>

data/app/components/solidus_admin/ui/alert/component.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::UI::Alert::Component < SolidusAdmin::BaseComponent
+  SCHEMES = {
+    success: %w[
+      border-forest bg-seafoam
+    ],
+    warning: %w[
+      border-orange bg-sazerac
+    ],
+    danger: %w[
+      border-red-500 bg-red-100 text-black
+    ],
+    info: %w[
+      border-gray-500 bg-gray-50
+    ]
+  }
+
+  ICONS = {
+    success: {
+      name: "checkbox-circle-fill",
+      class: "fill-forest"
+    },
+    warning: {
+      name: "error-warning-fill",
+      class: "fill-orange"
+    },
+    danger: {
+      name: "error-warning-fill",
+      class: "fill-red-500"
+    },
+    info: {
+      name: "information-fill",
+      class: "fill-gray-500"
+    }
+  }
+
+  def initialize(title:, message:, scheme: :success)
+    @title = title
+    @message = message
+    @scheme = scheme
+  end
+
+  def before_render
+    @title = @title.presence || t(".defaults.titles")[@scheme.to_sym]
+  end
+
+  def icon
+    icon_tag(ICONS.dig(@scheme.to_sym, :name), class: "w-5 h-5 #{ICONS.dig(@scheme.to_sym, :class)}")
+  end
+end

data/app/components/solidus_admin/ui/alert/component.yml

@@ -0,0 +1,8 @@
+en:
+  close: "Close"
+  defaults:
+    titles:
+      danger: "Caution"
+      info: "Info"
+      success: "Success"
+      warning: "Warning"

data/app/components/solidus_admin/ui/badge/component.rb

@@ -3,27 +3,27 @@
 class SolidusAdmin::UI::Badge::Component < SolidusAdmin::BaseComponent
   COLORS = {
     graphite_light: "text-black bg-graphite-light",
-    red: 'text-red-500 bg-red-100',
-    green: 'text-forest bg-seafoam',
-    blue: 'text-blue bg-sky',
-    black: 'text-white bg-black',
-    yellow: 'text-orange bg-papaya-whip',
+    red: "text-red-500 bg-red-100",
+    green: "text-forest bg-seafoam",
+    blue: "text-solidus-blue bg-sky",
+    black: "text-white bg-black",
+    yellow: "text-orange bg-papaya-whip"
   }.freeze
 
   SIZES = {
-    s: 'px-2 py-0.5 text-xs font-semibold',
-    m: 'px-3 py-0.5 text-sm font-semibold',
-    l: 'px-3 py-0.5 text-base font-semibold',
+    s: "px-2 py-0.5 text-xs font-semibold",
+    m: "px-3 py-0.5 text-sm font-semibold",
+    l: "px-3 py-0.5 text-base font-semibold"
   }.freeze
 
   def initialize(name:, color: :graphite_light, size: :m)
     @name = name
 
     @class_name = [
-      'inline-flex items-center rounded-full whitespace-nowrap', # layout
+      "inline-flex items-center rounded-full whitespace-nowrap", # layout
       SIZES.fetch(size.to_sym), # size
-      COLORS.fetch(color.to_sym), # color
-    ].join(' ')
+      COLORS.fetch(color.to_sym) # color
+    ].join(" ")
   end
 
   def self.yes