Skip to content

Commit 23b633a

Browse files
review
1 parent 8f7e5e5 commit 23b633a

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ interface ExplicitNamingFilterFormProps {
9999
sourceFilterForExplicitNamingConversion?: FilterForExplicitConversionProps;
100100
}
101101

102-
function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversion }: ExplicitNamingFilterFormProps) {
102+
function ExplicitNamingFilterForm({
103+
sourceFilterForExplicitNamingConversion,
104+
}: Readonly<ExplicitNamingFilterFormProps>) {
103105
const intl = useIntl();
104106
const { snackError } = useSnackMessage();
105107

@@ -166,9 +168,9 @@ function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversion }: E
166168
return newCsvFileHeaders;
167169
}, [intl, forGeneratorOrLoad]);
168170

169-
const getDataFromCsvFile = useCallback((csvData: any) => {
171+
const getDataFromCsvFile = useCallback((csvData: string[][]) => {
170172
if (csvData) {
171-
return csvData.map((value: any) => {
173+
return csvData.map((value) => {
172174
return {
173175
[FieldConstants.AG_GRID_ROW_UUID]: uuid4(),
174176
[FieldConstants.EQUIPMENT_ID]: value[0]?.trim(),

src/components/inputs/reactHookForm/agGridTable/BottomRightButtons.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ function BottomRightButtons({
5050
}: Readonly<BottomRightButtonsProps>) {
5151
const [uploaderOpen, setUploaderOpen] = useState(false);
5252
const intl = useIntl();
53+
const onClose = useCallback(() => setUploaderOpen(false), []);
5354

5455
return (
5556
<>
@@ -88,7 +89,7 @@ function BottomRightButtons({
8889
</Grid>
8990
<CsvUploader
9091
open={uploaderOpen}
91-
onClose={useCallback(() => setUploaderOpen(false), [])}
92+
onClose={onClose}
9293
name={name}
9394
useFieldArrayOutput={useFieldArrayOutput}
9495
{...csvProps}

src/components/inputs/reactHookForm/agGridTable/csvUploader/CsvUploader.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { useCSVReader } from 'react-papaparse';
1919
import { ReactNode, useMemo, useState } from 'react';
2020
import { FormattedMessage, useIntl } from 'react-intl';
2121
import CsvDownloader from 'react-csv-downloader';
22-
import { FieldValues, UseFieldArrayReturn, useWatch } from 'react-hook-form';
22+
import { FieldValues, UseFieldArrayAppend, UseFieldArrayReturn, useWatch } from 'react-hook-form';
2323
import { RECORD_SEP, UNIT_SEP } from 'papaparse';
2424
import FieldConstants from '../../../../../utils/constants/fieldConstants';
2525
import CancelButton from '../../utils/CancelButton';
@@ -33,7 +33,7 @@ export interface CsvUploaderProps {
3333
fileName: string;
3434
csvData?: Array<string[] | Record<string, string | null | undefined>>;
3535
validateData?: (rows: string[][]) => boolean;
36-
getDataFromCsv: any;
36+
getDataFromCsv: (csvData: string[][]) => Parameters<UseFieldArrayAppend<FieldValues, string>>[0]; // keep generics in sync with useFieldArrayOutput field
3737
useFieldArrayOutput: UseFieldArrayReturn<FieldValues, string, 'id'>;
3838
}
3939

0 commit comments

Comments
 (0)