From a839927851ac11123d7d111dcb6812da5c766a0c Mon Sep 17 00:00:00 2001 From: Rafael Date: Wed, 30 Jun 2021 14:39:09 -0300 Subject: [PATCH 1/4] fixes long name --- src/pages/home/report/ReportActionItemFragment.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index 71b47452715..3847545966a 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -79,9 +79,10 @@ class ReportActionItemFragment extends React.PureComponent { ); case 'TEXT': return ( - + {Str.htmlDecode(fragment.text)} From ff0507e4db3e7bfc82892d49bc87a7916b9710bb Mon Sep 17 00:00:00 2001 From: Rafael Date: Wed, 30 Jun 2021 18:07:09 -0300 Subject: [PATCH 2/4] make numberOfLines conditional --- src/pages/home/report/ReportActionItemFragment.js | 2 +- src/pages/home/report/ReportActionItemSingle.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index 3847545966a..289b7ab3e94 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -82,7 +82,7 @@ class ReportActionItemFragment extends React.PureComponent { {Str.htmlDecode(fragment.text)} diff --git a/src/pages/home/report/ReportActionItemSingle.js b/src/pages/home/report/ReportActionItemSingle.js index 8845b69476e..576363918b1 100644 --- a/src/pages/home/report/ReportActionItemSingle.js +++ b/src/pages/home/report/ReportActionItemSingle.js @@ -54,7 +54,7 @@ const ReportActionItemSingle = ({ // we'll need to take the displayName from personal details and have it be in the same format for now. Eventually, // we should stop referring to the report history items entirely for this information. const personArray = displayName - ? [{type: 'TEXT', text: Str.isSMSLogin(login) ? toLocalPhone(displayName) : displayName}] + ? [{type: 'TEXT', text: Str.isSMSLogin(login) ? toLocalPhone(displayName) : displayName, isSingleLine: true}] : action.person; return ( From 1e3f882bd432eed6772dfdb0fe8b80300a710a36 Mon Sep 17 00:00:00 2001 From: Rafael Date: Wed, 30 Jun 2021 18:49:58 -0300 Subject: [PATCH 3/4] makes isSingleLine a prop of our report fragment --- src/pages/home/report/ReportActionItemFragment.js | 7 ++++++- src/pages/home/report/ReportActionItemSingle.js | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index 289b7ab3e94..fc624a0620f 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -25,12 +25,16 @@ const propTypes = { /** Does this fragment belong to a reportAction that has not yet loaded? */ loading: PropTypes.bool, + /** Should this fragment be contained in a single line? */ + isSingleLine: PropTypes.bool, + ...windowDimensionsPropTypes, }; const defaultProps = { isAttachment: false, loading: false, + isSingleLine: false, tooltipText: '', }; @@ -78,11 +82,12 @@ class ReportActionItemFragment extends React.PureComponent { ); case 'TEXT': + console.log(fragment); return ( {Str.htmlDecode(fragment.text)} diff --git a/src/pages/home/report/ReportActionItemSingle.js b/src/pages/home/report/ReportActionItemSingle.js index 576363918b1..2224f564801 100644 --- a/src/pages/home/report/ReportActionItemSingle.js +++ b/src/pages/home/report/ReportActionItemSingle.js @@ -54,7 +54,7 @@ const ReportActionItemSingle = ({ // we'll need to take the displayName from personal details and have it be in the same format for now. Eventually, // we should stop referring to the report history items entirely for this information. const personArray = displayName - ? [{type: 'TEXT', text: Str.isSMSLogin(login) ? toLocalPhone(displayName) : displayName, isSingleLine: true}] + ? [{type: 'TEXT', text: Str.isSMSLogin(login) ? toLocalPhone(displayName) : displayName}] : action.person; return ( @@ -71,6 +71,7 @@ const ReportActionItemSingle = ({ tooltipText={action.actorEmail} isAttachment={action.isAttachment} isLoading={action.loading} + isSingleLine={true} /> ))} From dd614559fa5ca8d56531d04b21d67ad1d2f355a9 Mon Sep 17 00:00:00 2001 From: Rafael Date: Wed, 30 Jun 2021 18:54:18 -0300 Subject: [PATCH 4/4] lint fixes --- src/pages/home/report/ReportActionItemFragment.js | 1 - src/pages/home/report/ReportActionItemSingle.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index fc624a0620f..9e5e65dfca9 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -82,7 +82,6 @@ class ReportActionItemFragment extends React.PureComponent { ); case 'TEXT': - console.log(fragment); return ( ))}