diff --git a/modules/cloud_service_providers/k8s/js/k8s_cost_block.js b/modules/cloud_service_providers/k8s/js/k8s_cost_block.js index 9ae38f5268eddd12261fea62af6be387fa597b85..d289f8e48a2b75f0e5a1dc301db076619f22bca3 100644 --- a/modules/cloud_service_providers/k8s/js/k8s_cost_block.js +++ b/modules/cloud_service_providers/k8s/js/k8s_cost_block.js @@ -1,27 +1,19 @@ -(function ($) { +(function () { 'use strict'; - $('button[name=apply]').click(function () { - let $parent = $(this).parent('.form-inline'); - if ($parent.length === 0 || $parent.parents('.panel').length === 0) { - return; + for (const apply_button of document.querySelectorAll('.simple-datatable .form-inline .button[name="apply"]')) { + const form_inline = apply_button.closest('.form-inline'); + const block_id = form_inline.closest('.simple-datatable').id; + if (!block_id) { + continue; } - let block_id = $parent.parents('.panel').attr('id'); - let params = (new URL(location)).searchParams; - let param_arr = []; - $parent.find('select').each(function () { - let name = $(this).attr('name'); - params.set(block_id + '[' + name + ']', $(this).val()); + apply_button.addEventListener('click', function () { + const url = new URL(location.href); + form_inline.querySelectorAll('select').forEach(function (select) { + url.searchParams.set(block_id + '[' + select.name + ']', select.value); + }); + location.href = url.href; }); - - if (Array.from(params).length === 0) { - return; - } - let url = location.href; - if (url.indexOf('?') !== -1) { - url = url.substr(0, url.indexOf('?')); - } - location = url + '?' + params.toString(); - }); -})(jQuery); + } +})(); diff --git a/modules/cloud_service_providers/k8s/k8s.libraries.yml b/modules/cloud_service_providers/k8s/k8s.libraries.yml index 4824157a759ff729b5079edd09044e02e1bbeec7..b402402d38f4b260bb2dcad8b7ae49a0f55ef75e 100644 --- a/modules/cloud_service_providers/k8s/k8s.libraries.yml +++ b/modules/cloud_service_providers/k8s/k8s.libraries.yml @@ -54,8 +54,6 @@ k8s_cost_block: version: 5.x-dev js: js/k8s_cost_block.js: {} - dependencies: - - core/jquery k8s_project_costs_chart: version: 5.x-dev @@ -79,8 +77,6 @@ k8s_all_resources: version: 5.x-dev js: js/k8s_all_resources.js: {} - dependencies: - - core/jquery k8s_refresh_resource_trigger: version: 5.x-dev