small cleanups of localstorage keys code

Remove tests for getLocalStorageMap()
The function is a simple getter with trivial logic; test is effectively just asserting the size of the map, which coverage adds no meaningful value and adds cruft to the codebase.
2026-01-23 16:33:05 +00:00 · 2025-10-05 23:24:50 -04:00 · 2025-10-05 23:24:35 -04:00 · 2025-10-05 22:31:15 -04:00 · 2025-10-05 22:19:43 -04:00 · 2025-10-05 22:09:06 -04:00
9 changed files with 108 additions and 52 deletions
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -46,8 +46,8 @@ const STYLEKEY = 'HB_newPage_style';
 const SNIPKEY  = 'HB_newPage_snippets';
 const METAKEY  = 'HB_newPage_meta';

-
 const useLocalStorage = false;
+const neverSaved			= false;

 const EditPage = (props)=>{
 	props = {
@@ -309,14 +309,18 @@ const EditPage = (props)=>{

 		// #3 - Unsaved changes exist, click to save, show SAVE NOW
 		if(unsavedChanges)
-			return <Nav.item className='save' onClick={()=>trySave(true)} color='blue' icon='fas fa-save'>Save Now</Nav.item>;
+			return <Nav.item className='save' onClick={()=>trySave(true)} color='blue' icon='fas fa-save'>save now</Nav.item>;

 		// #4 - No unsaved changes, autosave is ON, show AUTO-SAVED
 		if(autoSaveEnabled)
-			return <Nav.item className='save saved'>auto-saved.</Nav.item>;
+			return <Nav.item className='save saved'>auto-saved</Nav.item>;
+
+		// #5 - No unsaved changes, and has never been saved, hide the button
+		if(neverSaved)
+			return <Nav.item className='save neverSaved'>save now</Nav.item>;

 		// DEFAULT - No unsaved changes, show SAVED
-		return <Nav.item className='save saved'>saved.</Nav.item>;
+		return <Nav.item className='save saved'>saved</Nav.item>;
 	};

 	const toggleAutoSave = ()=>{
--- a/client/homebrew/pages/homePage/homePage.jsx
+++ b/client/homebrew/pages/homePage/homePage.jsx
@@ -33,6 +33,7 @@ const SNIPKEY  = 'homebrewery-new-snippets';
 const METAKEY  = 'homebrewery-new-meta';

 const useLocalStorage = false;
+const neverSaved      = true;

 const HomePage =(props)=>{
 	props = {
@@ -122,6 +123,41 @@ const HomePage =(props)=>{
 		}
 	};

+	const renderSaveButton = ()=>{
+		// #1 - Currently saving, show SAVING
+		if(isSaving)
+			return <Nav.item className='save' icon='fas fa-spinner fa-spin'>saving...</Nav.item>;
+
+		// #2 - Unsaved changes exist, autosave is OFF and warning timer has expired, show AUTOSAVE WARNING
+		// if(unsavedChanges && warnUnsavedChanges) {
+		// 	resetWarnUnsavedTimer();
+		// 	const elapsedTime = Math.round((new Date() - lastSavedTime) / 1000 / 60);
+		// 	const text = elapsedTime === 0
+		// 		? 'Autosave is OFF.'
+		// 		: `Autosave is OFF, and you haven't saved for ${elapsedTime} minutes.`;
+
+		// 	return <Nav.item className='save error' icon='fas fa-exclamation-circle'>
+		// 					Reminder...
+		// 		<div className='errorContainer'>{text}</div>
+		// 	</Nav.item>;
+		// }
+
+		// #3 - Unsaved changes exist, click to save, show SAVE NOW
+		if(unsavedChanges)
+			return <Nav.item className='save' onClick={save} color='blue' icon='fas fa-save'>save now</Nav.item>;
+
+		// #4 - No unsaved changes, autosave is ON, show AUTO-SAVED
+		if(autoSaveEnabled)
+			return <Nav.item className='save saved'>auto-saved</Nav.item>;
+
+		// #5 - No unsaved changes, and has never been saved, hide the button
+		if(neverSaved)
+			return <Nav.item className='save neverSaved'>save now</Nav.item>;
+
+		// DEFAULT - No unsaved changes, show SAVED
+		return <Nav.item className='save saved'>saved</Nav.item>;
+	};
+
 	const clearError = ()=>{
 		setError(null);
 		setIsSaving(false);
@@ -130,10 +166,9 @@ const HomePage =(props)=>{
 	const renderNavbar = ()=>{
 		return <Navbar ver={props.ver}>
 			<Nav.section>
-				{error ?
-					<ErrorNavItem error={error} clearError={clearError}></ErrorNavItem> :
-					null
-				}
+				{error
+					? <ErrorNavItem error={error} clearError={clearError} />
+					: renderSaveButton()}
 				<NewBrewItem />
 				<PrintNavItem />
 				<HelpNavItem />
--- a/client/homebrew/pages/homePage/homePage.less
+++ b/client/homebrew/pages/homePage/homePage.less
@@ -34,7 +34,13 @@
 	}

 	.navItem.save {
+		.fadeInRight();
+		.transition(opacity);
 		background-color : @orange;
 		&:hover { background-color : @green; }
+		&.neverSaved {
+			.fadeOutRight();
+			opacity: 0;
+		}
 	}
 }
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -33,8 +33,8 @@ const METAKEY  = 'HB_newPage_metadata';
 const SNIPKEY  = 'HB_newPage_snippets';
 const SAVEKEYPREFIX  = 'HB_editor_defaultSave_';

-
 const useLocalStorage = true;
+const neverSaved      = true;

 const NewPage = (props) => {
 	props = {
@@ -96,6 +96,7 @@ const NewPage = (props) => {
 		const saveStorage = localStorage.getItem(SAVEKEY) || 'HOMEBREWERY';

 		setCurrentBrew(brew);
+		lastSavedBrew.current = brew;
 		setSaveGoogle(saveStorage == 'GOOGLE-DRIVE' && saveGoogle);

 		localStorage.setItem(BREWKEY, brew.text);
@@ -169,15 +170,38 @@ const NewPage = (props) => {
 	};

 	const renderSaveButton = ()=>{
-		if(isSaving){
-			return <Nav.item icon='fas fa-spinner fa-spin' className='save'>
-				save...
-			</Nav.item>;
-		} else {
-			return <Nav.item icon='fas fa-save' className='save' onClick={save}>
-				save
-			</Nav.item>;
-		}
+		// #1 - Currently saving, show SAVING
+		if(isSaving)
+			return <Nav.item className='save' icon='fas fa-spinner fa-spin'>saving...</Nav.item>;
+
+		// #2 - Unsaved changes exist, autosave is OFF and warning timer has expired, show AUTOSAVE WARNING
+		// if(unsavedChanges && warnUnsavedChanges) {
+		// 	resetWarnUnsavedTimer();
+		// 	const elapsedTime = Math.round((new Date() - lastSavedTime) / 1000 / 60);
+		// 	const text = elapsedTime === 0
+		// 		? 'Autosave is OFF.'
+		// 		: `Autosave is OFF, and you haven't saved for ${elapsedTime} minutes.`;
+
+		// 	return <Nav.item className='save error' icon='fas fa-exclamation-circle'>
+		// 					Reminder...
+		// 		<div className='errorContainer'>{text}</div>
+		// 	</Nav.item>;
+		// }
+
+		// #3 - Unsaved changes exist, click to save, show SAVE NOW
+		if(unsavedChanges)
+			return <Nav.item className='save' onClick={save} color='blue' icon='fas fa-save'>save now</Nav.item>;
+
+		// #4 - No unsaved changes, autosave is ON, show AUTO-SAVED
+		if(autoSaveEnabled)
+			return <Nav.item className='save saved'>auto-saved</Nav.item>;
+
+		// #5 - No unsaved changes, and has never been saved, hide the button
+		if(neverSaved)
+			return <Nav.item className='save neverSaved'>save now</Nav.item>;
+
+		// DEFAULT - No unsaved changes, show SAVED
+		return <Nav.item className='save saved'>saved</Nav.item>;
 	};

 	const clearError = ()=>{
--- a/client/homebrew/pages/newPage/newPage.less
+++ b/client/homebrew/pages/newPage/newPage.less
@@ -1,6 +1,12 @@
 .newPage {
 	.navItem.save {
+		.fadeInRight();
+		.transition(opacity);
 		background-color : @orange;
 		&:hover { background-color : @green; }
+		&.neverSaved {
+			.fadeOutRight();
+			opacity: 0;
+		}
 	}
 }
--- a/client/homebrew/utils/updateLocalStorage/localStorageKeyMap.js
+++ b/client/homebrew/utils/updateLocalStorage/localStorageKeyMap.js
@@ -26,7 +26,7 @@ const getLocalStorageMap = function(){

 	if(global?.account?.username){
 		const username = global.account.username;
-		 localStorageMap[`HOMEBREWERY-DEFAULT-SAVE-LOCATION-${username}`] = `HB_editor_defaultSave_${username}`;
+		localStorageMap[`HOMEBREWERY-DEFAULT-SAVE-LOCATION-${username}`] = `HB_editor_defaultSave_${username}`;
 	}

 	return localStorageMap;
--- a/client/homebrew/utils/updateLocalStorage/localStorageKeyMap.spec.js
+++ b/client/homebrew/utils/updateLocalStorage/localStorageKeyMap.spec.js
@@ -1,30 +0,0 @@
-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');
-	});
-});
--- a/client/homebrew/utils/updateLocalStorage/updateLocalStorageKeys.js
+++ b/client/homebrew/utils/updateLocalStorage/updateLocalStorageKeys.js
@@ -4,10 +4,7 @@ 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;

 	Object.keys(localStorageKeyMap).forEach((key)=>{
--- a/themes/V3/Blank/style.less
+++ b/themes/V3/Blank/style.less
@@ -611,3 +611,17 @@ h6,
 	}
 	.toc.wide li { break-inside : auto; }
 }
+
+
+/**********************************
+Firefox endruns
+**********************************/
+
+@supports (-moz-user-select: none) {  // This section will only apply to Firefox; it's the only browser that supports `-mos-xyz...`
+  .page {
+    blockquote, table {
+      page-break-inside: auto;
+      break-inside: auto; 
+    }
+  }
+}
Author	SHA1	Message	Date
Trevor Buckner	643e0ac650	small cleanups of localstorage keys code	2025-10-05 23:24:50 -04:00
Trevor Buckner	5395412ac5	Remove tests for `getLocalStorageMap()` The function is a simple getter with trivial logic; test is effectively just asserting the size of the map, which coverage adds no meaningful value and adds cruft to the codebase.	2025-10-05 23:24:35 -04:00
Trevor Buckner	dc4610ea1b	Merge pull request #4447 from dbolack-ab/issue_3426 Applies G-Ambatte's fix for Firefox browser lock.	2025-10-05 22:31:15 -04:00
Trevor Buckner	1e71e9e18a	Use blockquote and table elements, not .classes	2025-10-05 22:19:43 -04:00
Trevor Buckner	4203e90d09	Merge branch 'master' into issue_3426	2025-10-05 22:09:06 -04:00
Trevor Buckner	dc94555c94	Merge pull request #4458 from naturalcrit/new/edit/home_commonSaveButton Make the renderSaveButton() function common between edit/new/home	2025-10-05 22:03:32 -04:00
Trevor Buckner	41aebf084b	Make the renderSaveButton() function common between edit/new/home Each of the edit/home/new pages renders its save button differently. This makes it a common function with all the same possible render states (does the document have unsaved changes? Is it already saved? Was it auto-saved?). - Common save button - Adds the "save" button to /home page which wasn't there before - Animates the "save" button in /home and /new when the user makes their first change to signal that yes, you do have to actually click the save button if you want to keep this. - "reminder... you haven't saved for X minutes" still not functional on /new and /home since that involves more moving pieces.	2025-10-05 21:57:19 -04:00
David Bolack	74e17e154f	Merge branch 'issue_3426' of github.com:dbolack-ab/homebrewery into issue_3426	2025-10-05 20:12:32 -05:00
Trevor Buckner	a944b23ca0	Merge pull request #4457 from naturalcrit/new/home/edit/_unsavedChanges_common Make `unsavedChanges` state common	2025-10-05 20:09:14 -04:00
David Bolack	8f715a6615	Isolate change to Firefox	2025-10-05 18:36:14 -05:00
Trevor Buckner	8f7ae35f08	Merge branch 'master' into issue_3426	2025-10-04 18:32:15 -04:00
David Bolack	f0bb06e706	Merge branch 'master' into issue_3426	2025-10-03 18:52:56 -05:00
David Bolack	c50c279ef3	Merge branch 'issue_3426' of github.com:dbolack-ab/homebrewery into issue_3426	2025-09-22 20:36:45 -05:00
David Bolack	cc246fb31a	Merge branch 'master' into issue_3426	2025-09-22 20:36:09 -05:00
Víctor Losada Hernández	4c5eef46a0	Merge branch 'master' into issue_3426	2025-08-21 16:33:19 +02:00
David Bolack	a1ab27b57f	Applies G-Ambatte's fix	2025-07-30 19:47:59 -05:00