Merge pull request #818 from leoendless/hotfix/history

fix: Cache history by user
kubesphere · Jul 20, 2020 · dd5d415 · dd5d415
2 parents 315800f + 87a7469
commit dd5d415
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/components/Modals/History/index.jsx b/src/components/Modals/History/index.jsx
@@ -27,7 +27,8 @@ import styles from './index.scss'
 
 export default class History extends Component {
   get histories() {
-    return safeParseJSON(localStorage.getItem('history-cache'), [])
+    const caches = safeParseJSON(localStorage.getItem('history-cache'), {})
+    return caches[globals.user.username] || []
   }
 
   renderHistory() {

diff --git a/src/core/global.js b/src/core/global.js
@@ -399,11 +399,14 @@ export default class GlobalValue {
   }
 
   cacheHistory(url, obj) {
-    let histories = safeParseJSON(localStorage.getItem('history-cache'), [])
+    let histories = safeParseJSON(localStorage.getItem('history-cache'), {})
+    histories = histories[globals.user.username] || []
     histories = histories.filter(item => item.url !== url)
     localStorage.setItem(
       'history-cache',
-      JSON.stringify([{ url, ...obj }, ...histories].slice(0, 8))
+      JSON.stringify({
+        [globals.user.username]: [{ url, ...obj }, ...histories].slice(0, 8),
+      })
     )
   }
 }