solidus_admin 0.2.0 → 0.3.1

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

@@ -5,6 +5,7 @@ en:
   select_row: 'Select row'
   filter: 'Filter'
   search_placeholder: 'Search all %{resources}'
+  action_confirmation: 'Are you sure you want to %{action} ${count} ${resource}?'
   refine_search: 'Refine Search'
   batch_actions: Batch actions
   cancel: Cancel

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

@@ -31,7 +31,7 @@ class SolidusAdmin::UI::Thumbnail::Component < SolidusAdmin::BaseComponent
 
   def self.for(record, **attrs)
     case record
-    when Spree::PromotionAction then new(icon: "megaphone-line", **attrs)
+    when *Spree::Config.adjustment_promotion_source_types then new(icon: "megaphone-line", **attrs)
     when Spree::UnitCancel then new(icon: "close-circle-line", **attrs)
     when Spree::TaxRate then new(icon: "percent-line", **attrs)
     when Spree::LineItem then self.for(record.variant, **attrs)

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

@@ -0,0 +1,17 @@
+<figure class="flex items-center gap-2">
+  <% if content? %>
+    <%= content %>
+  <% else %>
+    <%= icon_thumbnail %>
+  <% end %>
+  <figcaption class="flex flex-col gap-0 max-w-[15rem]">
+    <div class="text-black body-small whitespace-nowrap text-ellipsis overflow-hidden">
+      <%= caption %>
+    </div>
+    <% if detail %>
+      <div class="text-gray-500 body-small whitespace-nowrap text-ellipsis overflow-hidden">
+        <%= detail %>
+      </div>
+    <% end %>
+  </figcaption>
+</figure>

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::UI::ThumbnailWithCaption::Component < SolidusAdmin::BaseComponent
+  attr_reader :icon, :caption, :detail
+
+  def initialize(icon: "question-line", caption: "", detail: nil)
+    @icon = icon
+    @caption = caption
+    @detail = detail
+  end
+
+  def icon_thumbnail
+    render component("ui/thumbnail").new(icon: icon)
+  end
+end

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

@@ -0,0 +1,46 @@
+<%= page do %>
+  <%= page_header do %>
+    <%= page_header_back(solidus_admin.users_path) %>
+    <%= page_header_title(t(".title", email: @user.email)) %>
+
+    <%= 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 %>
+
+  <%= 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 %>
+  <% end %>
+
+  <%= page_with_sidebar do %>
+    <%= page_with_sidebar_main do %>
+      <%= 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]") %>
+          <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) %>
+          </div>
+        <% end %>
+      <% end %>
+
+      <%= 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]") %>
+          <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) %>
+          </div>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <%= page_with_sidebar_aside do %>
+      <%= render component("users/stats").new(user: @user) %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Users::Addresses::Component < SolidusAdmin::BaseComponent
+  include SolidusAdmin::Layout::PageHelpers
+
+  def initialize(user:, address: nil, type: nil)
+    @user = user
+    @bill_address = bill_address(address, type)
+    @ship_address = ship_address(address, type)
+  end
+
+  def form_id
+    @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
+    else
+      @user.bill_address || Spree::Address.build_default
+    end
+  end
+
+  def ship_address(address, type)
+    if address.present? && type == "ship"
+      address
+    else
+      @user.ship_address || Spree::Address.build_default
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,49 @@
+<%= render component('ui/panel').new(title: t('.api_access')) do %>
+  <section>
+    <% if @user.spree_api_key.present? %>
+      <div id="current-api-key">
+        <h2 class="py-1.5 font-semibold"><%= t('.key') %></h2>
+        <% if @user == helpers.current_solidus_admin_user %>
+          <%= @user.spree_api_key %>
+        <% else %>
+          <i>(<%= t('spree.hidden') %>)</i>
+        <% end %>
+      </div>
+
+      <div class="py-1.5 text-center">
+        <%= form_with url: spree.admin_user_api_key_path(@user), method: :delete, local: true, html: { class: 'clear_api_key inline-flex' } do %>
+          <%= render component("ui/button").new(
+            text: t('.clear_key'),
+            scheme: :secondary,
+            type: :submit,
+            "data-action": "click->#{stimulus_id}#confirm",
+            "data-#{stimulus_id}-message-param": t(".confirm_clear_key"),
+          ) %>
+        <% end %>
+
+        <%= form_with url: spree.admin_user_api_key_path(@user), method: :post, local: true, html: { class: 'regen_api_key inline-flex' } do %>
+          <%= render component("ui/button").new(
+            text: t('.regenerate_key'),
+            scheme: :secondary,
+            type: :submit,
+            "data-action": "click->#{stimulus_id}#confirm",
+            "data-#{stimulus_id}-message-param": t(".confirm_regenerate_key"),
+          ) %>
+        <% end %>
+      </div>
+
+    <% else %>
+      <div class="no-objects-found"><%= t('.no_key') %></div>
+      <div class="filter-actions actions">
+        <div class="py-1.5 text-center">
+          <%= form_with url: spree.admin_user_api_key_path(@user), method: :post, local: true, html: { class: 'generate_api_key inline-flex' } do %>
+            <%= render component("ui/button").new(
+              text: t('.generate_key'),
+              type: :submit,
+            ) %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  </section>
+<% end %>

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

@@ -0,0 +1,9 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  confirm(event) {
+    if (!confirm(event.params.message)) {
+      event.preventDefault()
+    }
+  }
+}

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Users::Edit::ApiAccess::Component < SolidusAdmin::BaseComponent
+  def initialize(user:)
+    @user = user
+  end
+end

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

@@ -0,0 +1,10 @@
+en:
+  api_access: API Access
+  no_key: No key
+  key: "Key"
+  generate_key: Generate API key
+  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.

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

@@ -0,0 +1,52 @@
+<%= page do %>
+  <%= page_header do %>
+    <%= 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) %>
+      <%= 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 %>
+
+  <%= 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 %>
+  <% 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| %>
+          <div class="py-1.5">
+            <%= render component("ui/forms/field").text_field(f, :email) %>
+          </div>
+          <div class="py-1.5">
+            <%= render component("ui/forms/field").text_field(f, :password) %>
+          </div>
+          <div class="py-1.5">
+            <%= render component("ui/forms/field").text_field(f, :password_confirmation) %>
+          </div>
+          <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) %>
+          </div>
+          <div class="py-1.5 text-center">
+            <%= render component("ui/button").new(tag: :button, text: t(".update"), form: form_id) %>
+            <%= render component("ui/button").new(tag: :a, text: t(".cancel"), href: solidus_admin.user_path(@user), scheme: :secondary) %>
+          </div>
+        <% end %>
+      <% end %>
+
+      <%= render component("users/edit/api_access").new(user: @user) %>
+
+    <% end %>
+
+    <%= page_with_sidebar_aside do %>
+      <%= render component("users/stats").new(user: @user) %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Users::Edit::Component < SolidusAdmin::BaseComponent
+  include SolidusAdmin::Layout::PageHelpers
+
+  def initialize(user:)
+    @user = user
+  end
+
+  def form_id
+    @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 }
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+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/index/component.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::Users::Index::Component < SolidusAdmin::UI::Pages::Index::Component
+class SolidusAdmin::Users::Index::Component < SolidusAdmin::UsersAndRoles::Component
+  include SolidusAdmin::LastLoginHelper
+
   def model_class
     Spree.user_class
   end
@@ -14,7 +16,7 @@ class SolidusAdmin::Users::Index::Component < SolidusAdmin::UI::Pages::Index::Co
   end
 
   def row_url(user)
-    spree.admin_user_path(user)
+    solidus_admin.edit_user_path(user)
   end
 
   def page_actions
@@ -29,7 +31,7 @@ class SolidusAdmin::Users::Index::Component < SolidusAdmin::UI::Pages::Index::Co
   def batch_actions
     [
       {
-        display_name: t('.batch_actions.delete'),
+        label: t('.batch_actions.delete'),
         action: solidus_admin.users_path,
         method: :delete,
         icon: 'delete-bin-7-line',
@@ -39,18 +41,18 @@ class SolidusAdmin::Users::Index::Component < SolidusAdmin::UI::Pages::Index::Co
 
   def scopes
     [
-      { name: :customers, label: t('.scopes.customers'), default: true },
+      { 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') },
     ]
   end
 
   def filters
     [
       {
-        presentation: Spree::Role.model_name.human.pluralize,
+        label: Spree::Role.model_name.human.pluralize,
         attribute: "spree_roles_id",
         predicate: "in",
         options: Spree::Role.pluck(:name, :id)
@@ -88,8 +90,8 @@ class SolidusAdmin::Users::Index::Component < SolidusAdmin::UI::Pages::Index::Co
         data: -> { _1.display_lifetime_value.to_html },
       },
       {
-        header: :created_at,
-        data: ->(user) { l(user.created_at.to_date, format: :long) },
+        header: :last_active,
+        data: ->(user) { last_login(user) },
       },
     ]
   end

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

@@ -0,0 +1,41 @@
+<%= page do %>
+  <%= page_header do %>
+    <%= page_header_back(solidus_admin.users_path) %>
+    <%= page_header_title(t(".title", email: @user.email)) %>
+
+    <%= 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 %>
+
+  <%= 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 %>
+  <% end %>
+
+  <%= page_with_sidebar do %>
+    <%= page_with_sidebar_main do %>
+      <%= render component('ui/panel').new(title: t(".items_purchased")) do %>
+        <% if @items.present? %>
+          <%= render component('ui/table').new(
+              id: stimulus_id,
+              data: {
+                class: model_class,
+                rows: rows,
+                columns: columns,
+                url: -> { row_url(_1.order) },
+              },
+          )%>
+        <% else %>
+            <%= t(".no_orders_found") %>
+            <%= render component("ui/button").new(tag: :a, text: t(".create_one"), href: spree.new_admin_order_path(user_id: @user.id)) %>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <%= page_with_sidebar_aside do %>
+      <%= render component("users/stats").new(user: @user) %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::Users::Items::Component < SolidusAdmin::BaseComponent
+  include SolidusAdmin::Layout::PageHelpers
+
+  def initialize(user:, items:)
+    @user = user
+    @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
+
+  def row_url(order)
+    spree.edit_admin_order_path(order)
+  end
+
+  def rows
+    @items
+  end
+
+  def columns
+    [
+      date_column,
+      image_column,
+      description_column,
+      price_column,
+      quantity_column,
+      total_column,
+      state_column,
+      number_column,
+    ]
+  end
+
+  def date_column
+    {
+      col: { class: "w-[8%]" },
+      header: :date,
+      data: ->(item) do
+        content_tag :div, l(item.order.created_at, format: :short), class: "text-sm"
+      end
+    }
+  end
+
+  def image_column
+    {
+      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(
+            src: image.url(:small),
+            alt: item.product.name
+          )
+        )
+      end
+    }
+  end
+
+  def description_column
+    {
+      col: { class: "w-[24%]" },
+      header: t(".description_column_header"),
+      data: ->(item) { item_name_with_variant_and_sku(item) }
+    }
+  end
+
+  def price_column
+    {
+      col: { class: "w-[10%]" },
+      header: :price,
+      data: ->(item) do
+        content_tag :div, item.single_money.to_html
+      end
+    }
+  end
+
+  def quantity_column
+    {
+      col: { class: "w-[7%]" },
+      header: :qty,
+      data: ->(item) do
+        content_tag :div, item.quantity
+      end
+    }
+  end
+
+  def total_column
+    {
+      col: { class: "w-[10%]" },
+      header: t(".total_column_header"),
+      data: ->(item) do
+        content_tag :div, item.money.to_html
+      end
+    }
+  end
+
+  def state_column
+    {
+      col: { class: "w-[15%]" },
+      header: :state,
+      data: ->(item) do
+        color = {
+          'complete' => :green,
+          'returned' => :red,
+          'canceled' => :blue,
+          'cart' => :graphite_light,
+        }[item.order.state] || :yellow
+        component('ui/badge').new(name: item.order.state.humanize, color: color)
+      end
+    }
+  end
+
+  def number_column
+    {
+      col: { class: "w-[18%]" },
+      header: t(".number_column_header"),
+      data: ->(item) do
+        content_tag :div, item.order.number, class: "font-semibold text-sm"
+      end
+    }
+  end
+
+  private
+
+  def item_name_with_variant_and_sku(item)
+    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?
+
+    # 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
+  end
+end

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

@@ -0,0 +1,16 @@
+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"