From 2946ad9968859d6c7cd8039917397b470aaf4e66 Mon Sep 17 00:00:00 2001 From: Andre Fonseca Date: Wed, 26 Aug 2020 17:13:27 +0100 Subject: [PATCH 1/3] restoring the grouped comments, and fixing the style for it --- src/page/HomePage/Report/ReportHistoryItem.js | 2 +- .../Report/ReportHistoryItemGrouped.js | 17 +++++++--- src/page/HomePage/Report/ReportHistoryView.js | 34 +++++++++---------- src/style/StyleSheet.js | 8 +++++ 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/src/page/HomePage/Report/ReportHistoryItem.js b/src/page/HomePage/Report/ReportHistoryItem.js index 806da6592f8d..91a1e59a32e8 100644 --- a/src/page/HomePage/Report/ReportHistoryItem.js +++ b/src/page/HomePage/Report/ReportHistoryItem.js @@ -34,7 +34,7 @@ class ReportHistoryItem extends React.Component { return ( {!displayAsGroup && ()} - {displayAsGroup && } + {displayAsGroup && ()} ); } diff --git a/src/page/HomePage/Report/ReportHistoryItemGrouped.js b/src/page/HomePage/Report/ReportHistoryItemGrouped.js index 62c195e3b655..bcac4014902a 100644 --- a/src/page/HomePage/Report/ReportHistoryItemGrouped.js +++ b/src/page/HomePage/Report/ReportHistoryItemGrouped.js @@ -1,5 +1,5 @@ import React from 'react'; -import {Text} from 'react-native'; +import {View} from 'react-native'; import PropTypes from 'prop-types'; import ReportHistoryPropsTypes from './ReportHistoryPropsTypes'; import ReportHistoryItemMessage from './ReportHistoryItemMessage'; @@ -8,15 +8,22 @@ import styles from '../../../style/StyleSheet'; const propTypes = { // All the data of the history item historyItem: PropTypes.shape(ReportHistoryPropsTypes).isRequired, + + // Current users auth token + authToken: PropTypes.string.isRequired, }; class ReportHistoryItemGrouped extends React.PureComponent { render() { - const {historyItem} = this.props; + const {historyItem, authToken} = this.props; return ( - - - + + + + + + + ); } } diff --git a/src/page/HomePage/Report/ReportHistoryView.js b/src/page/HomePage/Report/ReportHistoryView.js index bc958f7240e4..88461cf99638 100644 --- a/src/page/HomePage/Report/ReportHistoryView.js +++ b/src/page/HomePage/Report/ReportHistoryView.js @@ -60,24 +60,22 @@ class ReportHistoryView extends React.Component { */ // eslint-disable-next-line isConsecutiveHistoryItemMadeByPreviousActor(historyItemIndex) { - // Disable this for now - return false; - - // const filteredHistory = this.getFilteredReportHistory(); - // - // // This is the created action and the very first action so it cannot be a consecutive comment. - // if (historyItemIndex === 0) { - // return false; - // } - // - // const previousAction = filteredHistory[historyItemIndex - 1]; - // const currentAction = filteredHistory[historyItemIndex]; - // - // if (currentAction.timestamp - previousAction.timestamp > 300) { - // return false; - // } - // - // return currentAction.actorEmail === previousAction.actorEmail; + // this.getFilteredReportHistory(); + const reportHistory = lodashGet(this.props, 'reportHistory', {}); + + // This is the created action and the very first action so it cannot be a consecutive comment. + if (historyItemIndex === 0) { + return false; + } + + const previousAction = reportHistory[historyItemIndex - 1]; + const currentAction = reportHistory[historyItemIndex]; + + if (currentAction.timestamp - previousAction.timestamp > 300) { + return false; + } + + return currentAction.actorEmail === previousAction.actorEmail; } /** diff --git a/src/style/StyleSheet.js b/src/style/StyleSheet.js index 3edd065da5eb..5a3bb10c930c 100644 --- a/src/style/StyleSheet.js +++ b/src/style/StyleSheet.js @@ -423,6 +423,14 @@ const styles = { marginRight: 8, }, + chatItemRightGrouped: { + flexGrow: 1, + flexShrink: 1, + flexBasis: 0, + position: 'relative', + marginLeft: 48, + }, + chatItemRight: { flexGrow: 1, flexShrink: 1, From 847f5633763d7d69cac34dffa4fdae4830287e46 Mon Sep 17 00:00:00 2001 From: Andre Fonseca Date: Thu, 27 Aug 2020 12:18:08 +0100 Subject: [PATCH 2/3] remove commented line --- src/page/HomePage/Report/ReportHistoryView.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/page/HomePage/Report/ReportHistoryView.js b/src/page/HomePage/Report/ReportHistoryView.js index 88461cf99638..002d9d1f96a2 100644 --- a/src/page/HomePage/Report/ReportHistoryView.js +++ b/src/page/HomePage/Report/ReportHistoryView.js @@ -60,7 +60,6 @@ class ReportHistoryView extends React.Component { */ // eslint-disable-next-line isConsecutiveHistoryItemMadeByPreviousActor(historyItemIndex) { - // this.getFilteredReportHistory(); const reportHistory = lodashGet(this.props, 'reportHistory', {}); // This is the created action and the very first action so it cannot be a consecutive comment. From f737865bd41c2e7753fff25723c2aa9218db48a4 Mon Sep 17 00:00:00 2001 From: Andre Fonseca Date: Thu, 27 Aug 2020 16:14:18 +0100 Subject: [PATCH 3/3] adding a comment and removing the `(` --- src/page/HomePage/Report/ReportHistoryItem.js | 4 ++-- src/page/HomePage/Report/ReportHistoryView.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/page/HomePage/Report/ReportHistoryItem.js b/src/page/HomePage/Report/ReportHistoryItem.js index 91a1e59a32e8..4b67b2b5760f 100644 --- a/src/page/HomePage/Report/ReportHistoryItem.js +++ b/src/page/HomePage/Report/ReportHistoryItem.js @@ -33,8 +33,8 @@ class ReportHistoryItem extends React.Component { return ( - {!displayAsGroup && ()} - {displayAsGroup && ()} + {!displayAsGroup && } + {displayAsGroup && } ); } diff --git a/src/page/HomePage/Report/ReportHistoryView.js b/src/page/HomePage/Report/ReportHistoryView.js index 40bbd7842489..9006f2b16cbe 100644 --- a/src/page/HomePage/Report/ReportHistoryView.js +++ b/src/page/HomePage/Report/ReportHistoryView.js @@ -71,6 +71,7 @@ class ReportHistoryView extends React.Component { const previousAction = reportHistory[historyItemIndex - 1]; const currentAction = reportHistory[historyItemIndex]; + // Comments are only grouped if they happen within 5 minutes of each other if (currentAction.timestamp - previousAction.timestamp > 300) { return false; }