From 2ade68110f970abc9191bb7ad47e11fe8ddbaaff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= Date: Mon, 6 Oct 2025 16:25:27 +0200 Subject: [PATCH] Revert "Add translations for report field formula type" --- src/CONST/index.ts | 1 - src/languages/de.ts | 2 -- src/languages/en.ts | 2 -- src/languages/es.ts | 2 -- src/languages/fr.ts | 2 -- src/languages/it.ts | 2 -- src/languages/ja.ts | 2 -- src/languages/nl.ts | 2 -- src/languages/pl.ts | 2 -- src/languages/pt-BR.ts | 2 -- src/languages/zh-hans.ts | 2 -- src/libs/WorkspaceReportFieldUtils.ts | 2 -- .../reports/CreateReportFieldsPage.tsx | 17 +---------------- .../reports/ReportFieldsInitialValuePage.tsx | 3 +-- 14 files changed, 2 insertions(+), 41 deletions(-) diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 35552dadc2ed..3ff29cfbdd20 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -6972,7 +6972,6 @@ const CONST = { TEXT: 'text', DATE: 'date', LIST: 'dropdown', - FORMULA: 'formula', }, NAVIGATION_ACTIONS: { diff --git a/src/languages/de.ts b/src/languages/de.ts index 8a3b4e9284a9..d81004be379f 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -4806,11 +4806,9 @@ const translations = { textType: 'Text', dateType: 'Datum', dropdownType: 'Liste', - formulaType: 'Formel', textAlternateText: 'Fügen Sie ein Feld für die freie Texteingabe hinzu.', dateAlternateText: 'Fügen Sie einen Kalender zur Datumauswahl hinzu.', dropdownAlternateText: 'Fügen Sie eine Liste von Optionen zur Auswahl hinzu.', - formulaAlternateText: 'Fügen Sie ein Formularfeld hinzu.', nameInputSubtitle: 'Wählen Sie einen Namen für das Berichtsfeld.', typeInputSubtitle: 'Wählen Sie aus, welche Art von Berichtsfeld verwendet werden soll.', initialValueInputSubtitle: 'Geben Sie einen Startwert ein, der im Berichtsfeld angezeigt werden soll.', diff --git a/src/languages/en.ts b/src/languages/en.ts index aa81412998c2..c2bdb54504b2 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4782,11 +4782,9 @@ const translations = { textType: 'Text', dateType: 'Date', dropdownType: 'List', - formulaType: 'Formula', textAlternateText: 'Add a field for free text input.', dateAlternateText: 'Add a calendar for date selection.', dropdownAlternateText: 'Add a list of options to choose from.', - formulaAlternateText: 'Add a formula field.', nameInputSubtitle: 'Choose a name for the report field.', typeInputSubtitle: 'Choose what type of report field to use.', initialValueInputSubtitle: 'Enter a starting value to show in the report field.', diff --git a/src/languages/es.ts b/src/languages/es.ts index 6cc1d5ba4e1e..4ad7827964ac 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -4789,11 +4789,9 @@ const translations = { textType: 'Texto', dateType: 'Fecha', dropdownType: 'Lista', - formulaType: 'Fórmula', textAlternateText: 'Añade un campo para introducir texto libre.', dateAlternateText: 'Añade un calendario para la selección de fechas.', dropdownAlternateText: 'Añade una lista de opciones para elegir.', - formulaAlternateText: 'Añade un campo con una fórmula.', nameInputSubtitle: 'Elige un nombre para el campo del informe.', typeInputSubtitle: 'Elige qué tipo de campo de informe utilizar.', initialValueInputSubtitle: 'Ingresa un valor inicial para mostrar en el campo del informe.', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 9aa0ba3a4e55..64301d491a17 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -4819,11 +4819,9 @@ const translations = { textType: 'Texte', dateType: 'Date', dropdownType: 'Liste', - formulaType: 'Formule', textAlternateText: 'Ajoutez un champ pour la saisie de texte libre.', dateAlternateText: 'Ajouter un calendrier pour la sélection de la date.', dropdownAlternateText: "Ajouter une liste d'options à choisir.", - formulaAlternateText: 'Ajouter un champ de formule.', nameInputSubtitle: 'Choisissez un nom pour le champ du rapport.', typeInputSubtitle: 'Choisissez le type de champ de rapport à utiliser.', initialValueInputSubtitle: 'Entrez une valeur de départ à afficher dans le champ du rapport.', diff --git a/src/languages/it.ts b/src/languages/it.ts index 663804973837..cc7f79141ad2 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -4819,11 +4819,9 @@ const translations = { textType: 'Testo', dateType: 'Data', dropdownType: 'Elenco', - formulaType: 'Formula', textAlternateText: "Aggiungi un campo per l'inserimento di testo libero.", dateAlternateText: 'Aggiungi un calendario per la selezione delle date.', dropdownAlternateText: 'Aggiungi un elenco di opzioni tra cui scegliere.', - formulaAlternateText: 'Aggiungi un campo formula.', nameInputSubtitle: 'Scegli un nome per il campo del rapporto.', typeInputSubtitle: 'Scegli quale tipo di campo del report utilizzare.', initialValueInputSubtitle: 'Inserisci un valore iniziale da mostrare nel campo del report.', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 32e82e9d3ce1..f26d5cb12877 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -4779,11 +4779,9 @@ const translations = { textType: 'テキスト', dateType: '日付', dropdownType: 'リスト', - formulaType: 'Formula', textAlternateText: '自由入力フィールドを追加してください。', dateAlternateText: '日付選択用のカレンダーを追加します。', dropdownAlternateText: '選択肢のリストを追加してください。', - formulaAlternateText: '数式フィールドを追加します。', nameInputSubtitle: 'レポートフィールドの名前を選択してください。', typeInputSubtitle: '使用するレポートフィールドのタイプを選択してください。', initialValueInputSubtitle: 'レポートフィールドに表示する開始値を入力してください。', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index e54963722c95..6d10f5d8008d 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -4814,11 +4814,9 @@ const translations = { textType: 'Tekst', dateType: 'Datum', dropdownType: 'Lijst', - formulaType: 'Formule', textAlternateText: 'Voeg een veld toe voor vrije tekstinvoer.', dateAlternateText: 'Voeg een kalender toe voor datumselectie.', dropdownAlternateText: 'Voeg een lijst met opties toe om uit te kiezen.', - formulaAlternateText: 'Voeg een formuleveld toe.', nameInputSubtitle: 'Kies een naam voor het rapportveld.', typeInputSubtitle: 'Kies welk type rapportveld je wilt gebruiken.', initialValueInputSubtitle: 'Voer een startwaarde in om in het rapportveld te tonen.', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index f776be1698d9..54b718aaa51d 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -4804,11 +4804,9 @@ const translations = { textType: 'Tekst', dateType: 'Data', dropdownType: 'Lista', - formulaType: 'Formuła', textAlternateText: 'Dodaj pole do swobodnego wprowadzania tekstu.', dateAlternateText: 'Dodaj kalendarz do wyboru daty.', dropdownAlternateText: 'Dodaj listę opcji do wyboru.', - formulaAlternateText: 'Dodaj pole formuły.', nameInputSubtitle: 'Wybierz nazwę dla pola raportu.', typeInputSubtitle: 'Wybierz, jakiego typu pola raportu chcesz użyć.', initialValueInputSubtitle: 'Wprowadź wartość początkową do wyświetlenia w polu raportu.', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index aed4ddfc7650..5070a8d09433 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -4809,11 +4809,9 @@ const translations = { textType: 'Texto', dateType: 'Data', dropdownType: 'Lista', - formulaType: 'Fórmula', textAlternateText: 'Adicione um campo para entrada de texto livre.', dateAlternateText: 'Adicione um calendário para seleção de data.', dropdownAlternateText: 'Adicione uma lista de opções para escolher.', - formulaAlternateText: 'Adicione um campo de fórmula.', nameInputSubtitle: 'Escolha um nome para o campo do relatório.', typeInputSubtitle: 'Escolha qual tipo de campo de relatório usar.', initialValueInputSubtitle: 'Insira um valor inicial para mostrar no campo do relatório.', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index a7a8b81fc54a..4bcebb156e70 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -4716,11 +4716,9 @@ const translations = { textType: '文本', dateType: '日期', dropdownType: '列表', - formulaType: '公式', textAlternateText: '添加一个字段用于自由文本输入。', dateAlternateText: '添加日历以选择日期。', dropdownAlternateText: '添加一个选项列表供选择。', - formulaAlternateText: '添加一个公式字段。', nameInputSubtitle: '为报告字段选择一个名称。', typeInputSubtitle: '选择要使用的报告字段类型。', initialValueInputSubtitle: '输入一个起始值以显示在报告字段中。', diff --git a/src/libs/WorkspaceReportFieldUtils.ts b/src/libs/WorkspaceReportFieldUtils.ts index 0f0d69ad96c2..141a8abb96a8 100644 --- a/src/libs/WorkspaceReportFieldUtils.ts +++ b/src/libs/WorkspaceReportFieldUtils.ts @@ -16,7 +16,6 @@ function getReportFieldTypeTranslationKey(reportFieldType: PolicyReportFieldType [CONST.REPORT_FIELD_TYPES.TEXT]: 'workspace.reportFields.textType', [CONST.REPORT_FIELD_TYPES.DATE]: 'workspace.reportFields.dateType', [CONST.REPORT_FIELD_TYPES.LIST]: 'workspace.reportFields.dropdownType', - [CONST.REPORT_FIELD_TYPES.FORMULA]: 'workspace.reportFields.formulaType', }; return typeTranslationKeysStrategy[reportFieldType]; @@ -30,7 +29,6 @@ function getReportFieldAlternativeTextTranslationKey(reportFieldType: PolicyRepo [CONST.REPORT_FIELD_TYPES.TEXT]: 'workspace.reportFields.textAlternateText', [CONST.REPORT_FIELD_TYPES.DATE]: 'workspace.reportFields.dateAlternateText', [CONST.REPORT_FIELD_TYPES.LIST]: 'workspace.reportFields.dropdownAlternateText', - [CONST.REPORT_FIELD_TYPES.FORMULA]: 'workspace.reportFields.formulaAlternateText', }; return typeTranslationKeysStrategy[reportFieldType]; diff --git a/src/pages/workspace/reports/CreateReportFieldsPage.tsx b/src/pages/workspace/reports/CreateReportFieldsPage.tsx index 07e640598162..12ee04a14aed 100644 --- a/src/pages/workspace/reports/CreateReportFieldsPage.tsx +++ b/src/pages/workspace/reports/CreateReportFieldsPage.tsx @@ -156,22 +156,7 @@ function WorkspaceCreateReportFieldsPage({ label={translate('common.type')} subtitle={translate('workspace.reportFields.typeInputSubtitle')} rightLabel={translate('common.required')} - onTypeSelected={(type) => { - let initialValue; - if (type === CONST.REPORT_FIELD_TYPES.DATE) { - initialValue = defaultDate; - } else if (type === CONST.REPORT_FIELD_TYPES.FORMULA) { - initialValue = '{report:id}'; - } else { - initialValue = ''; - } - - formRef.current?.resetForm({ - ...inputValues, - type, - initialValue, - }); - }} + onTypeSelected={(type) => formRef.current?.resetForm({...inputValues, type, initialValue: type === CONST.REPORT_FIELD_TYPES.DATE ? defaultDate : ''})} /> {inputValues[INPUT_IDS.TYPE] === CONST.REPORT_FIELD_TYPES.LIST && ( diff --git a/src/pages/workspace/reports/ReportFieldsInitialValuePage.tsx b/src/pages/workspace/reports/ReportFieldsInitialValuePage.tsx index 2484eef72ade..4fdae0c8452b 100644 --- a/src/pages/workspace/reports/ReportFieldsInitialValuePage.tsx +++ b/src/pages/workspace/reports/ReportFieldsInitialValuePage.tsx @@ -87,7 +87,6 @@ function ReportFieldsInitialValuePage({ } const isTextFieldType = reportField.type === CONST.REPORT_FIELD_TYPES.TEXT; - const isFormulaFieldType = reportField.type === CONST.REPORT_FIELD_TYPES.FORMULA; const isListFieldType = reportField.type === CONST.REPORT_FIELD_TYPES.LIST; return ( @@ -112,7 +111,7 @@ function ReportFieldsInitialValuePage({ )} - {(isTextFieldType || isFormulaFieldType) && ( + {isTextFieldType && (