Skip to content

Commit c11f4a7

Browse files
ChavdaSachinChavdaSachin
committed
replace 'reportField' with 'report'
1 parent 413175a commit c11f4a7

14 files changed

Lines changed: 52 additions & 52 deletions

File tree

‎src/ROUTES.ts‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,43 +1609,43 @@ const ROUTES = {
16091609
route: 'workspaces/:policyID/tax/:taxID/tax-code',
16101610
getRoute: (policyID: string, taxID: string) => `workspaces/${policyID}/tax/${encodeURIComponent(taxID)}/tax-code` as const,
16111611
},
1612-
WORKSPACE_REPORT_FIELDS: {
1613-
route: 'workspaces/:policyID/reportFields',
1612+
WORKSPACE_REPORTS: {
1613+
route: 'workspaces/:policyID/reports',
16141614
getRoute: (policyID: string | undefined) => {
16151615
if (!policyID) {
1616-
Log.warn('Invalid policyID is used to build the WORKSPACE_REPORT_FIELDS route');
1616+
Log.warn('Invalid policyID is used to build the WORKSPACE_REPORTS route');
16171617
}
1618-
return `workspaces/${policyID}/reportFields` as const;
1618+
return `workspaces/${policyID}/reports` as const;
16191619
},
16201620
},
16211621
WORKSPACE_CREATE_REPORT_FIELD: {
1622-
route: 'workspaces/:policyID/reportFields/new',
1623-
getRoute: (policyID: string) => `workspaces/${policyID}/reportFields/new` as const,
1622+
route: 'workspaces/:policyID/reports/newReportField',
1623+
getRoute: (policyID: string) => `workspaces/${policyID}/reports/newReportField` as const,
16241624
},
16251625
WORKSPACE_REPORT_FIELDS_SETTINGS: {
1626-
route: 'workspaces/:policyID/reportFields/:reportFieldID/edit',
1627-
getRoute: (policyID: string, reportFieldID: string) => `workspaces/${policyID}/reportFields/${encodeURIComponent(reportFieldID)}/edit` as const,
1626+
route: 'workspaces/:policyID/reports/:reportFieldID/edit',
1627+
getRoute: (policyID: string, reportFieldID: string) => `workspaces/${policyID}/reports/${encodeURIComponent(reportFieldID)}/edit` as const,
16281628
},
16291629
WORKSPACE_REPORT_FIELDS_LIST_VALUES: {
1630-
route: 'workspaces/:policyID/reportFields/listValues/:reportFieldID?',
1631-
getRoute: (policyID: string, reportFieldID?: string) => `workspaces/${policyID}/reportFields/listValues/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
1630+
route: 'workspaces/:policyID/reports/listValues/:reportFieldID?',
1631+
getRoute: (policyID: string, reportFieldID?: string) => `workspaces/${policyID}/reports/listValues/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
16321632
},
16331633
WORKSPACE_REPORT_FIELDS_ADD_VALUE: {
1634-
route: 'workspaces/:policyID/reportFields/addValue/:reportFieldID?',
1635-
getRoute: (policyID: string, reportFieldID?: string) => `workspaces/${policyID}/reportFields/addValue/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
1634+
route: 'workspaces/:policyID/reports/addValue/:reportFieldID?',
1635+
getRoute: (policyID: string, reportFieldID?: string) => `workspaces/${policyID}/reports/addValue/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
16361636
},
16371637
WORKSPACE_REPORT_FIELDS_VALUE_SETTINGS: {
1638-
route: 'workspaces/:policyID/reportFields/:valueIndex/:reportFieldID?',
1638+
route: 'workspaces/:policyID/reports/:valueIndex/:reportFieldID?',
16391639
getRoute: (policyID: string, valueIndex: number, reportFieldID?: string) =>
1640-
`workspaces/${policyID}/reportFields/${valueIndex}/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
1640+
`workspaces/${policyID}/reports/${valueIndex}/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
16411641
},
16421642
WORKSPACE_REPORT_FIELDS_EDIT_VALUE: {
1643-
route: 'workspaces/:policyID/reportFields/new/:valueIndex/edit',
1644-
getRoute: (policyID: string, valueIndex: number) => `workspaces/${policyID}/reportFields/new/${valueIndex}/edit` as const,
1643+
route: 'workspaces/:policyID/reports/newReportField/:valueIndex/edit',
1644+
getRoute: (policyID: string, valueIndex: number) => `workspaces/${policyID}/reports/newReportField/${valueIndex}/edit` as const,
16451645
},
16461646
WORKSPACE_EDIT_REPORT_FIELDS_INITIAL_VALUE: {
1647-
route: 'workspaces/:policyID/reportFields/:reportFieldID/edit/initialValue',
1648-
getRoute: (policyID: string, reportFieldID: string) => `workspaces/${policyID}/reportFields/${encodeURIComponent(reportFieldID)}/edit/initialValue` as const,
1647+
route: 'workspaces/:policyID/reports/:reportFieldID/edit/initialValue',
1648+
getRoute: (policyID: string, reportFieldID: string) => `workspaces/${policyID}/reports/${encodeURIComponent(reportFieldID)}/edit/initialValue` as const,
16491649
},
16501650
WORKSPACE_COMPANY_CARDS: {
16511651
route: 'workspaces/:policyID/company-cards',
@@ -1859,9 +1859,9 @@ const ROUTES = {
18591859
route: 'workspaces/:policyID/per-diem/edit/currency/:rateID/:subRateID',
18601860
getRoute: (policyID: string, rateID: string, subRateID: string) => `workspaces/${policyID}/per-diem/edit/currency/${rateID}/${subRateID}` as const,
18611861
},
1862-
RULES_CUSTOM_NAME: {
1863-
route: 'workspaces/:policyID/rules/name',
1864-
getRoute: (policyID: string) => `workspaces/${policyID}/rules/name` as const,
1862+
REPORTS_DEFAULT_TITLE: {
1863+
route: 'workspaces/:policyID/reports/name',
1864+
getRoute: (policyID: string) => `workspaces/${policyID}/reports/name` as const,
18651865
},
18661866
RULES_AUTO_APPROVE_REPORTS_UNDER: {
18671867
route: 'workspaces/:policyID/rules/auto-approve',

‎src/SCREENS.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ const SCREENS = {
552552
TAGS_IMPORTED_MULTI_LEVEL: 'Tags_Imported_Multi_Level',
553553
TAG_EDIT: 'Tag_Edit',
554554
TAXES: 'Workspace_Taxes',
555-
REPORT_FIELDS: 'Workspace_ReportFields',
555+
REPORTS: 'Workspace_Reports',
556556
REPORT_FIELDS_SETTINGS: 'Workspace_ReportFields_Settings',
557557
REPORT_FIELDS_CREATE: 'Workspace_ReportFields_Create',
558558
REPORT_FIELDS_LIST_VALUES: 'Workspace_ReportFields_ListValues',
@@ -619,7 +619,7 @@ const SCREENS = {
619619
DOWNGRADE: 'Workspace_Downgrade',
620620
PAY_AND_DOWNGRADE: 'Workspace_Pay_And_Downgrade',
621621
RULES: 'Policy_Rules',
622-
RULES_CUSTOM_NAME: 'Rules_Custom_Name',
622+
REPORTS_DEFAULT_TITLE: 'Reports_Default_Title',
623623
RULES_AUTO_APPROVE_REPORTS_UNDER: 'Rules_Auto_Approve_Reports_Under',
624624
RULES_RANDOM_REPORT_AUDIT: 'Rules_Random_Report_Audit',
625625
RULES_AUTO_PAY_REPORTS_UNDER: 'Rules_AutoPay_Reports_Under',

‎src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const WIDE_LAYOUT_INACTIVE_SCREENS: string[] = [
2525
SCREENS.WORKSPACE.MORE_FEATURES,
2626
SCREENS.WORKSPACE.TAGS,
2727
SCREENS.WORKSPACE.TAXES,
28-
SCREENS.WORKSPACE.REPORT_FIELDS,
28+
SCREENS.WORKSPACE.REPORTS,
2929
SCREENS.WORKSPACE.EXPENSIFY_CARD,
3030
SCREENS.WORKSPACE.COMPANY_CARDS,
3131
SCREENS.WORKSPACE.DISTANCE_RATES,

‎src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -605,13 +605,13 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
605605
[SCREENS.SETTINGS.SUBSCRIPTION.CHANGE_BILLING_CURRENCY]: () => require<ReactComponentModule>('../../../../pages/settings/Subscription/PaymentCard/ChangeBillingCurrency').default,
606606
[SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD]: () => require<ReactComponentModule>('../../../../pages/settings/Subscription/PaymentCard').default,
607607
[SCREENS.SETTINGS.ADD_PAYMENT_CARD_CHANGE_CURRENCY]: () => require<ReactComponentModule>('../../../../pages/settings/PaymentCard/ChangeCurrency').default,
608-
[SCREENS.WORKSPACE.REPORT_FIELDS_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/CreateReportFieldsPage').default,
609-
[SCREENS.WORKSPACE.REPORT_FIELDS_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/ReportFieldsSettingsPage').default,
610-
[SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/ReportFieldsListValuesPage').default,
611-
[SCREENS.WORKSPACE.REPORT_FIELDS_ADD_VALUE]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/ReportFieldsAddListValuePage').default,
612-
[SCREENS.WORKSPACE.REPORT_FIELDS_VALUE_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/ReportFieldsValueSettingsPage').default,
613-
[SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_INITIAL_VALUE]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/ReportFieldsInitialValuePage').default,
614-
[SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_VALUE]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/ReportFieldsEditValuePage').default,
608+
[SCREENS.WORKSPACE.REPORT_FIELDS_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/reports/CreateReportFieldsPage').default,
609+
[SCREENS.WORKSPACE.REPORT_FIELDS_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/reports/ReportFieldsSettingsPage').default,
610+
[SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES]: () => require<ReactComponentModule>('../../../../pages/workspace/reports/ReportFieldsListValuesPage').default,
611+
[SCREENS.WORKSPACE.REPORT_FIELDS_ADD_VALUE]: () => require<ReactComponentModule>('../../../../pages/workspace/reports/ReportFieldsAddListValuePage').default,
612+
[SCREENS.WORKSPACE.REPORT_FIELDS_VALUE_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/reports/ReportFieldsValueSettingsPage').default,
613+
[SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_INITIAL_VALUE]: () => require<ReactComponentModule>('../../../../pages/workspace/reports/ReportFieldsInitialValuePage').default,
614+
[SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_VALUE]: () => require<ReactComponentModule>('../../../../pages/workspace/reports/ReportFieldsEditValuePage').default,
615615
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/import/SageIntacctImportPage').default,
616616
[SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_TOGGLE_MAPPING]: () =>
617617
require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage').default,
@@ -638,7 +638,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
638638
[SCREENS.SETTINGS.LOCK.LOCK_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/settings/Security/LockAccount/LockAccountPage').default,
639639
[SCREENS.SETTINGS.LOCK.UNLOCK_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/settings/Security/LockAccount/UnlockAccountPage').default,
640640
[SCREENS.SETTINGS.LOCK.FAILED_TO_LOCK_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/settings/Security/LockAccount/FailedToLockAccountPage').default,
641-
[SCREENS.WORKSPACE.RULES_CUSTOM_NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/rules/RulesCustomNamePage').default,
641+
[SCREENS.WORKSPACE.REPORTS_DEFAULT_TITLE]: () => require<ReactComponentModule>('../../../../pages/workspace/reports/ReportsDefaultTitle').default,
642642
[SCREENS.WORKSPACE.RULES_AUTO_APPROVE_REPORTS_UNDER]: () => require<ReactComponentModule>('../../../../pages/workspace/rules/RulesAutoApproveReportsUnderPage').default,
643643
[SCREENS.WORKSPACE.RULES_RANDOM_REPORT_AUDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/rules/RulesRandomReportAuditPage').default,
644644
[SCREENS.WORKSPACE.RULES_AUTO_PAY_REPORTS_UNDER]: () => require<ReactComponentModule>('../../../../pages/workspace/rules/RulesAutoPayReportsUnderPage').default,

‎src/libs/Navigation/AppNavigator/Navigators/WorkspaceSplitNavigator.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const CENTRAL_PANE_WORKSPACE_SCREENS = {
2525
[SCREENS.WORKSPACE.MORE_FEATURES]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceMoreFeaturesPage').default,
2626
[SCREENS.WORKSPACE.TAGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceTagsPage').default,
2727
[SCREENS.WORKSPACE.TAXES]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceTaxesPage').default,
28-
[SCREENS.WORKSPACE.REPORT_FIELDS]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/WorkspaceReportFieldsPage').default,
28+
[SCREENS.WORKSPACE.REPORTS]: () => require<ReactComponentModule>('../../../../pages/workspace/reports/WorkspaceReportsPage').default,
2929
[SCREENS.WORKSPACE.EXPENSIFY_CARD]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardPage').default,
3030
[SCREENS.WORKSPACE.COMPANY_CARDS]: () => require<ReactComponentModule>('../../../../pages/workspace/companyCards/WorkspaceCompanyCardsPage').default,
3131
[SCREENS.WORKSPACE.PER_DIEM]: () => require<ReactComponentModule>('../../../../pages/workspace/perDiem/WorkspacePerDiemPage').default,

‎src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
207207
SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RATE_EDIT,
208208
SCREENS.WORKSPACE.DISTANCE_RATE_DETAILS,
209209
],
210-
[SCREENS.WORKSPACE.REPORT_FIELDS]: [
211-
SCREENS.WORKSPACE.RULES_CUSTOM_NAME,
210+
[SCREENS.WORKSPACE.REPORTS]: [
211+
SCREENS.WORKSPACE.REPORTS_DEFAULT_TITLE,
212212
SCREENS.WORKSPACE.REPORT_FIELDS_CREATE,
213213
SCREENS.WORKSPACE.REPORT_FIELDS_SETTINGS,
214214
SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES,

‎src/libs/Navigation/linkingConfig/config.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,8 +1008,8 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
10081008
taxID: (taxID: string) => decodeURIComponent(taxID),
10091009
},
10101010
},
1011-
[SCREENS.WORKSPACE.RULES_CUSTOM_NAME]: {
1012-
path: ROUTES.RULES_CUSTOM_NAME.route,
1011+
[SCREENS.WORKSPACE.REPORTS_DEFAULT_TITLE]: {
1012+
path: ROUTES.REPORTS_DEFAULT_TITLE.route,
10131013
},
10141014
[SCREENS.WORKSPACE.RULES_AUTO_APPROVE_REPORTS_UNDER]: {
10151015
path: ROUTES.RULES_AUTO_APPROVE_REPORTS_UNDER.route,
@@ -1765,8 +1765,8 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
17651765
[SCREENS.WORKSPACE.TAXES]: {
17661766
path: ROUTES.WORKSPACE_TAXES.route,
17671767
},
1768-
[SCREENS.WORKSPACE.REPORT_FIELDS]: {
1769-
path: ROUTES.WORKSPACE_REPORT_FIELDS.route,
1768+
[SCREENS.WORKSPACE.REPORTS]: {
1769+
path: ROUTES.WORKSPACE_REPORTS.route,
17701770
},
17711771
[SCREENS.WORKSPACE.DISTANCE_RATES]: {
17721772
path: ROUTES.WORKSPACE_DISTANCE_RATES.route,

‎src/libs/Navigation/types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ type SettingsNavigatorParamList = {
10541054
cardID: string;
10551055
backTo?: Routes;
10561056
};
1057-
[SCREENS.WORKSPACE.RULES_CUSTOM_NAME]: {
1057+
[SCREENS.WORKSPACE.REPORTS_DEFAULT_TITLE]: {
10581058
policyID: string;
10591059
};
10601060
[SCREENS.WORKSPACE.RULES_AUTO_APPROVE_REPORTS_UNDER]: {
@@ -1872,7 +1872,7 @@ type WorkspaceSplitNavigatorParamList = {
18721872
[SCREENS.WORKSPACE.TAXES]: {
18731873
policyID: string;
18741874
};
1875-
[SCREENS.WORKSPACE.REPORT_FIELDS]: {
1875+
[SCREENS.WORKSPACE.REPORTS]: {
18761876
policyID: string;
18771877
};
18781878
[SCREENS.WORKSPACE.DISTANCE_RATES]: {

‎src/pages/workspace/WorkspaceInitialPage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
186186
protectedMenuItems.push({
187187
translationKey: 'common.reports',
188188
icon: Document,
189-
action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_REPORT_FIELDS.getRoute(policyID)))),
190-
screenName: SCREENS.WORKSPACE.REPORT_FIELDS,
189+
action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_REPORTS.getRoute(policyID)))),
190+
screenName: SCREENS.WORKSPACE.REPORTS,
191191
});
192192

193193
if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED]) {

‎src/pages/workspace/reports/ReportsDefaultTitle.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
2727
import type SCREENS from '@src/SCREENS';
2828
import INPUT_IDS from '@src/types/form/RulesCustomNameModalForm';
2929

30-
type RulesCustomNamePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.RULES_CUSTOM_NAME>;
30+
type RulesCustomNamePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.REPORTS_DEFAULT_TITLE>;
3131

3232
function RulesCustomNamePage({route}: RulesCustomNamePageProps) {
3333
const policyID = route.params.policyID;

0 commit comments

Comments
 (0)