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: Display error message when saving the same report list value #49791

Merged
merged 4 commits into from
Oct 8, 2024
Merged

fix: Display error message when saving the same report list value #49791

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f9f939
throw validation error when adding existing filed list value
etCoderDysto Sep 26, 2024
839b071
fix lint error
etCoderDysto Sep 26, 2024
f9e60dc
use useMemo to calculate listValues
etCoderDysto Sep 27, 2024
d23de9c
Merge branch 'main' into report-fields-validation
etCoderDysto Oct 3, 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: 15 additions & 3 deletions src/pages/workspace/reportFields/ReportFieldsAddListValuePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type {StackScreenProps} from '@react-navigation/stack';
import React, {useCallback} from 'react';
import React, {useCallback, useMemo} from 'react';
import {Keyboard} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import FormProvider from '@components/Form/FormProvider';
Expand All @@ -14,6 +14,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
import * as ReportField from '@libs/actions/Policy/ReportField';
import Navigation from '@libs/Navigation/Navigation';
import * as PolicyUtils from '@libs/PolicyUtils';
import * as ReportUtils from '@libs/ReportUtils';
import * as WorkspaceReportFieldUtils from '@libs/WorkspaceReportFieldUtils';
import type {SettingsNavigatorParamList} from '@navigation/types';
import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
Expand All @@ -37,10 +38,21 @@ function ReportFieldsAddListValuePage({
const {inputCallbackRef} = useAutoFocusInput();
const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);

const listValues = useMemo(() => {
let reportFieldListValues: string[];
if (reportFieldID) {
const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
reportFieldListValues = Object.values(policy?.fieldList?.[reportFieldKey]?.values ?? {});
} else {
reportFieldListValues = formDraft?.[INPUT_IDS.LIST_VALUES] ?? [];
}
return reportFieldListValues;
}, [formDraft, policy?.fieldList, reportFieldID]);

const validate = useCallback(
(values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM>) =>
WorkspaceReportFieldUtils.validateReportFieldListValueName(values[INPUT_IDS.VALUE_NAME].trim(), '', formDraft?.[INPUT_IDS.LIST_VALUES] ?? [], INPUT_IDS.VALUE_NAME),
[formDraft],
WorkspaceReportFieldUtils.validateReportFieldListValueName(values[INPUT_IDS.VALUE_NAME].trim(), '', listValues, INPUT_IDS.VALUE_NAME),
[listValues],
);

const createValue = useCallback(
Expand Down
Loading