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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Add ability to remove icon image from menu_item. Fix small bug with adding menu_item to root. Use @menu.root.name in admin view and test it is in sync with Menu Name.
Matthew Kennedyccba8fe4c1ef
diff --git a/backend/app/controllers/spree/admin/menu_items_controller.rb b/backend/app/controllers/spree/admin/menu_items_controller.rbindex 283cb6615b..79ce5c7c1c 100644--- a/backend/app/controllers/spree/admin/menu_items_controller.rb+++ b/backend/app/controllers/spree/admin/menu_items_controller.rb@@ -13,6 +13,18 @@ module Spreespree.edit_admin_menu_menu_item_path(@menu, @menu_item)end+ def remove_icon+ if @menu_item.icon.destroy+ flash[:success] = Spree.t('notice_messages.icon_removed')+ redirect_to spree.edit_admin_menu_menu_item_path(@menu, @menu_item)+ else+ flash[:error] = Spree.t('errors.messages.cannot_remove_icon')+ render :edit+ end+ end++ private+def load_data@menu_item_types = Spree::MenuItem::ITEM_TYPEenddiff --git a/backend/app/views/spree/admin/menu_items/_form.html.erb b/backend/app/views/spree/admin/menu_items/_form.html.erbindex 8a46bb90d9..7a5fff1ccf 100644--- a/backend/app/views/spree/admin/menu_items/_form.html.erb+++ b/backend/app/views/spree/admin/menu_items/_form.html.erb@@ -62,8 +62,9 @@<%= f.fields_for :icon do |icon_field| %><%= f.field_container :icon_attachment do %><% unless @menu_item.icon.new_record? %>- <div id="menuItemImgContainer" class="my-2">+ <div id="menuItemImgContainer" class="my-3 "><%= image_tag(main_app.url_for(@menu_item.icon.attachment)) %>+ <%= link_to Spree.t(:remove_image), remove_icon_admin_menu_menu_item_path(@menu, @menu_item), method: :delete %></div><% end %><div id="<% unless @menu_item.icon.new_record? %>MenuItemImageButton<% end %>">diff --git a/backend/app/views/spree/admin/menus/edit.html.erb b/backend/app/views/spree/admin/menus/edit.html.erbindex 9ef96ac090..f840858cdd 100644--- a/backend/app/views/spree/admin/menus/edit.html.erb+++ b/backend/app/views/spree/admin/menus/edit.html.erb@@ -45,7 +45,7 @@<% end %><% else %><div class="alert alert-info no-objects-found m-5">- <%= raw Spree.t('admin.navigation.no_menu_items', menu: @menu.name) %>+ <%= raw Spree.t('admin.navigation.no_menu_items', menu: @menu.root.name) %></div><% end %></div>diff --git a/backend/config/routes.rb b/backend/config/routes.rbindex 1b7dc93147..6e35c36502 100644--- a/backend/config/routes.rb+++ b/backend/config/routes.rb@@ -189,7 +189,11 @@ Spree::Core::Engine.add_routes doendresources :menus do- resources :menu_items, except: :index+ resources :menu_items, except: :index do+ member do+ delete :remove_icon+ end+ endendenddiff --git a/backend/spec/features/admin/menus/edit_menu_spec.rb b/backend/spec/features/admin/menus/edit_menu_spec.rbindex 89d38ed4a6..67ee9023c0 100644--- a/backend/spec/features/admin/menus/edit_menu_spec.rb+++ b/backend/spec/features/admin/menus/edit_menu_spec.rb@@ -4,8 +4,9 @@ describe 'Menu Edit', type: :feature dostub_authorization!let!(:store_1) { create(:store) }- let!(:main_menu) { create(:menu, name: 'Main Menu', store_id: store_1.id) }- let!(:menu_item) { create(:menu_item, menu_id: main_menu.id, parent_id: main_menu.root.id) }+ let!(:main_menu) { create(:menu, name: 'Main Menu', store: store_1) }+ let!(:menu_item) { create(:menu_item, menu: main_menu, parent: main_menu.root) }+ let(:file_path) { Rails.root + '../../spec/support/ror_ringer.jpeg' }context 'when link to URL the user can' dobefore do@@ -59,7 +60,7 @@ describe 'Menu Edit', type: :feature doendend- context 'setting the link to a taxon link', js: true do+ context 'setting the link to a menu link', js: true dolet!(:taxon_1) { create(:taxon) }let!(:taxon_2) { create(:taxon) }let!(:taxon_3) { create(:taxon) }@@ -68,7 +69,7 @@ describe 'Menu Edit', type: :feature dovisit spree.edit_admin_menu_menu_item_path(main_menu, menu_item)end- it 'allows you to select a taxon and save' do+ it 'allows you to select a menu and save' doselect2 'Taxon', from: 'Link To'expect(page).to have_text 'Click the Update button below to change the link.'click_on 'Update'@@ -95,4 +96,24 @@ describe 'Menu Edit', type: :feature doexpect(page).to have_text "Name can't be blank"endend++ context 'when admin adds and removes an image icon' do+ before do+ visit spree.edit_admin_menu_menu_item_path(main_menu, menu_item)+ end++ it 'adds menu_item icon and removes when clicked' do+ attach_file('menu_item_icon_attributes_attachment', file_path)++ click_button 'Update'++ expect(page).to have_content('successfully updated!')+ expect(page).to have_css('#menuItemImgContainer img')++ click_link 'Remove Image'++ expect(page).to have_content('Image has been successfully removed')+ expect(page).not_to have_css('#menuItemImgContainer img')+ end+ endenddiff --git a/backend/spec/features/admin/menus/index_menu_spec.rb b/backend/spec/features/admin/menus/index_menu_spec.rbindex 7955a01fda..ea8ff87ae3 100644--- a/backend/spec/features/admin/menus/index_menu_spec.rb+++ b/backend/spec/features/admin/menus/index_menu_spec.rb@@ -19,15 +19,15 @@ describe 'Menus Index', type: :feature dolet!(:store_3) { create(:store) }let!(:store_4) { create(:store) }- let!(:main_menu) { create(:menu, name: 'Main Menu', store_id: store_1.id) }- let!(:main_menu_fr) { create(:menu, name: 'Main Menu FR', store_id: store_1.id, locale: 'fr') }+ let!(:main_menu) { create(:menu, name: 'Main Menu', store: store_1) }+ let!(:main_menu_fr) { create(:menu, name: 'Main Menu FR', store: store_1, locale: 'fr') }- let!(:main_menu_a) { create(:menu, name: 'MA', store_id: store_2.id) }- let!(:main_menu_b) { create(:menu, name: 'MB', store_id: store_3.id) }+ let!(:main_menu_a) { create(:menu, name: 'MA', store: store_2) }+ let!(:main_menu_b) { create(:menu, name: 'MB', store: store_3) }- let!(:footer_menu) { create(:menu, name: 'Footer Menu', location: 'footer', store_id: store_3.id) }- let!(:footer_menu_a) { create(:menu, name: 'FA', location: 'footer', store_id: store_1.id) }- let!(:footer_menu_b) { create(:menu, name: 'FB', location: 'footer', store_id: store_2.id) }+ let!(:footer_menu) { create(:menu, name: 'Footer Menu', location: 'footer', store: store_3) }+ let!(:footer_menu_a) { create(:menu, name: 'FA', location: 'footer', store: store_1) }+ let!(:footer_menu_b) { create(:menu, name: 'FB', location: 'footer', store: store_2) }before dovisit spree.admin_menus_pathdiff --git a/backend/spec/features/admin/menus/new_menu_spec.rb b/backend/spec/features/admin/menus/new_menu_spec.rbindex f5b02f0b95..724dcd8c8c 100644--- a/backend/spec/features/admin/menus/new_menu_spec.rb+++ b/backend/spec/features/admin/menus/new_menu_spec.rb@@ -36,7 +36,7 @@ describe 'New Menu', type: :feature docontext 'when a user tries to create a menu with a duplicate location within scope of stores and language', js: true dolet!(:store_1) { create(:store) }- let!(:main_menu) { create(:menu, name: 'Main Menu', store_id: store_1.id) }+ let!(:main_menu) { create(:menu, name: 'Main Menu', store: store_1) }before dovisit spree.new_admin_menu_path@@ -72,6 +72,11 @@ describe 'New Menu', type: :feature doexpect(page).to have_selector('a', text: Spree.t('admin.navigation.add_new_item'))expect(page).not_to have_css('.translation_missing', visible: :all)++ # Tests that root name is in sync with menu name.+ fill_in 'Name', with: 'X14dP'+ click_on 'Update'+ expect(page).to have_text 'X14dP has no items. Click the Add New Item button to begin adding links to this menu.'endendenddiff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rbindex 2f6d197e15..ea39c161c7 100644--- a/core/app/models/spree/menu_item.rb+++ b/core/app/models/spree/menu_item.rb@@ -5,9 +5,12 @@ module Spreebelongs_to :menubelongs_to :linked_resource, polymorphic: true- before_create :ensure_item_belongs_to_root+ around_create :ensure_item_belongs_to_rootbefore_save :reset_link_attributes, :build_path, :paremeterize_code+ after_save :touch_ancestors_and_menu+ after_touch :touch_ancestors_and_menu+ITEM_TYPE = %w[Link Promotion Container]LINKED_RESOURCE_TYPE = ['URL']@@ -71,8 +74,17 @@ module Spreedef ensure_item_belongs_to_rootif menu.try(:root).present? && parent_id.nil?- self.parent_id = menu.root.id+ self.parent = menu.rootend++ yield++ move_to_child_of(menu.root) unless root+ end++ def touch_ancestors_and_menu+ ancestors.update_all(updated_at: Time.current)+ menu.try!(:touch)enddef paremeterize_code