2 files changed, 8 insertions, 42 deletions

diff --git a/web/src/containers/timezone/SelectTz.jsx b/web/src/containers/timezone/SelectTz.jsx
index 78092d2ab..b8e5060be 100644
--- a/web/src/containers/timezone/SelectTz.jsx
+++ b/web/src/containers/timezone/SelectTz.jsx
@@ -30,35 +30,18 @@ class SelectTz extends React.Component {
 
   componentDidMount () {
     this.loadState()
+    window.addEventListener('storage', this.loadState)
   }
 
   handleChange = (selectedTz) => {
     const tz = selectedTz.value
 
-    this.setCookie('zuul_tz_string', tz)
+    localStorage.setItem('zuul_tz_string', tz)
     this.updateState(tz)
   }
 
-  setCookie (name, value) {
-    document.cookie = name + '=' + value + '; path=/'
-  }
-
   loadState = () => {
-    function readCookie (name, defaultValue) {
-      let nameEQ = name + '='
-      let ca = document.cookie.split(';')
-      for (let i = 0; i < ca.length; i++) {
-        let c = ca[i]
-        while (c.charAt(0) === ' ') {
-          c = c.substring(1, c.length)
-        }
-        if (c.indexOf(nameEQ) === 0) {
-          return c.substring(nameEQ.length, c.length)
-        }
-      }
-      return defaultValue
-    }
-    let tz = readCookie('zuul_tz_string', '')
+    let tz = localStorage.getItem('zuul_tz_string') || ''
     if (tz) {
       this.updateState(tz)
     }
diff --git a/web/src/pages/Status.jsx b/web/src/pages/Status.jsx
index 3ad50f4cb..67bb3230b 100644
--- a/web/src/pages/Status.jsx
+++ b/web/src/pages/Status.jsx
@@ -78,10 +78,6 @@ class StatusPage extends Refreshable {
       this.visibilityChangeEvent, this.visibilityListener, false)
   }
 
-  setCookie (name, value, pathname) {
-    document.cookie = name + '=' + value + '; path=' + pathname
-  }
-
   updateData = (force) => {
     if (force || (this.visible && this.state.autoReload)) {
       this.props.dispatch(fetchStatusIfNeeded(this.props.tenant))
@@ -100,6 +96,7 @@ class StatusPage extends Refreshable {
     document.title = 'Zuul Status'
     this.loadState()
     super.componentDidMount()
+    window.addEventListener('storage', this.loadState)
   }
 
   componentWillUnmount () {
@@ -115,7 +112,7 @@ class StatusPage extends Refreshable {
   setFilter = (filter) => {
     this.filter.value = filter
     this.setState({filter: filter})
-    this.setCookie('zuul_filter_string', filter, window.location.pathname)
+    localStorage.setItem('zuul_filter_string', filter)
   }
 
   handleKeyPress = (e) => {
@@ -128,26 +125,12 @@ class StatusPage extends Refreshable {
 
   handleCheckBox = (e) => {
     this.setState({expanded: e.target.checked})
-    this.setCookie('zuul_expand_by_default', e.target.checked, '/')
+    localStorage.setItem('zuul_expand_by_default', e.target.checked)
   }
 
   loadState = () => {
-    function readCookie (name, defaultValue) {
-      let nameEQ = name + '='
-      let ca = document.cookie.split(';')
-      for (let i = 0; i < ca.length; i++) {
-        let c = ca[i]
-        while (c.charAt(0) === ' ') {
-          c = c.substring(1, c.length)
-        }
-        if (c.indexOf(nameEQ) === 0) {
-          return c.substring(nameEQ.length, c.length)
-        }
-      }
-      return defaultValue
-    }
-    let filter = readCookie('zuul_filter_string', '')
-    let expanded = readCookie('zuul_expand_by_default', false)
+    let filter = localStorage.getItem('zuul_filter_string') || ''
+    let expanded = localStorage.getItem('zuul_expand_by_default') || false
     if (typeof expanded === 'string') {
       expanded = (expanded === 'true')
     }