Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix uploading multiple assets for a new product (#12266)

Łukasz Adamczyk3bf03e4377b2
diff --git a/admin/app/controllers/spree/admin/assets_controller.rb b/admin/app/controllers/spree/admin/assets_controller.rb
index 70a4c2e26a..cc4e98037a 100644
--- a/admin/app/controllers/spree/admin/assets_controller.rb
+++ b/admin/app/controllers/spree/admin/assets_controller.rb
@@ -1,6 +1,8 @@
module Spree
module Admin
class AssetsController < ResourceController
+ include Spree::Admin::SessionAssetsHelper
+
ALLOWED_ASSET_TYPES = ['Spree::Asset', 'Spree::Image'].freeze
def create
@@ -17,12 +19,7 @@ module Spree
@product = @asset.product || current_store.products.new
# we need to store the asset ids in the session to be able to display them in the product page
- if @product.new_record?
- uploaded_asssets_id = session[:uploaded_asset_ids]&.split(',') || []
- uploaded_asssets_id << @asset.id
-
- session[:uploaded_asset_ids] = uploaded_asssets_id.join(',')
- end
+ store_uploaded_asset_in_session(@asset) if @product.new_record?
else
flash.now[:error] = @asset.errors.full_messages.to_sentence
render :create, status: :unprocessable_entity
diff --git a/admin/app/controllers/spree/admin/products_controller.rb b/admin/app/controllers/spree/admin/products_controller.rb
index 8e85602c9c..6537e95701 100644
--- a/admin/app/controllers/spree/admin/products_controller.rb
+++ b/admin/app/controllers/spree/admin/products_controller.rb
@@ -3,6 +3,7 @@ module Spree
class ProductsController < ResourceController
include Spree::Admin::StockLocationsHelper
include Spree::Admin::BulkOperationsConcern
+ include Spree::Admin::SessionAssetsHelper
helper 'spree/admin/products'
helper 'spree/admin/taxons'
@@ -12,8 +13,8 @@ module Spree
before_action :set_product_defaults, only: :new
before_action :prepare_product_params, only: [:create, :update]
-
before_action :strip_stock_items_param, only: [:create, :update]
+ before_action :ensure_session_uploaded_assets_uuid, only: :new
new_action.before :build_master_prices
new_action.before :build_master_stock_items
@@ -346,11 +347,10 @@ module Spree
def assign_master_images
return unless @product.master.persisted?
- assets_ids = session[:uploaded_asset_ids]&.split(',')
- return if assets_ids.blank?
+ return if session_uploaded_assets.empty?
- Spree::Asset.where(id: assets_ids, viewable_id: nil).update_all(viewable_id: @product.master.id, viewable_type: 'Spree::Variant', updated_at: Time.current)
- session.delete(:uploaded_asset_ids)
+ session_uploaded_assets.update_all(viewable_id: @product.master.id, viewable_type: 'Spree::Variant', updated_at: Time.current)
+ clear_session_for_uploaded_assets
end
def product_includes
diff --git a/admin/app/helpers/spree/admin/products_helper.rb b/admin/app/helpers/spree/admin/products_helper.rb
index 782db41065..98be99859f 100644
--- a/admin/app/helpers/spree/admin/products_helper.rb
+++ b/admin/app/helpers/spree/admin/products_helper.rb
@@ -32,8 +32,8 @@ module Spree
def media_form_assets(variant)
if variant&.persisted?
variant.images
- elsif session[:uploaded_asset_ids].present?
- Spree::Image.accessible_by(current_ability, :manage).where(id: session[:uploaded_asset_ids].split(','))
+ elsif session_uploaded_assets.any?
+ Spree::Image.accessible_by(current_ability, :manage).where(id: session_uploaded_assets)
end
end
diff --git a/admin/app/helpers/spree/admin/session_assets_helper.rb b/admin/app/helpers/spree/admin/session_assets_helper.rb
new file mode 100644
index 0000000000..0ba8262076
--- /dev/null
+++ b/admin/app/helpers/spree/admin/session_assets_helper.rb
@@ -0,0 +1,24 @@
+module Spree
+ module Admin
+ module SessionAssetsHelper
+ def ensure_session_uploaded_assets_uuid
+ session['spree.admin.uploaded_assets.uuid'] ||= SecureRandom.uuid
+ end
+
+ def store_uploaded_asset_in_session(asset)
+ ensure_session_uploaded_assets_uuid
+ asset.update(session_uploaded_assets_uuid: session['spree.admin.uploaded_assets.uuid'])
+ end
+
+ def session_uploaded_assets
+ return Spree::Asset.none if session['spree.admin.uploaded_assets.uuid'].blank?
+
+ Spree::Asset.with_session_uploaded_assets_uuid(session['spree.admin.uploaded_assets.uuid']).where(viewable_id: nil)
+ end
+
+ def clear_session_for_uploaded_assets
+ session.delete('spree.admin.uploaded_assets.uuid')
+ end
+ end
+ end
+end
diff --git a/admin/spec/controllers/spree/admin/assets_controller_spec.rb b/admin/spec/controllers/spree/admin/assets_controller_spec.rb
index 06be979112..686485bd16 100644
--- a/admin/spec/controllers/spree/admin/assets_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/assets_controller_spec.rb
@@ -21,6 +21,7 @@ describe Spree::Admin::AssetsController, type: :controller do
expect(asset.alt).to eq("some text")
expect(asset.attached?).to be true
expect(asset.viewable).to be_nil
+ expect(asset.session_uploaded_assets_uuid).to eq(request.session['spree.admin.uploaded_assets.uuid'])
end
end
@@ -35,6 +36,7 @@ describe Spree::Admin::AssetsController, type: :controller do
expect { subject }.to change(Spree::Asset, :count).by(1)
expect(asset.viewable).to eq(product.master)
+ expect(asset.session_uploaded_assets_uuid).to be_nil
end
end
end
diff --git a/core/app/models/spree/asset.rb b/core/app/models/spree/asset.rb
index 6f64f1479f..15742b3bc6 100644
--- a/core/app/models/spree/asset.rb
+++ b/core/app/models/spree/asset.rb
@@ -19,6 +19,9 @@ module Spree
default_scope { includes(attachment_attachment: :blob) }
+ store_accessor :private_metadata, :session_uploaded_assets_uuid
+ scope :with_session_uploaded_assets_uuid, ->(uuid) { where("#{table_name}.private_metadata @> ?", { session_uploaded_assets_uuid: uuid }.to_json) }
+
def product
@product ||= viewable_type == 'Spree::Variant' ? viewable&.product : nil
end