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
Improve view setup for link types.
Matthew Kennedy27c5f0386b70
diff --git a/backend/app/helpers/spree/admin/menu_helper.rb b/backend/app/helpers/spree/admin/menu_helper.rbindex 2684e6f596..03bf4eeef0 100644--- a/backend/app/helpers/spree/admin/menu_helper.rb+++ b/backend/app/helpers/spree/admin/menu_helper.rb@@ -51,6 +51,10 @@ module Spreedef default_menu_for_store?(menu)menu.store.default_locale == menu.localeend++ def to_path_format(string)+ string.parameterize(separator: '_')+ endendendenddiff --git a/backend/app/views/spree/admin/menu_items/_form.html.erb b/backend/app/views/spree/admin/menu_items/_form.html.erbindex 4179038170..282f28bb33 100644--- a/backend/app/views/spree/admin/menu_items/_form.html.erb+++ b/backend/app/views/spree/admin/menu_items/_form.html.erb@@ -100,9 +100,9 @@<% end %></div><div class="col-6">-- <%= render 'link_input', linked_resource_type: @menu_item.linked_resource_type, f: f %>-+ <div id="linkResourcePanel" data-panel-type="<%= @menu_item.linked_resource_type %>">+ <%= render "spree/admin/menu_items/link_inputs/#{to_path_format(@menu_item.linked_resource_type)}", linked_resource: @menu_item.linked_resource_type, f: f %>+ </div><div id="alertToClickUpdate" class="d-none"><div class="alert alert-warning mt-3"><% if %w[new create].include? controller.action_name %>@@ -117,11 +117,6 @@</div></div></div>- <div class="d-none" id="usingContainerInfo">- <div class="alert alert-info mt-3 mb-0">- <%= raw Spree.t('admin.navigation.menu_item_type_container_message') %>- </div>- </div></div></div></div>diff --git a/backend/app/views/spree/admin/menu_items/_link_input.html.erb b/backend/app/views/spree/admin/menu_items/_link_input.html.erbdeleted file mode 100644index 9d8a8a12f2..0000000000--- a/backend/app/views/spree/admin/menu_items/_link_input.html.erb+++ /dev/null@@ -1,10 +0,0 @@-<div id="linkResourcePanel" data-panel-type="<%= linked_resource_type %>">- <% case linked_resource_type %>- <% when 'URL' %>- <%= render 'spree/admin/menu_items/link_inputs/url', f: f %>- <% when 'Home Page' %>- <%= render 'spree/admin/menu_items/link_inputs/home_page', f: f %>- <% else %>- <%= render 'spree/admin/menu_items/link_inputs/resource', linked_resource: linked_resource_type, f: f %>- <% end %>-</div>diff --git a/backend/app/views/spree/admin/menu_items/link_inputs/_resource.html.erb b/backend/app/views/spree/admin/menu_items/link_inputs/_resource.html.erbdeleted file mode 100644index 0a4f754ac0..0000000000--- a/backend/app/views/spree/admin/menu_items/link_inputs/_resource.html.erb+++ /dev/null@@ -1,53 +0,0 @@-<% resorce_holder = [] %>-<% id_holder = nil %>-<% name_holder = nil %>-<% active_id_holder = nil %>--<% if @menu_item.linked_resource_type == 'Spree::Taxon' %>- <% label_text = Spree.t('taxon') %>-- <% if @menu_item.linked_resource %>- <% resorce_holder = [@menu_item.linked_resource] %>- <% id_holder = :id %>- <% name_holder = :pretty_name %>- <% active_id_holder = @menu_item.linked_resource.id %>- <% end %>-- <script>- document.addEventListener('DOMContentLoaded', function() {- $('.autocomplete').select2Autocomplete({- data_attrbute_name: 'taxons',- placeholder: "<%= Spree.t('admin.navigation.seach_for_a_taxon') %>",- allow_clear: true,- apiUrl: Spree.routes.taxons_api_v2,- return_attribute: 'pretty_name',- })- })- </script>-<% elsif @menu_item.linked_resource_type == 'Spree::Product' %>- <% label_text = Spree.t('product') %>- <% if @menu_item.linked_resource %>- <% resorce_holder = [@menu_item.linked_resource] %>- <% id_holder = :id %>- <% name_holder = :name %>- <% active_id_holder = @menu_item.linked_resource.id %>- <% end %>-- <script>- document.addEventListener('DOMContentLoaded', function() {- $('.autocomplete').select2Autocomplete({- data_attrbute_name: 'products',- placeholder: "<%= Spree.t('admin.navigation.seach_for_a_product') %>",- allow_clear: true,- apiUrl: Spree.routes.products_api_v2,- })- })- </script>-<% end %>--<%= f.field_container :linked_resource_id, class: ['form-group'] do %>- <%= f.label :linked_resource_id, label_text %>- <%= f.select :linked_resource_id, options_from_collection_for_select(resorce_holder, id_holder, name_holder, active_id_holder), { include_blank: true }, class: 'autocomplete' %>- <%= f.error_message_on :linked_resource_id %>- <small class="form-text text-muted"><%= @menu_item.link %></small>-<% end %>diff --git a/backend/app/views/spree/admin/menu_items/link_inputs/_spree_product.html.erb b/backend/app/views/spree/admin/menu_items/link_inputs/_spree_product.html.erbnew file mode 100644index 0000000000..7551d88746--- /dev/null+++ b/backend/app/views/spree/admin/menu_items/link_inputs/_spree_product.html.erb@@ -0,0 +1,24 @@+<% if @menu_item.linked_resource %>+ <% resorce_holder = [@menu_item.linked_resource] %>+ <% id_holder = :id %>+ <% name_holder = :name %>+ <% active_id_holder = @menu_item.linked_resource.id %>+<% end %>++<%= f.field_container :linked_resource_id, class: ['form-group'] do %>+ <%= f.label :linked_resource_id, Spree.t('product') %>+ <%= f.select :linked_resource_id, options_from_collection_for_select(resorce_holder || [] , id_holder, name_holder, active_id_holder || nil), { include_blank: true }, class: 'autocomplete' %>+ <%= f.error_message_on :linked_resource_id %>+ <small class="form-text text-muted"><%= @menu_item.link %></small>+<% end %>++<script>+ document.addEventListener('DOMContentLoaded', function() {+ $('.autocomplete').select2Autocomplete({+ data_attrbute_name: 'products',+ placeholder: "<%= Spree.t('admin.navigation.seach_for_a_product') %>",+ allow_clear: true,+ apiUrl: Spree.routes.products_api_v2,+ })+ })+</script>diff --git a/backend/app/views/spree/admin/menu_items/link_inputs/_spree_taxon.html.erb b/backend/app/views/spree/admin/menu_items/link_inputs/_spree_taxon.html.erbnew file mode 100644index 0000000000..3e83df09e3--- /dev/null+++ b/backend/app/views/spree/admin/menu_items/link_inputs/_spree_taxon.html.erb@@ -0,0 +1,25 @@+<% if @menu_item.linked_resource %>+ <% resorce_holder = [@menu_item.linked_resource] %>+ <% id_holder = :id %>+ <% name_holder = :pretty_name %>+ <% active_id_holder = @menu_item.linked_resource.id %>+<% end %>++<%= f.field_container :linked_resource_id, class: ['form-group'] do %>+ <%= f.label :linked_resource_id, Spree.t('taxon') %>+ <%= f.select :linked_resource_id, options_from_collection_for_select(resorce_holder || [] , id_holder, name_holder, active_id_holder || nil), { include_blank: true }, class: 'autocomplete' %>+ <%= f.error_message_on :linked_resource_id %>+ <small class="form-text text-muted"><%= @menu_item.link %></small>+<% end %>++<script>+ document.addEventListener('DOMContentLoaded', function() {+ $('.autocomplete').select2Autocomplete({+ data_attrbute_name: 'taxons',+ placeholder: "<%= Spree.t('admin.navigation.seach_for_a_taxon') %>",+ allow_clear: true,+ apiUrl: Spree.routes.taxons_api_v2,+ return_attribute: 'pretty_name',+ })+ })+</script>