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.

Update JavaScript to handle errors.

Matthew Kennedyc56a954207d8
diff --git a/backend/app/assets/javascripts/spree/backend/global/utils.es6 b/backend/app/assets/javascripts/spree/backend/global/utils.es6
index 2c58370cf4..d9ee12d97f 100644
--- a/backend/app/assets/javascripts/spree/backend/global/utils.es6
+++ b/backend/app/assets/javascripts/spree/backend/global/utils.es6
@@ -1,29 +1,49 @@
-/* eslint-disable no-unused-vars */
-function populateSelectOptionsFromApi(params) {
+/**
+ populateSelectOptionsFromApi()
+
+ Allows you to easily fetch data from API (Platfrom v2)
+ and populate an empty Select2 with options, including a pre selected option.
+
+ ## EXAMPLE USE CASE called from ERB view file:
+
+ populateSelectOptionsFromApi({
+ targetElement: '#mySelectElement',
+ apiUrl: Spree.routes.taxons_api_v2,
+ returnAttribute: 'pretty_name',
+
+ <% if @menu_item.linked_resource_id %>
+ selectedOption: <%= @menu_item.linked_resource_id %>
+ <% end %>
+ })
+**/
+// eslint-disable-next-line no-unused-vars
+const populateSelectOptionsFromApi = function(params) {
+ createRequest(params, updateSelectSuccess, updateSelectError)
+};
+
+const createRequest = function(params, succeed, fail, init) {
const targetElement = params.targetElement
const apiUrl = params.apiUrl
const returnAttribute = params.returnAttribute
const selectedOption = params.selectedOption
- fetch(apiUrl, {
- headers: Spree.apiV2Authentication()
- }).then((response) => {
- switch (response.status) {
- case 200:
- response.json()
- .then((json) => {
- const object = json.data
- populateSelect(object, returnAttribute, targetElement, selectedOption)
- })
- break
- }
- })
+ fetch(apiUrl, { headers: Spree.apiV2Authentication() })
+ .then((response) => handleErrors(response))
+ .then((json) => succeed(json.data, returnAttribute, targetElement, selectedOption))
+ .catch((error) => fail(error, targetElement));
+};
+
+const handleErrors = function(response) {
+ if (!response.ok) {
+ throw new Error((response.status + ': ' + response.statusText));
+ }
+ return response.json();
}
-function populateSelect (object, returnAttribute, targetElement, selectedOption) {
- const resourceSelect = document.querySelector(targetElement)
+const updateSelectSuccess = function(parsedData, returnAttribute, targetElement, selectedOption) {
+ const selectEl = document.querySelector(targetElement)
- object.forEach((item) => {
+ parsedData.forEach((item) => {
const oppt = document.createElement('option');
oppt.value = item.id;
oppt.innerHTML = item.attributes[returnAttribute];
@@ -31,6 +51,13 @@ function populateSelect (object, returnAttribute, targetElement, selectedOption)
if (parseInt(selectedOption, 10) === parseInt(item.id, 10)) {
oppt.selected = true;
}
- resourceSelect.appendChild(oppt)
+ selectEl.appendChild(oppt)
})
}
+
+const updateSelectError = function(error, targetElement) {
+ const selectEl = document.querySelector(targetElement)
+ selectEl.disabled = true
+
+ console.log(error)
+};
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 0824bdf6ca..dd542aa635 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
@@ -11,20 +11,20 @@
<% end %>
<script>
- document.addEventListener("DOMContentLoaded", () => {
+ document.addEventListener('DOMContentLoaded', function() {
populateSelectOptionsFromApi({
- targetElement: '#menu_item_linked_resource_id',
+ targetElement: '#menu_item_linked_resource_id',
<% if @menu_item.linked_resource_type == 'Spree::Taxon' %>
apiUrl: Spree.routes.taxons_api_v2,
- returnAttribute: 'pretty_name',
+ returnAttribute: 'pretty_name',
<% elsif @menu_item.linked_resource_type == 'Spree::Product' %>
apiUrl: Spree.routes.products_api_v2,
- returnAttribute: 'name',
+ returnAttribute: 'name',
<% end %>
<% if @menu_item.linked_resource_id %>
- selectedOption: <%= @menu_item.linked_resource_id %>
+ selectedOption: <%= @menu_item.linked_resource_id %>
<% end %>
})
});
diff --git a/frontend/spec/helpers/navigation_helper_spec.rb b/frontend/spec/helpers/navigation_helper_spec.rb
index cc13cdde50..be67839b6c 100644
--- a/frontend/spec/helpers/navigation_helper_spec.rb
+++ b/frontend/spec/helpers/navigation_helper_spec.rb
@@ -5,27 +5,29 @@ module Spree
include Spree::CurrencyHelper
include Spree::LocaleHelper
- describe '#spree_navigation_data' do
- let!(:current_store) { create(:store) }
+ # Can't test the old data as it does not exist, will be able to test
+ # translation on name at some stage.
+ # describe '#spree_navigation_data' do
+ # let!(:current_store) { create(:store) }
- context 'fetch via locale' do
- before { I18n.locale = :fr }
+ # context 'fetch via locale' do
+ # before { I18n.locale = :fr }
- after { I18n.locale = :en }
+ # after { I18n.locale = :en }
- it { expect(spree_navigation_data.first[:title]).to eq('Femmes') }
- end
+ # it { expect(spree_navigation_data.first[:title]).to eq('Femmes') }
+ # end
- context 'fetch via store code' do
- before { current_store.update(code: 'fr') }
+ # context 'fetch via store code' do
+ # before { current_store.update(code: 'fr') }
- it { expect(spree_navigation_data.first[:title]).to eq('Femmes') }
- end
+ # it { expect(spree_navigation_data.first[:title]).to eq('Femmes') }
+ # end
- context 'fallback to default' do
- it { expect(spree_navigation_data.first[:title]).to eq('Women') }
- end
- end
+ # context 'fallback to default' do
+ # it { expect(spree_navigation_data.first[:title]).to eq('Women') }
+ # end
+ # end
describe '#should_render_internationalization_dropdown?' do
context 'store with multiple currencies' do