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.

Remove product images using turbo stream (#12558)

Łukasz Adamczykfa9a546252ae
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_media_form.scss b/admin/app/assets/stylesheets/spree/admin/components/_media_form.scss
index 6487c02dc5..7be3392054 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_media_form.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_media_form.scss
@@ -19,6 +19,10 @@
grid-row: 1 / span 1;
aspect-ratio: 12/1;
}
+
+ &:not(:only-child) {
+ height: 100% !important;
+ }
}
&__image {
diff --git a/admin/app/controllers/spree/admin/assets_controller.rb b/admin/app/controllers/spree/admin/assets_controller.rb
index cc4e98037a..10319abcac 100644
--- a/admin/app/controllers/spree/admin/assets_controller.rb
+++ b/admin/app/controllers/spree/admin/assets_controller.rb
@@ -58,6 +58,10 @@ module Spree
true
end
+ def destroy_turbo_stream_enabled?
+ true
+ end
+
def asset_type
permitted_resource_params[:type] || model_class.to_s
end
diff --git a/admin/app/views/spree/admin/assets/destroy.turbo_stream.erb b/admin/app/views/spree/admin/assets/destroy.turbo_stream.erb
new file mode 100644
index 0000000000..5f3445717c
--- /dev/null
+++ b/admin/app/views/spree/admin/assets/destroy.turbo_stream.erb
@@ -0,0 +1,4 @@
+<%= turbo_render_alerts %>
+<%= turbo_close_modal('modal-lg') %>
+
+<%= turbo_stream.remove "spree_image_#{@asset.id}" %>
diff --git a/admin/app/views/spree/admin/variants/form/_media.html.erb b/admin/app/views/spree/admin/variants/form/_media.html.erb
index 6b005ba979..8b33703d99 100644
--- a/admin/app/views/spree/admin/variants/form/_media.html.erb
+++ b/admin/app/views/spree/admin/variants/form/_media.html.erb
@@ -13,7 +13,7 @@
data-sortable-resource-name-value="asset"
data-sortable-response-kind-value="json">
<%= render partial: 'spree/admin/variants/form/media_asset', collection: media_form_assets(viewable), as: :asset, cached: spree_base_cache_scope %>
- <%= button_tag class: "text-muted border border-dashed bg-gray-25 hover-gray-50 rounded-lg media-form__add-button #{'h-100' if media_form_assets(viewable).any?}", data: {
+ <%= button_tag class: 'text-muted border border-dashed bg-gray-25 hover-gray-50 rounded-lg media-form__add-button', data: {
controller: 'asset-uploader',
asset_uploader_multiple_value: true,
asset_uploader_viewable_id_value: viewable&.id,
diff --git a/admin/spec/controllers/spree/admin/assets_controller_spec.rb b/admin/spec/controllers/spree/admin/assets_controller_spec.rb
index 686485bd16..cde20672ef 100644
--- a/admin/spec/controllers/spree/admin/assets_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/assets_controller_spec.rb
@@ -3,6 +3,8 @@ require 'spec_helper'
describe Spree::Admin::AssetsController, type: :controller do
stub_authorization!
+ render_views
+
let(:store) { Spree::Store.default }
let(:product) { create(:product, stores: [store]) }
@@ -18,6 +20,8 @@ describe Spree::Admin::AssetsController, type: :controller do
it 'creates a new image' do
expect { subject }.to change(Spree::Asset, :count).by(1)
+ expect(response).to have_http_status(:ok)
+
expect(asset.alt).to eq("some text")
expect(asset.attached?).to be true
expect(asset.viewable).to be_nil
@@ -35,6 +39,8 @@ describe Spree::Admin::AssetsController, type: :controller do
it 'creates a new image' do
expect { subject }.to change(Spree::Asset, :count).by(1)
+ expect(response).to have_http_status(:ok)
+
expect(asset.viewable).to eq(product.master)
expect(asset.session_uploaded_assets_uuid).to be_nil
end
@@ -48,17 +54,20 @@ describe Spree::Admin::AssetsController, type: :controller do
it 'updates the image' do
subject
+
+ expect(response).to have_http_status(:ok)
expect(image.reload.alt).to eq('Alt text')
end
end
describe '#destroy' do
- subject { delete :destroy, params: { id: image.id } }
+ subject { delete :destroy, params: { id: image.id }, format: :turbo_stream }
let!(:image) { create(:image, viewable: product.master) }
it 'deletes the image' do
expect { subject }.to change(Spree::Asset, :count).by(-1)
+ expect(response).to have_http_status(:ok)
end
end
@@ -74,6 +83,7 @@ describe Spree::Admin::AssetsController, type: :controller do
it 'deletes images' do
expect { subject }.to change(Spree::Asset, :count).by(-2)
+ expect(response).to have_http_status(:ok)
end
end
end
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index e387e69086..105b887fb1 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -1220,9 +1220,9 @@ en:
new_balance: New balance
new_billing_address: New Billing Address
new_country: New Country
+ new_custom_domain: New Custom Domain
new_customer: Create new account
new_customer_return: New Customer Return
- new_custom_domain: New Custom Domain
new_digital_asset: New digital asset
new_domain: New domain
new_image: New Image