Fixes #37664 - switch to using js-cookie

theforeman · Jul 18, 2024 · cca3247 · cca3247
1 parent f824a88
commit cca3247
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -5,6 +5,7 @@
 //= require hidden_values
 //= require select_on_click
 //= require lookup_keys
+//= require js.cookie
 
 $(function() {
   if(window.allJsLoaded){
@@ -81,7 +82,7 @@ function onContentLoad() {
 
   tfm.i18n.intl.ready.then(function() {
     var tz = jstz.determine();
-    $.cookie('timezone', tz.name(), {
+    Cookies.set('timezone', tz.name(), {
       path: '/',
       secure: location.protocol === 'https:',
     });

diff --git a/bundler.d/assets.rb b/bundler.d/assets.rb
@@ -6,4 +6,5 @@
   gem 'execjs', '>= 1.4.0', '< 3.0'
   gem 'terser', '~> 1.1'
   gem 'sass-rails', '~> 6.0'
+  gem 'js_cookie_rails', '~> 2.2'
 end
diff --git a/package.json b/package.json
@@ -25,6 +25,7 @@
     "graphql-tag": "^2.11.0",
     "intl": "~1.2.5",
     "jed": "^1.1.1",
+    "js-cookie": "^3.0.5",
     "os-browserify": "^0.3.0",
     "react-intl": "^2.8.0"
   },

diff --git a/webpack/assets/javascripts/hosts/tableCheckboxes.js b/webpack/assets/javascripts/hosts/tableCheckboxes.js
@@ -14,6 +14,7 @@
 /* eslint-disable jquery/no-in-array */
 
 import $ from 'jquery';
+import Cookies from 'js-cookie';
 
 import {
   sprintf,
@@ -43,7 +44,7 @@ export function hostChecked({ id, checked }) {
       multipleAlert.data('multiple', false);
     }
   }
-  $.cookie(cookieName, JSON.stringify(foremanSelectedHosts), {
+  Cookies.set(cookieName, JSON.stringify(foremanSelectedHosts), {
     secure: window.location.protocol === 'https:',
   });
   toggleActions();
@@ -62,7 +63,7 @@ function rmHostId(id) {
 
 function readFromCookie() {
   try {
-    const r = $.cookie(cookieName);
+    const r = Cookies.get(cookieName);
     if (r) return $.parseJSON(r);
     return [];
   } catch (err) {
@@ -116,7 +117,7 @@ $(document).on('ContentLoad', () => {
 });
 
 function removeForemanHostsCookie() {
-  $.removeCookie(cookieName);
+  Cookies.remove(cookieName);
 }
 
 export function resetSelection() {