spree_admin 5.0.3 → 5.0.4

data/app/views/spree/admin/users/_form.html.erb

@@ -1,6 +1,6 @@
 <div class="form-group">
   <%= f.label :email, raw(Spree.t(:email) + required_span_tag) %>
-  <%= f.email_field :email, class: 'form-control', required: true, autofocus: f.object.new_record?, required: true %>
+  <%= f.email_field :email, class: 'form-control', required: true, autofocus: f.object.new_record? %>
   <%= f.error_message_on :email %>
 </div>
 <div class="form-group">

data/app/views/spree/admin/users/index.html.erb

@@ -6,12 +6,12 @@
   <%= link_to spree.admin_users_path(q: params[:q].to_unsafe_hash, page: params[:page], per_page: params[:per_page], format: :csv), class: 'btn btn-light bg-transparent with-tip d-none d-lg-inline-flex', title: 'Export Customers to a CSV file. To filter specific Customers use "Filters" or Customers/Subscribers tabs before clicking this button' do %>
     <%= icon 'table-export' %>
     <%= Spree.t(:export) %>
-  <% end if can?(:export, Spree::Export) %>
+  <% end if can?(:create, Spree::Export) %>
   
   <%= render 'extra_actions' %>
 
-  <%= link_to_with_icon 'plus', Spree.t(:create_customer), spree.new_admin_user_path, class: "btn btn-primary" %>
-<% end if can? :create, Spree::user_class %>
+  <%= link_to_with_icon 'plus', Spree.t(:create_customer), spree.new_admin_user_path, class: "btn btn-primary" if can? :create, Spree::user_class %>
+<% end %>
 
 <div class="card-lg">
   <%= render "spree/admin/users/filters" %>

data/app/views/spree/admin/variants/form/_media.html.erb

@@ -19,6 +19,7 @@
           asset_uploader_viewable_id_value: viewable&.id,
           asset_uploader_viewable_type_value: 'Spree::Variant',
           asset_uploader_allowed_file_types_value: allowed_file_types_for_upload,
+          asset_uploader_admin_assets_path_value: spree.admin_assets_path,
           action: 'asset-uploader#open',
           media_form_target: 'addButton'
         }  do %>

data/app/views/spree/admin/webhooks_subscribers/_form.html.erb

@@ -30,33 +30,51 @@
           <%= Spree.t('admin.webhooks_subscribers.webhooks_events') %>
         </h5>
       </div>
-      <div class="card-body" data-controller="webhooks-subscriber-events">
+      <div class="card-body" data-controller="reveal">
         <div class="form-group">
           <div>
-            <div class="radio my-2">
+            <div class="custom-control custom-radio mb-3">
               <%= radio_button_tag :subscribe_to_all_events, true,
                                subscribe_to_all_events?,
                                {
-                                 'data-action' => 'webhooks-subscriber-events#hideCheckboxes',
-                                 'data-webhooks-subscriber-events-target' => 'subscribeToAll',
-                                  class: 'events' } %>
-              <%= label_tag :subscribe_to_all_events_true, Spree.t('admin.webhooks_subscribers.subscribe_to_all_events') %>
+                                 'data-action' => 'click->reveal#hide',
+                                  class: 'custom-control-input events' } %>
+              <%= label_tag :subscribe_to_all_events_true, Spree.t('admin.webhooks_subscribers.subscribe_to_all_events'), class: 'custom-control-label' %>
             </div>
-            <div class="radio my-2">
+            <div class="custom-control custom-radio">
               <%= radio_button_tag :subscribe_to_all_events, false,
                                !subscribe_to_all_events?,
-                               { 'data-action' => 'webhooks-subscriber-events#showCheckboxes',
-                                 class: 'events' } %>
-              <%= label_tag :subscribe_to_all_events_false, Spree.t('admin.webhooks_subscribers.select_events') %>
-            </div>
-          </div>
-          <br/>
-          <div data-webhooks-subscriber-events-target="eventsCheckboxesContainer" class="<%= subscribe_to_all_events? ? 'd-none' : '' %>">
-            <div class="row" >
-              <% Spree::Webhooks::Subscriber.supported_events.each_with_index do |se, index| %>
-                <% record, _ = se %>
-                <%= event_checkbox_for(record, f) %>
-              <% end %>
+                               { 'data-action' => 'click->reveal#show',
+                                 class: 'custom-control-input events' } %>
+              <%= label_tag :subscribe_to_all_events_false, Spree.t('admin.webhooks_subscribers.select_events'), class: 'custom-control-label' %>
+
+              <div data-reveal-target="item" class="<%= subscribe_to_all_events? ? 'hidden' : '' %>">
+                <div class="bg-light rounded-lg p-3 mt-3">
+                  <% @supported_events.each do |event| %>
+                    <div class="form-group">
+                      <div class="custom-control custom-switch">
+                        <% resource_name = event.first %>                        
+                        <%= f.check_box resource_name, 
+                          { class: 'events-checkbox custom-control-input',
+                            checked: @webhooks_subscriber.subscriptions&.any? { |event| event.include? "#{resource_name}." } },
+                          true, 
+                          nil %>
+                          
+                        <%= f.label resource_name, class: 'custom-control-label w-100' do %> 
+                          <%= Spree.t("#{resource_name.to_s.pluralize}") %>
+                          <p class="gap-2 mb-0 mt-1">
+                            <% event.last.each do |event| %>
+                              <span class="badge badge-light">
+                                <%= event %>
+                              </span>
+                            <% end %>
+                          </p>
+                        <% end %>
+                      </div>
+                    </div>
+                  <% end %>
+                </div>
+              </div>
             </div>
           </div>
         </div>

data/app/views/spree/admin/webhooks_subscribers/_webhooks_subscriber.html.erb

@@ -1,16 +1,22 @@
 <tr id="<%= spree_dom_id webhooks_subscriber %>" data-controller="row-link" class="cursor-pointer">
-  <td data-action="click->row-link#openLink">
+  <td class="w-40 text-wrap" data-action="click->row-link#openLink">
     <%= webhooks_subscriber.url %>
   </td>
-  <td data-action="click->row-link#openLink"><%= active_badge(webhooks_subscriber.active) %></td>
-  <td class="w-20" data-action="click->row-link#openLink">
+  <td class="w-5" data-action="click->row-link#openLink"><%= active_badge(webhooks_subscriber.active) %></td>
+  <td class="w-30 text-wrap" data-action="click->row-link#openLink">
     <% webhooks_subscriber.subscriptions&.sort&.each do |subscription| %>
       <span class="badge badge-light"><%= subscription %></span>
     <% end %>
   </td>
-  <td data-action="click->row-link#openLink"><%= local_time(webhooks_subscriber.latest_event_at) %></td>
-  <td class="actions">
-    <%= link_to_with_icon 'eye', Spree.t(:view), admin_webhooks_subscriber_path(webhooks_subscriber), class: "btn btn-light btn-sm", data: { row_link_target: 'link' } %>
+  <td class="w-10" data-action="click->row-link#openLink">
+    <% if webhooks_subscriber.latest_event_at %>
+      <%= local_time(webhooks_subscriber.latest_event_at) %>
+    <% else %>
+      <span class="text-muted"><%= Spree.t(:not_available) %></span>
+    <% end %>
+  </td>
+  <td class="w-15">
+    <%= link_to_with_icon 'eye', Spree.t(:view), spree.admin_webhooks_subscriber_path(webhooks_subscriber), class: "btn btn-light btn-sm", data: { row_link_target: 'link' } %>
     <%= link_to_edit(webhooks_subscriber) if can? :edit, webhooks_subscriber %>
   </td>
 </tr>

data/app/views/spree/admin/webhooks_subscribers/edit.html.erb

@@ -1,9 +1,9 @@
 <% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_webhooks_subscribers_path %>
+  <%= page_header_back_button spree.admin_webhooks_subscriber_path(@webhooks_subscriber) %>
   <%= @webhooks_subscriber.url %>
 <% end %>
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @webhooks_subscriber } %>
-<%= form_for [:admin, @webhooks_subscriber] do |f| %>
+<%= form_for [:admin, @webhooks_subscriber], html: { id: "edit_subscriber_#{@webhooks_subscriber.id}" } do |f| %>
   <%= render 'form', f: f %>
   <%= render 'spree/admin/shared/edit_resource_links', f: f %>
 <% end %>

data/app/views/spree/admin/webhooks_subscribers/show.html.erb

@@ -1,54 +1,65 @@
+<% content_for :title do %>
+  <%= @webhooks_subscriber.url %>
+<% end %>
+
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_webhooks_subscribers_path %>
   <%= @webhooks_subscriber.url %>
 <% end %>
-<fieldset class="card mb-4">
-  <table class="table card-body pb-0">
-    <tr>
-      <td><strong class="text-uppercase"><%= Spree.t(:url) %></strong></td>
-      <td><%= external_link_to @webhooks_subscriber.url, @webhooks_subscriber.url %></td>
-    </tr>
-    <tr>
-      <td><strong><%= Spree.t(:active) %></strong></td>
-      <td><%= active_badge(@webhooks_subscriber.active) %></td>
-    </tr>
-    <tr>
-      <td><strong><%= Spree.t('admin.webhooks_subscribers.subscriptions') %></strong></td>
-      <td>
-        <% @webhooks_subscriber.subscriptions&.sort&.each do |subscription| %>
-          <span class="badge badge-light"><%= subscription %></span>
-        <% end %>
-      </td>
-    </tr>
-  </table>
-</fieldset>
-<% if @events.any? %>
-  <div class="card mb-4">
-    <div class="card-header">
-      <h5 class="card-title">
-        <%= Spree.t('admin.webhooks_subscribers.webhooks_events') %>
-      </h5>
+
+<% content_for :page_actions do %>
+  <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_webhooks_subscriber_path(@webhooks_subscriber), class: 'btn btn-primary' %>
+<% end %>
+
+<ul class="list-group bg-white mb-4 rounded-lg">
+  <li class="list-group-item d-flex justify-content-between">
+    <strong class="text-uppercase"><%= Spree.t(:url) %></strong>
+    <%= external_link_to @webhooks_subscriber.url, @webhooks_subscriber.url, class: 'text-blue text-decoration-none' %>
+  </li>
+  <li class="list-group-item d-flex justify-content-between">
+    <strong><%= Spree.t(:active) %></strong>
+    <%= active_badge(@webhooks_subscriber.active) %>
+  </li>
+  <li class="list-group-item d-flex justify-content-between">
+    <strong><%= Spree.t('admin.webhooks_subscribers.subscriptions') %></strong>
+    <div>
+      <% @webhooks_subscriber.subscriptions&.sort&.each do |subscription| %>
+        <span class="badge badge-light"><%= subscription %></span>
+      <% end %>
     </div>
-    <table class="table card-body pb-0">
-      <thead class="text-muted">
+  </li>
+</ul>
+
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title">
+      <%= Spree.t('admin.webhooks_subscribers.webhooks_events') %>
+    </h5>
+  </div>
+  <table class="table card-body pb-0">
+    <thead>
+      <tr>
+        <th><%= Spree.t('admin.name') %></th>
+        <th><%= Spree.t('admin.successful') %></th>
+        <th><%= Spree.t('admin.created_at') %></th>
+        <th><%= Spree.t('admin.response_code') %></th>
+        <th><%= Spree.t('admin.execution_time') %></th>
+        <th><%= Spree.t('admin.errors') %></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% if @events.any? %>
+        <%= render partial: 'spree/admin/webhook_events/webhook_event', collection: @events, cached: spree_base_cache_scope %>
+      <% else %>
         <tr>
-          <th><%= Spree.t('admin.name') %></th>
-          <th><%= Spree.t('admin.successful') %></th>
-          <th><%= Spree.t('admin.created_at') %></th>
-          <th><%= Spree.t('admin.response_code') %></th>
-          <th><%= Spree.t('admin.execution_time') %></th>
-          <th><%= Spree.t('admin.errors') %></th>
-          <th></th>
+          <td colspan="7" class="text-center">
+            <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil, model_class: Spree::Webhooks::Event %>
+          </td>
         </tr>
-      </thead>
-      <tbody>
-        <%= render partial: 'spree/admin/webhook_events/webhook_event', collection: @events, cached: spree_base_cache_scope %>
-      </tbody>
-    </table>
-    <%= render 'spree/admin/shared/index_table_options', collection: @events %>
-  </div>
-<% else %>
-  <div class="text-center no-objects-found m-5">
-    <%= Spree.t('admin.webhooks_subscribers.no_events') %>
-  </div>
-<% end %>
+      <% end %>
+    </tbody>
+  </table>
+  <%= render 'spree/admin/shared/index_table_options', collection: @events %>
+</div>
+

data/config/importmap.rb

@@ -15,8 +15,8 @@ pin 'Chart.bundle', to: 'Chart.bundle.js', preload: ['application-spree-admin']
 pin 'local-time', preload: ['application-spree-admin'] # @3.0.2
 pin 'mapkick/bundle', to: 'mapkick.bundle.js', preload: ['application-spree-admin']
 pin "jquery", to: 'jquery.min.js', preload: ['application-spree-admin'] # @3.7.1
-pin 'bootstrap', to: 'bootstrap--dist--js--bootstrap.bundle.min.js.js', preload: ['application-spree-admin'] # @4.6.1
-pin 'dompurify', preload: ['application-spree-admin'] # @3.2.3
+pin 'bootstrap', to: 'bootstrap--dist--js--bootstrap.bundle.min.js.js', preload: ['application-spree-admin'] # @4.6.2
+pin 'dompurify', preload: ['application-spree-admin'] # @3.2.5
 
 # Stimulus components
 pin '@stimulus-components/rails-nested-form', to: '@stimulus-components--rails-nested-form.js', preload: ['application-spree-admin'] # @5.0.0

data/lib/spree/admin/engine.rb

@@ -21,9 +21,13 @@ module Spree
         :orders_filters_partials,
         :store_form_partials,
         :store_nav_partials,
+        :settings_nav_partials,
         :store_settings_nav_partials,
         :store_orders_nav_partials,
-        :store_products_nav_partials
+        :store_products_nav_partials,
+        :storefront_nav_partials,
+        :tax_nav_partials,
+        :user_dropdown_partials
       )
 
       # accessible via Rails.application.config.spree_admin
@@ -92,9 +96,13 @@ module Spree
         Rails.application.config.spree_admin.orders_filters_partials = []
         Rails.application.config.spree_admin.store_form_partials = []
         Rails.application.config.spree_admin.store_nav_partials = []
+        Rails.application.config.spree_admin.settings_nav_partials = []
         Rails.application.config.spree_admin.store_settings_nav_partials = []
         Rails.application.config.spree_admin.store_orders_nav_partials = []
         Rails.application.config.spree_admin.store_products_nav_partials = []
+        Rails.application.config.spree_admin.storefront_nav_partials = []
+        Rails.application.config.spree_admin.tax_nav_partials = []
+        Rails.application.config.spree_admin.user_dropdown_partials = []
       end
     end
   end