From c0f113723410281190ce2130edcab1403bce26d0 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Mon, 24 May 2021 18:10:16 -0400 Subject: [PATCH 1/7] initial addition for chatType info --- src/ONYXKEYS.js | 3 +++ src/libs/actions/Policy.js | 14 ++++++++++++++ src/libs/actions/Report.js | 5 +++++ 3 files changed, 22 insertions(+) create mode 100644 src/libs/actions/Policy.js diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js index 6ee6ba2a626d..2ba87e4443ab 100755 --- a/src/ONYXKEYS.js +++ b/src/ONYXKEYS.js @@ -42,6 +42,9 @@ export default { // Contains all the personalDetails the user has access to PERSONAL_DETAILS: 'personalDetails', + // Contains all relevant details to the policies that the user has access to + POLICY: 'policy', + // Indicates whether an update is available and ready to beinstalled. UPDATE_AVAILABLE: 'updateAvailable', diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js new file mode 100644 index 000000000000..15143b21cd4d --- /dev/null +++ b/src/libs/actions/Policy.js @@ -0,0 +1,14 @@ +import Onyx from 'react-native-onyx'; +import ONYXKEYS from '../../ONYXKEYS'; + + +/** + * + * @param {String} policyID + */ +function getPolicySummary(policyID) { +} + +export { + getPolicySummary, +} diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 0d5085ada3ee..f51dcdc7bc2a 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -163,6 +163,11 @@ function getSimplifiedReportObject(report) { return { reportID: report.reportID, reportName, + chatType: lodashGet(report, [ + 'reportNameValuePairs.chatType' + ]), + ownerEmail: report.ownerEmail, + policyName: getPolicyName(report.), unreadActionCount: getUnreadActionCount(report), maxSequenceNumber: report.reportActionList.length, participants: getParticipantEmailsFromReport(report), From fc787a18289a5cdf2c912fdb2c10c35258355deb Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Thu, 27 May 2021 14:28:39 -0400 Subject: [PATCH 2/7] Revert policy action changes --- src/ONYXKEYS.js | 3 --- src/libs/actions/Policy.js | 14 -------------- 2 files changed, 17 deletions(-) delete mode 100644 src/libs/actions/Policy.js diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js index 2ba87e4443ab..6ee6ba2a626d 100755 --- a/src/ONYXKEYS.js +++ b/src/ONYXKEYS.js @@ -42,9 +42,6 @@ export default { // Contains all the personalDetails the user has access to PERSONAL_DETAILS: 'personalDetails', - // Contains all relevant details to the policies that the user has access to - POLICY: 'policy', - // Indicates whether an update is available and ready to beinstalled. UPDATE_AVAILABLE: 'updateAvailable', diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js deleted file mode 100644 index 15143b21cd4d..000000000000 --- a/src/libs/actions/Policy.js +++ /dev/null @@ -1,14 +0,0 @@ -import Onyx from 'react-native-onyx'; -import ONYXKEYS from '../../ONYXKEYS'; - - -/** - * - * @param {String} policyID - */ -function getPolicySummary(policyID) { -} - -export { - getPolicySummary, -} From 8a7ffac753568be8fb4691c08b44c7926901c260 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Thu, 3 Jun 2021 17:16:52 -0400 Subject: [PATCH 3/7] Use lodash get instead --- src/libs/actions/Report.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index f51dcdc7bc2a..abb95062db30 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -163,11 +163,9 @@ function getSimplifiedReportObject(report) { return { reportID: report.reportID, reportName, - chatType: lodashGet(report, [ - 'reportNameValuePairs.chatType' - ]), - ownerEmail: report.ownerEmail, - policyName: getPolicyName(report.), + chatType: lodashGet(report, ['reportNameValuePairs.chatType'], ''), + ownerEmail:lodashGet(report, ['ownerEmail'], ''), + policyName: lodashGet(report, ['policyName'], ''), unreadActionCount: getUnreadActionCount(report), maxSequenceNumber: report.reportActionList.length, participants: getParticipantEmailsFromReport(report), From 02c8122c941c7f5a5119159683788734c345ee4a Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Fri, 4 Jun 2021 09:45:30 -0400 Subject: [PATCH 4/7] comment out --- src/libs/actions/Report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index abb95062db30..c17d1e35fce7 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -165,7 +165,7 @@ function getSimplifiedReportObject(report) { reportName, chatType: lodashGet(report, ['reportNameValuePairs.chatType'], ''), ownerEmail:lodashGet(report, ['ownerEmail'], ''), - policyName: lodashGet(report, ['policyName'], ''), + // policyName: lodashGet(report, ['policyName'], ''), unreadActionCount: getUnreadActionCount(report), maxSequenceNumber: report.reportActionList.length, participants: getParticipantEmailsFromReport(report), From 0a89813b3d02b411ae3129fa1b833345cb8f2e61 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Tue, 8 Jun 2021 15:19:27 -0400 Subject: [PATCH 5/7] Fix incorrect lodashGet syntax --- src/libs/actions/Report.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 81dd8481f51e..85193a48e4c0 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -166,9 +166,9 @@ function getSimplifiedReportObject(report) { return { reportID: report.reportID, reportName, - chatType: lodashGet(report, ['reportNameValuePairs.chatType'], ''), - ownerEmail:lodashGet(report, ['ownerEmail'], ''), - // policyName: lodashGet(report, ['policyName'], ''), + chatType: lodashGet(report, ['reportNameValuePairs', 'chatType'], ''), + ownerEmail: lodashGet(report, 'ownerEmail', ''), + policyID: lodashGet(report, ['reportNameValuePairs', 'expensify_policyID'], ''), unreadActionCount: getUnreadActionCount(report), maxSequenceNumber: report.reportActionList.length, participants: getParticipantEmailsFromReport(report), From 5d4ed5115265f05997d8b358b9cb3ce8a0a68824 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Tue, 8 Jun 2021 15:20:21 -0400 Subject: [PATCH 6/7] Use common syntax for lodashGet --- src/libs/actions/Report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 85193a48e4c0..f28998156a89 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -158,7 +158,7 @@ function getSimplifiedReportObject(report) { const lastMessageText = lodashGet(lastReportAction, ['message', 'html'], '') .replace(/((]*>)+)/gi, ' ') .replace(/(<([^>]+)>)/gi, ''); - const reportName = lodashGet(report, 'reportNameValuePairs.type') === 'chat' + const reportName = lodashGet(report, ['reportNameValuePairs', 'type']) === 'chat' ? getChatReportName(report.sharedReportList) : report.reportName; const lastActorEmail = lodashGet(lastReportAction, 'accountEmail', ''); From 7f9ee7206d89982848087c79a7d4ea3f29c8d50d Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Tue, 8 Jun 2021 15:33:05 -0400 Subject: [PATCH 7/7] better syntax --- src/libs/actions/Report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index f28998156a89..ec549c3e984e 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -167,7 +167,7 @@ function getSimplifiedReportObject(report) { reportID: report.reportID, reportName, chatType: lodashGet(report, ['reportNameValuePairs', 'chatType'], ''), - ownerEmail: lodashGet(report, 'ownerEmail', ''), + ownerEmail: lodashGet(report, ['ownerEmail'], ''), policyID: lodashGet(report, ['reportNameValuePairs', 'expensify_policyID'], ''), unreadActionCount: getUnreadActionCount(report), maxSequenceNumber: report.reportActionList.length,