Skip to content

Commit a1be2a6

Browse files
committed
prettier
1 parent f7eac51 commit a1be2a6

7 files changed

Lines changed: 19 additions & 23 deletions

File tree

src/pages/workspace/reports/InitialListValueSelector/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type InitialListValueSelectorProps = Pick<MenuItemBaseProps, 'label' | 'rightLab
2020
};
2121

2222
function InitialListValueSelector({value = '', label = '', rightLabel, subtitle = '', errorText = '', onInputChange}: InitialListValueSelectorProps, forwardedRef: ForwardedRef<View>) {
23-
const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
23+
const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT, {canBeMissing: true});
2424

2525
const [isPickerVisible, setIsPickerVisible] = useState(false);
2626

src/pages/workspace/reports/ReportFieldTypePicker/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, {useMemo} from 'react';
22
import SelectionList from '@components/SelectionList';
33
import RadioListItem from '@components/SelectionList/RadioListItem';
44
import useLocalize from '@hooks/useLocalize';
5-
import * as WorkspaceReportFieldUtils from '@libs/WorkspaceReportFieldUtils';
5+
import {getReportFieldAlternativeTextTranslationKey, getReportFieldTypeTranslationKey} from '@libs/WorkspaceReportFieldUtils';
66
import CONST from '@src/CONST';
77
import type {PolicyReportFieldType} from '@src/types/onyx/Policy';
88

@@ -36,8 +36,8 @@ function ReportFieldTypePicker({defaultValue, onOptionSelected}: ReportFieldType
3636
keyForList: reportFieldType,
3737
value: reportFieldType,
3838
isSelected: defaultValue === reportFieldType,
39-
text: translate(WorkspaceReportFieldUtils.getReportFieldTypeTranslationKey(reportFieldType)),
40-
alternateText: translate(WorkspaceReportFieldUtils.getReportFieldAlternativeTextTranslationKey(reportFieldType)),
39+
text: translate(getReportFieldTypeTranslationKey(reportFieldType)),
40+
alternateText: translate(getReportFieldAlternativeTextTranslationKey(reportFieldType)),
4141
}));
4242

4343
return [{data}];

src/pages/workspace/reports/ReportFieldsAddListValuePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function ReportFieldsAddListValuePage({
3636
const styles = useThemeStyles();
3737
const {translate} = useLocalize();
3838
const {inputCallbackRef} = useAutoFocusInput();
39-
const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
39+
const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT, {canBeMissing: true});
4040

4141
const listValues = useMemo(() => {
4242
let reportFieldListValues: string[];

src/pages/workspace/reports/ReportFieldsEditValuePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function ReportFieldsEditValuePage({
3535
const styles = useThemeStyles();
3636
const {translate} = useLocalize();
3737
const {inputCallbackRef} = useAutoFocusInput();
38-
const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
38+
const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT, {canBeMissing: true});
3939

4040
const currentValueName = formDraft?.listValues?.[valueIndex] ?? '';
4141

src/pages/workspace/reports/ReportFieldsValueSettingsPage.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import useLocalize from '@hooks/useLocalize';
1212
import useOnyx from '@hooks/useOnyx';
1313
import usePrevious from '@hooks/usePrevious';
1414
import useThemeStyles from '@hooks/useThemeStyles';
15-
import * as ReportField from '@libs/actions/Policy/ReportField';
15+
import {deleteReportFieldsListValue, removeReportFieldListValue, setReportFieldsListValueEnabled, updateReportFieldListValueEnabled} from '@libs/actions/Policy/ReportField';
1616
import Navigation from '@libs/Navigation/Navigation';
1717
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
18-
import * as PolicyUtils from '@libs/PolicyUtils';
19-
import * as ReportUtils from '@libs/ReportUtils';
18+
import {hasAccountingConnections as hasAccountingConnectionsUtil} from '@libs/PolicyUtils';
19+
import {getReportFieldKey} from '@libs/ReportUtils';
2020
import type {SettingsNavigatorParamList} from '@navigation/types';
2121
import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
2222
import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
@@ -37,7 +37,7 @@ function ReportFieldsValueSettingsPage({
3737
}: ReportFieldsValueSettingsPageProps) {
3838
const styles = useThemeStyles();
3939
const {translate} = useLocalize();
40-
const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
40+
const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT, {canBeMissing: true});
4141

4242
const [isDeleteTagModalOpen, setIsDeleteTagModalOpen] = useState(false);
4343

@@ -46,7 +46,7 @@ function ReportFieldsValueSettingsPage({
4646
let reportFieldDisabledValue: boolean;
4747

4848
if (reportFieldID) {
49-
const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
49+
const reportFieldKey = getReportFieldKey(reportFieldID);
5050

5151
reportFieldValue = Object.values(policy?.fieldList?.[reportFieldKey]?.values ?? {})?.at(valueIndex) ?? '';
5252
reportFieldDisabledValue = Object.values(policy?.fieldList?.[reportFieldKey]?.disabledOptions ?? {})?.at(valueIndex) ?? false;
@@ -58,29 +58,29 @@ function ReportFieldsValueSettingsPage({
5858
return [reportFieldValue, reportFieldDisabledValue];
5959
}, [formDraft?.disabledListValues, formDraft?.listValues, policy?.fieldList, reportFieldID, valueIndex]);
6060

61-
const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
61+
const hasAccountingConnections = hasAccountingConnectionsUtil(policy);
6262
const oldValueName = usePrevious(currentValueName);
6363

6464
if ((!currentValueName && !oldValueName) || hasAccountingConnections) {
6565
return <NotFoundPage />;
6666
}
6767
const deleteListValueAndHideModal = () => {
6868
if (reportFieldID) {
69-
ReportField.removeReportFieldListValue(policyID, reportFieldID, [valueIndex]);
69+
removeReportFieldListValue(policyID, reportFieldID, [valueIndex]);
7070
} else {
71-
ReportField.deleteReportFieldsListValue([valueIndex]);
71+
deleteReportFieldsListValue([valueIndex]);
7272
}
7373
setIsDeleteTagModalOpen(false);
7474
Navigation.goBack();
7575
};
7676

7777
const updateListValueEnabled = (value: boolean) => {
7878
if (reportFieldID) {
79-
ReportField.updateReportFieldListValueEnabled(policyID, reportFieldID, [Number(valueIndex)], value);
79+
updateReportFieldListValueEnabled(policyID, reportFieldID, [Number(valueIndex)], value);
8080
return;
8181
}
8282

83-
ReportField.setReportFieldsListValueEnabled([valueIndex], value);
83+
setReportFieldsListValueEnabled([valueIndex], value);
8484
};
8585

8686
const navigateToEditValue = () => {

src/pages/workspace/reports/TypeSelector/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {View} from 'react-native';
55
import type {MenuItemBaseProps} from '@components/MenuItem';
66
import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
77
import useLocalize from '@hooks/useLocalize';
8-
import * as WorkspaceReportFieldUtils from '@libs/WorkspaceReportFieldUtils';
8+
import {getReportFieldTypeTranslationKey} from '@libs/WorkspaceReportFieldUtils';
99
import type {ReportFieldItemType} from '@pages/workspace/reports/ReportFieldTypePicker';
1010
import CONST from '@src/CONST';
1111
import type {PolicyReportFieldType} from '@src/types/onyx/Policy';
@@ -49,7 +49,7 @@ function TypeSelector({value, label = '', rightLabel, subtitle = '', errorText =
4949
<MenuItemWithTopDescription
5050
ref={forwardedRef}
5151
shouldShowRightIcon
52-
title={value ? Str.recapitalize(translate(WorkspaceReportFieldUtils.getReportFieldTypeTranslationKey(value as PolicyReportFieldType))) : ''}
52+
title={value ? Str.recapitalize(translate(getReportFieldTypeTranslationKey(value as PolicyReportFieldType))) : ''}
5353
description={label}
5454
rightLabel={rightLabel}
5555
brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}

src/pages/workspace/reports/WorkspaceReportsPage.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,7 @@ function WorkspaceReportFieldsPage({
268268
}
269269
if (!isControlPolicy(policy)) {
270270
Navigation.navigate(
271-
ROUTES.WORKSPACE_UPGRADE.getRoute(
272-
policyID,
273-
CONST.UPGRADE_FEATURE_INTRO_MAPPING.reportFields.alias,
274-
ROUTES.WORKSPACE_REPORTS.getRoute(policyID),
275-
),
271+
ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.reportFields.alias, ROUTES.WORKSPACE_REPORTS.getRoute(policyID)),
276272
);
277273
return;
278274
}

0 commit comments

Comments
 (0)