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
Sort admin.js functions
Matthew Kennedy50416996e377
diff --git a/.eslintrc b/.eslintrcindex 3102f5e4e7..bab405e574 100644--- a/.eslintrc+++ b/.eslintrc@@ -29,3 +29,4 @@ env:rules:space-before-function-paren: offsemi: off+ no-var: offdiff --git a/backend/app/assets/javascripts/spree/backend.js b/backend/app/assets/javascripts/spree/backend.jsindex 921d16120f..dc10a9c565 100644--- a/backend/app/assets/javascripts/spree/backend.js+++ b/backend/app/assets/javascripts/spree/backend.js@@ -14,6 +14,14 @@//= require select2-full//= require underscore-min.js+//= require spree/backend/global/alerts+//= require spree/backend/global/bootstrap+//= require spree/backend/global/flatpickr+//= require spree/backend/global/ransack+//= require spree/backend/global/radio_panel_toggle+//= require spree/backend/global/responsive_menus+//= require spree/backend/global/sortable+//= require spree//= require spree/backend/spree-select2//= require spree/backend/address_statesdiff --git a/backend/app/assets/javascripts/spree/backend/admin.js b/backend/app/assets/javascripts/spree/backend/admin.jsindex 43a16718f0..cb0355918e 100644--- a/backend/app/assets/javascripts/spree/backend/admin.js+++ b/backend/app/assets/javascripts/spree/backend/admin.js@@ -1,289 +1,51 @@-/**-This is a collection of javascript functions and whatnot-under the spree namespace that do stuff we find helpful.-Hopefully, this will evolve into a propper class.-**/--/* global AUTH_TOKEN, order_number, Sortable, flatpickr, DOMPurify */-jQuery(function ($) {- // Add some tips- $('.with-tip').each(function() {- $(this).tooltip({- container: $(this)- })- })-- $('.with-tip').on('show.bs.tooltip', function(event) {- if (('ontouchstart' in window)) {- event.preventDefault()- }- })-- $('.js-show-index-filters').click(function () {- $('.filter-well').slideToggle()- $(this).parents('.filter-wrap').toggleClass('collapsed')- })-- // Responsive Menus- var body = $('body')- var modalBackdrop = $('#multi-backdrop')-- // Fail safe on resize- var resizeTimer;- window.addEventListener('resize', function () {- document.body.classList.remove('modal-open', 'sidebar-open', 'contextualSideMenu-open');- document.body.classList.add('resize-animation-stopper');- clearTimeout(resizeTimer);- resizeTimer = setTimeout(function () {- document.body.classList.remove('resize-animation-stopper');- }, 400);- });-- function closeAllMenus() {- body.removeClass()- body.addClass('admin')- modalBackdrop.removeClass('show')- }-- modalBackdrop.click(closeAllMenus)-- // Main Menu Functionality- var sidebarOpen = $('#sidebar-open')- var sidebarClose = $('#sidebar-close')- var activeItem = $('#main-sidebar').find('.selected')-- activeItem.closest('.nav-sidebar').addClass('active-option')- activeItem.closest('.nav-pills').addClass('in show')-- function openMenu() {- closeAllMenus()- body.addClass('sidebar-open modal-open')- modalBackdrop.addClass('show')- }- sidebarOpen.click(openMenu)- sidebarClose.click(closeAllMenus)-- // Contextual Sidebar Menu- var contextualSidebarMenuToggle = $('#contextual-menu-toggle')- var contextualSidebarMenuClose = $('#contextual-menu-close')-- function toggleContextualMenu() {- if (document.body.classList.contains('contextualSideMenu-open')) {- closeAllMenus()- } else {- closeAllMenus()- body.addClass('contextualSideMenu-open modal-open')- modalBackdrop.addClass('show')- }- }- contextualSidebarMenuToggle.click(toggleContextualMenu)- contextualSidebarMenuClose.click(toggleContextualMenu)-- // TODO: remove this js temp behaviour and fix this decent- // Temp quick search- // When there was a search term, copy it- $('.js-quick-search').val($('.js-quick-search-target').val())- // Catch the quick search form submit and submit the real form- $('#quick-search').submit(function () {- $('.js-quick-search-target').val($('.js-quick-search').val())- $('#table-filter form').submit()- return false- })-- // Clickable ransack filters- $('.js-add-filter').click(function () {- var ransackField = $(this).data('ransack-field')- var ransackValue = $(this).data('ransack-value')-- $('#' + ransackField).val(ransackValue)- $('#table-filter form').submit()- })-- $(document).on('click', '.js-delete-filter', function () {- var ransackField = $(this).parents('.js-filter').data('ransack-field')-- $('#' + ransackField).val('')- $('#table-filter form').submit()- })-- function ransackField (value) {- switch (value) {- case 'Date Range':- return 'Start'- case '':- return 'Stop'- default:- return value.trim()- }- }-- // To appear in the filtered options, the elements id attribute must start with 'q_',- // and it must have the class'.js-filterable'.- $('[id^="q_"].js-filterable').each(function () {- var $this = $(this)-- if ($this.val() !== null && $this.val() !== '' && $this.val().length !== 0) {- var ransackValue, filter- var ransackFieldId = $this.attr('id')- var label = $('label[for="' + ransackFieldId + '"]')-- if ($this.is('select')) {- ransackValue = $this.find('option:selected').toArray().map(function (option) {- return option.text;- }).join(', ')- } else {- ransackValue = $this.val()- }-- label = ransackField(label.text()) + ': ' + ransackValue-- var cleanLabel = DOMPurify.sanitize(label)-- filter = '<span class="js-filter badge badge-secondary" data-ransack-field="' + ransackFieldId + '">' + cleanLabel + '<i class="icon icon-cancel ml-2 js-delete-filter"></i></span>'- $('.js-filters').append(filter).show()- }- })-- // per page dropdown- // preserves all selected filters / queries supplied by user- // changes only per_page value- $('.js-per-page-select').change(function () {- var form = $(this).closest('.js-per-page-form')- var url = form.attr('action')- var value = $(this).val().toString()- if (url.match(/\?/)) {- url += '&per_page=' + value- } else {- url += '?per_page=' + value- }- window.location = url- })-- // injects per_page settings to all available search forms- // so when user changes some filters / queries per_page is preserved- $(document).ready(function () {- var perPageDropdown = $('.js-per-page-select:first')- if (perPageDropdown.length) {- var perPageValue = perPageDropdown.val().toString()- var perPageInput = '<input type="hidden" name="per_page" value=' + perPageValue + ' />'- $('#table-filter form').append(perPageInput)- }- })-})--function handleAlert (element) {- element.classList.add('animate__animated', 'animate__bounceInUp')- element.addEventListener('animationend', function () {- element.classList.remove('animate__bounceInUp')- element.classList.add('animate__fadeOutDownBig', 'animate__delay-3s')- })-}--// Triggers alert if required on document ready.-$(document).ready(function () {- var element = document.querySelector('.flash-alert')-- if (element) {- handleAlert(element)- }-})--$.fn.visible = function (cond) { this[ cond ? 'show' : 'hide' ]() }-// Triggers alerts when requested by javascript.-// eslint-disable-next-line camelcase-function show_flash (type, message) {- var cleanMessage = DOMPurify.sanitize(message)- var existingAlert = document.querySelector('.flash-alert')-- if (existingAlert) {- existingAlert.remove()- }-- var flashDiv = $('.alert-' + type)- if (flashDiv.length === 0) {- flashDiv = $('<div class="d-flex justify-content-center position-fixed flash-alert">' +- '<div class="alert alert-' + type + ' mx-2">' + cleanMessage + '</div></div>')-- $('body').append(flashDiv)-- var ajaxFlashNotfication = document.querySelector('.flash-alert')- handleAlert(ajaxFlashNotfication)- }-}--// Apply to individual radio button that makes another element visible when checked-$.fn.radioControlsVisibilityOfElement = function (dependentElementSelector) {- if (!this.get(0)) { return }- var showValue = this.get(0).value- var radioGroup = $("input[name='" + this.get(0).name + "']")- radioGroup.each(function () {- $(this).click(function () {- // eslint-disable-next-line eqeqeq- $(dependentElementSelector).visible(this.checked && this.value == showValue)- })- if (this.checked) { this.click() }- })-}--document.addEventListener('DOMContentLoaded', function() {- flatpickr.setDefaults({- altInput: true,- time_24hr: true,- altInputClass: 'flatpickr-alt-input',- locale: Spree.translations.flatpickr_locale- })-- var dateFrom = flatpickr('.datePickerFrom', {- onChange: function(selectedDates) {- dateTo.set('minDate', selectedDates[0])- }- })-- var dateTo = flatpickr('.datePickerTo', {- onChange: function(selectedDates) {- dateFrom.set('maxDate', selectedDates[0])- }- })-- flatpickr('.datepicker', { })-})+/* global AUTH_TOKEN, order_number, show_flash */$(document).ready(function() {+ /**+ OBSERVE FIELD:+ **/$('.observe_field').on('change', function() {- target = $(this).data('update')+ var target = $(this).data('update')$(target).hide()$.ajax({dataType: 'html',url: $(this).data('base-url') + encodeURIComponent($(this).val()),type: 'GET'- }).done(function (data) {+ }).done(function(data) {$(target).html(data)$(target).show()})})+ /**+ ADD FIELDS+ **/var uniqueId = 1- $('.spree_add_fields').click(function () {+ $('.spree_add_fields').click(function() {var target = $(this).data('target')var newTableRow = $(target + ' tr:visible:last').clone()var newId = new Date().getTime() + (uniqueId++)- newTableRow.find('input, select').each(function () {+ newTableRow.find('input, select').each(function() {var el = $(this)el.val('')el.prop('id', el.prop('id').replace(/\d+/, newId))el.prop('name', el.prop('name').replace(/\d+/, newId))})+// When cloning a new row, set the href of all icons to be an empty "#"// This is so that clicking on them does not perform the actions for the// duplicated row- newTableRow.find('a').each(function () {+ newTableRow.find('a').each(function() {var el = $(this)el.prop('href', '#')})$(target).prepend(newTableRow)})- $('body').on('click', '.delete-resource', function () {+ /**+ DELETE RESOURCE+ **/+ $('body').on('click', '.delete-resource', function() {var el = $(this)if (confirm(el.data('confirm'))) {$.ajax({@@ -297,14 +59,14 @@ $(document).ready(function() {complete: function() {el.blur()}- }).done(function () {- var $flash_element = $('.alert-success')- if ($flash_element.length) {- el.parents('tr').fadeOut('hide', function () {+ }).done(function() {+ var $flashElement = $('.alert-success')+ if ($flashElement.length) {+ el.parents('tr').fadeOut('hide', function() {$(this).remove()})}- }).fail(function (response) {+ }).fail(function(response) {show_flash('error', response.responseText)})} else {@@ -313,8 +75,11 @@ $(document).ready(function() {return false})- $('body').on('click', 'a.spree_remove_fields', function () {- el = $(this)+ /**+ REMOVE FIELDS+ **/+ $('body').on('click', 'a.spree_remove_fields', function() {+ var el = $(this)el.prev('input[type=hidden]').val('1')el.closest('.fields').hide()if (el.prop('href').substr(-1) === '#') {@@ -327,72 +92,37 @@ $(document).ready(function() {_method: 'delete',authenticity_token: AUTH_TOKEN}- }).done(function () {- el.parents('tr').fadeOut('hide', function () {+ }).done(function() {+ el.parents('tr').fadeOut('hide', function() {$(this).remove()})- }).fail(function (response) {+ }).fail(function(response) {show_flash('error', response.responseText)})}return false})+ /**+ SELECT PROPERTIES FROM PROTOTYPE+ **/$('body').on('click', '.select_properties_from_prototype', function() {$('#busy_indicator').show()- var clicked_link = $(this)+ var clickedLink = $(this)$.ajax({dataType: 'script',- url: clicked_link.prop('href'),+ url: clickedLink.prop('href'),type: 'GET'- }).done(function () {- clicked_link.parent('td').parent('tr').hide()+ }).done(function() {+ clickedLink.parent('td').parent('tr').hide()$('#busy_indicator').hide()})return false})- // Sortable List Up-Down- var parentEl = document.getElementsByClassName("sortable")[0];- if (parentEl) {- var element = parentEl.querySelector('tbody')- }-- if (element) {- Sortable.create(element, {- handle: '.move-handle',- animation: 550,- ghostClass: 'bg-light',- dragClass: "sortable-drag-v",- easing: 'cubic-bezier(1, 0, 0, 1)',- swapThreshold: 0.9,- forceFallback: true,- onEnd: function (evt) {- var itemEl = evt.item- var positions = { authenticity_token: AUTH_TOKEN }- $.each($('tr', element), function(position, obj) {- reg = /spree_(\w+_?)+_(\d+)/- parts = reg.exec($(obj).prop('id'))- if (parts) {- positions['positions[' + parts[2] + ']'] = position + 1- }- })- $.ajax({- type: 'POST',- dataType: 'json',- url: $(itemEl).closest('table.sortable').data('sortable-link'),- data: positions- })- }- })- }-- // Close notifications- $('a.dismiss').click(function () {- $(this).parent().fadeOut()- })-- // Utility+ /**+ UTILITY+ **/window.Spree.advanceOrder = function() {$.ajax({type: 'PUT',diff --git a/backend/app/assets/javascripts/spree/backend/global/alerts.js b/backend/app/assets/javascripts/spree/backend/global/alerts.jsnew file mode 100644index 0000000000..e7704dc222--- /dev/null+++ b/backend/app/assets/javascripts/spree/backend/global/alerts.js@@ -0,0 +1,40 @@+/* global DOMPurify */++// Triggers alert if required on DOMContentLoaded.+document.addEventListener('DOMContentLoaded', function() {+ var element = document.querySelector('.flash-alert')++ if (element) {+ handleAlert(element)+ }+})++// Triggers alerts when requested by javascript.+// eslint-disable-next-line camelcase, no-unused-vars+function show_flash(type, message) {+ var cleanMessage = DOMPurify.sanitize(message)+ var existingAlert = document.querySelector('.flash-alert')++ if (existingAlert) {+ existingAlert.remove()+ }++ var flashDiv = $('.alert-' + type)+ if (flashDiv.length === 0) {+ flashDiv = $('<div class="d-flex justify-content-center position-fixed flash-alert">' ++ '<div class="alert alert-' + type + ' mx-2">' + cleanMessage + '</div></div>')++ $('body').append(flashDiv)++ var ajaxFlashNotfication = document.querySelector('.flash-alert')+ handleAlert(ajaxFlashNotfication)+ }+}++function handleAlert(element) {+ element.classList.add('animate__animated', 'animate__bounceInUp')+ element.addEventListener('animationend', function() {+ element.classList.remove('animate__bounceInUp')+ element.classList.add('animate__fadeOutDownBig', 'animate__delay-3s')+ })+}diff --git a/backend/app/assets/javascripts/spree/backend/global/bootstrap.js b/backend/app/assets/javascripts/spree/backend/global/bootstrap.jsnew file mode 100644index 0000000000..4cee2eb27d--- /dev/null+++ b/backend/app/assets/javascripts/spree/backend/global/bootstrap.js@@ -0,0 +1,15 @@+// Use this file for Boostrap customization applied across the Spree Backend++document.addEventListener('DOMContentLoaded', function() {+ $('.with-tip').each(function() {+ $(this).tooltip({+ container: $(this)+ })+ })++ $('.with-tip').on('show.bs.tooltip', function(event) {+ if (('ontouchstart' in window)) {+ event.preventDefault()+ }+ })+})diff --git a/backend/app/assets/javascripts/spree/backend/global/flatpickr.js b/backend/app/assets/javascripts/spree/backend/global/flatpickr.jsnew file mode 100644index 0000000000..80b919e829--- /dev/null+++ b/backend/app/assets/javascripts/spree/backend/global/flatpickr.js@@ -0,0 +1,24 @@+/* global flatpickr */++document.addEventListener('DOMContentLoaded', function() {+ flatpickr.setDefaults({+ altInput: true,+ time_24hr: true,+ altInputClass: 'flatpickr-alt-input',+ locale: Spree.translations.flatpickr_locale+ })++ var dateFrom = flatpickr('.datePickerFrom', {+ onChange: function(selectedDates) {+ dateTo.set('minDate', selectedDates[0])+ }+ })++ var dateTo = flatpickr('.datePickerTo', {+ onChange: function(selectedDates) {+ dateFrom.set('maxDate', selectedDates[0])+ }+ })++ flatpickr('.datepicker', {})+})diff --git a/backend/app/assets/javascripts/spree/backend/global/radio_panel_toggle.js b/backend/app/assets/javascripts/spree/backend/global/radio_panel_toggle.jsnew file mode 100644index 0000000000..decc274398--- /dev/null+++ b/backend/app/assets/javascripts/spree/backend/global/radio_panel_toggle.js@@ -0,0 +1,18 @@+/**+ radioControlsVisibilityOfElement:+ Apply to individual radio button that makes another element visible when checked+**/+document.addEventListener('DOMContentLoaded', function() {+ $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector) {+ if (!this.get(0)) { return }+ var showValue = this.get(0).value+ var radioGroup = $("input[name='" + this.get(0).name + "']")+ radioGroup.each(function() {+ $(this).click(function() {+ // eslint-disable-next-line eqeqeq+ $(dependentElementSelector).visible(this.checked && this.value == showValue)+ })+ if (this.checked) { this.click() }+ })+ }+})diff --git a/backend/app/assets/javascripts/spree/backend/global/ransack.js b/backend/app/assets/javascripts/spree/backend/global/ransack.jsnew file mode 100644index 0000000000..5e9a900a6a--- /dev/null+++ b/backend/app/assets/javascripts/spree/backend/global/ransack.js@@ -0,0 +1,99 @@+/* global DOMPurify */++document.addEventListener('DOMContentLoaded', function() {+ $('.js-show-index-filters').click(function() {+ $('.filter-well').slideToggle()+ $(this).parents('.filter-wrap').toggleClass('collapsed')+ })++ // TODO: remove this js temp behaviour and fix this decent+ // Temp quick search+ // When there was a search term, copy it+ $('.js-quick-search').val($('.js-quick-search-target').val())+ // Catch the quick search form submit and submit the real form+ $('#quick-search').submit(function() {+ $('.js-quick-search-target').val($('.js-quick-search').val())+ $('#table-filter form').submit()+ return false+ })++ // Clickable ransack filters+ $('.js-add-filter').click(function() {+ var ransackField = $(this).data('ransack-field')+ var ransackValue = $(this).data('ransack-value')++ $('#' + ransackField).val(ransackValue)+ $('#table-filter form').submit()+ })++ $(document).on('click', '.js-delete-filter', function() {+ var ransackField = $(this).parents('.js-filter').data('ransack-field')++ $('#' + ransackField).val('')+ $('#table-filter form').submit()+ })++ function ransackField(value) {+ switch (value) {+ case 'Date Range':+ return 'Start'+ case '':+ return 'Stop'+ default:+ return value.trim()+ }+ }++ // To appear in the filtered options, the elements id attribute must start with 'q_',+ // and it must have the class'.js-filterable'.+ $('[id^="q_"].js-filterable').each(function() {+ var $this = $(this)++ if ($this.val() !== null && $this.val() !== '' && $this.val().length !== 0) {+ var ransackValue, filter+ var ransackFieldId = $this.attr('id')+ var label = $('label[for="' + ransackFieldId + '"]')++ if ($this.is('select')) {+ ransackValue = $this.find('option:selected').toArray().map(function(option) {+ return option.text;+ }).join(', ')+ } else {+ ransackValue = $this.val()+ }++ label = ransackField(label.text()) + ': ' + ransackValue++ var cleanLabel = DOMPurify.sanitize(label)++ filter = '<span class="js-filter badge badge-secondary" data-ransack-field="' + ransackFieldId + '">' + cleanLabel + '<i class="icon icon-cancel ml-2 js-delete-filter"></i></span>'+ $('.js-filters').append(filter).show()+ }+ })++ // per page dropdown+ // preserves all selected filters / queries supplied by user+ // changes only per_page value+ $('.js-per-page-select').change(function() {+ var form = $(this).closest('.js-per-page-form')+ var url = form.attr('action')+ var value = $(this).val().toString()+ if (url.match(/\?/)) {+ url += '&per_page=' + value+ } else {+ url += '?per_page=' + value+ }+ window.location = url+ })++ // injects per_page settings to all available search forms+ // so when user changes some filters / queries per_page is preserved+ $(document).ready(function() {+ var perPageDropdown = $('.js-per-page-select:first')+ if (perPageDropdown.length) {+ var perPageValue = perPageDropdown.val().toString()+ var perPageInput = '<input type="hidden" name="per_page" value=' + perPageValue + ' />'+ $('#table-filter form').append(perPageInput)+ }+ })+})diff --git a/backend/app/assets/javascripts/spree/backend/global/responsive_menus.js b/backend/app/assets/javascripts/spree/backend/global/responsive_menus.jsnew file mode 100644index 0000000000..ab4b489e92--- /dev/null+++ b/backend/app/assets/javascripts/spree/backend/global/responsive_menus.js@@ -0,0 +1,56 @@+document.addEventListener('DOMContentLoaded', function() {+ var body = $('body')+ var modalBackdrop = $('#multi-backdrop')++ // Fail safe on screen resize+ var resizeTimer;+ window.addEventListener('resize', function() {+ document.body.classList.remove('modal-open', 'sidebar-open', 'contextualSideMenu-open');+ document.body.classList.add('resize-animation-stopper');+ clearTimeout(resizeTimer);+ resizeTimer = setTimeout(function() {+ document.body.classList.remove('resize-animation-stopper');+ }, 400);+ });++ function closeAllMenus() {+ body.removeClass()+ body.addClass('admin')+ modalBackdrop.removeClass('show')+ }++ modalBackdrop.click(closeAllMenus)++ // Main Menu Functionality+ var sidebarOpen = $('#sidebar-open')+ var sidebarClose = $('#sidebar-close')+ var activeItem = $('#main-sidebar').find('.selected')++ activeItem.closest('.nav-sidebar').addClass('active-option')+ activeItem.closest('.nav-pills').addClass('in show')++ function openMenu() {+ closeAllMenus()+ body.addClass('sidebar-open modal-open')+ modalBackdrop.addClass('show')+ }+ sidebarOpen.click(openMenu)+ sidebarClose.click(closeAllMenus)++ // Contextual Sidebar Menu+ var contextualSidebarMenuToggle = $('#contextual-menu-toggle')+ var contextualSidebarMenuClose = $('#contextual-menu-close')++ function toggleContextualMenu() {+ if (document.body.classList.contains('contextualSideMenu-open')) {+ closeAllMenus()+ } else {+ closeAllMenus()+ body.addClass('contextualSideMenu-open modal-open')+ modalBackdrop.addClass('show')+ }+ }++ contextualSidebarMenuToggle.click(toggleContextualMenu)+ contextualSidebarMenuClose.click(toggleContextualMenu)+})diff --git a/backend/app/assets/javascripts/spree/backend/global/sortable.js b/backend/app/assets/javascripts/spree/backend/global/sortable.jsnew file mode 100644index 0000000000..d938187bee--- /dev/null+++ b/backend/app/assets/javascripts/spree/backend/global/sortable.js@@ -0,0 +1,37 @@+/* global Sortable */++document.addEventListener('DOMContentLoaded', function() {+ var parentEl = document.getElementsByClassName('sortable')[0];+ if (parentEl) {+ var element = parentEl.querySelector('tbody')+ }++ if (element) {+ Sortable.create(element, {+ handle: '.move-handle',+ animation: 550,+ ghostClass: 'bg-light',+ dragClass: 'sortable-drag-v',+ easing: 'cubic-bezier(1, 0, 0, 1)',+ swapThreshold: 0.9,+ forceFallback: true,+ onEnd: function(evt) {+ var itemEl = evt.item+ var positions = { authenticity_token: AUTH_TOKEN }+ $.each($('tr', element), function(position, obj) {+ var reg = /spree_(\w+_?)+_(\d+)/+ var parts = reg.exec($(obj).prop('id'))+ if (parts) {+ positions['positions[' + parts[2] + ']'] = position + 1+ }+ })+ $.ajax({+ type: 'POST',+ dataType: 'json',+ url: $(itemEl).closest('table.sortable').data('sortable-link'),+ data: positions+ })+ }+ })+ }+})