fix #7243 ignore cookieconsent cookie changes (#7268)

radiasoft · Sep 19, 2024 · c511eed · c511eed
1 parent 94851a3
commit c511eed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/sirepo/package_data/static/js/sirepo-common.js b/sirepo/package_data/static/js/sirepo-common.js
@@ -1,6 +1,7 @@
 'use strict';
 
 // Common code shared between the landing page app and the various sirepo apps
+SIREPO.cookieConsentName = 'sr_cookieconsent';
 
 window.cookieconsent.initialise({
     //TODO(pjm): set cookie domain?
@@ -11,7 +12,7 @@ window.cookieconsent.initialise({
         link: null,
     },
     cookie: {
-        name: 'sr_cookieconsent',
+        name: SIREPO.cookieConsentName,
     },
     palette: {
         popup: {

diff --git a/sirepo/package_data/static/js/sirepo.js b/sirepo/package_data/static/js/sirepo.js
@@ -2751,7 +2751,7 @@ SIREPO.app.factory('msgRouter', ($http, $interval, $q, $window, errorService, ur
         const c = cookiesSorted;
         _saveCookies();
         // first time is null, and reordering is ok
-        if (c === null || c === cookiesSorted) {
+        if (c === null || c === cookiesSorted.replace(`; ${SIREPO.cookieConsentName}=dismiss`, '')) {
             return false;
         }
         srlog("cookies changed via another browser tab, reloading application");