Skip to content

Commit ca54fdd

Browse files
committed
fix linter errors
1 parent 1a4e19f commit ca54fdd

File tree

2 files changed

+36
-22
lines changed

2 files changed

+36
-22
lines changed

web-app/src/app/screens/FeedSubmission/Form/FirstStep.tsx

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
import { type YesNoFormInput, type FeedSubmissionFormFormInput } from '.';
2222
import { useEffect } from 'react';
2323
import { useTranslation } from 'react-i18next';
24-
import { isValidFeedLink, checkFeedUrlExistsInCsv } from '../../../services/feeds/utils';
24+
import { isValidFeedLink, checkFeedUrlExistsInCsv, } from '../../../services/feeds/utils';
2525
import FormLabelDescription from './components/FormLabelDescription';
2626

2727
export interface FeedSubmissionFormFormInputFirstStep {
@@ -42,7 +42,7 @@ interface FormFirstStepProps {
4242
setNumberOfSteps: (numberOfSteps: YesNoFormInput) => void;
4343
}
4444

45-
const realtimeFeedURLPrefix = "https://mobilitydatabase.org/feeds/gtfs/";
45+
const realtimeFeedURLPrefix = 'https://mobilitydatabase.org/feeds/gtfs/';
4646

4747
export default function FormFirstStep({
4848
initialValues,
@@ -270,9 +270,11 @@ export default function FormFirstStep({
270270
rules={{
271271
required: t('form.feedLinkRequired'),
272272
validate: async (value) => {
273-
if (!isValidFeedLink(value ?? '')) return t('form.errorUrl');
273+
if (!isValidFeedLink(value ?? '')) {
274+
return t('form.errorUrl');
275+
}
274276
const exists = await checkFeedUrlExistsInCsv(value ?? '');
275-
if (exists) {
277+
if (typeof exists === 'string' && exists.length > 0) {
276278
return `Feed Exists:${exists}`;
277279
}
278280
return true;
@@ -287,12 +289,15 @@ export default function FormFirstStep({
287289
error={errors.feedLink !== undefined}
288290
{...field}
289291
helperText={
290-
errors.feedLink?.message?.startsWith('Feed Exists:') ? (
292+
typeof errors.feedLink?.message === 'string' && errors.feedLink.message.startsWith('Feed Exists:') ? (
291293
<span>
292294
{t('form.feedAlreadyExists')}
293-
<a href=
294-
{errors.feedLink.message.replace('Feed Exists:', `${realtimeFeedURLPrefix}`)} target="_blank" rel="noopener noreferrer">
295-
{t(errors.feedLink.message.replace('Feed Exists:',''))}
295+
<a
296+
href={errors.feedLink.message.replace('Feed Exists:', `${realtimeFeedURLPrefix}`)}
297+
target="_blank"
298+
rel="noopener noreferrer"
299+
>
300+
{t(errors.feedLink.message.replace('Feed Exists:', ''))}
296301
</a>
297302
</span>
298303
) : (

web-app/src/app/screens/FeedSubmission/Form/SecondStepRealtime.tsx

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { type SubmitHandler, Controller, useForm } from 'react-hook-form';
1010
import { type AuthTypes, type FeedSubmissionFormFormInput } from '.';
1111
import { useEffect } from 'react';
1212
import { useTranslation } from 'react-i18next';
13-
import { isValidFeedLink, checkFeedUrlExistsInCsv } from '../../../services/feeds/utils';
13+
import { isValidFeedLink, checkFeedUrlExistsInCsv, } from '../../../services/feeds/utils';
1414

1515
export interface FeedSubmissionFormInputSecondStepRT {
1616
tripUpdates: string;
@@ -32,7 +32,7 @@ interface FormSecondStepRTProps {
3232
handleBack: (formData: Partial<FeedSubmissionFormFormInput>) => void;
3333
}
3434

35-
const realtimeFeedURLPrefix = "https://mobilitydatabase.org/feeds/gtfs_rt/";
35+
const realtimeFeedURLPrefix = 'https://mobilitydatabase.org/feeds/gtfs_rt/';
3636

3737
export default function FormSecondStepRT({
3838
initialValues,
@@ -125,10 +125,13 @@ export default function FormSecondStepRT({
125125
errors.serviceAlerts?.message?.startsWith('Feed Exists:') ? (
126126
<span>
127127
{t('form.feedAlreadyExists')}
128-
<a href=
129-
{errors.serviceAlerts.message.replace('Feed Exists:', `${realtimeFeedURLPrefix}`)} target="_blank" rel="noopener noreferrer">
130-
{t(errors.serviceAlerts.message.replace('Feed Exists:',''))}
131-
</a>
128+
<a
129+
href={errors.serviceAlerts.message.replace('Feed Exists:', `${realtimeFeedURLPrefix}`)}
130+
target="_blank"
131+
rel="noopener noreferrer"
132+
>
133+
{t(errors.serviceAlerts.message.replace('Feed Exists:', ''))}
134+
</a>
132135
</span>
133136
) : (
134137
errors.serviceAlerts?.message ?? ''
@@ -202,10 +205,13 @@ export default function FormSecondStepRT({
202205
errors.tripUpdates?.message?.startsWith('Feed Exists:') ? (
203206
<span>
204207
{t('form.feedAlreadyExists')}
205-
<a href=
206-
{errors.tripUpdates.message.replace('Feed Exists:', `${realtimeFeedURLPrefix}`)} target="_blank" rel="noopener noreferrer">
207-
{t(errors.tripUpdates.message.replace('Feed Exists:',''))}
208-
</a>
208+
<a
209+
href={errors.tripUpdates.message.replace('Feed Exists:', `${realtimeFeedURLPrefix}`)}
210+
target="_blank"
211+
rel="noopener noreferrer"
212+
>
213+
{t(errors.tripUpdates.message.replace('Feed Exists:', ''))}
214+
</a>
209215
</span>
210216
) : (
211217
errors.tripUpdates?.message ?? ''
@@ -279,10 +285,13 @@ export default function FormSecondStepRT({
279285
errors.vehiclePositions?.message?.startsWith('Feed Exists:') ? (
280286
<span>
281287
{t('form.feedAlreadyExists')}
282-
<a href=
283-
{errors.vehiclePositions.message.replace('Feed Exists:', `${realtimeFeedURLPrefix}`)} target="_blank" rel="noopener noreferrer">
284-
{t(errors.vehiclePositions.message.replace('Feed Exists:',''))}
285-
</a>
288+
<a
289+
href={errors.vehiclePositions.message.replace('Feed Exists:', `${realtimeFeedURLPrefix}`)}
290+
target="_blank"
291+
rel="noopener noreferrer"
292+
>
293+
{t(errors.vehiclePositions.message.replace('Feed Exists:', ''))}
294+
</a>
286295
</span>
287296
) : (
288297
errors.vehiclePositions?.message ?? ''

0 commit comments

Comments
 (0)