Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[No QA] Display policy changes logs in NewDot #16500

Merged
merged 19 commits into from
Mar 28, 2023
Merged

[No QA] Display policy changes logs in NewDot #16500

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
86b0c56
add regex and conditional
luacmartins Mar 24, 2023
8bb7a42
create PolicyChangeLogActionItem
luacmartins Mar 24, 2023
1eee700
add PolicyChangeLogActionItem to ReportActionItem
luacmartins Mar 24, 2023
0acb700
revert changes to PolicyChangeLogActionItem
luacmartins Mar 27, 2023
e7e7635
rm unused import
luacmartins Mar 27, 2023
9a9bf8b
add styles to system message
luacmartins Mar 27, 2023
34b9e2b
update color
luacmartins Mar 27, 2023
168c5a5
use startsWith instead of regex
luacmartins Mar 27, 2023
55d155f
fix tests
luacmartins Mar 27, 2023
3b89cae
simplify logic and add specific consts
luacmartins Mar 27, 2023
00ed57f
add all policy change log types
luacmartins Mar 27, 2023
f3ed5da
update test
luacmartins Mar 27, 2023
dcff1f2
disable reactions
luacmartins Mar 27, 2023
88f9878
revert disable reactions
luacmartins Mar 28, 2023
fee39d4
rm parenthesis
luacmartins Mar 28, 2023
e6552c4
rm POLICYCHANGELOG prefix
luacmartins Mar 28, 2023
2e080fb
fix test
luacmartins Mar 28, 2023
24101a3
update contains logic
luacmartins Mar 28, 2023
1d0f6d1
revert package-lock.json changes
luacmartins Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/CONST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ const CONST = {
IOU: 'IOU',
RENAMED: 'RENAMED',
CHRONOSOOOLIST: 'CHRONOSOOOLIST',
POLICYCHANGELOG_REGEX: /^POLICYCHANGELOG_/,
},
},
ARCHIVE_REASON: {
Expand Down
5 changes: 5 additions & 0 deletions src/libs/ReportActionsUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,11 @@ function getSortedReportActionsForDisplay(reportActions) {
const filteredReportActions = filterOutDeprecatedReportActions(reportActions);
const sortedReportActions = getSortedReportActions(filteredReportActions, true);
return _.filter(sortedReportActions, (reportAction) => {
// Allow all Policy Change reportActions to be displayed
if (CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG_REGEX.test(reportAction.actionName)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use startsWith instead of a regex. (https://www.measurethat.net/Benchmarks/Show/4797/1/js-regex-vs-startswith-vs-indexof#latest_results_block)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated! But according to that benchmark, we should actually be using indexOf :P

return true;
}

// Filter out any unsupported reportAction types
if (!_.has(CONST.REPORT.ACTIONS.TYPE, reportAction.actionName)) {
return false;
Expand Down
5 changes: 4 additions & 1 deletion src/pages/home/report/ReportActionItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,10 @@ class ReportActionItem extends Component {
? (
<ReportActionItemMessage
action={this.props.action}
style={(!this.props.displayAsGroup && isAttachment) ? [styles.mt2] : undefined}
style={[
(!this.props.displayAsGroup && isAttachment) ? styles.mt2 : undefined,
CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG_REGEX.test(this.props.action.actionName) ? styles.colorMuted : undefined,
luacmartins marked this conversation as resolved.
Show resolved Hide resolved
]}
/>
) : (
<ReportActionItemMessageEdit
Expand Down