From 120e99959ab7286a1320fa1ff78209bc7237fc63 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Tue, 10 Aug 2021 18:54:16 +1200 Subject: [PATCH 1/5] Update BrewItem tooltips --- client/homebrew/pages/userPage/brewItem/brewItem.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/homebrew/pages/userPage/brewItem/brewItem.jsx b/client/homebrew/pages/userPage/brewItem/brewItem.jsx index f0557c47e..693e17c94 100644 --- a/client/homebrew/pages/userPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/userPage/brewItem/brewItem.jsx @@ -48,7 +48,7 @@ const BrewItem = createClass({ if(!this.props.brew.editId) return; return - + ; }, @@ -61,7 +61,7 @@ const BrewItem = createClass({ } return - + ; }, @@ -74,7 +74,7 @@ const BrewItem = createClass({ } return - + ; }, @@ -87,7 +87,7 @@ const BrewItem = createClass({ } return - + ; }, @@ -101,7 +101,7 @@ const BrewItem = createClass({ getTooltipData : function(){ const dateFormatString = 'YYYY-MM-DD HH:mm:ss'; - let outputString = `Created: ${this.props.brew.createdAt ? moment(this.props.brew.createdAt).local().format(dateFormatString) : 'UNKNOWN'}\n`; + let outputString = `Title: ${this.props.brew.title}\nCreated: ${this.props.brew.createdAt ? moment(this.props.brew.createdAt).local().format(dateFormatString) : 'UNKNOWN'}\n`; outputString += `Last updated: ${this.props.brew.updatedAt ? moment(this.props.brew.updatedAt).local().format(dateFormatString) : 'UNKNOWN'}`; return outputString; }, From 0ddfb6e4e76e8fbf09f11ebf24aab7c985e654a7 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Tue, 10 Aug 2021 20:47:49 +1200 Subject: [PATCH 2/5] Update following Gitter conversation --- .../pages/userPage/brewItem/brewItem.jsx | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/client/homebrew/pages/userPage/brewItem/brewItem.jsx b/client/homebrew/pages/userPage/brewItem/brewItem.jsx index 693e17c94..adc63c39c 100644 --- a/client/homebrew/pages/userPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/userPage/brewItem/brewItem.jsx @@ -99,29 +99,29 @@ const BrewItem = createClass({ ; }, - getTooltipData : function(){ - const dateFormatString = 'YYYY-MM-DD HH:mm:ss'; - let outputString = `Title: ${this.props.brew.title}\nCreated: ${this.props.brew.createdAt ? moment(this.props.brew.createdAt).local().format(dateFormatString) : 'UNKNOWN'}\n`; - outputString += `Last updated: ${this.props.brew.updatedAt ? moment(this.props.brew.updatedAt).local().format(dateFormatString) : 'UNKNOWN'}`; - return outputString; - }, - render : function(){ const brew = this.props.brew; - return
+ const dateFormatString = 'YYYY-MM-DD HH:mm:ss'; + + return

{brew.title}

{brew.description}

- - {brew.authors.join(', ')} + + {brew.authors.join(', ')} - - {brew.views} + + {brew.views} - - {moment(brew.updatedAt).fromNow()} + + + {moment(brew.updatedAt).fromNow()} {this.renderGoogleDriveIcon()}
From 479f9af08ce92d1a05850d6d5660b81a5fd51177 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Tue, 10 Aug 2021 21:31:02 +1200 Subject: [PATCH 3/5] Wrap Last Viewed tooltip with Moment --- client/homebrew/pages/userPage/brewItem/brewItem.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/homebrew/pages/userPage/brewItem/brewItem.jsx b/client/homebrew/pages/userPage/brewItem/brewItem.jsx index adc63c39c..50ab397c3 100644 --- a/client/homebrew/pages/userPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/userPage/brewItem/brewItem.jsx @@ -112,13 +112,13 @@ const BrewItem = createClass({ {brew.authors.join(', ')} - + {brew.views} {moment(brew.updatedAt).fromNow()} From 72b18e42665cbbe4328a176aa79e6a22afff4b96 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Tue, 10 Aug 2021 21:35:27 +1200 Subject: [PATCH 4/5] Add `modifiedTime` to properties to apply during view count increase update. --- server/googleActions.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/googleActions.js b/server/googleActions.js index ff5fd0662..320e6f752 100644 --- a/server/googleActions.js +++ b/server/googleActions.js @@ -358,8 +358,9 @@ GoogleActions = { await drive.files.update({ fileId : brew.googleId, - resource : { properties : { views : brew.views + 1, - lastViewed : new Date() } } + resource : { modifiedTime : brew.updatedAt, + properties : { views : brew.views + 1, + lastViewed : new Date() } } }) .catch((err)=>{ console.log('Error updating Google views'); From a6aaa933899cdafa372728612b3045d5c80df6bc Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Tue, 10 Aug 2021 21:37:03 +1200 Subject: [PATCH 5/5] Revert "Add `modifiedTime` to properties to apply during view count increase update." This reverts commit 72b18e42665cbbe4328a176aa79e6a22afff4b96. --- server/googleActions.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/googleActions.js b/server/googleActions.js index 320e6f752..ff5fd0662 100644 --- a/server/googleActions.js +++ b/server/googleActions.js @@ -358,9 +358,8 @@ GoogleActions = { await drive.files.update({ fileId : brew.googleId, - resource : { modifiedTime : brew.updatedAt, - properties : { views : brew.views + 1, - lastViewed : new Date() } } + resource : { properties : { views : brew.views + 1, + lastViewed : new Date() } } }) .catch((err)=>{ console.log('Error updating Google views');