Skip to content

Commit

Permalink
Merge pull request #9183 from neinteractiveliterature/empty-the-lint-…
Browse files Browse the repository at this point in the history
…trap

Upgrade to eslint 9; enable warnings for untranslated strings
  • Loading branch information
nbudin authored Jul 10, 2024
2 parents f1cdd4b + 8d33362 commit 5ce714d
Show file tree
Hide file tree
Showing 83 changed files with 691 additions and 545 deletions.
66 changes: 0 additions & 66 deletions .codeclimate.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .eslintignore

This file was deleted.

192 changes: 0 additions & 192 deletions .eslintrc.cjs

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ jobs:
- uses: reviewdog/action-eslint@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
eslint_flags: 'app/javascript test/javascript schema.graphql --ext .js,.jsx,.ts,.tsx,.gql,.graphql'
eslint_flags: 'app/javascript test/javascript schema.graphql'
2 changes: 1 addition & 1 deletion app/graphql/graphql_operations_generated.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/javascript/BuiltInFormControls/ArrayEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function ArrayEditor<T>({

<ul className="list-group list-group-flush">
{array.map((value, index) => (
// eslint-disable-next-line react/no-array-index-key
<li className="list-group-item" key={index}>
<div className="d-flex">
<div className="flex-grow-1">{renderValue(value)}</div>
Expand Down
7 changes: 4 additions & 3 deletions app/javascript/BuiltInFormControls/CommitableInput.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useState, useCallback, useRef, ReactNode, InputHTMLAttributes } from 'react';
import * as React from 'react';
import classNames from 'classnames';
import { useTranslation } from 'react-i18next';

type CommitableInputChangeHandler = React.Dispatch<string> | ((value: string) => Promise<void>);

Expand Down Expand Up @@ -33,6 +34,7 @@ function CommitableInput({
const [editingValue, setEditingValue] = useState<string | undefined>('');
const [commitInProgress, setCommitInProgress] = useState(false);
const inputRef = useRef<HTMLInputElement>();
const { t } = useTranslation();

const beginEditing = useCallback(() => {
setEditing(true);
Expand Down Expand Up @@ -159,10 +161,9 @@ function CommitableInput({
onChange('');
}}
disabled={disabled || !value}
aria-label={t('buttons.clear')}
>
<i className="bi-x-square-fill">
<span className="visually-hidden">Clear</span>
</i>
<i className="bi-x-square-fill" />
</button>
) : null}
</div>
Expand Down
6 changes: 4 additions & 2 deletions app/javascript/BuiltInFormControls/LiquidInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
CodeInput,
useStandardCodeMirror,
UseStandardCodeMirrorExtensionsOptions,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
liquid,
LoadQueryWrapper,
} from '@neinteractiveliterature/litform';
Expand Down Expand Up @@ -171,8 +171,10 @@ function LiquidInput(props: LiquidInputProps): JSX.Element {
className="btn btn-link btn-sm me-3 text-body"
style={{ cursor: 'pointer' }}
onClick={() => setShowingDocs(false)}
title={t('buttons.close')}
aria-label={t('buttons.close')}
>
<i className="bi-x" title={t('buttons.close')} />
<i className="bi-x" />
</button>
</div>
</header>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ function ScheduledValueEditor<ValueType>({
<ScheduledValueTimespanRow
timespan={timespan}
timezone={timezone}
key={i} // eslint-disable-line react/no-array-index-key
key={i}
rowIdentifier={i}
deleteClicked={deleteRowClicked}
finishDidChange={timespanFinishDidChange}
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/BuiltInFormControls/TimezoneSelect.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable jsx-a11y/label-has-for */

import { useState, useMemo, ReactNode, SetStateAction, useId } from 'react';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "../../Permissions/fragments.graphql"

fragment CmsContentFields on CmsContent {
# eslint-disable-next-line @graphql-eslint/naming-convention
__typename

... on Page {
Expand Down
3 changes: 2 additions & 1 deletion app/javascript/CmsAdmin/CmsFilesAdmin/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export default LoadQueryWrapper(useCmsFilesAdminQuery, function CmsFilesAdmin({
renderError: (deleteError) => <ErrorDisplay graphQLError={deleteError} />,
})
}
aria-label={t('buttons.delete')}
>
<i className="bi-trash-fill" aria-hidden="true" />
</button>
Expand All @@ -95,7 +96,7 @@ export default LoadQueryWrapper(useCmsFilesAdminQuery, function CmsFilesAdmin({
/>
</div>
<div className="card-body text-center py-2">
<a href={cmsFile.file.url}>
<a href={cmsFile.file.url} aria-label={cmsFile.file.filename}>
<FilePreview
url={cmsFile.file.thumbnailUrl}
contentType={cmsFile.file.content_type}
Expand Down
Loading

0 comments on commit 5ce714d

Please sign in to comment.