spree_admin 5.0.2 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fb2e27934e0ce22324b5a7c032fbeb7d0abf76d3512f726dd0acddc30a217dc
-  data.tar.gz: 3caabc53934c4c0bdbd2b70bfea5dcaa9685eb3acb9a2d2bcebcc362c4807e73
+  metadata.gz: 896d26ce5c5cefb448bf77753fbb39af32b548d26aad748b20eae32ac51f1972
+  data.tar.gz: c51934c9b3763132ad0978789d770645819016286aa505a065e0257a1bbb517d
 SHA512:
-  metadata.gz: ffb8d7703b134adf2439b7f035557930448883896f6e4a07daea768de52847d13dc0ed7ca8cb37fc1e38e0df637b7fcbfb54cc3d7e13fdf03adc23493714e33a
-  data.tar.gz: 88f4985f3985761932f2e341ed62085658c925a18244718bb14ffc729b3074cc9d726fa8419c70af12a3da77e9a624f39d3bba5841b4d759a03a1cb8abaad994
+  metadata.gz: 3e4045b8196f7e9d3464942a40d5d8875ee37b0511df0e41a91876f83f052ea84ac94623ead5f91eff08fb1be514cb268894af96cd1b678045fb2f21ab6d26b6
+  data.tar.gz: 2845718bc86d3007d26c8482fe14b566d72a51b5b0159557969ce53c42cc2ddba9abd853da9458ee3914901cdce1341212babe1010e7b8dab81109d6cc0cf090

data/app/controllers/spree/admin/dashboard_controller.rb

@@ -111,9 +111,11 @@ module Spree
         @audience_growth_rate = calc_growth_rate(@audience_total, previous_audience_total)
 
         @audience = if same_day?
-                      @audience_scope.group_by_hour(:created_at, range: analytics_time_range, time_zone: current_store.preferred_timezone, default_value: 0)
+                      @audience_scope.group_by_hour(:created_at, range: analytics_time_range, time_zone: current_store.preferred_timezone,
+                                                                 default_value: 0)
                     else
-                      @audience_scope.group_by_day(:created_at, range: analytics_time_range, time_zone: current_store.preferred_timezone, default_value: 0)
+                      @audience_scope.group_by_day(:created_at, range: analytics_time_range, time_zone: current_store.preferred_timezone,
+                                                                default_value: 0)
                     end
 
         return unless defined?(Ahoy)
@@ -123,25 +125,22 @@ module Spree
         previous_visits_total = Ahoy::Visit.where(started_at: previous_analytics_time_range).count
         @visits_growth_rate = calc_growth_rate(@visits_total, previous_visits_total)
 
-        @visits_scope = Ahoy::Visit.where(started_at: analytics_time_range)
-        @visits_total = @visits_scope.count
-        previous_visits_total = Ahoy::Visit.where(started_at: previous_analytics_time_range).count
-        @visits_growth_rate = calc_growth_rate(@visits_total, previous_visits_total)
-
         @visits = if same_day?
-                    @visits_scope.group_by_hour(:started_at, range: analytics_time_range, time_zone: current_store.preferred_timezone, default_value: 0)
+                    @visits_scope.group_by_hour(:started_at, range: analytics_time_range, time_zone: current_store.preferred_timezone,
+                                                             default_value: 0)
                   else
-                    @visits_scope.group_by_day(:started_at, range: analytics_time_range, time_zone: current_store.preferred_timezone, default_value: 0)
+                    @visits_scope.group_by_day(:started_at, range: analytics_time_range, time_zone: current_store.preferred_timezone,
+                                                            default_value: 0)
                   end
 
-        @top_landing_pages = @visits_scope.where.not(landing_page_title: [nil, '']).top(:landing_page_title, 10)
+        @top_landing_pages = @visits_scope.where.not(landing_page: [nil, '']).top(:landing_page, 10)
         @top_referrers = @visits_scope.where.not(referring_domain: current_store.custom_domains.pluck(:url) << current_store.url).top(
           :referring_domain, 10
         )
         @top_locations = @visits_scope.top(:country, 10)
         @top_devices = @visits_scope.group(:device_type).count.transform_keys do |device|
-                        device.nil? ? 'N/A' : device
-                      end.map { |series| [series.first, (series.second.to_f / @visits_scope.count) * 100] }
+          device.nil? ? 'N/A' : device
+        end.map { |series| [series.first, (series.second.to_f / @visits_scope.count) * 100] }
       end
     end
   end

data/app/controllers/spree/admin/page_blocks_controller.rb

@@ -26,15 +26,23 @@ module Spree
       end
 
       def create
-        allowed_types = Rails.application.config.spree.page_blocks.map(&:to_s)
         page_block_type = params.dig(:page_block, :type)
 
-        if allowed_types.include?(page_block_type) && page_block_type.safe_constantize.present?
+        if allowed_types.map(&:to_s).include?(page_block_type) && page_block_type.safe_constantize.present?
           @page_block = page_block_type.constantize.new
           @page_block.section = @page_section
           @page_block.save!
         end
       end
+
+      private
+
+      def allowed_types
+        [
+          *Rails.application.config.spree.page_blocks,
+          *parent&.available_blocks_to_add
+        ].uniq.sort_by(&:name)
+      end
     end
   end
 end

data/app/controllers/spree/admin/page_sections_controller.rb

@@ -7,7 +7,7 @@ module Spree
 
       def create
         page_section_type = params.dig(:page_section, :type)
-        allowed_types = Rails.application.config.spree.page_sections.map(&:to_s)
+        allowed_types = available_page_section_types.map(&:to_s)
 
         if allowed_types.include?(page_section_type) && page_section_type.safe_constantize.present?
           @page_section = page_section_type.constantize.new(permitted_resource_params)
@@ -52,6 +52,18 @@ module Spree
                       current_store.theme_previews.find(params[:theme_id])
                     end
       end
+
+      def available_page_section_types
+        return [] unless @pageable.present?
+
+        if @pageable.is_a?(Spree::Theme)
+          @pageable.available_page_sections
+        elsif @pageable.respond_to?(:theme)
+          @pageable.theme.available_page_sections
+        else
+          []
+        end
+      end
     end
   end
 end

data/app/controllers/spree/admin/webhooks_subscribers_controller.rb

@@ -1,20 +1,11 @@
 module Spree
   module Admin
     class WebhooksSubscribersController < ResourceController
+      before_action :set_supported_events, except: [:index, :show]
+
       create.before :process_subscriptions
       update.before :process_subscriptions
 
-      def index
-        params[:q] ||= {}
-        params[:q][:s] ||= 'created_at desc'
-
-        search = Webhooks::Subscriber.accessible_by(current_ability).ransack(params[:q])
-        @webhooks_subscribers = search.result.
-                                includes(:events).
-                                page(params[:page]).
-                                per(params[:per_page])
-      end
-
       def show
         @webhooks_subscriber = Webhooks::Subscriber.find(params[:id])
         @events = @webhooks_subscriber.events.order(created_at: :desc).page(params[:page]).per(params[:per_page])
@@ -26,7 +17,19 @@ module Spree
         @resource ||= Spree::Admin::Resource.new 'spree/admin/webhooks/subscribers', 'subscribers', nil
       end
 
+      def collection
+        params[:q] ||= {}
+        params[:q][:s] ||= 'created_at desc'
+
+        @search = Webhooks::Subscriber.accessible_by(current_ability).ransack(params[:q])
+        @collection = @search.result.
+                      page(params[:page]).
+                      per(params[:per_page])
+      end
+
       def process_subscriptions
+        return if params[:webhooks_subscriber].blank?
+
         params[:webhooks_subscriber][:subscriptions] = if params[:subscribe_to_all_events] == 'true'
                                                          ['*']
                                                        else
@@ -37,12 +40,28 @@ module Spree
       end
 
       def selected_events
-        supported_events.select { |resource, _events| params[:webhooks_subscriber][resource] == 'true' }.values.flatten
+        @supported_events.select { |resource, _events| params[:webhooks_subscriber][resource] == 'true' }.values.flatten
       end
 
-      def supported_events
+      def set_supported_events
         @supported_events ||= Spree::Webhooks::Subscriber.supported_events
       end
+
+      def supported_events
+        @supported_events
+      end
+
+      def permitted_resource_params
+        params.require(:webhooks_subscriber).permit(:url, :active, subscriptions: [])
+      end
+
+      def location_after_create
+        location_after_save
+      end
+
+      def location_after_save
+        spree.admin_webhooks_subscriber_path(@object)
+      end
     end
   end
 end

data/app/helpers/spree/admin/base_helper.rb

@@ -10,7 +10,7 @@ module Spree
       end
 
       def enterprise_edition?
-        defined?(Vendo)
+        defined?(SpreeEnterprise)
       end
 
       def spree_updater

data/app/helpers/spree/admin/navigation_helper.rb

@@ -190,7 +190,7 @@ module Spree
       # @return [String] the badge with the icon
       def active_badge(condition, options = {})
         label = options[:label]
-        label ||= condition ? Spree.t(:say_yes) : Spree.t(:say_no)
+        label ||= condition ? Spree.t(:say_yes).to_s : Spree.t(:say_no).to_s
         label = icon('check') + label if condition
 
         css_class = condition ? 'badge-active' : 'badge-inactive'

data/app/helpers/spree/admin/orders_helper.rb

@@ -25,8 +25,10 @@ module Spree
             icon('credit-card-refund') + Spree.t('payment_states.refunded')
           elsif order.partially_refunded?
             icon('credit-card-refund') + Spree.t('payment_states.partially_refunded')
-          elsif order.payment_state == 'failed' || order.payment_state == 'void'
+          elsif order.payment_state == 'failed'
             icon('cancel') + Spree.t('payment_states.failed')
+          elsif order.payment_state == 'void'
+            icon('cancel') + Spree.t('payment_states.void')
           elsif order.payment_state == 'paid'
             icon('check') + Spree.t('payment_states.paid')
           else

data/app/helpers/spree/admin/products_helper.rb

@@ -122,6 +122,10 @@ module Spree
       def product_list_filters_search_form_path
         [:admin, @search]
       end
+
+      def sorted_product_properties(product)
+        product.product_properties.sort_by { |product_property| product_property.property.position }
+      end
     end
   end
 end

data/app/helpers/spree/admin/tags_helper.rb

@@ -13,7 +13,7 @@ module Spree
         @post_tags_scope ||= ActsAsTaggableOn::Tag.
                              joins(:taggings).
                              where("#{ActsAsTaggableOn.taggings_table}.taggable_type = ?", 'Spree::Post').
-                             for_context(:tags)
+                             for_context(:tags).for_tenant(current_store.id)
       end
 
       def post_tags_json_array

data/app/javascript/spree/admin/application.js

@@ -78,7 +78,6 @@ import StockTransferController from 'spree/admin/controllers/stock_transfer_cont
 import StoreFormController from 'spree/admin/controllers/store_form_controller'
 import UnitSystemController from 'spree/admin/controllers/unit_system_controller'
 import VariantsFormController from 'spree/admin/controllers/variants_form_controller'
-import WebhooksSubscriberEventsController from 'spree/admin/controllers/webhook_subscriber_events_controller'
 import AddressAutocompleteController from 'spree/core/controllers/address_autocomplete_controller'
 import AddressFormController from 'spree/core/controllers/address_form_controller'
 import EnableButtonController from 'spree/core/controllers/enable_button_controller'
@@ -131,7 +130,6 @@ application.register('tabs', Tabs)
 application.register('textarea-autogrow', TextareaAutogrow)
 application.register('unit-system', UnitSystemController)
 application.register('variants-form', VariantsFormController)
-application.register('webhooks-subscriber-events', WebhooksSubscriberEventsController)
 
 LocalTime.start()
 

data/app/javascript/spree/admin/controllers/asset_uploader_controller.js

@@ -11,7 +11,8 @@ export default class extends Controller {
     viewableType: String,
     multiple: { type: Boolean, default: false },
     type: { type: String, default: 'image' },
-    allowedFileTypes: { type: Array, default: [] }
+    allowedFileTypes: { type: Array, default: [] },
+    adminAssetsPath: String
   }
 
   connect() {
@@ -43,7 +44,7 @@ export default class extends Controller {
   }
 
   handleSuccessResult(response) {
-    post('/admin/assets', {
+    post(this.adminAssetsPathValue, {
       body: JSON.stringify({
         asset: {
           type: this.assetClassValue,

data/app/javascript/spree/admin/controllers/variants_form_controller.js

@@ -37,7 +37,8 @@ export default class extends CheckboxSelectAll {
     currentStockLocationId: String,
     stockLocations: Array,
     optionValuesSelectOptions: Array,
-    locale: String
+    locale: String,
+    adminPath: String
   }
 
   connect() {
@@ -67,6 +68,8 @@ export default class extends CheckboxSelectAll {
           .filter((internalName) => !existingVariantsOnServer.includes(internalName))
       )
     }
+
+    this.inventoryFormTarget = document.querySelector('.inventory-form');
   }
 
   toggleQuantityTracked() {
@@ -236,11 +239,14 @@ export default class extends CheckboxSelectAll {
   }
 
   optionsValueChanged(value, previousValue) {
+    let hasNoOptions = true
+
     if (this.hasNewOptionButtonTarget) {
       const label = this.newOptionButtonLabelTarget
 
       if (Object.values(value).filter(Boolean).length) {
         label.textContent = label.dataset.hasOptionsText
+        hasNoOptions = false
       } else {
         label.textContent = label.dataset.noOptionsText
       }
@@ -248,6 +254,8 @@ export default class extends CheckboxSelectAll {
     this.refreshOptionNameSelect()
     this.variantsValue = this.generateVariants(value)
 
+    this.toggleInventoryForm(hasNoOptions)
+
     // We want to clear the ignoredVariants when the options change
     if (previousValue && Object.keys(previousValue).length === 0) return
     this.ignoredVariants = new Set()
@@ -717,7 +725,7 @@ export default class extends CheckboxSelectAll {
     this.lastOptionNameId = targetInput.value
 
     if (this.lastOptionNameId) {
-      const response = await get(`/admin/option_types/${this.lastOptionNameId}/option_values/select_options`)
+      const response = await get(`${this.adminPathValue}/option_types/${this.lastOptionNameId}/option_values/select_options`)
 
       if (response.ok) {
         this.currentOptionValues[this.lastOptionNameId] = await response.json
@@ -765,6 +773,8 @@ export default class extends CheckboxSelectAll {
     this.addOption(newOptionName, newOptionValues, newOptionId)
 
     this.hideNewOptionForm()
+
+    this.toggleInventoryForm(false)
   }
 
   hideNewOptionForm() {
@@ -1052,4 +1062,14 @@ export default class extends CheckboxSelectAll {
       }
     }
   }
+
+  toggleInventoryForm(value) {
+    if (!this.inventoryFormTarget) return
+
+    if (value) {
+      this.inventoryFormTarget.classList.remove('d-none')
+    } else {
+      this.inventoryFormTarget.classList.add('d-none')
+    }
+  }
 }

data/app/javascript/spree/admin/helpers/trix/video_embed.js

@@ -90,7 +90,7 @@ document.addEventListener("trix-attachment-remove", async function(event) {
   const { attachment } = event
   const { sgid } = attachment.attachment.attributes.values
 
-  destroy(`/admin/action_text/video_embeds/${sgid}`, { responseKind: 'json' })
+  destroy(`${Spree.adminPath}/action_text/video_embeds/${sgid}`, { responseKind: 'json' })
 })
 
 function initializeTrixEditor(editor) {
@@ -129,7 +129,7 @@ function initializeTrixEditor(editor) {
 
       errorMessage.innerHTML = ''
 
-      const response = await post('/admin/action_text/video_embeds', { body: JSON.stringify({ url: input.value }), responseKind: 'json' })
+      const response = await post(`${Spree.adminPath}/action_text/video_embeds`, { body: JSON.stringify({ url: input.value }), responseKind: 'json' })
 
       if (response.ok) {
         const { sgid, content } = await response.json

data/app/views/spree/admin/dashboard/_top_products.html.erb

@@ -45,7 +45,7 @@
                     <%= product.name %>
                   <% end %>
                 </td>
-                <% if enterprise_edition? && defined?(vendor_logo_link) && !@vendor %>
+                <% if defined?(vendor_logo_link) && !@vendor %>
                   <td>
                     <%= vendor_logo_link(product.vendor) if product.vendor.present? %>
                   </td>

data/app/views/spree/admin/orders/_filters.html.erb

@@ -1,7 +1,17 @@
 <% frame_name ||= nil %>
 
+<% search_form_path = if @user.present?
+                        spree.admin_user_orders_path(@user)
+                      elsif @vendor.present? && spree.respond_to?(:admin_vendor_orders_path)
+                        spree.admin_vendor_orders_path(@vendor)
+                      elsif controller_name == 'checkouts'
+                        spree.admin_checkouts_path
+                      else
+                        spree.admin_orders_path
+                      end %>
+
 <%= search_form_for [:admin, @vendor || @user, @search],
-  url: controller_name == 'checkouts' ? spree.admin_checkouts_path : nil,
+  url: search_form_path,
   class: "filter-wrap",
   data: {
     controller: "filters reveal",

data/app/views/spree/admin/orders/_summary.html.erb

@@ -74,7 +74,7 @@
       <%= render 'tax_lines', tax_lines: tax_lines, id: 'tax-lines-additional' %>
     </li>
 
-    <%= render_admin_partials(:order_page_body_partials, order: @order) %>
+    <%= render_admin_partials(:order_page_summary_partials, order: @order) %>
 
     <li class="list-group-item d-flex justify-content-between align-items-center border-0">
       <span data-hook='admin_order_tab_total_title'><%= Spree.t(:total) %></span>

data/app/views/spree/admin/page_blocks/forms/_image.html.erb

@@ -1 +1,10 @@
 <%= render 'active_storage/upload_form', form: f, field_name: :asset, width: 512, height: 512, auto_submit: true %>
+
+<% content_for(:design_tab) do %>
+  <%= render 'spree/admin/page_builder/labeled_range_input',
+    f: f, field: :preferred_height, min: 1, max: 1024, unit: 'px', _label: 'Max image height on desktop'
+  %>
+  <%= render 'spree/admin/page_builder/labeled_range_input',
+    f: f, field: :preferred_mobile_height, min: 1, max: 512, unit: 'px', _label: 'Max image height on mobile'
+  %>
+<% end %>

data/app/views/spree/admin/page_builder/_sidebar_block.html.erb

@@ -7,15 +7,16 @@
                                      } do %>
     <div class="d-flex align-items-center justify-content-between sidebar-block-title p-1 rounded-sm">
       <div class="d-flex align-items-center flex-fill">
-        <%= icon "#{block.icon_name}", class: 'mr-2' if block.icon_name.present? %>
-        <%= link_to block.display_name, edit_admin_page_section_block_path(block.section, block),
-                    class: 'block-edit-link flex-fill text-dark',
-                    data: {
-                      turbo_frame: :page_sidebar,
-                      action: 'click->page-builder#makeOverlayActive',
-                      page_builder_editor_id_param: "block-#{block.id}"
-                    }
-        %>
+        <%= link_to(edit_admin_page_section_block_path(block.section, block),
+          class: 'block-edit-link flex-fill text-dark',
+          data: {
+            turbo_frame: :page_sidebar,
+            action: 'click->page-builder#makeOverlayActive',
+            page_builder_editor_id_param: "block-#{block.id}"
+          }) do %>
+          <%= icon "#{block.icon_name}", class: 'mr-2' if block.icon_name.present? %>
+          <%= block.display_name %>
+        <% end %>
       </div>
       <div class="d-flex align-items-center d-none">
         <% if block.section.can_sort_blocks? %>