solidus_admin 0.4.0 → 0.5.0

data/app/components/solidus_admin/users/addresses/component.html.erb

@@ -9,9 +9,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: :addresses) %>
   <% end %>
 
   <%= page_with_sidebar do %>
@@ -19,7 +17,7 @@
       <%= render component('ui/panel').new(title: t(".billing_address")) do %>
         <%= form_for @user, url: solidus_admin.update_addresses_user_path(@user), method: :put, html: { id: "#{form_id}_billing", autocomplete: "off", class: "bill_address" } do |f| %>
 
-          <%= render component('ui/forms/address').new(address: @bill_address, name: "user[bill_address_attributes]") %>
+          <%= render component('ui/forms/address').new(addressable: @bill_address, form_field_name: "user[bill_address_attributes]") %>
           <div class="py-1.5 text-center">
             <%= render component("ui/button").new(tag: :button, text: t(".update"), form: "#{form_id}_billing") %>
             <%= render component("ui/button").new(tag: :a, text: t(".cancel"), href: solidus_admin.addresses_user_path(@user), scheme: :secondary) %>
@@ -30,7 +28,7 @@
       <%= render component('ui/panel').new(title: t(".shipping_address")) do %>
         <%= form_for @user, url: solidus_admin.update_addresses_user_path(@user), method: :put, html: { id: "#{form_id}_shipping", autocomplete: "off", class: "ship_address"  } do |f| %>
 
-          <%= render component('ui/forms/address').new(address: @ship_address, name: "user[ship_address_attributes]") %>
+          <%= render component('ui/forms/address').new(addressable: @ship_address, form_field_name: "user[ship_address_attributes]") %>
           <div class="py-1.5 text-center">
             <%= render component("ui/button").new(tag: :button, text: t(".update"), form: "#{form_id}_shipping") %>
             <%= render component("ui/button").new(tag: :a, text: t(".cancel"), href: solidus_admin.addresses_user_path(@user), scheme: :secondary) %>

data/app/components/solidus_admin/users/addresses/component.rb

@@ -13,36 +13,6 @@ class SolidusAdmin::Users::Addresses::Component < SolidusAdmin::BaseComponent
     @form_id ||= "#{stimulus_id}--form-#{@user.id}"
   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: true,
-      },
-      {
-        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: spree.admin_user_store_credits_path(@user),
-        current: false,
-      },
-    ]
-  end
-
   def bill_address(address, type)
     if address.present? && type == "bill"
       address

data/app/components/solidus_admin/users/addresses/component.yml

@@ -1,14 +1,7 @@
 en:
   title: "Users / %{email} / Addresses"
-  account: Account
-  addresses: Addresses
-  order_history: Order History
-  items: Items
-  store_credit: Store Credit
-  last_active: Last Active
   create_order_for_user: Create order for this user
   update: Update
   cancel: Cancel
-  back: Back
   billing_address: Billing Address
   shipping_address: Shipping Address

data/app/components/solidus_admin/users/edit/api_access/component.html.erb

@@ -16,8 +16,9 @@
             text: t('.clear_key'),
             scheme: :secondary,
             type: :submit,
-            "data-action": "click->#{stimulus_id}#confirm",
-            "data-#{stimulus_id}-message-param": t(".confirm_clear_key"),
+            "data-turbo-confirm": t(".confirm.title"),
+            "data-confirm-details": t(".confirm.clear.details"),
+            "data-confirm-button": t(".confirm.clear.button"),
           ) %>
         <% end %>
 
@@ -26,8 +27,9 @@
             text: t('.regenerate_key'),
             scheme: :secondary,
             type: :submit,
-            "data-action": "click->#{stimulus_id}#confirm",
-            "data-#{stimulus_id}-message-param": t(".confirm_regenerate_key"),
+            "data-turbo-confirm": t(".confirm.title"),
+            "data-confirm-details": t(".confirm.regenerate.details"),
+            "data-confirm-button": t(".confirm.regenerate.button")
           ) %>
         <% end %>
       </div>

data/app/components/solidus_admin/users/edit/api_access/component.yml

@@ -6,5 +6,11 @@ en:
   clear_key: Clear key
   regenerate_key: Regenerate key
   hidden: Hidden
-  confirm_clear_key: Are you sure you want to clear this user's API key? It will invalidate the existing key.
-  confirm_regenerate_key: Are you sure you want to regenerate this user's API key? It will invalidate the existing key.
+  confirm:
+    title: Are you sure?
+    clear:
+      details: Are you sure you want to clear this user's API key? It will invalidate the existing key.
+      button: Clear
+    regenerate:
+      details: Are you sure you want to regenerate this user's API key? It will invalidate the existing key.
+      button: Regenerate

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

@@ -3,39 +3,42 @@
     <%= page_header_back(solidus_admin.users_path) %>
     <%= page_header_title(t(".title", email: @user.email)) %>
 
-    <% # @todo: I am not sure how we want to handle Cancan stuff in the new admin. %>
-    <% # if can?(:admin, Spree::Order) && can?(:create, Spree::Order) %>
+    <%# @todo: I am not sure how we want to handle Cancan stuff in the new admin. %>
+    <%# if can?(:admin, Spree::Order) && can?(:create, Spree::Order) %>
       <%= page_header_actions do %>
         <%= render component("ui/button").new(tag: :a, text: t(".create_order_for_user"), href: spree.new_admin_order_path(user_id: @user.id)) %>
       <% end %>
-    <% # end %>
+    <%# end %>
   <% 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: :account) %>
   <% end %>
 
   <%= page_with_sidebar do %>
     <%= page_with_sidebar_main do %>
 
       <%= render component('ui/panel').new(title: Spree.user_class.model_name.human) do %>
-        <%= form_for @user, url: solidus_admin.user_path(@user), html: { id: form_id, autocomplete: "off" } do |f| %>
+        <%= solidus_form_for @user, url: solidus_admin.user_path(@user), html: { id: form_id, autocomplete: "off" } do |f| %>
           <div class="py-1.5">
-            <%= render component("ui/forms/field").text_field(f, :email) %>
+            <%= f.text_field(:email) %>
           </div>
           <div class="py-1.5">
-            <%= render component("ui/forms/field").text_field(f, :password) %>
+            <%= f.text_field(:password) %>
           </div>
           <div class="py-1.5">
-            <%= render component("ui/forms/field").text_field(f, :password_confirmation) %>
+            <%= f.text_field(:password_confirmation) %>
           </div>
+          <% if @user.respond_to?(:timezone) %>
+            <div class="py-1.5">
+              <%= f.select(:timezone, ActiveSupport::TimeZone.all.map { [_1.to_s, _1.name] }, include_blank: t("spree.none")) %>
+            </div>
+          <% end %>
           <div class="py-1.5">
-            <%= render component("ui/checkbox_row").new(options: role_options, row_title: "Roles", form: f, method: "spree_role_ids", layout: :subsection) %>
+            <%= f.checkbox_row(:spree_role_ids, options: role_options, row_title: "Roles", layout: :subsection) %>
           </div>
           <div class="py-1.5 text-center">
-            <%= render component("ui/button").new(tag: :button, text: t(".update"), form: form_id) %>
+            <%= f.submit(text: t(".update")) %>
             <%= render component("ui/button").new(tag: :a, text: t(".cancel"), href: solidus_admin.user_path(@user), scheme: :secondary) %>
           </div>
         <% end %>

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

@@ -11,41 +11,9 @@ class SolidusAdmin::Users::Edit::Component < SolidusAdmin::BaseComponent
     @form_id ||= "#{stimulus_id}--form-#{@user.id}"
   end
 
-  def tabs
-    [
-      {
-        text: t('.account'),
-        href: solidus_admin.user_path(@user),
-        current: action_name == "edit",
-      },
-      {
-        text: t('.addresses'),
-        href: solidus_admin.addresses_user_path(@user),
-        current: action_name == "addresses",
-      },
-      {
-        text: t('.order_history'),
-        href: solidus_admin.orders_user_path(@user),
-        current: action_name == "orders",
-      },
-      {
-        text: t('.items'),
-        href: spree.items_admin_user_path(@user),
-        # @todo: update this "current" logic once folded into new admin
-        current: action_name != "edit",
-      },
-      {
-        text: t('.store_credit'),
-        href: spree.admin_user_store_credits_path(@user),
-        # @todo: update this "current" logic once folded into new admin
-        current: action_name != "edit",
-      },
-    ]
-  end
-
   def role_options
     Spree::Role.all.map do |role|
-      { label: role.name, id: role.id }
+      {label: role.name, id: role.id}
     end
   end
 end

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

@@ -1,12 +1,5 @@
 en:
   title: "Users / %{email}"
-  account: Account
-  addresses: Addresses
-  order_history: Order History
-  items: Items
-  store_credit: Store Credit
-  last_active: Last Active
   create_order_for_user: Create order for this user
   update: Update
   cancel: Cancel
-  back: Back

data/app/components/solidus_admin/users/edit/tabs/component.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Users::Edit::Tabs::Component < SolidusAdmin::BaseComponent
+  def initialize(user:, current:)
+    @user = user
+    @current = current
+  end
+
+  def call
+    rendered_tabs = tabs.map do |tab|
+      render component("ui/button").new(tag: :a, scheme: :ghost, text: tab[:text], "aria-current": tab[:current], href: tab[:href])
+    end
+
+    safe_join(rendered_tabs)
+  end
+
+  def tabs
+    [
+      {
+        text: t(".account"),
+        href: solidus_admin.user_path(@user),
+        current: @current == :account
+      },
+      {
+        text: t(".addresses"),
+        href: solidus_admin.addresses_user_path(@user),
+        current: @current == :addresses
+      },
+      {
+        text: t(".order_history"),
+        href: solidus_admin.orders_user_path(@user),
+        current: @current == :orders
+      },
+      {
+        text: t(".items"),
+        href: solidus_admin.items_user_path(@user),
+        current: @current == :items
+      },
+      {
+        text: t(".store_credit"),
+        href: solidus_admin.user_store_credits_path(@user),
+        current: @current == :store_credits
+      }
+    ]
+  end
+end

data/app/components/solidus_admin/users/edit/tabs/component.yml

@@ -0,0 +1,6 @@
+en:
+  account: Account
+  addresses: Addresses
+  order_history: Order History
+  items: Items
+  store_credit: Store Credit

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

@@ -22,30 +22,30 @@ class SolidusAdmin::Users::Index::Component < SolidusAdmin::UsersAndRoles::Compo
   def page_actions
     render component("ui/button").new(
       tag: :a,
-      text: t('.add'),
+      text: t(".add"),
       href: spree.new_admin_user_path,
-      icon: "add-line",
+      icon: "add-line"
     )
   end
 
   def batch_actions
     [
       {
-        label: t('.batch_actions.delete'),
+        label: t(".batch_actions.delete"),
         action: solidus_admin.users_path,
         method: :delete,
-        icon: 'delete-bin-7-line',
-      },
+        icon: "delete-bin-7-line"
+      }
     ]
   end
 
   def scopes
     [
-      { name: :all, label: t('.scopes.all'), default: true },
-      { name: :customers, label: t('.scopes.customers') },
-      { name: :admin, label: t('.scopes.admin') },
-      { name: :with_orders, label: t('.scopes.with_orders') },
-      { name: :without_orders, label: t('.scopes.without_orders') },
+      {name: :all, label: t(".scopes.all"), default: true},
+      {name: :customers, label: t(".scopes.customers")},
+      {name: :admin, label: t(".scopes.admin")},
+      {name: :with_orders, label: t(".scopes.with_orders")},
+      {name: :without_orders, label: t(".scopes.without_orders")}
     ]
   end
 
@@ -64,35 +64,35 @@ class SolidusAdmin::Users::Index::Component < SolidusAdmin::UsersAndRoles::Compo
     [
       {
         header: :email,
-        data: :email,
+        data: :email
       },
       {
         header: :roles,
         data: ->(user) do
-          roles = user.spree_roles.presence || [Spree::Role.new(name: 'customer')]
+          roles = user.spree_roles.presence || [Spree::Role.new(name: "customer")]
           safe_join(roles.map {
             color =
               case _1.name
-              when 'admin' then :blue
-              when 'customer' then :green
+              when "admin" then :blue
+              when "customer" then :green
               else :graphite_light
               end
-            render component('ui/badge').new(name: _1.name, color:)
+            render component("ui/badge").new(name: _1.name, color:)
           })
-        end,
+        end
       },
       {
         header: :order_count,
-        data: ->(user) { user.order_count },
+        data: ->(user) { user.order_count }
       },
       {
         header: :lifetime_value,
-        data: -> { _1.display_lifetime_value.to_html },
+        data: -> { _1.display_lifetime_value.to_html }
       },
       {
         header: :last_active,
-        data: ->(user) { last_login(user) },
-      },
+        data: ->(user) { last_login(user) }
+      }
     ]
   end
 end

data/app/components/solidus_admin/users/items/component.html.erb

@@ -9,9 +9,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: :items) %>
   <% end %>
 
   <%= page_with_sidebar do %>

data/app/components/solidus_admin/users/items/component.rb

@@ -8,36 +8,6 @@ class SolidusAdmin::Users::Items::Component < SolidusAdmin::BaseComponent
     @items = items
   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: solidus_admin.items_user_path(@user),
-        current: true,
-      },
-      {
-        text: t('.store_credit'),
-        href: spree.admin_user_store_credits_path(@user),
-        current: false,
-      },
-    ]
-  end
-
   def model_class
     Spree::LineItem
   end
@@ -59,13 +29,13 @@ class SolidusAdmin::Users::Items::Component < SolidusAdmin::BaseComponent
       quantity_column,
       total_column,
       state_column,
-      number_column,
+      number_column
     ]
   end
 
   def date_column
     {
-      col: { class: "w-[8%]" },
+      col: {class: "w-[8%]"},
       header: :date,
       data: ->(item) do
         content_tag :div, l(item.order.created_at, format: :short), class: "text-sm"
@@ -75,13 +45,13 @@ class SolidusAdmin::Users::Items::Component < SolidusAdmin::BaseComponent
 
   def image_column
     {
-      col: { class: "w-[8%]" },
-      header: tag.span('aria-label': Spree::Image.model_name.human, role: 'text'),
+      col: {class: "w-[8%]"},
+      header: tag.span("aria-label": Spree::Image.model_name.human, role: "text"),
       data: ->(item) do
         image = item.variant.gallery.images.first || item.variant.product.gallery.images.first or return
 
         render(
-          component('ui/thumbnail').new(
+          component("ui/thumbnail").new(
             src: image.url(:small),
             alt: item.product.name
           )
@@ -92,7 +62,7 @@ class SolidusAdmin::Users::Items::Component < SolidusAdmin::BaseComponent
 
   def description_column
     {
-      col: { class: "w-[24%]" },
+      col: {class: "w-[24%]"},
       header: t(".description_column_header"),
       data: ->(item) { item_name_with_variant_and_sku(item) }
     }
@@ -100,7 +70,7 @@ class SolidusAdmin::Users::Items::Component < SolidusAdmin::BaseComponent
 
   def price_column
     {
-      col: { class: "w-[10%]" },
+      col: {class: "w-[10%]"},
       header: :price,
       data: ->(item) do
         content_tag :div, item.single_money.to_html
@@ -110,7 +80,7 @@ class SolidusAdmin::Users::Items::Component < SolidusAdmin::BaseComponent
 
   def quantity_column
     {
-      col: { class: "w-[7%]" },
+      col: {class: "w-[7%]"},
       header: :qty,
       data: ->(item) do
         content_tag :div, item.quantity
@@ -120,7 +90,7 @@ class SolidusAdmin::Users::Items::Component < SolidusAdmin::BaseComponent
 
   def total_column
     {
-      col: { class: "w-[10%]" },
+      col: {class: "w-[10%]"},
       header: t(".total_column_header"),
       data: ->(item) do
         content_tag :div, item.money.to_html
@@ -130,23 +100,23 @@ class SolidusAdmin::Users::Items::Component < SolidusAdmin::BaseComponent
 
   def state_column
     {
-      col: { class: "w-[15%]" },
+      col: {class: "w-[15%]"},
       header: :state,
       data: ->(item) do
         color = {
-          'complete' => :green,
-          'returned' => :red,
-          'canceled' => :blue,
-          'cart' => :graphite_light,
+          "complete" => :green,
+          "returned" => :red,
+          "canceled" => :blue,
+          "cart" => :graphite_light
         }[item.order.state] || :yellow
-        component('ui/badge').new(name: item.order.state.humanize, color: color)
+        component("ui/badge").new(name: item.order.state.humanize, color: color)
       end
     }
   end
 
   def number_column
     {
-      col: { class: "w-[18%]" },
+      col: {class: "w-[18%]"},
       header: t(".number_column_header"),
       data: ->(item) do
         content_tag :div, item.order.number, class: "font-semibold text-sm"
@@ -160,11 +130,8 @@ class SolidusAdmin::Users::Items::Component < SolidusAdmin::BaseComponent
     content = []
     content << item.product.name
     content << "(#{item.variant.options_text})" if item.variant.option_values.any?
-    content << "<strong>#{t('spree.sku')}:</strong> #{item.variant.sku}" if item.variant.sku.present?
+    content << safe_join([tag.strong("#{t("spree.sku")}:"), " ", item.variant.sku]) if item.variant.sku.present?
 
-    # The `.html_safe` is required for the description to display as desired.
-    # rubocop:disable Rails/OutputSafety
-    safe_join([content_tag(:div, content.join("<br>").html_safe, class: "text-sm")])
-    # rubocop:enable Rails/OutputSafety
+    content_tag(:div, safe_join(content, tag.br), class: "text-sm")
   end
 end

data/app/components/solidus_admin/users/items/component.yml

@@ -1,16 +1,9 @@
 en:
   title: "Users / %{email} / Items Purchased"
-  account: Account
-  addresses: Addresses
-  order_history: Order History
-  items: Items
-  store_credit: Store Credit
-  last_active: Last Active
   create_order_for_user: Create order for this user
   items_purchased: Items Purchased
   no_orders_found: No Orders found.
   create_one: Create One
-  back: Back
   number_column_header: "Order #"
   description_column_header: "Description"
   total_column_header: "Total"

data/app/components/solidus_admin/users/orders/component.html.erb

@@ -9,9 +9,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: :orders) %>
   <% end %>
 
   <%= page_with_sidebar do %>

data/app/components/solidus_admin/users/orders/component.rb

@@ -8,36 +8,6 @@ class SolidusAdmin::Users::Orders::Component < SolidusAdmin::BaseComponent
     @orders = orders
   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: true,
-      },
-      {
-        text: t('.items'),
-        href: spree.items_admin_user_path(@user),
-        current: false,
-      },
-      {
-        text: t('.store_credit'),
-        href: spree.admin_user_store_credits_path(@user),
-        current: false,
-      },
-    ]
-  end
-
   def model_class
     Spree::Order
   end
@@ -61,7 +31,7 @@ class SolidusAdmin::Users::Orders::Component < SolidusAdmin::BaseComponent
       date_column,
       payment_column,
       shipment_column,
-      total_column,
+      total_column
     ]
   end
 
@@ -70,7 +40,7 @@ class SolidusAdmin::Users::Orders::Component < SolidusAdmin::BaseComponent
       header: :order,
       data: ->(order) do
         if !row_fade(order)
-          content_tag :div, order.number, class: 'font-semibold'
+          content_tag :div, order.number, class: "font-semibold"
         else
           content_tag :div, order.number
         end
@@ -83,12 +53,12 @@ class SolidusAdmin::Users::Orders::Component < SolidusAdmin::BaseComponent
       header: :state,
       data: ->(order) do
         color = {
-          'complete' => :green,
-          'returned' => :red,
-          'canceled' => :blue,
-          'cart' => :graphite_light,
+          "complete" => :green,
+          "returned" => :red,
+          "canceled" => :blue,
+          "cart" => :graphite_light
         }[order.state] || :yellow
-        component('ui/badge').new(name: order.state.humanize, color: color)
+        component("ui/badge").new(name: order.state.humanize, color: color)
       end
     }
   end
@@ -115,7 +85,7 @@ class SolidusAdmin::Users::Orders::Component < SolidusAdmin::BaseComponent
     {
       header: :payment,
       data: ->(order) do
-        component('ui/badge').new(name: order.payment_state.humanize, color: order.paid? ? :green : :yellow) if order.payment_state?
+        component("ui/badge").new(name: order.payment_state.humanize, color: order.paid? ? :green : :yellow) if order.payment_state?
       end
     }
   end
@@ -124,7 +94,7 @@ class SolidusAdmin::Users::Orders::Component < SolidusAdmin::BaseComponent
     {
       header: :shipment,
       data: ->(order) do
-        component('ui/badge').new(name: order.shipment_state.humanize, color: order.shipped? ? :green : :yellow) if order.shipment_state?
+        component("ui/badge").new(name: order.shipment_state.humanize, color: order.shipped? ? :green : :yellow) if order.shipment_state?
       end
     }
   end