Skip to content

Commit 01140d3

Browse files
GonalsGonals
authored
Merge pull request Expensify#67248 from ChavdaSachin/cleanup-reportFields
Cleanup report fields
2 parents 91b52b0 + 3ffed16 commit 01140d3

38 files changed

Lines changed: 247 additions & 233 deletions

‎src/ONYXKEYS.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -834,8 +834,8 @@ const ONYXKEYS = {
834834
SEARCH_SAVED_SEARCH_RENAME_FORM_DRAFT: 'searchSavedSearchRenameFormDraft',
835835
TEXT_PICKER_MODAL_FORM: 'textPickerModalForm',
836836
TEXT_PICKER_MODAL_FORM_DRAFT: 'textPickerModalFormDraft',
837-
RULES_CUSTOM_NAME_MODAL_FORM: 'rulesCustomNameModalForm',
838-
RULES_CUSTOM_NAME_MODAL_FORM_DRAFT: 'rulesCustomNameModalFormDraft',
837+
REPORTS_DEFAULT_TITLE_MODAL_FORM: 'ReportsDefaultTitleModalForm',
838+
REPORTS_DEFAULT_TITLE_MODAL_FORM_DRAFT: 'ReportsDefaultTitleModalFormDraft',
839839
RULES_AUTO_APPROVE_REPORTS_UNDER_MODAL_FORM: 'rulesAutoApproveReportsUnderModalForm',
840840
RULES_AUTO_APPROVE_REPORTS_UNDER_MODAL_FORM_DRAFT: 'rulesAutoApproveReportsUnderModalFormDraft',
841841
RULES_RANDOM_REPORT_AUDIT_MODAL_FORM: 'rulesRandomReportAuditModalForm',
@@ -954,7 +954,7 @@ type OnyxFormValuesMapping = {
954954
[ONYXKEYS.FORMS.SAGE_INTACCT_DIMENSION_TYPE_FORM]: FormTypes.SageIntacctDimensionForm;
955955
[ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM]: FormTypes.SearchAdvancedFiltersForm;
956956
[ONYXKEYS.FORMS.TEXT_PICKER_MODAL_FORM]: FormTypes.TextPickerModalForm;
957-
[ONYXKEYS.FORMS.RULES_CUSTOM_NAME_MODAL_FORM]: FormTypes.RulesCustomNameModalForm;
957+
[ONYXKEYS.FORMS.REPORTS_DEFAULT_TITLE_MODAL_FORM]: FormTypes.ReportsDefaultTitleModalForm;
958958
[ONYXKEYS.FORMS.RULES_AUTO_APPROVE_REPORTS_UNDER_MODAL_FORM]: FormTypes.RulesAutoApproveReportsUnderModalForm;
959959
[ONYXKEYS.FORMS.RULES_RANDOM_REPORT_AUDIT_MODAL_FORM]: FormTypes.RulesRandomReportAuditModalForm;
960960
[ONYXKEYS.FORMS.RULES_AUTO_PAY_REPORTS_UNDER_MODAL_FORM]: FormTypes.RulesAutoPayReportsUnderModalForm;

‎src/ROUTES.ts‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,43 +1630,43 @@ const ROUTES = {
16301630
route: 'workspaces/:policyID/tax/:taxID/tax-code',
16311631
getRoute: (policyID: string, taxID: string) => `workspaces/${policyID}/tax/${encodeURIComponent(taxID)}/tax-code` as const,
16321632
},
1633-
WORKSPACE_REPORT_FIELDS: {
1634-
route: 'workspaces/:policyID/reportFields',
1633+
WORKSPACE_REPORTS: {
1634+
route: 'workspaces/:policyID/reports',
16351635
getRoute: (policyID: string | undefined) => {
16361636
if (!policyID) {
1637-
Log.warn('Invalid policyID is used to build the WORKSPACE_REPORT_FIELDS route');
1637+
Log.warn('Invalid policyID is used to build the WORKSPACE_REPORTS route');
16381638
}
1639-
return `workspaces/${policyID}/reportFields` as const;
1639+
return `workspaces/${policyID}/reports` as const;
16401640
},
16411641
},
16421642
WORKSPACE_CREATE_REPORT_FIELD: {
1643-
route: 'workspaces/:policyID/reportFields/new',
1644-
getRoute: (policyID: string) => `workspaces/${policyID}/reportFields/new` as const,
1643+
route: 'workspaces/:policyID/reports/newReportField',
1644+
getRoute: (policyID: string) => `workspaces/${policyID}/reports/newReportField` as const,
16451645
},
16461646
WORKSPACE_REPORT_FIELDS_SETTINGS: {
1647-
route: 'workspaces/:policyID/reportFields/:reportFieldID/edit',
1648-
getRoute: (policyID: string, reportFieldID: string) => `workspaces/${policyID}/reportFields/${encodeURIComponent(reportFieldID)}/edit` as const,
1647+
route: 'workspaces/:policyID/reports/:reportFieldID/edit',
1648+
getRoute: (policyID: string, reportFieldID: string) => `workspaces/${policyID}/reports/${encodeURIComponent(reportFieldID)}/edit` as const,
16491649
},
16501650
WORKSPACE_REPORT_FIELDS_LIST_VALUES: {
1651-
route: 'workspaces/:policyID/reportFields/listValues/:reportFieldID?',
1652-
getRoute: (policyID: string, reportFieldID?: string) => `workspaces/${policyID}/reportFields/listValues/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
1651+
route: 'workspaces/:policyID/reports/listValues/:reportFieldID?',
1652+
getRoute: (policyID: string, reportFieldID?: string) => `workspaces/${policyID}/reports/listValues/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
16531653
},
16541654
WORKSPACE_REPORT_FIELDS_ADD_VALUE: {
1655-
route: 'workspaces/:policyID/reportFields/addValue/:reportFieldID?',
1656-
getRoute: (policyID: string, reportFieldID?: string) => `workspaces/${policyID}/reportFields/addValue/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
1655+
route: 'workspaces/:policyID/reports/addValue/:reportFieldID?',
1656+
getRoute: (policyID: string, reportFieldID?: string) => `workspaces/${policyID}/reports/addValue/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
16571657
},
16581658
WORKSPACE_REPORT_FIELDS_VALUE_SETTINGS: {
1659-
route: 'workspaces/:policyID/reportFields/:valueIndex/:reportFieldID?',
1659+
route: 'workspaces/:policyID/reports/:valueIndex/:reportFieldID?',
16601660
getRoute: (policyID: string, valueIndex: number, reportFieldID?: string) =>
1661-
`workspaces/${policyID}/reportFields/${valueIndex}/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
1661+
`workspaces/${policyID}/reports/${valueIndex}/${reportFieldID ? encodeURIComponent(reportFieldID) : ''}` as const,
16621662
},
16631663
WORKSPACE_REPORT_FIELDS_EDIT_VALUE: {
1664-
route: 'workspaces/:policyID/reportFields/new/:valueIndex/edit',
1665-
getRoute: (policyID: string, valueIndex: number) => `workspaces/${policyID}/reportFields/new/${valueIndex}/edit` as const,
1664+
route: 'workspaces/:policyID/reports/newReportField/:valueIndex/edit',
1665+
getRoute: (policyID: string, valueIndex: number) => `workspaces/${policyID}/reports/newReportField/${valueIndex}/edit` as const,
16661666
},
16671667
WORKSPACE_EDIT_REPORT_FIELDS_INITIAL_VALUE: {
1668-
route: 'workspaces/:policyID/reportFields/:reportFieldID/edit/initialValue',
1669-
getRoute: (policyID: string, reportFieldID: string) => `workspaces/${policyID}/reportFields/${encodeURIComponent(reportFieldID)}/edit/initialValue` as const,
1668+
route: 'workspaces/:policyID/reports/:reportFieldID/edit/initialValue',
1669+
getRoute: (policyID: string, reportFieldID: string) => `workspaces/${policyID}/reports/${encodeURIComponent(reportFieldID)}/edit/initialValue` as const,
16701670
},
16711671
WORKSPACE_COMPANY_CARDS: {
16721672
route: 'workspaces/:policyID/company-cards',
@@ -1884,9 +1884,9 @@ const ROUTES = {
18841884
route: 'workspaces/:policyID/per-diem/edit/currency/:rateID/:subRateID',
18851885
getRoute: (policyID: string, rateID: string, subRateID: string) => `workspaces/${policyID}/per-diem/edit/currency/${rateID}/${subRateID}` as const,
18861886
},
1887-
RULES_CUSTOM_NAME: {
1888-
route: 'workspaces/:policyID/rules/name',
1889-
getRoute: (policyID: string) => `workspaces/${policyID}/rules/name` as const,
1887+
REPORTS_DEFAULT_TITLE: {
1888+
route: 'workspaces/:policyID/reports/name',
1889+
getRoute: (policyID: string) => `workspaces/${policyID}/reports/name` as const,
18901890
},
18911891
RULES_AUTO_APPROVE_REPORTS_UNDER: {
18921892
route: 'workspaces/:policyID/rules/auto-approve',

‎src/SCREENS.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ const SCREENS = {
553553
TAGS_IMPORTED_MULTI_LEVEL: 'Tags_Imported_Multi_Level',
554554
TAG_EDIT: 'Tag_Edit',
555555
TAXES: 'Workspace_Taxes',
556-
REPORT_FIELDS: 'Workspace_ReportFields',
556+
REPORTS: 'Workspace_Reports',
557557
REPORT_FIELDS_SETTINGS: 'Workspace_ReportFields_Settings',
558558
REPORT_FIELDS_CREATE: 'Workspace_ReportFields_Create',
559559
REPORT_FIELDS_LIST_VALUES: 'Workspace_ReportFields_ListValues',
@@ -621,7 +621,7 @@ const SCREENS = {
621621
DOWNGRADE: 'Workspace_Downgrade',
622622
PAY_AND_DOWNGRADE: 'Workspace_Pay_And_Downgrade',
623623
RULES: 'Policy_Rules',
624-
RULES_CUSTOM_NAME: 'Rules_Custom_Name',
624+
REPORTS_DEFAULT_TITLE: 'Reports_Default_Title',
625625
RULES_AUTO_APPROVE_REPORTS_UNDER: 'Rules_Auto_Approve_Reports_Under',
626626
RULES_RANDOM_REPORT_AUDIT: 'Rules_Random_Report_Audit',
627627
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/languages/de.ts‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4621,6 +4621,20 @@ const translations = {
46214621
subtitle: 'Belege anfordern, hohe Ausgaben kennzeichnen und mehr.',
46224622
},
46234623
},
4624+
reports: {
4625+
reportsCustomTitleExamples: 'Beispiele:',
4626+
customReportNamesSubtitle: 'Passen Sie Berichtstitel mit unserem an',
4627+
customNameTitle: 'Standardberichtstitel',
4628+
customNameDescription: 'Wählen Sie einen benutzerdefinierten Namen für Spesenabrechnungen mit unserem',
4629+
customNameDescriptionLink: 'umfassende Formeln',
4630+
customNameInputLabel: 'Name',
4631+
customNameEmailPhoneExample: 'E-Mail oder Telefon des Mitglieds: {report:submit:from}',
4632+
customNameStartDateExample: 'Berichtsstartdatum: {report:startdate}',
4633+
customNameWorkspaceNameExample: 'Workspace-Name: {report:workspacename}',
4634+
customNameReportIDExample: 'Report-ID: {report:id}',
4635+
customNameTotalExample: 'Gesamt: {report:total}.',
4636+
preventMembersFromChangingCustomNamesTitle: 'Verhindern Sie, dass Mitglieder benutzerdefinierte Berichtsnamen ändern',
4637+
},
46244638
reportFields: {
46254639
addField: 'Feld hinzufügen',
46264640
delete: 'Feld löschen',
@@ -5503,20 +5517,8 @@ const translations = {
55035517
adultEntertainment: 'Erwachsenenunterhaltung',
55045518
},
55055519
expenseReportRules: {
5506-
examples: 'Beispiele:',
55075520
title: 'Spesenabrechnungen',
55085521
subtitle: 'Automatisieren Sie die Einhaltung von Spesenabrechnungen, Genehmigungen und Zahlungen.',
5509-
customReportNamesSubtitle: 'Passen Sie Berichtstitel mit unserem an',
5510-
customNameTitle: 'Standardberichtstitel',
5511-
customNameDescription: 'Wählen Sie einen benutzerdefinierten Namen für Spesenabrechnungen mit unserem',
5512-
customNameDescriptionLink: 'umfassende Formeln',
5513-
customNameInputLabel: 'Name',
5514-
customNameEmailPhoneExample: 'E-Mail oder Telefon des Mitglieds: {report:submit:from}',
5515-
customNameStartDateExample: 'Berichtsstartdatum: {report:startdate}',
5516-
customNameWorkspaceNameExample: 'Workspace-Name: {report:workspacename}',
5517-
customNameReportIDExample: 'Report-ID: {report:id}',
5518-
customNameTotalExample: 'Gesamt: {report:total}.',
5519-
preventMembersFromChangingCustomNamesTitle: 'Verhindern Sie, dass Mitglieder benutzerdefinierte Berichtsnamen ändern',
55205522
preventSelfApprovalsTitle: 'Selbstgenehmigungen verhindern',
55215523
preventSelfApprovalsSubtitle: 'Verhindern Sie, dass Arbeitsbereichsmitglieder ihre eigenen Spesenabrechnungen genehmigen.',
55225524
autoApproveCompliantReportsTitle: 'Konforme Berichte automatisch genehmigen',

‎src/languages/en.ts‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4600,6 +4600,20 @@ const translations = {
46004600
subtitle: 'Require receipts, flag high spend, and more.',
46014601
},
46024602
},
4603+
reports: {
4604+
reportsCustomTitleExamples: 'Examples:',
4605+
customReportNamesSubtitle: 'Customize report titles using our ',
4606+
customNameTitle: 'Default report title',
4607+
customNameDescription: 'Choose a custom name for expense reports using our ',
4608+
customNameDescriptionLink: 'extensive formulas',
4609+
customNameInputLabel: 'Name',
4610+
customNameEmailPhoneExample: 'Member’s email or phone: {report:submit:from}',
4611+
customNameStartDateExample: 'Report start date: {report:startdate}',
4612+
customNameWorkspaceNameExample: 'Workspace name: {report:workspacename}',
4613+
customNameReportIDExample: 'Report ID: {report:id}',
4614+
customNameTotalExample: 'Total: {report:total}.',
4615+
preventMembersFromChangingCustomNamesTitle: 'Prevent members from changing custom report names',
4616+
},
46034617
reportFields: {
46044618
addField: 'Add field',
46054619
delete: 'Delete field',
@@ -5475,20 +5489,8 @@ const translations = {
54755489
adultEntertainment: 'Adult entertainment',
54765490
},
54775491
expenseReportRules: {
5478-
examples: 'Examples:',
54795492
title: 'Expense reports',
54805493
subtitle: 'Automate expense report compliance, approvals, and payment.',
5481-
customReportNamesSubtitle: 'Customize report titles using our ',
5482-
customNameTitle: 'Default report title',
5483-
customNameDescription: 'Choose a custom name for expense reports using our ',
5484-
customNameDescriptionLink: 'extensive formulas',
5485-
customNameInputLabel: 'Name',
5486-
customNameEmailPhoneExample: 'Member’s email or phone: {report:submit:from}',
5487-
customNameStartDateExample: 'Report start date: {report:startdate}',
5488-
customNameWorkspaceNameExample: 'Workspace name: {report:workspacename}',
5489-
customNameReportIDExample: 'Report ID: {report:id}',
5490-
customNameTotalExample: 'Total: {report:total}.',
5491-
preventMembersFromChangingCustomNamesTitle: 'Prevent members from changing custom report names',
54925494
preventSelfApprovalsTitle: 'Prevent self-approvals',
54935495
preventSelfApprovalsSubtitle: 'Prevent workspace members from approving their own expense reports.',
54945496
autoApproveCompliantReportsTitle: 'Auto-approve compliant reports',

‎src/languages/es.ts‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4614,6 +4614,20 @@ const translations = {
46144614
subtitle: 'Solicita recibos, resalta gastos de alto importe y mucho más.',
46154615
},
46164616
},
4617+
reports: {
4618+
reportsCustomTitleExamples: 'Ejemplos:',
4619+
customReportNamesSubtitle: 'Personaliza los títulos de los informes usando nuestras amplias fórmulas.',
4620+
customNameTitle: 'Título de informe predeterminado',
4621+
customNameDescription: 'Elige un nombre personalizado para los informes de gastos usando nuestras ',
4622+
customNameDescriptionLink: 'fórmulas variadas',
4623+
customNameInputLabel: 'Nombre',
4624+
customNameEmailPhoneExample: 'Correo electrónico o teléfono del miembro: {report:submit:from}',
4625+
customNameStartDateExample: 'Fecha de inicio del informe: {report:startdate}',
4626+
customNameWorkspaceNameExample: 'Nombre del espacio de trabajo: {report:workspacename}',
4627+
customNameReportIDExample: 'ID del informe: {report:id}',
4628+
customNameTotalExample: 'Total: {report:total}.',
4629+
preventMembersFromChangingCustomNamesTitle: 'Evitar que los miembros cambien los nombres personalizados de los informes',
4630+
},
46174631
reportFields: {
46184632
addField: 'Añadir campo',
46194633
delete: 'Eliminar campo',
@@ -5513,20 +5527,8 @@ const translations = {
55135527
adultEntertainment: 'Entretenimiento para adultos',
55145528
},
55155529
expenseReportRules: {
5516-
examples: 'Ejemplos:',
55175530
title: 'Informes de gastos',
55185531
subtitle: 'Automatiza el cumplimiento, la aprobación y el pago de los informes de gastos.',
5519-
customReportNamesSubtitle: 'Personaliza los títulos de los informes usando nuestras amplias fórmulas.',
5520-
customNameTitle: 'Título de informe predeterminado',
5521-
customNameDescription: 'Elige un nombre personalizado para los informes de gastos usando nuestras ',
5522-
customNameDescriptionLink: 'fórmulas variadas',
5523-
customNameInputLabel: 'Nombre',
5524-
customNameEmailPhoneExample: 'Correo electrónico o teléfono del miembro: {report:submit:from}',
5525-
customNameStartDateExample: 'Fecha de inicio del informe: {report:startdate}',
5526-
customNameWorkspaceNameExample: 'Nombre del espacio de trabajo: {report:workspacename}',
5527-
customNameReportIDExample: 'ID del informe: {report:id}',
5528-
customNameTotalExample: 'Total: {report:total}.',
5529-
preventMembersFromChangingCustomNamesTitle: 'Evitar que los miembros cambien los nombres personalizados de los informes',
55305532
preventSelfApprovalsTitle: 'Evitar autoaprobaciones',
55315533
preventSelfApprovalsSubtitle: 'Evita que los miembros del espacio de trabajo aprueben sus propios informes de gastos.',
55325534
autoApproveCompliantReportsTitle: 'Aprobación automática de informes conformes',

‎src/languages/fr.ts‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4637,6 +4637,20 @@ const translations = {
46374637
subtitle: 'Exiger des reçus, signaler les dépenses élevées, et plus encore.',
46384638
},
46394639
},
4640+
reports: {
4641+
reportsCustomTitleExamples: 'Exemples :',
4642+
customReportNamesSubtitle: 'Personnalisez les titres des rapports en utilisant notre',
4643+
customNameTitle: 'Titre de rapport par défaut',
4644+
customNameDescription: 'Choisissez un nom personnalisé pour les rapports de dépenses en utilisant notre',
4645+
customNameDescriptionLink: 'formules étendues',
4646+
customNameInputLabel: 'Nom',
4647+
customNameEmailPhoneExample: 'E-mail ou téléphone du membre : {report:submit:from}',
4648+
customNameStartDateExample: 'Date de début du rapport : {report:startdate}',
4649+
customNameWorkspaceNameExample: "Nom de l'espace de travail : {report:workspacename}",
4650+
customNameReportIDExample: 'Report ID : {report:id}',
4651+
customNameTotalExample: 'Total : {report:total}.',
4652+
preventMembersFromChangingCustomNamesTitle: 'Empêcher les membres de modifier les noms des rapports personnalisés',
4653+
},
46404654
reportFields: {
46414655
addField: 'Ajouter un champ',
46424656
delete: 'Supprimer le champ',
@@ -5516,20 +5530,8 @@ const translations = {
55165530
adultEntertainment: 'Divertissement pour adultes',
55175531
},
55185532
expenseReportRules: {
5519-
examples: 'Exemples :',
55205533
title: 'Rapports de dépenses',
55215534
subtitle: 'Automatisez la conformité des rapports de dépenses, les approbations et le paiement.',
5522-
customReportNamesSubtitle: 'Personnalisez les titres des rapports en utilisant notre',
5523-
customNameTitle: 'Titre de rapport par défaut',
5524-
customNameDescription: 'Choisissez un nom personnalisé pour les rapports de dépenses en utilisant notre',
5525-
customNameDescriptionLink: 'formules étendues',
5526-
customNameInputLabel: 'Nom',
5527-
customNameEmailPhoneExample: 'E-mail ou téléphone du membre : {report:submit:from}',
5528-
customNameStartDateExample: 'Date de début du rapport : {report:startdate}',
5529-
customNameWorkspaceNameExample: "Nom de l'espace de travail : {report:workspacename}",
5530-
customNameReportIDExample: 'Report ID : {report:id}',
5531-
customNameTotalExample: 'Total : {report:total}.',
5532-
preventMembersFromChangingCustomNamesTitle: 'Empêcher les membres de modifier les noms des rapports personnalisés',
55335535
preventSelfApprovalsTitle: 'Empêcher les auto-approbations',
55345536
preventSelfApprovalsSubtitle: "Empêcher les membres de l'espace de travail d'approuver leurs propres rapports de dépenses.",
55355537
autoApproveCompliantReportsTitle: 'Approuver automatiquement les rapports conformes',

0 commit comments

Comments
 (0)