Skip to content

chore: enable React hook rules part 2 and fix validation hooks #216

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

Draft
aminamos wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −33
Draft

chore: enable React hook rules part 2 and fix validation hooks #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ export default tseslint.config(
],
// TODO: hooks called inside render callbacks, incorrect hook usage patterns,
// and missing/extra effect dependencies — to be fixed in a separate ticket.
'react-hooks/rules-of-hooks': 'off',
'react-hooks/rules-of-hooks': 'error',
'react-hooks/refs': 'off',
'react-hooks/set-state-in-render': 'off',
'react-hooks/set-state-in-effect': 'off',
'react-hooks/immutability': 'off',
'react-hooks/exhaustive-deps': 'off',
'react-hooks/immutability': 'warn',
'react-hooks/exhaustive-deps': 'warn',
// TypeScript handles these; disable the core JS versions.
'no-undef': 'off',
'no-unused-vars': 'off',
Expand Down
27 changes: 9 additions & 18 deletions src/app/screens/GbfsValidator/ValidationReport.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import WarningAmberOutlinedIcon from '@mui/icons-material/WarningAmberOutlined';
import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline';
import LanguageIcon from '@mui/icons-material/Language';
import { type components } from '../../services/feeds/gbfs-validator-types';
import { useEffect, useMemo, useRef, useState } from 'react';
import { useRef, useState } from 'react';
import { OpenInNew } from '@mui/icons-material';
import {
ValidationReportTableStyles,
Expand All @@ -45,6 +45,9 @@ export type ValidationResult = components['schemas']['ValidationResult'];
export type GbfsFile = components['schemas']['GbfsFile'];
export type FileError = components['schemas']['FileError'];

// needed as a module level constant to avoid re-rendering the component when the array is empty
const EMPTY_FILES: GbfsFile[] = [];

interface ValidationResultProps {
validationResult: ValidationResult | undefined;
loading: boolean;
Expand All @@ -61,26 +64,17 @@ export default function ValidationReport({
const [groupedExpanded, setGroupedExpanded] = useState<
Record<string, boolean>
>({});
const allFiles: GbfsFile[] = validationResult?.summary?.files ?? [];
const baseFiles: GbfsFile[] = allFiles.filter((f) => f.language == null);
const languageSpecificFiles: GbfsFile[] = allFiles.filter(
(f) => f.language != null,
);
const allFiles = validationResult?.summary?.files ?? EMPTY_FILES;
const baseFiles = allFiles.filter((f) => f.language == null);
const languageSpecificFiles = allFiles.filter((f) => f.language != null);
const languages = Array.from(
new Set(languageSpecificFiles.map((f) => f.language ?? '')),
).sort();
const [selectedLanguage, setSelectedLanguage] = useState<string>(
languages[0] ?? '',
);

// Adjust selectedLanguage if languages set changes (e.g., after loading finishes)
useEffect(() => {
if (languages.length > 0 && !languages.includes(selectedLanguage)) {
setSelectedLanguage(languages[0]);
}
}, [languages, selectedLanguage]);

const filesForLanguage: GbfsFile[] =
const filesForLanguage =
selectedLanguage !== ''
? [
...baseFiles,
Expand All @@ -90,10 +84,7 @@ export default function ValidationReport({
]
: [...baseFiles];
// Group errors by fileName, normalized instancePath and message. Shared util ensures consistency.
const groupedByFile = useMemo(
() => groupErrorsByFile(filesForLanguage),
[filesForLanguage],
);
const groupedByFile = groupErrorsByFile(filesForLanguage);
const fileGroupRefs = useRef<Array<HTMLDivElement | null>>([]);

// Error details dialog selection state
Expand Down
20 changes: 8 additions & 12 deletions src/app/screens/GbfsValidator/ValidationState.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,14 @@ export default function ValidationState(): ReactElement {
};

useEffect(() => {
let timer: ReturnType<typeof setTimeout> | null = null;
if (loadingState) {
timer = setTimeout(() => {
setLongLoadingState(true);
}, 5000);
} else {
setLongLoadingState(false);
}
if (!loadingState) return;
const timer = setTimeout(() => {
setLongLoadingState(true);
}, 5000);

return () => {
// cleanup timer on unmount or when loadingState changes
if (timer != null) {
clearTimeout(timer);
}
clearTimeout(timer);
setLongLoadingState(false);
};
}, [loadingState]);

Expand All @@ -117,6 +111,7 @@ export default function ValidationState(): ReactElement {
>
<Container maxWidth='lg' sx={{ my: 2 }}>
<GbfsFeedSearchInput
key={feedUrl ?? ''}
initialFeedUrl={feedUrl ?? ''}
triggerDataFetch={triggerDataFetch}
></GbfsFeedSearchInput>
Expand Down Expand Up @@ -250,6 +245,7 @@ export default function ValidationState(): ReactElement {
</Box> */}

<ValidationReport
key={feedUrl ?? ''}
validationResult={validationResult}
loading={loadingState}
></ValidationReport>
Expand Down