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.

Use API to V2 for new autocomplete.

Matthew Kennedycfa399482502
diff --git a/api/app/serializers/spree/api/v2/platform/taxon_serializer.rb b/api/app/serializers/spree/api/v2/platform/taxon_serializer.rb
index 9fa5c1b7f2..ac7ff4641f 100644
--- a/api/app/serializers/spree/api/v2/platform/taxon_serializer.rb
+++ b/api/app/serializers/spree/api/v2/platform/taxon_serializer.rb
@@ -3,22 +3,7 @@ module Spree
module V2
module Platform
class TaxonSerializer < BaseSerializer
- set_type :taxon
-
- attributes :name, :pretty_name, :permalink, :seo_title, :description, :meta_title, :meta_description,
- :meta_keywords, :left, :right, :position, :depth, :updated_at
-
- attribute :is_root do |taxon|
- taxon.root?
- end
-
- attribute :is_child do |taxon|
- taxon.child?
- end
-
- attribute :is_leaf do |taxon|
- taxon.leaf?
- end
+ include ::Spree::Api::V2::ResourceSerializerConcern
belongs_to :parent, record_type: :taxon, serializer: :taxon
belongs_to :taxonomy, record_type: :taxonomy
diff --git a/backend/app/assets/javascripts/spree/backend.js b/backend/app/assets/javascripts/spree/backend.js
index 40cebcaa6f..a3bb76b0ba 100644
--- a/backend/app/assets/javascripts/spree/backend.js
+++ b/backend/app/assets/javascripts/spree/backend.js
@@ -87,16 +87,22 @@ Spree.routes.stock_items_api = function (stockLocationId) {
}
// API v2
-
Spree.routes.countries_api_v2 = Spree.pathFor('api/v2/platform/countries')
Spree.routes.menus_api_v2 = Spree.pathFor('api/v2/platform/menus')
Spree.routes.menus_items_api_v2 = Spree.pathFor('api/v2/platform/menu_items/reposition')
Spree.routes.option_types_api_v2 = Spree.pathFor('api/v2/platform/option_types')
Spree.routes.option_values_api_v2 = Spree.pathFor('api/v2/platform/option_values')
Spree.routes.products_api_v2 = Spree.pathFor('/api/v2/platform/products')
-Spree.routes.taxons_api_v2 = Spree.pathFor('/api/v2/platform/taxons')
Spree.routes.users_api_v2 = Spree.pathFor('api/v2/platform/users')
+// TODO:
+// Update this from storefont to platform.
+
+// Using storefront due to issues with
+// taxon platform api not returning the attribute :pretty_name
+// and also returning all taxons, even when filtered by name.
+Spree.routes.taxons_api_v2 = Spree.pathFor('/api/v2/storefront/taxons')
+
Spree.apiV2Authentication = function() {
return {
'Authorization': 'Bearer ' + OAUTH_TOKEN
diff --git a/backend/app/assets/javascripts/spree/backend/global/select2_autocomplete.es6 b/backend/app/assets/javascripts/spree/backend/global/select2_autocomplete.es6
index 879151c39c..fa799af4b9 100644
--- a/backend/app/assets/javascripts/spree/backend/global/select2_autocomplete.es6
+++ b/backend/app/assets/javascripts/spree/backend/global/select2_autocomplete.es6
@@ -11,13 +11,13 @@ $.fn.select2Autocomplete = function(params) {
const select2allowClear = params.allow_clear || false // Pass true to use Allow Clear on the Select2, you will also need to set include_blank: true on the select el.
const returnAttribute = params.return_attribute || 'name' // Pass a custom return attribute -> return_attribute: 'pretty_name'
const minimumInput = params.minimum_input || 3 // Pass a custom minimum input
- const searchQuery = params.search_query || 'name_cont' // Pass a search query -> search_query: 'name_or_master_sku_cont'
+ const searchQuery = params.search_query || 'filter[name]' // Pass a search query -> search_query: 'name_or_master_sku_cont'
function formatList(values) {
return values.map(function (obj) {
return {
id: obj.id,
- text: obj[returnAttribute]
+ text: obj.attributes[returnAttribute]
}
})
}
@@ -29,18 +29,13 @@ $.fn.select2Autocomplete = function(params) {
minimumInputLength: minimumInput,
ajax: {
url: apiUrl,
- dataType: 'json',
+ headers: Spree.apiV2Authentication(),
data: function (params) {
- return {
- q: {
- [searchQuery]: params.term
- },
- token: Spree.api_key
- }
+ return { [searchQuery]: params.term }
},
- processResults: function(data) {
+ processResults: function(json) {
return {
- results: formatList(data[dataAttrName])
+ results: formatList(json.data)
}
}
}
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.erb
index 5ea28e2755..3be8337d77 100644
--- 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.erb
@@ -19,7 +19,7 @@
data_attrbute_name: 'taxons',
placeholder: "<%= Spree.t('admin.navigation.seach_for_a_taxon') %>",
allow_clear: true,
- apiUrl: Spree.routes.taxons_api,
+ apiUrl: Spree.routes.taxons_api_v2,
return_attribute: 'pretty_name',
})
})
@@ -39,7 +39,7 @@
data_attrbute_name: 'products',
placeholder: "<%= Spree.t('admin.navigation.seach_for_a_product') %>",
allow_clear: true,
- apiUrl: Spree.routes.products_api
+ apiUrl: Spree.routes.taxons_api_v2,
})
})
</script>