Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: [Wave Control] Update the Report field list type creation flow. #46382

Merged
merged 6 commits into from
Aug 7, 2024
Merged

fix: [Wave Control] Update the Report field list type creation flow. #46382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
744523e
fix: [Wave Control] Update the Report field list type creation flow.
Krishna2323 Jul 28, 2024
826c5c8
fix: merge conflicts.
Krishna2323 Aug 5, 2024
fc09fd7
remove view component.
Krishna2323 Aug 5, 2024
f4c0bbc
move ConfirmModal at the bottom.
Krishna2323 Aug 5, 2024
3c15a2f
merge conflicts.
Krishna2323 Aug 5, 2024
4c54aaf
Merge branch 'main' into krishna2323/issue/45990
Krishna2323 Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,16 @@ function CreateReportFieldsPage({
onTypeSelected={(type) => formRef.current?.resetForm({...inputValues, type, initialValue: type === CONST.REPORT_FIELD_TYPES.DATE ? defaultDate : ''})}
/>

{inputValues[INPUT_IDS.TYPE] === CONST.REPORT_FIELD_TYPES.LIST && (
<MenuItemWithTopDescription
description={translate('workspace.reportFields.listValues')}
shouldShowRightIcon
onPress={() => Navigation.navigate(ROUTES.WORKSPACE_REPORT_FIELDS_LIST_VALUES.getRoute(policyID))}
title={formDraft?.[INPUT_IDS.LIST_VALUES]?.join(', ')}
numberOfLinesTitle={5}
/>
)}

{inputValues[INPUT_IDS.TYPE] === CONST.REPORT_FIELD_TYPES.TEXT && (
<InputWrapper
InputComponent={TextPicker}
Expand Down Expand Up @@ -175,14 +185,6 @@ function CreateReportFieldsPage({
rightLabel={translate('common.required')}
/>
)}

{inputValues[INPUT_IDS.TYPE] === CONST.REPORT_FIELD_TYPES.LIST && (
<MenuItemWithTopDescription
description={translate('workspace.reportFields.listValues')}
shouldShowRightIcon
onPress={() => Navigation.navigate(ROUTES.WORKSPACE_REPORT_FIELDS_LIST_VALUES.getRoute(policyID))}
/>
)}
</View>
)}
</FormProvider>
Expand Down
21 changes: 12 additions & 9 deletions src/pages/workspace/reportFields/ReportFieldsSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function ReportFieldsSettingsPage({
const isDateFieldType = reportField.type === CONST.REPORT_FIELD_TYPES.DATE;
const isListFieldType = reportField.type === CONST.REPORT_FIELD_TYPES.LIST;
const isListFieldEmpty = isListFieldType && reportField.values.length <= 0;
const listValues = Object.values(policy?.fieldList?.[reportFieldKey]?.values ?? {});

const deleteReportFieldAndHideModal = () => {
ReportField.deleteReportFields(policyID, [reportFieldKey]);
Expand Down Expand Up @@ -95,6 +96,17 @@ function ReportFieldsSettingsPage({
description={translate('common.type')}
interactive={false}
/>
{isListFieldType && (
<MenuItemWithTopDescription
style={[styles.moneyRequestMenuItem]}
titleStyle={styles.flex1}
description={translate('workspace.reportFields.listValues')}
shouldShowRightIcon
onPress={() => Navigation.navigate(ROUTES.WORKSPACE_REPORT_FIELDS_LIST_VALUES.getRoute(policyID, reportFieldID))}
title={listValues.join(', ')}
numberOfLinesTitle={5}
/>
)}
{!isListFieldEmpty && (
<MenuItemWithTopDescription
style={[styles.moneyRequestMenuItem]}
Expand All @@ -106,15 +118,6 @@ function ReportFieldsSettingsPage({
onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EDIT_REPORT_FIELDS_INITIAL_VALUE.getRoute(policyID, reportFieldID))}
/>
)}
{isListFieldType && (
<MenuItemWithTopDescription
style={[styles.moneyRequestMenuItem]}
titleStyle={styles.flex1}
description={translate('workspace.reportFields.listValues')}
shouldShowRightIcon
onPress={() => Navigation.navigate(ROUTES.WORKSPACE_REPORT_FIELDS_LIST_VALUES.getRoute(policyID, reportFieldID))}
/>
)}
{!hasAccountingConnections && (
<View style={styles.flexGrow1}>
<MenuItem
Expand Down
Loading