From e5187acdcaaf10358bc0f8b90d024962e5749470 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Thu, 30 May 2024 00:00:15 +0200 Subject: [PATCH 1/7] Add new deprecated report actions --- src/libs/ReportActionsUtils.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index bda96e01fbe6..ce056973d4d4 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -506,6 +506,12 @@ function isReportActionDeprecated(reportAction: OnyxEntry, key: st return true; } + const deprecatedOldDotReportActions = ['DELETEDACCOUNT', 'REIMBURSEMENTREQUESTED', 'REIMBURSEMENTSETUPREQUESTED', 'DONATION']; + if (deprecatedOldDotReportActions.includes(String(reportAction.actionName))) { + Log.info('Front end filtered out reportAction for being an older, deprecated report action', false, reportAction); + return true; + } + return false; } From c34b7af3fbe7b600b53ce905afa676ff495010d9 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Thu, 30 May 2024 00:03:19 +0200 Subject: [PATCH 2/7] test --- src/libs/ReportActionsUtils.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index ce056973d4d4..4b25929e3969 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -506,11 +506,11 @@ function isReportActionDeprecated(reportAction: OnyxEntry, key: st return true; } - const deprecatedOldDotReportActions = ['DELETEDACCOUNT', 'REIMBURSEMENTREQUESTED', 'REIMBURSEMENTSETUPREQUESTED', 'DONATION']; - if (deprecatedOldDotReportActions.includes(String(reportAction.actionName))) { - Log.info('Front end filtered out reportAction for being an older, deprecated report action', false, reportAction); - return true; - } + // const deprecatedOldDotReportActions = ['DELETEDACCOUNT', 'REIMBURSEMENTREQUESTED', 'REIMBURSEMENTSETUPREQUESTED', 'DONATION']; + // if (deprecatedOldDotReportActions.includes(String(reportAction.actionName))) { + // Log.info('Front end filtered out reportAction for being an older, deprecated report action', false, reportAction); + // return true; + // } return false; } From b6aa13d63126543430837db355dc381e5f98e514 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Thu, 30 May 2024 00:31:25 +0200 Subject: [PATCH 3/7] fix type test --- src/libs/ReportActionsUtils.ts | 10 +++++----- src/libs/ReportUtils.ts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index 4b25929e3969..ce056973d4d4 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -506,11 +506,11 @@ function isReportActionDeprecated(reportAction: OnyxEntry, key: st return true; } - // const deprecatedOldDotReportActions = ['DELETEDACCOUNT', 'REIMBURSEMENTREQUESTED', 'REIMBURSEMENTSETUPREQUESTED', 'DONATION']; - // if (deprecatedOldDotReportActions.includes(String(reportAction.actionName))) { - // Log.info('Front end filtered out reportAction for being an older, deprecated report action', false, reportAction); - // return true; - // } + const deprecatedOldDotReportActions = ['DELETEDACCOUNT', 'REIMBURSEMENTREQUESTED', 'REIMBURSEMENTSETUPREQUESTED', 'DONATION']; + if (deprecatedOldDotReportActions.includes(String(reportAction.actionName))) { + Log.info('Front end filtered out reportAction for being an older, deprecated report action', false, reportAction); + return true; + } return false; } diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index a6fe52f4c7b2..8a59958c208b 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -81,7 +81,7 @@ import * as ReportActionsUtils from './ReportActionsUtils'; import StringUtils from './StringUtils'; import * as TransactionUtils from './TransactionUtils'; import * as Url from './Url'; -import type * as UserUtils from './UserUtils'; +import * as UserUtils from './UserUtils'; type AvatarRange = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18; From f6380488d9c03296559ae0cbfd7b6c96334a2639 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Thu, 30 May 2024 00:47:35 +0200 Subject: [PATCH 4/7] fix import --- src/libs/ReportUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index a6fe52f4c7b2..8a59958c208b 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -81,7 +81,7 @@ import * as ReportActionsUtils from './ReportActionsUtils'; import StringUtils from './StringUtils'; import * as TransactionUtils from './TransactionUtils'; import * as Url from './Url'; -import type * as UserUtils from './UserUtils'; +import * as UserUtils from './UserUtils'; type AvatarRange = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18; From 1bb10a50a54c42fe327fc65cb2061aa50a26ad63 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Thu, 30 May 2024 01:14:58 +0200 Subject: [PATCH 5/7] Update Perf tests --- src/CONST.ts | 1 + src/libs/ReportActionsUtils.ts | 6 ++++++ tests/utils/collections/reportActions.ts | 4 +++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/CONST.ts b/src/CONST.ts index ebab53ffae22..4f622cc0b3bf 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -685,6 +685,7 @@ const CONST = { REIMBURSEMENT_DEQUEUED: 'REIMBURSEMENTDEQUEUED', REIMBURSEMENT_REQUESTED: 'REIMBURSEMENTREQUESTED', // OldDot Action REIMBURSEMENT_SETUP: 'REIMBURSEMENTSETUP', // OldDot Action + REIMBURSEMENT_SETUP_REQUESTED: 'REIMBURSEMENTSETUPREQUESTED', // OldDot Action RENAMED: 'RENAMED', REPORT_PREVIEW: 'REPORTPREVIEW', SELECTED_FOR_RANDOM_AUDIT: 'SELECTEDFORRANDOMAUDIT', // OldDot Action diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index bda96e01fbe6..ce056973d4d4 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -506,6 +506,12 @@ function isReportActionDeprecated(reportAction: OnyxEntry, key: st return true; } + const deprecatedOldDotReportActions = ['DELETEDACCOUNT', 'REIMBURSEMENTREQUESTED', 'REIMBURSEMENTSETUPREQUESTED', 'DONATION']; + if (deprecatedOldDotReportActions.includes(String(reportAction.actionName))) { + Log.info('Front end filtered out reportAction for being an older, deprecated report action', false, reportAction); + return true; + } + return false; } diff --git a/tests/utils/collections/reportActions.ts b/tests/utils/collections/reportActions.ts index 152358cedb49..85d79eaa3aac 100644 --- a/tests/utils/collections/reportActions.ts +++ b/tests/utils/collections/reportActions.ts @@ -26,11 +26,13 @@ const getRandomDate = (): string => { return formattedDate; }; +const deprecatedReportActions: ActionName[] = [CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP_REQUESTED, CONST.REPORT.ACTIONS.TYPE.DONATION]; + export default function createRandomReportAction(index: number): ReportAction { return { // we need to add any here because of the way we are generating random values // eslint-disable-next-line @typescript-eslint/no-explicit-any - actionName: rand(flattenActionNamesValues(CONST.REPORT.ACTIONS.TYPE)) as any, + actionName: rand(flattenActionNamesValues(CONST.REPORT.ACTIONS.TYPE).filter((actionType: ActionName) => !deprecatedReportActions.includes(actionType))) as any, reportActionID: index.toString(), previousReportActionID: (index === 0 ? 0 : index - 1).toString(), actorAccountID: index, From b2908b6ac61dba90e64757a1c747f2b33fb4cec7 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Thu, 30 May 2024 01:16:15 +0200 Subject: [PATCH 6/7] Update the method --- src/libs/ReportActionsUtils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index ce056973d4d4..bc8d6b414152 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -506,8 +506,8 @@ function isReportActionDeprecated(reportAction: OnyxEntry, key: st return true; } - const deprecatedOldDotReportActions = ['DELETEDACCOUNT', 'REIMBURSEMENTREQUESTED', 'REIMBURSEMENTSETUPREQUESTED', 'DONATION']; - if (deprecatedOldDotReportActions.includes(String(reportAction.actionName))) { + const deprecatedOldDotReportActions: ActionName[] = [CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP_REQUESTED, CONST.REPORT.ACTIONS.TYPE.DONATION]; + if (deprecatedOldDotReportActions.includes(reportAction.actionName as ActionName)) { Log.info('Front end filtered out reportAction for being an older, deprecated report action', false, reportAction); return true; } From 4fc94b45c93a38aba04127a67387391c81a6ef75 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Thu, 30 May 2024 01:38:22 +0200 Subject: [PATCH 7/7] Prettier --- src/libs/ReportActionsUtils.ts | 7 ++++++- tests/utils/collections/reportActions.ts | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index bc8d6b414152..1b2b03e7e2c4 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -506,7 +506,12 @@ function isReportActionDeprecated(reportAction: OnyxEntry, key: st return true; } - const deprecatedOldDotReportActions: ActionName[] = [CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP_REQUESTED, CONST.REPORT.ACTIONS.TYPE.DONATION]; + const deprecatedOldDotReportActions: ActionName[] = [ + CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT, + CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED, + CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP_REQUESTED, + CONST.REPORT.ACTIONS.TYPE.DONATION, + ]; if (deprecatedOldDotReportActions.includes(reportAction.actionName as ActionName)) { Log.info('Front end filtered out reportAction for being an older, deprecated report action', false, reportAction); return true; diff --git a/tests/utils/collections/reportActions.ts b/tests/utils/collections/reportActions.ts index 85d79eaa3aac..6dd82c3134ab 100644 --- a/tests/utils/collections/reportActions.ts +++ b/tests/utils/collections/reportActions.ts @@ -26,7 +26,12 @@ const getRandomDate = (): string => { return formattedDate; }; -const deprecatedReportActions: ActionName[] = [CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP_REQUESTED, CONST.REPORT.ACTIONS.TYPE.DONATION]; +const deprecatedReportActions: ActionName[] = [ + CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT, + CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED, + CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP_REQUESTED, + CONST.REPORT.ACTIONS.TYPE.DONATION, +]; export default function createRandomReportAction(index: number): ReportAction { return {