From 50d172bbd50ed7b6195a69b91ecb5aacc485e585 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 15 Jan 2023 14:11:33 +1300 Subject: [PATCH 1/6] Add Themes directory to watch list --- scripts/buildHomebrew.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/buildHomebrew.js b/scripts/buildHomebrew.js index ea5d1d0e2..ed9afb58b 100644 --- a/scripts/buildHomebrew.js +++ b/scripts/buildHomebrew.js @@ -136,6 +136,6 @@ fs.emptyDirSync('./build'); if(isDev){ livereload('./build'); watchFile('./server.js', { - watch : ['./client', './server'] // Watch additional folders if you want + watch : ['./client', './server', './themes'] // Watch additional folders if you want }); } From 3c86984cf1a7059766cb61e9474852b1ad1b4d3e Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 15 Jan 2023 14:13:25 +1300 Subject: [PATCH 2/6] Add change to changelog --- changelog.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changelog.md b/changelog.md index adb2d73ce..e1ab6e391 100644 --- a/changelog.md +++ b/changelog.md @@ -57,6 +57,13 @@ pre { ## changelog For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery). +### v3.6.0 +{{taskList +##### G-Ambatte + +* [x] Add Themes directory to development server watchlist. +}} + ### v3.6.0 {{taskList ##### Jeddai From 40e36fd87576c12b24a1b76115805c0ff4c04408 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 15 Jan 2023 17:26:56 +1300 Subject: [PATCH 3/6] Fix minor version number --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index e1ab6e391..907210661 100644 --- a/changelog.md +++ b/changelog.md @@ -57,7 +57,7 @@ pre { ## changelog For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery). -### v3.6.0 +### v3.6.1 {{taskList ##### G-Ambatte From e82da3a6c1e3310b59eac09e41dc3011ff025063 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 15 Jan 2023 18:19:23 +1300 Subject: [PATCH 4/6] Add buildDev to NPM scripts --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 978bde7e7..5d630bf2a 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "quick": "node scripts/quick.js", "build": "node scripts/buildHomebrew.js", "buildall": "node scripts/buildHomebrew.js && node scripts/buildAdmin.js", + "builddev": "node scripts/buildHomebrew.js --dev", "lint": "eslint --fix **/*.{js,jsx}", "lint:dry": "eslint **/*.{js,jsx}", "circleci": "npm test && eslint **/*.{js,jsx} --max-warnings=0", From ac9fbb1f085fa204b6affd8a0061e6e88877eb07 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 15 Jan 2023 18:24:23 +1300 Subject: [PATCH 5/6] Move changes from 3.6.1 to 3.6.0 --- changelog.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/changelog.md b/changelog.md index 907210661..67503206d 100644 --- a/changelog.md +++ b/changelog.md @@ -57,18 +57,15 @@ pre { ## changelog For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery). -### v3.6.1 -{{taskList -##### G-Ambatte - -* [x] Add Themes directory to development server watchlist. -}} - ### v3.6.0 {{taskList ##### Jeddai * [x] Add unit tests with full coverage for the Homebrewery API + +##### G-Ambatte + +* [x] Add Themes directory to development server watchlist. }} ### Friday 23/12/2022 - v3.5.0 From c9241e21624aed44d9f4fa84a747a631f6f00bba Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 20 Jan 2023 17:19:02 -0500 Subject: [PATCH 6/6] Fix Google Drive brews duplicating --- changelog.md | 6 ++++++ server/homebrew.api.js | 13 +++++++------ server/homebrew.api.spec.js | 3 --- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/changelog.md b/changelog.md index adb2d73ce..8311fce01 100644 --- a/changelog.md +++ b/changelog.md @@ -59,6 +59,12 @@ For a full record of development, visit our [Github Page](https://github.com/nat ### v3.6.0 {{taskList +##### calculuschild + + * [x] Fix Google Drive brews sometimes duplicating + +Fixes issues [#2603](https://github.com/naturalcrit/homebrewery/issues/2603) + ##### Jeddai * [x] Add unit tests with full coverage for the Homebrewery API diff --git a/server/homebrew.api.js b/server/homebrew.api.js index 07b1c33f2..0d3f87a20 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -109,7 +109,7 @@ If you believe you should have access to this brew, ask the file owner to invite excludePropsFromUpdate : (brew)=>{ // Remove undesired properties const modified = _.clone(brew); - const propsToExclude = ['_id', 'views', 'lastViewed', 'editId', 'shareId', 'googleId']; + const propsToExclude = ['_id', 'views', 'lastViewed']; for (const prop of propsToExclude) { delete modified[prop]; } @@ -189,17 +189,18 @@ If you believe you should have access to this brew, ask the file owner to invite res.status(200).send(saved); }, updateBrew : async (req, res)=>{ - // Initialize brew from request and body, destructure query params, set a constant for the google id, and set the initial value for the after-save method + // Initialize brew from request and body, destructure query params, and set the initial value for the after-save method const brewFromClient = api.excludePropsFromUpdate(req.body); - if(req.brew.version && brewFromClient.version && req.brew.version > brewFromClient.version) { - console.log(`Version mismatch on brew ${req.body.editId}`); + const brewFromServer = req.brew; + if(brewFromServer.version && brewFromClient.version && brewFromServer.version > brewFromClient.version) { + console.log(`Version mismatch on brew ${brewFromClient.editId}`); res.setHeader('Content-Type', 'application/json'); return res.status(409).send(JSON.stringify({ message: `The brew has been changed on a different device. Please save your changes elsewhere, refresh, and try again.` })); } - let brew = _.assign(req.brew, brewFromClient); - const { saveToGoogle, removeFromGoogle } = req.query; + let brew = _.assign(brewFromServer, brewFromClient); const googleId = brew.googleId; + const { saveToGoogle, removeFromGoogle } = req.query; let afterSave = async ()=>true; brew.text = api.mergeBrewText(brew); diff --git a/server/homebrew.api.spec.js b/server/homebrew.api.spec.js index 68355cc1a..71d9bdcc7 100644 --- a/server/homebrew.api.spec.js +++ b/server/homebrew.api.spec.js @@ -342,9 +342,6 @@ brew`); expect(result._id).toBeUndefined(); expect(result.views).toBeUndefined(); expect(result.lastViewed).toBeUndefined(); - expect(result.editId).toBeUndefined(); - expect(result.shareId).toBeUndefined(); - expect(result.googleId).toBeUndefined(); }); it('excludeGoogleProps removes the correct keys', ()=>{