From a237bac9dcb4da8cc8126338ee15763abd292d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Sun, 26 Jul 2026 19:51:26 +0200 Subject: [PATCH 1/5] fix the issue --- client/homebrew/pages/editPage/editPage.jsx | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index bc18bc5e5..4cb3ba522 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -71,6 +71,7 @@ const EditPage = (props)=>{ const [alertTrashedGoogleBrew, setAlertTrashedGoogleBrew] = useState(props.brew.trashed); const [alertLoginToTransfer, setAlertLoginToTransfer] = useState(false); const [confirmGoogleTransfer, setConfirmGoogleTransfer] = useState(false); + const [notOwnerToTransfer, setNotOwnerToTransfer] = useState(false); const [autoSaveEnabled, setAutoSaveEnabled] = useState(true); const [warnUnsavedChanges, setWarnUnsavedChanges] = useState(true); @@ -162,6 +163,9 @@ const EditPage = (props)=>{ }; const handleGoogleClick = ()=>{ + if(global.account !== brew.authors[0]) { + setNotOwnerToTransfer(true); + } if(!global.account?.googleId) { setAlertLoginToTransfer(true); return; @@ -176,6 +180,7 @@ const EditPage = (props)=>{ setAlertTrashedGoogleBrew(false); setAlertLoginToTransfer(false); setConfirmGoogleTransfer(false); + setNotOwnerToTransfer(false); }; const toggleGoogleStorage = ()=>{ @@ -271,9 +276,19 @@ const EditPage = (props)=>{ )} + {notOwnerToTransfer && ( +
+ You must be the Owner to transfer between the Homebrewery and Google Drive! + +
Sign In
+ +
Not Now
+
+ )} + {alertLoginToTransfer && (
- You must be signed in to a Google account to transfer between the homebrewery and Google Drive! + You must be signed in to a Google account to transfer between the Homebrewery and Google Drive!
Sign In
From 089e880b88ba87e5d0aea2f459ae4131d0725107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Tue, 28 Jul 2026 23:46:31 +0200 Subject: [PATCH 2/5] suggested changes --- client/homebrew/pages/editPage/editPage.jsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index 4cb3ba522..ebed5fa72 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -70,8 +70,8 @@ const EditPage = (props)=>{ const [unsavedChanges, setUnsavedChanges] = useState(false); const [alertTrashedGoogleBrew, setAlertTrashedGoogleBrew] = useState(props.brew.trashed); const [alertLoginToTransfer, setAlertLoginToTransfer] = useState(false); + const [alertOwnershipToTransfer, setalertOwnershipToTransfer] = useState(false); const [confirmGoogleTransfer, setConfirmGoogleTransfer] = useState(false); - const [notOwnerToTransfer, setNotOwnerToTransfer] = useState(false); const [autoSaveEnabled, setAutoSaveEnabled] = useState(true); const [warnUnsavedChanges, setWarnUnsavedChanges] = useState(true); @@ -164,7 +164,7 @@ const EditPage = (props)=>{ const handleGoogleClick = ()=>{ if(global.account !== brew.authors[0]) { - setNotOwnerToTransfer(true); + setalertOwnershipToTransfer(true); } if(!global.account?.googleId) { setAlertLoginToTransfer(true); @@ -180,7 +180,7 @@ const EditPage = (props)=>{ setAlertTrashedGoogleBrew(false); setAlertLoginToTransfer(false); setConfirmGoogleTransfer(false); - setNotOwnerToTransfer(false); + setalertOwnershipToTransfer(false); }; const toggleGoogleStorage = ()=>{ @@ -276,13 +276,13 @@ const EditPage = (props)=>{
)} - {notOwnerToTransfer && ( + {alertOwnershipToTransfer && (
You must be the Owner to transfer between the Homebrewery and Google Drive! + The owner of this file is ${brew.authors[0]} -
Sign In
+
Okay
-
Not Now
)} From 3367530733b7a622fbff48e05b4cc26f2c74ce51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Sat, 5 Sep 2026 21:30:46 +0200 Subject: [PATCH 3/5] corrections --- client/homebrew/pages/editPage/editPage.jsx | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index 98653a1f4..f6e50603a 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -69,7 +69,7 @@ const EditPage = (props)=>{ const [themeBundle, setThemeBundle] = useState({}); const [unsavedChanges, setUnsavedChanges] = useState(false); const [alertTrashedGoogleBrew, setAlertTrashedGoogleBrew] = useState(props.brew.trashed); - const [alertLoginToTransfer, setAlertLoginToTransfer] = useState(false); + const [alertNoGoogleToTransfer, setAlertNoGoogleToTransfer] = useState(false); const [alertOwnershipToTransfer, setalertOwnershipToTransfer] = useState(false); const [confirmGoogleTransfer, setConfirmGoogleTransfer] = useState(false); const [autoSaveEnabled, setAutoSaveEnabled] = useState(true); @@ -163,11 +163,12 @@ const EditPage = (props)=>{ }; const handleGoogleClick = ()=>{ - if(global.account !== brew.authors[0]) { + if(global.account !== currentBrew.authors[0]) { setalertOwnershipToTransfer(true); + return; } if(!global.account?.googleId) { - setAlertLoginToTransfer(true); + setAlertNoGoogleToTransfer(true); return; } @@ -178,7 +179,7 @@ const EditPage = (props)=>{ const closeAlerts = (e)=>{ e.stopPropagation(); //Only handle click once so alert doesn't reopen setAlertTrashedGoogleBrew(false); - setAlertLoginToTransfer(false); + setAlertNoGoogleToTransfer(false); setConfirmGoogleTransfer(false); setalertOwnershipToTransfer(false); }; @@ -279,14 +280,12 @@ const EditPage = (props)=>{ {alertOwnershipToTransfer && (
You must be the Owner to transfer between the Homebrewery and Google Drive! - The owner of this file is ${brew.authors[0]} - + The owner of this file is ${currentBrew.authors[0]}
Okay
-
)} - {alertLoginToTransfer && ( + {alertNoGoogleToTransfer && (
You must be signed in to a Google account to transfer between the Homebrewery and Google Drive! From 556569d1106c86609bbe32fb50bc58588d4457f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Sat, 5 Sep 2026 21:40:54 +0200 Subject: [PATCH 4/5] move priorities --- client/homebrew/pages/editPage/editPage.jsx | 24 +++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index f6e50603a..20c05a797 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -266,16 +266,7 @@ const EditPage = (props)=>{ Google Drive icon - {confirmGoogleTransfer && ( -
- {saveGoogle - ? 'Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?' - : 'Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?'} -
-
Yes
-
No
-
- )} + {alertOwnershipToTransfer && (
@@ -299,7 +290,18 @@ const EditPage = (props)=>{
This brew is currently in your Trash folder on Google Drive!
If you want to keep it, make sure to move it before it is deleted permanently!
-
OK
+
Save my brew
+
+ )} + + {confirmGoogleTransfer && ( +
+ {saveGoogle + ? 'Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?' + : 'Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?'} +
+
Yes
+
No
)} From 9dccd1ef98f143bd622278c4f1468c60a457ffc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Sat, 5 Sep 2026 21:53:52 +0200 Subject: [PATCH 5/5] small inconsistencies --- client/homebrew/pages/editPage/editPage.jsx | 27 +++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index 20c05a797..36df0f1bb 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -70,7 +70,7 @@ const EditPage = (props)=>{ const [unsavedChanges, setUnsavedChanges] = useState(false); const [alertTrashedGoogleBrew, setAlertTrashedGoogleBrew] = useState(props.brew.trashed); const [alertNoGoogleToTransfer, setAlertNoGoogleToTransfer] = useState(false); - const [alertOwnershipToTransfer, setalertOwnershipToTransfer] = useState(false); + const [alertOwnershipToTransfer, setAlertOwnershipToTransfer] = useState(false); const [confirmGoogleTransfer, setConfirmGoogleTransfer] = useState(false); const [autoSaveEnabled, setAutoSaveEnabled] = useState(true); const [warnUnsavedChanges, setWarnUnsavedChanges] = useState(true); @@ -106,7 +106,7 @@ const EditPage = (props)=>{ }; return ()=>{ document.removeEventListener('keydown', handleControlKeys); - window.onBeforeUnload = null; + window.onbeforeunload = null; }; }, []); @@ -184,7 +184,8 @@ const EditPage = (props)=>{ setalertOwnershipToTransfer(false); }; - const toggleGoogleStorage = ()=>{ + const toggleGoogleStorage = (e)=>{ + closeAlerts(e); const newSaveGoogle = !saveGoogle; setSaveGoogle((prev)=>!prev); setError(null); @@ -266,28 +267,28 @@ const EditPage = (props)=>{ Google Drive icon - + {alertOwnershipToTransfer && ( -
+
You must be the Owner to transfer between the Homebrewery and Google Drive! - The owner of this file is ${currentBrew.authors[0]} -
Okay
+ The owner of this file is {currentBrew.authors[0]} +
Okay
)} {alertNoGoogleToTransfer && ( -
+ )} {alertTrashedGoogleBrew && ( -
+
This brew is currently in your Trash folder on Google Drive!
If you want to keep it, make sure to move it before it is deleted permanently!
Save my brew
@@ -295,13 +296,13 @@ const EditPage = (props)=>{ )} {confirmGoogleTransfer && ( -
+
{saveGoogle ? 'Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?' : 'Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?'}
Yes
-
No
+
No
)}