spree_admin 5.0.3 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2314972e804657e3746e099913f84a2ffe364d955005ecd2ad0f441f6d38f44c
-  data.tar.gz: b5b4bc046008b7f3077c12dccb7571f5fc965f2196d3a1d077f044d911da0dd2
+  metadata.gz: 274d9668ae1ea544815eb385842f5556570acb9c999fe65ab07a6b639bb42b06
+  data.tar.gz: 706699d5694ae8d8e2ea3df88b4b1a27c7196474efdf9928ebbbb27fba3b1828
 SHA512:
-  metadata.gz: 0f823382a162659d30e565ff7dfc2299f4c8b5ce4e73e11c7b3a146dc0560ebadd289653d09b6c40eb33e30300f4d2032b91389b2a2eebad43657c236d2065df
-  data.tar.gz: 7e104c97735e15737d3b9d209a632ac7cdd8c53b0229e8482225e57e023d44d74228833fef8cb7f2fd54c1f56e696b634fff5d7d289bc6a3bdb5d2e14aa56c23
+  metadata.gz: 227638a7b026550f3cdfb9b0549798c91ae1a4feeefe7b97c7984d4005c74b1fc1a1d180707ebe2037af02d90b912bd7508d74fd291b5c29c520cbfe62f28691
+  data.tar.gz: f1ef07a89426530a25d0db9a50bed68eebd9af552a9d639f0b5bc138201deca3ae626d01032fa147f167bc82ebb714a71c470dadabbccac66dfe9eb02dff2716

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/orders_controller.rb

@@ -70,7 +70,7 @@ module Spree
         @payments = @order.payments.includes(:payment_method, :source).order(:created_at)
         @refunds = @order.refunds
 
-        @return_authorizations = @order.return_authorizations
+        @return_authorizations = @order.return_authorizations.includes(:return_items)
         @customer_returns = @order.customer_returns.distinct
       end
 

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

@@ -151,7 +151,7 @@ module Spree
       protected
 
       def find_resource
-        current_store.products.accessible_by(current_ability, :manage).with_deleted.friendly.find(params[:id])
+        current_store.products.accessible_by(current_ability, :manage).friendly.find(params[:id])
       end
 
       def load_data
@@ -179,10 +179,10 @@ module Spree
             @product_options[option_type.id.to_s] = {
               name: option_type.presentation,
               position: index + 1,
-              values: option_values.pluck(:presentation).uniq
+              values: option_values.pluck(:name, :presentation).uniq.map { |name, presentation| { value: name, text: presentation } }
             }
 
-            @product_available_options[option_type.id.to_s] = option_type.option_values.to_tom_select_json
+            @product_available_options[option_type.id.to_s] = option_type.option_values.pluck(:name, :presentation).uniq.map { |name, presentation| { id: name, name: presentation } }
           end
 
         @product_stock = {}
@@ -273,7 +273,7 @@ module Spree
                       for_ordering_with_translations(model_class, :name).
                       includes(product_includes).
                       page(params[:page]).
-                      per(params[:per_page] || ENV.fetch('ADMIN_PRODUCTS_PER_PAGE', 25))
+                      per(params[:per_page] || Spree::Admin::RuntimeConfig.admin_products_per_page)
 
         @collection
       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_filters_helper.rb

@@ -57,7 +57,7 @@ module Spree
         # lazy loading other models here (via includes) may result in an invalid query
         # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
         # see https://github.com/spree/spree/pull/3919
-        @orders = @search.result(distinct: true).page(params[:page]).per(params[:per_page])
+        @orders = @search.result(distinct: true).page(params[:page]).per(params[:per_page] || Spree::Admin::RuntimeConfig.admin_orders_per_page)
       end
 
       def load_user

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/payments_helper.rb

@@ -11,11 +11,6 @@ module Spree
         end
       end
 
-      def payment_method_icon_tag(payment_method, opts = {})
-        image_tag "payment_icons/#{payment_method}.svg", opts
-      rescue Sprockets::Rails::Helper::AssetNotFound
-      end
-
       def available_payment_methods
         @available_payment_methods ||= Spree::PaymentMethod.providers.map { |provider| provider.name.constantize.new }.delete_if { |payment_method| !payment_method.show_in_admin? || current_store.payment_methods.pluck(:type).include?(payment_method.type) }.sort_by(&:name)
       end

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/active_storage_upload_controller.js

@@ -29,7 +29,8 @@ export default class extends Controller {
     })
 
     this.uppy.use(ActiveStorageUpload, {
-      directUploadUrl: document.querySelector("meta[name='direct-upload-url']").getAttribute('content')
+      directUploadUrl: document.querySelector("meta[name='direct-upload-url']").getAttribute('content'),
+      crop: this.cropValue
     })
 
     let dashboardOptions = {}
@@ -55,16 +56,6 @@ export default class extends Controller {
 
     this.uppy.on('file-editor:complete', (updatedFile) => {
       console.log('File editing complete:', updatedFile)
-      // Remove the old file from Uppy's file list
-      this.uppy.removeFile(updatedFile.id)
-      // Add the updated file to Uppy
-      this.uppy.addFile({
-        name: updatedFile.name,
-        type: updatedFile.type,
-        data: updatedFile.data,
-        source: 'local',
-        isRemote: false
-      })
 
       this.handleUI(updatedFile)
 

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/multi_tom_select_controller.js

@@ -26,8 +26,9 @@ export default class extends Controller {
   values() {
     return this.selectTargets
       .map((selectTarget) => selectTarget.querySelector('select'))
-      .map((select) => select.options[select.selectedIndex].text)
-      .filter((text) => text?.length > 0)
+      .map((select) => select.options[select.selectedIndex])
+      .filter((option) => option.value.length > 0)
+      .map((option) => ({ text: option.text, value: option.value}))
   }
 
   setValues() {

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() {
@@ -128,7 +129,7 @@ export default class extends CheckboxSelectAll {
       const nestingLevel = internalName.split('/').length
       if (nestingLevel === 1) {
         const firstOptionKey = Object.keys(this.optionsValue)[0]
-        const newOptionValues = this.optionsValue[firstOptionKey].values.filter((value) => value !== internalName)
+        const newOptionValues = this.optionsValue[firstOptionKey].values.filter((value) => value.text !== internalName)
         if (newOptionValues.length === 0) {
           const newOptionsValue = this.optionsValue
           delete newOptionsValue[firstOptionKey]
@@ -264,12 +265,12 @@ export default class extends CheckboxSelectAll {
     let name = ''
     let internalName = name
     if (i === 0) {
-      name = variant[keys[i]]
+      name = variant[keys[i]].text
       internalName = name
     } else {
-      const namesPath = keys.slice(1, keys.length).map((key) => variant[key])
+      const namesPath = keys.slice(1, keys.length).map((key) => variant[key].text)
       name = namesPath.join(' / ')
-      internalName = `${variant[keys[0]]}/${namesPath.join('/')}`
+      internalName = `${variant[keys[0]].text}/${namesPath.join('/')}`
     }
 
     return { name, internalName }
@@ -571,12 +572,12 @@ export default class extends CheckboxSelectAll {
   refreshParentInputs() {
     const firstOption = Object.values(this.optionsValue)[0]
     if (firstOption) {
-      firstOption.values.forEach((name) => {
+      firstOption.values.forEach((option) => {
         this.currenciesValue.forEach((currency) => {
-          this.updateParentPriceRange(name, currency)
+          this.updateParentPriceRange(option.text, currency)
         })
         this.stockLocationsValue.forEach((stockLocationId) => {
-          this.updateParentStockSum(name, stockLocationId)
+          this.updateParentStockSum(option.text, stockLocationId)
         })
         this.updateShopLocationCountOnHand()
       })
@@ -614,11 +615,17 @@ export default class extends CheckboxSelectAll {
         .find((option) => option.name === key).position
       inputs.push(positionInput)
 
-      const valueInput = document.createElement('input')
-      valueInput.type = 'hidden'
-      valueInput.name = `product[variants_attributes][${i}][options][][value]`
-      valueInput.value = variant[key]
-      inputs.push(valueInput)
+      const optionNameInput = document.createElement('input')
+      optionNameInput.type = 'hidden'
+      optionNameInput.name = `product[variants_attributes][${i}][options][][option_value_name]`
+      optionNameInput.value = variant[key].value
+      inputs.push(optionNameInput)
+
+      const optionIdInput = document.createElement('input')
+      optionIdInput.type = 'hidden'
+      optionIdInput.name = `product[variants_attributes][${i}][options][][option_value_presentation]`
+      optionIdInput.value = variant[key].text
+      inputs.push(optionIdInput)
     })
 
     return inputs
@@ -724,7 +731,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
@@ -923,8 +930,8 @@ export default class extends CheckboxSelectAll {
     const optionValuesSelectContainer = template.querySelector('[data-slot="optionValuesSelectContainer"]')
     const tomSelectOptionValues = optionValues.map((optionValue) => {
       return {
-        id: availableOptions.find((availableOption) => availableOption.name === optionValue)?.id,
-        name: optionValue
+        id: optionValue.value,
+        name: optionValue.text,
       }
     })
 
@@ -947,8 +954,8 @@ export default class extends CheckboxSelectAll {
     values.forEach((value) => {
       const template = this.optionValueTemplateTarget.content.cloneNode(true)
       const optionValueNameEl = template.querySelector('[data-slot="optionValueName"]')
-      optionValueNameEl.textContent = value
-      optionValueNameEl.dataset.name = value
+      optionValueNameEl.textContent = value.text
+      optionValueNameEl.dataset.name = value.text
 
       templates.push(template)
     })

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/javascript/spree/admin/helpers/uppy_active_storage.js

@@ -20,7 +20,8 @@ export default class ActiveStorageUpload extends BasePlugin {
       limit: 0,
       timeout: 30 * 1000,
       directUploadUrl: null,
-      headers: {}
+      headers: {},
+      crop: false
     }
 
     this.opts = Object.assign({}, defaultOptions, opts)
@@ -37,10 +38,19 @@ export default class ActiveStorageUpload extends BasePlugin {
 
   install() {
     this.uppy.addUploader(this.handleUpload)
+    this.uppy.on('file-editor:complete', this.onEditorComplete)
   }
 
   uninstall() {
     this.uppy.removeUploader(this.handleUpload)
+    this.uppy.off('file-editor:complete', this.onEditorComplete)
+  }
+  
+  onEditorComplete = (updatedFile) => {
+    this.handleUpload([updatedFile.id])
+
+    // call directly upload method after editing image
+    return this.uploadFiles([updatedFile])
   }
 
   handleUpload(fileIDs) {
@@ -48,6 +58,10 @@ export default class ActiveStorageUpload extends BasePlugin {
       this.uppy.log("[ActiveStorage] No files to upload!")
       return Promise.resolve()
     }
+    // do not upload before editing is done
+    if (this.opts.crop) {
+      return Promise.resolve()
+    }
 
     this.uppy.log("[ActiveStorage] Uploading...")
     const files = fileIDs.map(fileID => this.uppy.getFile(fileID))
@@ -115,8 +129,6 @@ export default class ActiveStorageUpload extends BasePlugin {
             directUploadSignedId: blob.signed_id,
           }
 
-          this.uppy.setFileState(file.id, { response })
-
           this.uppy.emit("upload-success", file, blob)
 
           return resolve(file)

data/app/views/active_storage/_upload_form.html.erb

@@ -2,7 +2,7 @@
 <% height ||= 300 %>
 <% crop ||= false unless defined?(crop) %>
 <% auto_submit ||= false %>
-<% can_delete ||= true unless defined?(can_delete) %>
+<% show_delete_button = defined?(can_delete) ? can_delete : true %>
 <% css ||= '' %>
 
 <% if field_name && form %>
@@ -48,7 +48,7 @@
         <%= Spree.t('actions.select_file') %>
       </button>
 
-      <% if can_delete %>
+      <% if show_delete_button %>
         <button type="button" class="btn btn-danger ml-auto" data-action="active-storage-upload#remove" data-turbo-confirm="<%= Spree.t(:are_you_sure) %>">
           <%= icon('trash') %>
 

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/_return_authorizations.html.erb

@@ -17,7 +17,9 @@
             </tr>
           </thead>
           <tbody>
-            <%= render partial: 'spree/admin/orders/return_authorizations/return_authorization', collection: @return_authorizations, cached: spree_base_cache_scope %>
+            <%= render partial: "spree/admin/orders/return_authorizations/return_authorization",
+            collection: @return_authorizations,
+            cached: ->(r) { [spree_base_cache_key, r.cache_key_with_version, r.return_items.maximum(:updated_at)] } %>
           </tbody>
         </table>
       </div>

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? %>