solidus_admin 0.1.0 → 0.2.0

data/app/components/solidus_admin/ui/pages/index/component.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+class SolidusAdmin::UI::Pages::Index::Component < SolidusAdmin::BaseComponent
+  include SolidusAdmin::Layout::PageHelpers
+
+  Tab = Struct.new(:text, :href, :current, keyword_init: true)
+
+  def tabs
+    nil
+  end
+
+  def initialize(page:)
+    @page = page
+    @tabs = tabs&.map { |tab| Tab.new(**tab) }
+  end
+
+  def row_fade(_record)
+    false
+  end
+
+  def model_class
+    nil
+  end
+
+  def title
+    model_class.model_name.human.pluralize
+  end
+
+  def search_key
+    nil
+  end
+
+  def search_params
+    params[:q]
+  end
+
+  def search_name
+    :q
+  end
+
+  def search_url
+    nil
+  end
+
+  def table_id
+    stimulus_id
+  end
+
+  def rows
+    @page.records
+  end
+
+  def row_url(_record)
+    nil
+  end
+
+  def batch_actions
+    []
+  end
+
+  def scopes
+    []
+  end
+
+  def filters
+    []
+  end
+
+  def columns
+    []
+  end
+
+  def prev_page_path
+    solidus_admin.url_for(**request.params, page: @page.number - 1, only_path: true) unless @page.first?
+  end
+
+  def next_page_path
+    solidus_admin.url_for(**request.params, page: @page.next_param, only_path: true) unless @page.last?
+  end
+
+  def search_options
+    return unless search_url
+
+    {
+      name: search_name,
+      value: search_params,
+      url: search_url,
+      searchbar_key: search_key,
+      filters: filters,
+      scopes: scopes,
+    }
+  end
+
+  def sortable_options
+    nil
+  end
+
+  def render_table
+    render component('ui/table').new(
+      id: stimulus_id,
+      data: {
+        class: model_class,
+        rows: rows,
+        fade: -> { row_fade(_1) },
+        prev: prev_page_path,
+        next: next_page_path,
+        columns: columns,
+        batch_actions: batch_actions,
+        url: -> { row_url(_1) },
+      },
+      search: search_options,
+      sortable: sortable_options,
+    )
+  end
+
+  def page_actions
+    nil
+  end
+end

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

@@ -3,6 +3,7 @@
     rounded-lg
     border
     border-gray-100
+    <%= 'overflow-hidden' unless @search %>
   "
   data-controller="<%= stimulus_id %>"
   data-<%= stimulus_id %>-selected-row-class="bg-gray-15"
@@ -111,7 +112,7 @@
       </tr>
     </thead>
 
-    <% if @data.batch_actions %>
+    <% if @data.batch_actions && @data.rows.any? %>
       <thead
         data-<%= stimulus_id %>-target="batchHeader"
         class="bg-white color-black text-xs leading-none text-left"

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

@@ -59,7 +59,7 @@ class SolidusAdmin::UI::Table::Component < SolidusAdmin::BaseComponent
   def initialize(id:, data:, search: nil, sortable: nil)
     @id = id
     @data = Data.new(**data)
-    @data.columns.unshift selectable_column if @data.batch_actions.present?
+    @data.columns.unshift selectable_column if @data.batch_actions.present? && @data.rows.present?
     @search = Search.new(**search) if search
     @sortable = Sortable.new(**sortable) if sortable
   end

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

@@ -1,22 +1,29 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::Users::Index::Component < SolidusAdmin::BaseComponent
-  include SolidusAdmin::Layout::PageHelpers
+class SolidusAdmin::Users::Index::Component < SolidusAdmin::UI::Pages::Index::Component
+  def model_class
+    Spree.user_class
+  end
 
-  def initialize(page:)
-    @page = page
+  def search_key
+    :email_cont
   end
 
-  def title
-    Spree.user_class.model_name.human.pluralize
+  def search_url
+    solidus_admin.users_path
   end
 
-  def prev_page_path
-    solidus_admin.url_for(**request.params, page: @page.number - 1, only_path: true) unless @page.first?
+  def row_url(user)
+    spree.admin_user_path(user)
   end
 
-  def next_page_path
-    solidus_admin.url_for(**request.params, page: @page.next_param, only_path: true) unless @page.last?
+  def page_actions
+    render component("ui/button").new(
+      tag: :a,
+      text: t('.add'),
+      href: spree.new_admin_user_path,
+      icon: "add-line",
+    )
   end
 
   def batch_actions

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

@@ -1,8 +1,5 @@
 en:
-  promotion_image: 'Image'
-  add: 'Add new'
   batch_actions:
-    delete: 'Delete'
     discontinue: 'Discontinue'
     activate: 'Activate'
   filters:

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

@@ -1,22 +1,30 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::Zones::Index::Component < SolidusAdmin::BaseComponent
-  include SolidusAdmin::Layout::PageHelpers
+class SolidusAdmin::Zones::Index::Component < SolidusAdmin::UI::Pages::Index::Component
+  def model_class
+    Spree::Zone
+  end
 
-  def initialize(page:)
-    @page = page
+  def search_key
+    :name_or_description_cont
   end
 
-  def title
-    Spree::Zone.model_name.human.pluralize
+  def search_url
+    solidus_admin.zones_path
   end
 
-  def prev_page_path
-    solidus_admin.url_for(**request.params, page: @page.number - 1, only_path: true) unless @page.first?
+  def row_url(zone)
+    spree.edit_admin_zone_path(zone)
   end
 
-  def next_page_path
-    solidus_admin.url_for(**request.params, page: @page.next_param, only_path: true) unless @page.last?
+  def page_actions
+    render component("ui/button").new(
+      tag: :a,
+      text: t('.add'),
+      href: spree.new_admin_zone_path,
+      icon: "add-line",
+      class: "align-self-end w-full",
+    )
   end
 
   def batch_actions

data/app/controllers/solidus_admin/promotion_categories_controller.rb

@@ -4,8 +4,6 @@ module SolidusAdmin
   class PromotionCategoriesController < SolidusAdmin::BaseController
     include SolidusAdmin::ControllerHelpers::Search
 
-    before_action :load_promotion_category, only: [:move]
-
     def index
       promotion_categories = apply_search_to(
         Spree::PromotionCategory.all,
@@ -27,12 +25,5 @@ module SolidusAdmin
       flash[:notice] = t('.success')
       redirect_back_or_to promotion_categories_path, status: :see_other
     end
-
-    private
-
-    def load_promotion_category
-      @promotion_category = Spree::PromotionCategory.find(params[:id])
-      authorize! action_name, @promotion_category
-    end
   end
 end

data/app/controllers/solidus_admin/properties_controller.rb

@@ -23,7 +23,7 @@ module SolidusAdmin
       @properties = Spree::Property.where(id: params[:id])
 
       Spree::Property.transaction do
-        @properties.discard_all
+        @properties.destroy_all
       end
 
       flash[:notice] = t('.success')

data/app/views/layouts/solidus_admin/preview.html.erb

@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <%= stylesheet_link_tag SolidusAdmin::Config.theme_path(session[:admin_light_theme]), media: '(prefers-color-scheme: light)', "data-turbo-track": "reload" %>
+    <%= stylesheet_link_tag SolidusAdmin::Config.theme_path(session[:admin_dark_theme]), media: '(prefers-color-scheme: dark)', "data-turbo-track": "reload" %>
     <%= javascript_importmap_tags "solidus_admin/application", shim: false, importmap: SolidusAdmin.importmap %>
   </head>
   <body class="p-3">

data/config/initializers/view_component.rb

@@ -10,7 +10,7 @@ if Rails.env.development? || Rails.env.test?
   clear = "\e[0m"
 
   ActiveSupport::Notifications.subscribe("render.view_component") do |*args|
-    next unless args.last[:name].starts_with?("SolidusAdmin::")
+    next unless args.last[:name]&.starts_with?("SolidusAdmin::")
 
     event = ActiveSupport::Notifications::Event.new(*args)
     SolidusAdmin::BaseComponent.logger.debug \

data/lib/solidus_admin/configuration.rb

@@ -44,7 +44,9 @@ module SolidusAdmin
     #                     Setting this to `true` enables access to alpha stage features that might still be in testing or development.
     #                     Use with caution, as these features may not be fully stable or complete.
     #                     Default: false
-    preference :enable_alpha_features?, :boolean, default: false
+    preference :enable_alpha_features, :boolean, default: false
+
+    alias enable_alpha_features? enable_alpha_features
 
     preference :storefront_product_path_proc, :proc, default: ->(_version) {
       ->(product) { "/products/#{product.slug}" }

data/lib/solidus_admin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusAdmin
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-22 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geared_pagination
@@ -137,9 +137,7 @@ files:
 - app/assets/stylesheets/solidus_admin/application.tailwind.css
 - app/assets/stylesheets/solidus_admin/dark.css
 - app/assets/stylesheets/solidus_admin/dimmed.css
-- app/components/solidus_admin/adjustment_reasons/index/component.html.erb
 - app/components/solidus_admin/adjustment_reasons/index/component.rb
-- app/components/solidus_admin/adjustment_reasons/index/component.yml
 - app/components/solidus_admin/base_component.rb
 - app/components/solidus_admin/layout/feedback/component.html.erb
 - app/components/solidus_admin/layout/feedback/component.rb
@@ -157,16 +155,13 @@ files:
 - app/components/solidus_admin/layout/page_helpers.rb
 - app/components/solidus_admin/layout/skip_link/component.rb
 - app/components/solidus_admin/layout/skip_link/component.yml
-- app/components/solidus_admin/option_types/index/component.html.erb
 - app/components/solidus_admin/option_types/index/component.rb
-- app/components/solidus_admin/option_types/index/component.yml
 - app/components/solidus_admin/orders/cart/component.html.erb
 - app/components/solidus_admin/orders/cart/component.js
 - app/components/solidus_admin/orders/cart/component.rb
 - app/components/solidus_admin/orders/cart/component.yml
 - app/components/solidus_admin/orders/cart/result/component.html.erb
 - app/components/solidus_admin/orders/cart/result/component.rb
-- app/components/solidus_admin/orders/index/component.html.erb
 - app/components/solidus_admin/orders/index/component.rb
 - app/components/solidus_admin/orders/index/component.yml
 - app/components/solidus_admin/orders/show/address/component.html.erb
@@ -189,10 +184,8 @@ files:
 - app/components/solidus_admin/orders/show/summary/component.html.erb
 - app/components/solidus_admin/orders/show/summary/component.rb
 - app/components/solidus_admin/orders/show/summary/component.yml
-- app/components/solidus_admin/payment_methods/index/component.html.erb
 - app/components/solidus_admin/payment_methods/index/component.rb
 - app/components/solidus_admin/payment_methods/index/component.yml
-- app/components/solidus_admin/products/index/component.html.erb
 - app/components/solidus_admin/products/index/component.rb
 - app/components/solidus_admin/products/index/component.yml
 - app/components/solidus_admin/products/show/component.html.erb
@@ -203,64 +196,34 @@ files:
 - app/components/solidus_admin/products/status/component.yml
 - app/components/solidus_admin/products/stock/component.rb
 - app/components/solidus_admin/products/stock/component.yml
-- app/components/solidus_admin/promotion_categories/index/component.html.erb
 - app/components/solidus_admin/promotion_categories/index/component.rb
-- app/components/solidus_admin/promotion_categories/index/component.yml
-- app/components/solidus_admin/promotions/index/component.html.erb
 - app/components/solidus_admin/promotions/index/component.rb
 - app/components/solidus_admin/promotions/index/component.yml
-- app/components/solidus_admin/properties/index/component.html.erb
 - app/components/solidus_admin/properties/index/component.rb
-- app/components/solidus_admin/properties/index/component.yml
-- app/components/solidus_admin/refund_reasons/index/component.html.erb
 - app/components/solidus_admin/refund_reasons/index/component.rb
-- app/components/solidus_admin/refund_reasons/index/component.yml
-- app/components/solidus_admin/refunds_and_returns/component.html.erb
 - app/components/solidus_admin/refunds_and_returns/component.rb
 - app/components/solidus_admin/refunds_and_returns/component.yml
-- app/components/solidus_admin/reimbursement_types/index/component.html.erb
 - app/components/solidus_admin/reimbursement_types/index/component.rb
-- app/components/solidus_admin/reimbursement_types/index/component.yml
-- app/components/solidus_admin/return_reasons/index/component.html.erb
 - app/components/solidus_admin/return_reasons/index/component.rb
-- app/components/solidus_admin/return_reasons/index/component.yml
-- app/components/solidus_admin/shipping/component.html.erb
 - app/components/solidus_admin/shipping/component.rb
 - app/components/solidus_admin/shipping/component.yml
-- app/components/solidus_admin/shipping_categories/index/component.html.erb
 - app/components/solidus_admin/shipping_categories/index/component.rb
-- app/components/solidus_admin/shipping_categories/index/component.yml
-- app/components/solidus_admin/shipping_methods/index/component.html.erb
 - app/components/solidus_admin/shipping_methods/index/component.rb
-- app/components/solidus_admin/shipping_methods/index/component.yml
 - app/components/solidus_admin/stock_items/edit/component.html.erb
 - app/components/solidus_admin/stock_items/edit/component.js
 - app/components/solidus_admin/stock_items/edit/component.rb
 - app/components/solidus_admin/stock_items/edit/component.yml
-- app/components/solidus_admin/stock_items/index/component.html.erb
 - app/components/solidus_admin/stock_items/index/component.rb
 - app/components/solidus_admin/stock_items/index/component.yml
-- app/components/solidus_admin/stock_locations/index/component.html.erb
 - app/components/solidus_admin/stock_locations/index/component.rb
 - app/components/solidus_admin/stock_locations/index/component.yml
-- app/components/solidus_admin/store_credit_reasons/index/component.html.erb
 - app/components/solidus_admin/store_credit_reasons/index/component.rb
-- app/components/solidus_admin/store_credit_reasons/index/component.yml
-- app/components/solidus_admin/stores/index/component.html.erb
 - app/components/solidus_admin/stores/index/component.rb
-- app/components/solidus_admin/stores/index/component.yml
-- app/components/solidus_admin/tax_categories/index/component.html.erb
 - app/components/solidus_admin/tax_categories/index/component.rb
-- app/components/solidus_admin/tax_categories/index/component.yml
-- app/components/solidus_admin/tax_rates/index/component.html.erb
 - app/components/solidus_admin/tax_rates/index/component.rb
-- app/components/solidus_admin/tax_rates/index/component.yml
-- app/components/solidus_admin/taxes/component.html.erb
 - app/components/solidus_admin/taxes/component.rb
 - app/components/solidus_admin/taxes/component.yml
-- app/components/solidus_admin/taxonomies/index/component.html.erb
 - app/components/solidus_admin/taxonomies/index/component.rb
-- app/components/solidus_admin/taxonomies/index/component.yml
 - app/components/solidus_admin/ui/badge/component.rb
 - app/components/solidus_admin/ui/badge/component.yml
 - app/components/solidus_admin/ui/button/component.rb
@@ -295,6 +258,9 @@ files:
 - app/components/solidus_admin/ui/modal/component.html.erb
 - app/components/solidus_admin/ui/modal/component.rb
 - app/components/solidus_admin/ui/modal/component.yml
+- app/components/solidus_admin/ui/pages/index/component.html.erb
+- app/components/solidus_admin/ui/pages/index/component.rb
+- app/components/solidus_admin/ui/pages/index/component.yml
 - app/components/solidus_admin/ui/panel/component.html.erb
 - app/components/solidus_admin/ui/panel/component.rb
 - app/components/solidus_admin/ui/panel/component.yml
@@ -322,12 +288,9 @@ files:
 - app/components/solidus_admin/ui/toggletip/component.js
 - app/components/solidus_admin/ui/toggletip/component.rb
 - app/components/solidus_admin/ui/toggletip/component.yml
-- app/components/solidus_admin/users/index/component.html.erb
 - app/components/solidus_admin/users/index/component.rb
 - app/components/solidus_admin/users/index/component.yml
-- app/components/solidus_admin/zones/index/component.html.erb
 - app/components/solidus_admin/zones/index/component.rb
-- app/components/solidus_admin/zones/index/component.yml
 - app/controllers/solidus_admin/accounts_controller.rb
 - app/controllers/solidus_admin/addresses_controller.rb
 - app/controllers/solidus_admin/adjustment_reasons_controller.rb
@@ -454,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.

data/app/components/solidus_admin/adjustment_reasons/index/component.html.erb

@@ -1,32 +0,0 @@
-<%= render component('refunds_and_returns').new(current_class: Spree::AdjustmentReason) do |layout| %>
-  <% layout.with_actions do %>
-    <%= render component("ui/button").new(
-      tag: :a,
-      text: t('.add'),
-      href: spree.new_admin_adjustment_reason_path,
-      icon: "add-line",
-      class: "align-self-end w-full",
-    ) %>
-  <% end %>
-
-  <%= render component('ui/table').new(
-    id: stimulus_id,
-    data: {
-      class: Spree::AdjustmentReason,
-      rows: @page.records,
-      url: ->(adjustment_reason) { spree.edit_admin_adjustment_reason_path(adjustment_reason) },
-      prev: prev_page_path,
-      next: next_page_path,
-      columns: columns,
-      batch_actions: batch_actions,
-    },
-    search: {
-      name: :q,
-      value: params[:q],
-      url: solidus_admin.adjustment_reasons_path,
-      searchbar_key: :name_or_code_cont,
-      scopes: scopes,
-      filters: filters,
-    },
-  ) %>
-<% end %>

data/app/components/solidus_admin/adjustment_reasons/index/component.yml

@@ -1,4 +0,0 @@
-en:
-  add: 'Add new'
-  batch_actions:
-    delete: 'Delete'

data/app/components/solidus_admin/option_types/index/component.html.erb

@@ -1,30 +0,0 @@
-<%= page do %>
-  <%= page_header do %>
-    <%= page_header_title title %>
-    <%= page_header_actions do %>
-      <%= render component("ui/button").new(
-        tag: :a,
-        text: t('.add'),
-        href: spree.new_admin_option_type_path,
-        icon: "add-line",
-      ) %>
-    <% end %>
-  <% end %>
-
-  <%= render component('ui/table').new(
-    id: stimulus_id,
-    data: {
-      class: Spree::OptionType,
-      rows: @page.records,
-      url: ->(option_type) { spree.edit_admin_option_type_path(option_type) },
-      prev: prev_page_path,
-      next: next_page_path,
-      columns: columns,
-      batch_actions: batch_actions,
-    },
-    sortable: {
-      url: ->(option_type) { solidus_admin.move_option_type_path(option_type) },
-      param: 'position',
-    },
-  ) %>
-<% end %>

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

@@ -1,35 +0,0 @@
-<%= page do %>
-  <%= page_header do %>
-    <%= page_header_title title %>
-    <%= page_header_actions do %>
-      <%= render component("ui/button").new(
-        tag: :a,
-        text: t('.create_order'),
-        href: spree.new_admin_order_path,
-        icon: "add-line",
-      ) %>
-    <% end %>
-  <% end %>
-
-  <%= render component('ui/table').new(
-    id: stimulus_id,
-    data: {
-      class: Spree::Order,
-      rows: @page.records,
-      fade: row_fade,
-      url: ->(order) { spree.edit_admin_order_path(order) },
-      batch_actions: batch_actions,
-      columns: columns,
-      prev: prev_page_path,
-      next: next_page_path,
-    },
-    search: {
-      name: :q,
-      value: params[:q],
-      searchbar_key: :number_or_shipments_number_or_bill_address_name_or_email_cont,
-      url: solidus_admin.orders_path(scope: params[:scope]),
-      scopes: scopes,
-      filters: filters,
-    },
-  ) %>
-<% end %>

data/app/components/solidus_admin/payment_methods/index/component.html.erb

@@ -1,38 +0,0 @@
-<%= page do %>
-  <%= page_header do %>
-    <%= page_header_title title %>
-    <%= page_header_actions do %>
-      <%= render component("ui/button").new(
-        tag: :a,
-        text: t('.add'),
-        href: spree.new_admin_payment_method_path,
-        icon: "add-line",
-      ) %>
-    <% end %>
-  <% end %>
-
-  <%= render component('ui/table').new(
-    id: stimulus_id,
-    data: {
-      class: Spree::PaymentMethod,
-      rows: @page.records,
-      prev: prev_page_path,
-      next: next_page_path,
-      url: ->(payment_method) { spree.edit_admin_payment_method_path(payment_method) },
-      columns: columns,
-      batch_actions: batch_actions,
-    },
-    search: {
-      name: :q,
-      value: params[:q],
-      url: solidus_admin.payment_methods_path,
-      searchbar_key: :name_or_description_cont,
-      scopes: scopes,
-      filters: filters,
-    },
-    sortable: {
-      url: ->(payment_method) { solidus_admin.move_payment_method_path(payment_method) },
-      param: 'position',
-    },
-  ) %>
-<% end %>

data/app/components/solidus_admin/products/index/component.html.erb

@@ -1,34 +0,0 @@
-<%= page do %>
-  <%= page_header do %>
-    <%= page_header_title title %>
-    <%= page_header_actions do %>
-      <%= render component("ui/button").new(
-        tag: :a,
-        text: t('.add'),
-        href: spree.new_admin_product_path,
-        icon: "add-line",
-      ) %>
-    <% end %>
-  <% end %>
-
-  <%= render component('ui/table').new(
-    id: stimulus_id,
-    data: {
-      class: Spree::Product,
-      rows: @page.records,
-      url: ->(product) { solidus_admin.product_path(product) },
-      prev: prev_page_path,
-      next: next_page_path,
-      columns: columns,
-      batch_actions: batch_actions,
-    },
-    search: {
-      name: :q,
-      value: params[:q],
-      url: solidus_admin.products_path,
-      searchbar_key: :name_or_variants_including_master_sku_cont,
-      scopes: scopes,
-      filters: filters,
-    },
-  ) %>
-<% end %>

data/app/components/solidus_admin/promotion_categories/index/component.html.erb

@@ -1,26 +0,0 @@
-<%= page do %>
-  <%= page_header do %>
-    <%= page_header_title title %>
-    <%= page_header_actions do %>
-      <%= render component("ui/button").new(
-        tag: :a,
-        text: t('.add'),
-        href: spree.new_admin_promotion_category_path,
-        icon: "add-line",
-      ) %>
-    <% end %>
-  <% end %>
-
-  <%= render component('ui/table').new(
-    id: stimulus_id,
-    data: {
-      class: Spree::PromotionCategory,
-      rows: @page.records,
-      url: ->(promotion_category) { spree.edit_admin_promotion_category_path(promotion_category) },
-      prev: prev_page_path,
-      next: next_page_path,
-      columns: columns,
-      batch_actions: batch_actions,
-    },
-  ) %>
-<% end %>