From ac699d783fea0630848d09f932b63f46f7676769 Mon Sep 17 00:00:00 2001
From: Ankitha Shetty <51634-AnkShetty@users.noreply.drupalcode.org>
Date: Sun, 3 Dec 2023 09:33:13 +0000
Subject: [PATCH] Issue #3404519 by nakamurarts, ankithashetty, yas: Refactor
to native JavaScript from jQuery (k8s_cost_block.js)
---
.../k8s/js/k8s_cost_block.js | 36 ++++++++-----------
.../k8s/k8s.libraries.yml | 4 ---
2 files changed, 14 insertions(+), 26 deletions(-)
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 9ae38f5268..d289f8e48a 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 4824157a75..b402402d38 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
--
GitLab