diff --git a/client/homebrew/navbar/recent.navitem.jsx b/client/homebrew/navbar/recent.navitem.jsx
index a6cbbf406..4c4722515 100644
--- a/client/homebrew/navbar/recent.navitem.jsx
+++ b/client/homebrew/navbar/recent.navitem.jsx
@@ -5,8 +5,8 @@ const Moment = require('moment');
const Nav = require('naturalcrit/nav/nav.jsx');
-const EDIT_KEY = 'homebrewery-recently-edited';
-const VIEW_KEY = 'homebrewery-recently-viewed';
+const EDIT_KEY = 'HB_nav_recentlyEdited';
+const VIEW_KEY = 'HB_nav_recentlyViewed';
const RecentItems = createClass({
diff --git a/client/homebrew/pages/accountPage/accountPage.jsx b/client/homebrew/pages/accountPage/accountPage.jsx
index 598683504..b69eb6e3e 100644
--- a/client/homebrew/pages/accountPage/accountPage.jsx
+++ b/client/homebrew/pages/accountPage/accountPage.jsx
@@ -13,7 +13,7 @@ const AccountPage = (props)=>{
// initialize save location from local storage based on user id
React.useEffect(()=>{
if(!saveLocation && accountDetails.username) {
- SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${accountDetails.username}`;
+ SAVEKEY = `HB_editor_defaultSave_${accountDetails.username}`;
// if no SAVEKEY in local storage, default save location to Google Drive if user has Google account.
let saveLocation = window.localStorage.getItem(SAVEKEY);
saveLocation = saveLocation ?? (accountDetails.googleId ? 'GOOGLE-DRIVE' : 'HOMEBREWERY');
diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx
index ec557ffb1..4afc14364 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.jsx
+++ b/client/homebrew/pages/basePages/listPage/listPage.jsx
@@ -7,7 +7,9 @@ const moment = require('moment');
const BrewItem = require('./brewItem/brewItem.jsx');
-const USERPAGE_KEY_PREFIX = 'HOMEBREWERY-LISTPAGE';
+const USERPAGE_SORT_DIR = 'HB_listPage_sortDir';
+const USERPAGE_SORT_TYPE = 'HB_listPage_sortType';
+const USERPAGE_GROUP_VISIBILITY_PREFIX = 'HB_listPage_visibility_group';
const DEFAULT_SORT_TYPE = 'alpha';
const DEFAULT_SORT_DIR = 'asc';
@@ -50,12 +52,12 @@ const ListPage = createClass({
// LOAD FROM LOCAL STORAGE
if(typeof window !== 'undefined') {
- const newSortType = (this.state.sortType ?? (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-SORTTYPE`) || DEFAULT_SORT_TYPE));
- const newSortDir = (this.state.sortDir ?? (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-SORTDIR`) || DEFAULT_SORT_DIR));
+ const newSortType = (this.state.sortType ?? (localStorage.getItem(USERPAGE_SORT_TYPE) || DEFAULT_SORT_TYPE));
+ const newSortDir = (this.state.sortDir ?? (localStorage.getItem(USERPAGE_SORT_DIR) || DEFAULT_SORT_DIR));
this.updateUrl(this.state.filterString, newSortType, newSortDir);
const brewCollection = this.props.brewCollection.map((brewGroup)=>{
- brewGroup.visible = (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-VISIBILITY-${brewGroup.class}`) ?? 'true')=='true';
+ brewGroup.visible = (localStorage.getItem(`${USERPAGE_GROUP_VISIBILITY_PREFIX}_${brewGroup.class}`) ?? 'true')=='true';
return brewGroup;
});
@@ -73,10 +75,10 @@ const ListPage = createClass({
saveToLocalStorage : function() {
this.state.brewCollection.map((brewGroup)=>{
- localStorage.setItem(`${USERPAGE_KEY_PREFIX}-VISIBILITY-${brewGroup.class}`, `${brewGroup.visible}`);
+ localStorage.setItem(`${USERPAGE_GROUP_VISIBILITY_PREFIX}_${brewGroup.class}`, `${brewGroup.visible}`);
});
- localStorage.setItem(`${USERPAGE_KEY_PREFIX}-SORTTYPE`, this.state.sortType);
- localStorage.setItem(`${USERPAGE_KEY_PREFIX}-SORTDIR`, this.state.sortDir);
+ localStorage.setItem(USERPAGE_SORT_TYPE, this.state.sortType);
+ localStorage.setItem(USERPAGE_SORT_DIR, this.state.sortDir);
},
renderBrews : function(brews){
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index aff5dd3ea..200a754c2 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -39,10 +39,13 @@ const SAVE_TIMEOUT = 10000;
const UNSAVED_WARNING_TIMEOUT = 900000; //Warn user afer 15 minutes of unsaved changes
const UNSAVED_WARNING_POPUP_TIMEOUT = 4000; //Show the warning for 4 seconds
-const BREWKEY = 'homebrewery-new';
-const STYLEKEY = 'homebrewery-new-style';
-const SNIPKEY = 'homebrewery-new-snippets';
-const METAKEY = 'homebrewery-new-meta';
+
+const AUTOSAVE_KEY = 'HB_editor_autoSaveOn';
+const BREWKEY = 'HB_newPage_content';
+const STYLEKEY = 'HB_newPage_style';
+const SNIPKEY = 'HB_newPage_snippets';
+const METAKEY = 'HB_newPage_meta';
+
const EditPage = (props)=>{
props = {
@@ -77,7 +80,7 @@ const EditPage = (props)=>{
const useLocalStorage = false;
useEffect(()=>{
- const autoSavePref = JSON.parse(localStorage.getItem('AUTOSAVE_ON') ?? true);
+ const autoSavePref = JSON.parse(localStorage.getItem(AUTOSAVE_KEY) ?? true);
setAutoSaveEnabled(autoSavePref);
setWarnUnsavedChanges(!autoSavePref);
setHTMLErrors(Markdown.validate(currentBrew.text));
@@ -331,7 +334,7 @@ const EditPage = (props)=>{
const toggleAutoSave = ()=>{
clearTimeout(warnUnsavedTimeout.current);
clearTimeout(saveTimeout.current);
- localStorage.setItem('AUTOSAVE_ON', JSON.stringify(!autoSaveEnabled));
+ localStorage.setItem(AUTOSAVE_KEY, JSON.stringify(!autoSaveEnabled));
setAutoSaveEnabled(!autoSaveEnabled);
setWarnUnsavedChanges(autoSaveEnabled);
};
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index a22373d4a..b8c4e8100 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -20,11 +20,13 @@ import BrewRenderer from '../../brewRenderer/brewRenderer.jsx';
import { DEFAULT_BREW } from '../../../../server/brewDefaults.js';
import { printCurrentBrew, fetchThemeBundle, splitTextStyleAndMetadata } from '../../../../shared/helpers.js';
-const BREWKEY = 'homebrewery-new';
-const STYLEKEY = 'homebrewery-new-style';
-const SNIPKEY = 'homebrewery-new-snippets';
-const METAKEY = 'homebrewery-new-meta';
-const SAVEKEYPREFIX = 'HOMEBREWERY-DEFAULT-SAVE-LOCATION-';
+
+const BREWKEY = 'HB_newPage_content';
+const STYLEKEY = 'HB_newPage_style';
+const METAKEY = 'HB_newPage_metadata';
+const SNIPKEY = 'HB_newPage_snippets';
+const SAVEKEYPREFIX = 'HB_editor_defaultSave_';
+
const NewPage = (props) => {
props = {
diff --git a/client/homebrew/utils/updateLocalStorage/localStorageKeyMap.js b/client/homebrew/utils/updateLocalStorage/localStorageKeyMap.js
new file mode 100644
index 000000000..b4a05974f
--- /dev/null
+++ b/client/homebrew/utils/updateLocalStorage/localStorageKeyMap.js
@@ -0,0 +1,35 @@
+
+const getLocalStorageMap = function(){
+ const localStorageMap = {
+ 'AUTOSAVE_ON' : 'HB_editor_autoSaveOn',
+ 'HOMEBREWERY-EDITOR-THEME' : 'HB_editor_theme',
+ 'liveScroll' : 'HB_editor_liveScroll',
+ 'naturalcrit-pane-split' : 'HB_editor_splitWidth',
+
+ 'HOMEBREWERY-LISTPAGE-SORTDIR' : 'HB_listPage_sortDir',
+ 'HOMEBREWERY-LISTPAGE-SORTTYPE' : 'HB_listPage_sortType',
+ 'HOMEBREWERY-LISTPAGE-VISIBILITY-published' : 'HB_listPage_visibility_group_published',
+ 'HOMEBREWERY-LISTPAGE-VISIBILITY-unpublished' : 'HB_listPage_visibility_group_unpublished',
+
+ 'hbAdminTab' : 'HB_adminPage_currentTab',
+
+ 'homebrewery-new' : 'HB_newPage_content',
+ 'homebrewery-new-meta' : 'HB_newPage_metadata',
+ 'homebrewery-new-style' : 'HB_newPage_style',
+
+ 'homebrewery-recently-edited' : 'HB_nav_recentlyEdited',
+ 'homebrewery-recently-viewed' : 'HB_nav_recentlyViewed',
+
+ 'hb_toolbarState' : 'HB_renderer_toolbarState',
+ 'hb_toolbarVisibility' : 'HB_renderer_toolbarVisibility'
+ };
+
+ if(global?.account?.username){
+ const username = global.account.username;
+ localStorageMap[`HOMEBREWERY-DEFAULT-SAVE-LOCATION-${username}`] = `HB_editor_defaultSave_${username}`;
+ }
+
+ return localStorageMap;
+};
+
+export default getLocalStorageMap;
\ No newline at end of file
diff --git a/client/homebrew/utils/updateLocalStorage/localStorageKeyMap.spec.js b/client/homebrew/utils/updateLocalStorage/localStorageKeyMap.spec.js
new file mode 100644
index 000000000..ac61d4add
--- /dev/null
+++ b/client/homebrew/utils/updateLocalStorage/localStorageKeyMap.spec.js
@@ -0,0 +1,30 @@
+import getLocalStorageMap from './localStorageKeyMap.js';
+
+describe('getLocalStorageMap', ()=>{
+ it('no username', ()=>{
+ const account = global.account;
+
+ delete global.account;
+
+ const map = getLocalStorageMap();
+
+ global.account = account;
+
+ expect(map).toBeInstanceOf(Object);
+ expect(Object.entries(map)).toHaveLength(16);
+ });
+
+ it('no username', ()=>{
+ const account = global.account;
+
+ global.account = { username: 'test' };
+
+ const map = getLocalStorageMap();
+
+ global.account = account;
+
+ expect(map).toBeInstanceOf(Object);
+ expect(Object.entries(map)).toHaveLength(17);
+ expect(map).toHaveProperty('HOMEBREWERY-DEFAULT-SAVE-LOCATION-test', 'HB_editor_defaultSave_test');
+ });
+});
\ No newline at end of file
diff --git a/client/homebrew/utils/updateLocalStorage/updateLocalStorageKeys.js b/client/homebrew/utils/updateLocalStorage/updateLocalStorageKeys.js
new file mode 100644
index 000000000..6d0bf0c8c
--- /dev/null
+++ b/client/homebrew/utils/updateLocalStorage/updateLocalStorageKeys.js
@@ -0,0 +1,27 @@
+import getLocalStorageMap from './localStorageKeyMap.js';
+
+const updateLocalStorage = function(){
+ // Return if no window and thus no local storage
+ if(typeof window === 'undefined') return;
+
+ // Return if the local storage key map has no content
+ const localStorageKeyMap = getLocalStorageMap();
+ if(Object.keys(localStorageKeyMap).length == 0) return;
+
+ const storage = window.localStorage;
+
+ const deleteKeys = storage?.getItem('HB_deleteKeys') != null;
+
+ Object.keys(localStorageKeyMap).forEach((key)=>{
+ if(storage[key]){
+ if(!storage[localStorageKeyMap[key]]){
+ const data = storage.getItem(key);
+ storage.setItem(localStorageKeyMap[key], data);
+ };
+ if(deleteKeys) storage.removeItem(key);
+ }
+ });
+
+};
+
+export { updateLocalStorage };
\ No newline at end of file