From c017df0a3c0ded82071a3341a70973603269c087 Mon Sep 17 00:00:00 2001 From: Tilman Vatteroth Date: Sat, 16 Oct 2021 11:07:09 +0200 Subject: [PATCH] Fix linting errors Signed-off-by: Tilman Vatteroth --- .../application-loader/initializers/i18n/i18n.ts | 6 +++--- src/components/common/cache/cache.ts | 2 +- .../copyable/copyable-field/copyable-field.tsx | 2 +- .../editor-page/document-bar/revisions/utils.ts | 2 +- .../editor-page/editor-pane/upload-handler.ts | 2 +- .../editor-page/hooks/useLoadNoteFromServer.ts | 2 +- .../editor-page/sidebar/upload-input.tsx | 2 +- .../history-toolbar/clear-history-button.tsx | 2 +- .../history-toolbar/history-toolbar.tsx | 2 +- .../history-toolbar/import-history-button.tsx | 2 +- .../landing-layout/footer/language-picker.tsx | 2 +- .../markdown-renderer/hooks/use-reveal.ts | 2 +- .../replace-components/abc/abc-frame.tsx | 2 +- .../flow/flowchart/flowchart.tsx | 2 +- .../replace-components/gist/gist-frame.tsx | 2 +- .../gist/use-resize-gist-frame.ts | 16 +++++++++------- .../graphviz/graphviz-frame.tsx | 2 +- .../highlighted-code/highlighted-code.tsx | 2 +- .../replace-components/markmap/markmap-frame.tsx | 2 +- .../replace-components/mermaid/mermaid-chart.tsx | 2 +- .../replace-components/vega-lite/vega-chart.tsx | 2 +- .../access-tokens/profile-access-tokens.tsx | 4 ++-- src/redux/history/methods.ts | 2 +- src/service-worker-registration.ts | 2 +- 24 files changed, 35 insertions(+), 33 deletions(-) diff --git a/src/components/application-loader/initializers/i18n/i18n.ts b/src/components/application-loader/initializers/i18n/i18n.ts index 3f88faa09..8574e05f2 100644 --- a/src/components/application-loader/initializers/i18n/i18n.ts +++ b/src/components/application-loader/initializers/i18n/i18n.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import i18n from 'i18next' +import i18n, { ResourceKey } from 'i18next' import LanguageDetector from 'i18next-browser-languagedetector' import resourcesToBackend from 'i18next-resources-to-backend' import { Settings } from 'luxon' @@ -15,10 +15,10 @@ export const setUpI18n = async (): Promise => { .use( resourcesToBackend((language, namespace, callback) => { import(`../../../../../locales/${language}.json`) - .then((resources) => { + .then((resources: ResourceKey) => { callback(null, resources) }) - .catch((error) => { + .catch((error: Error) => { callback(error, null) }) }) diff --git a/src/components/common/cache/cache.ts b/src/components/common/cache/cache.ts index 8268f918b..0d7ae4084 100644 --- a/src/components/common/cache/cache.ts +++ b/src/components/common/cache/cache.ts @@ -40,7 +40,7 @@ export class Cache { put(key: K, value: V): void { if (this.maxEntries > 0 && this.store.size === this.maxEntries) { - this.store.delete(this.store.keys().next().value) + this.store.delete(this.store.keys().next().value as K) } this.store.set(key, { entryCreated: Date.now(), diff --git a/src/components/common/copyable/copyable-field/copyable-field.tsx b/src/components/common/copyable/copyable-field/copyable-field.tsx index 6001b0533..ba62880b2 100644 --- a/src/components/common/copyable/copyable-field/copyable-field.tsx +++ b/src/components/common/copyable/copyable-field/copyable-field.tsx @@ -30,7 +30,7 @@ export const CopyableField: React.FC = ({ content, nativeSha text: content, url: url }) - .catch((error) => { + .catch((error: Error) => { log.error('Native sharing failed', error) }) }, [content, url]) diff --git a/src/components/editor-page/document-bar/revisions/utils.ts b/src/components/editor-page/document-bar/revisions/utils.ts index 86f23d994..a19abd3f3 100644 --- a/src/components/editor-page/document-bar/revisions/utils.ts +++ b/src/components/editor-page/document-bar/revisions/utils.ts @@ -29,7 +29,7 @@ export const getUserDataForRevision = (authors: string[]): UserResponse[] => { .then((userData) => { users.push(userData) }) - .catch((error) => log.error(error)) + .catch((error: Error) => log.error(error)) }) return users } diff --git a/src/components/editor-page/editor-pane/upload-handler.ts b/src/components/editor-page/editor-pane/upload-handler.ts index 2995d93d7..27a09f86d 100644 --- a/src/components/editor-page/editor-pane/upload-handler.ts +++ b/src/components/editor-page/editor-pane/upload-handler.ts @@ -32,7 +32,7 @@ export const handleUpload = (file: File, editor: Editor): void => { .then(({ link }) => { insertCode(`![](${link})`) }) - .catch((error) => { + .catch((error: Error) => { log.error('error while uploading file', error) insertCode('') }) diff --git a/src/components/editor-page/hooks/useLoadNoteFromServer.ts b/src/components/editor-page/hooks/useLoadNoteFromServer.ts index dbe7f7a09..a1612ef1a 100644 --- a/src/components/editor-page/hooks/useLoadNoteFromServer.ts +++ b/src/components/editor-page/hooks/useLoadNoteFromServer.ts @@ -24,7 +24,7 @@ export const useLoadNoteFromServer = (): [boolean, boolean] => { .then((note) => { setNoteDataFromServer(note) }) - .catch((error) => { + .catch((error: Error) => { setError(true) log.error('Error while fetching note from server', error) }) diff --git a/src/components/editor-page/sidebar/upload-input.tsx b/src/components/editor-page/sidebar/upload-input.tsx index ab585b25a..b16a4ff10 100644 --- a/src/components/editor-page/sidebar/upload-input.tsx +++ b/src/components/editor-page/sidebar/upload-input.tsx @@ -32,7 +32,7 @@ export const UploadInput: React.FC = ({ onLoad, acceptedFiles, .then(() => { fileInput.value = '' }) - .catch((error) => { + .catch((error: Error) => { log.error('Error while uploading file', error) }) }) diff --git a/src/components/history-page/history-toolbar/clear-history-button.tsx b/src/components/history-page/history-toolbar/clear-history-button.tsx index c2c29b6f4..6235938bc 100644 --- a/src/components/history-page/history-toolbar/clear-history-button.tsx +++ b/src/components/history-page/history-toolbar/clear-history-button.tsx @@ -20,7 +20,7 @@ export const ClearHistoryButton: React.FC = () => { const handleClose = () => setShow(false) const onConfirm = useCallback(() => { - deleteAllHistoryEntries().catch((error) => { + deleteAllHistoryEntries().catch((error: Error) => { showErrorNotification('landing.history.error.deleteEntry.text')(error) refreshHistoryState().catch(showErrorNotification('landing.history.error.getHistory.text')) }) diff --git a/src/components/history-page/history-toolbar/history-toolbar.tsx b/src/components/history-page/history-toolbar/history-toolbar.tsx index ae091cf03..b1c1f30c5 100644 --- a/src/components/history-page/history-toolbar/history-toolbar.tsx +++ b/src/components/history-page/history-toolbar/history-toolbar.tsx @@ -127,7 +127,7 @@ export const HistoryToolbar: React.FC = ({ onSettingsChange .filter((entry) => entry.origin === HistoryEntryOrigin.LOCAL) .map((entry) => entry.identifier) historyEntries.forEach((entry) => (entry.origin = HistoryEntryOrigin.REMOTE)) - importHistoryEntries(historyEntries).catch((error) => { + importHistoryEntries(historyEntries).catch((error: Error) => { showErrorNotification('landing.history.error.setHistory.text')(error) historyEntries.forEach((entry) => { if (localEntries.includes(entry.identifier)) { diff --git a/src/components/history-page/history-toolbar/import-history-button.tsx b/src/components/history-page/history-toolbar/import-history-button.tsx index 5371490f8..48a1abedc 100644 --- a/src/components/history-page/history-toolbar/import-history-button.tsx +++ b/src/components/history-page/history-toolbar/import-history-button.tsx @@ -41,7 +41,7 @@ export const ImportHistoryButton: React.FC = () => { const onImportHistory = useCallback( (entries: HistoryEntry[]): void => { entries.forEach((entry) => (entry.origin = userExists ? HistoryEntryOrigin.REMOTE : HistoryEntryOrigin.LOCAL)) - importHistoryEntries(mergeHistoryEntries(historyState, entries)).catch((error) => { + importHistoryEntries(mergeHistoryEntries(historyState, entries)).catch((error: Error) => { showErrorNotification('landing.history.error.setHistory.text')(error) refreshHistoryState().catch(showErrorNotification('landing.history.error.getHistory.text')) }) diff --git a/src/components/landing-layout/footer/language-picker.tsx b/src/components/landing-layout/footer/language-picker.tsx index bb70d962f..4f3d56b1f 100644 --- a/src/components/landing-layout/footer/language-picker.tsx +++ b/src/components/landing-layout/footer/language-picker.tsx @@ -63,7 +63,7 @@ export const LanguagePicker: React.FC = () => { (event: React.ChangeEvent) => { const language = event.currentTarget.value Settings.defaultLocale = language - i18n.changeLanguage(language).catch((error) => log.error('Error while switching language', error)) + i18n.changeLanguage(language).catch((error: Error) => log.error('Error while switching language', error)) }, [i18n] ) diff --git a/src/components/markdown-renderer/hooks/use-reveal.ts b/src/components/markdown-renderer/hooks/use-reveal.ts index 92a4b38fd..540614be1 100644 --- a/src/components/markdown-renderer/hooks/use-reveal.ts +++ b/src/components/markdown-renderer/hooks/use-reveal.ts @@ -30,7 +30,7 @@ export const useReveal = (content: string, slideOptions?: SlideOptions): void => setDeck(reveal) log.debug('Initialisation finished') }) - .catch((error) => { + .catch((error: Error) => { log.error('Error while initializing reveal.js', error) }) }, [isInitialized, slideOptions]) diff --git a/src/components/markdown-renderer/replace-components/abc/abc-frame.tsx b/src/components/markdown-renderer/replace-components/abc/abc-frame.tsx index b954a7fd9..1305023a1 100644 --- a/src/components/markdown-renderer/replace-components/abc/abc-frame.tsx +++ b/src/components/markdown-renderer/replace-components/abc/abc-frame.tsx @@ -26,7 +26,7 @@ export const AbcFrame: React.FC = ({ code }) => { .then((imp) => { imp.renderAbc(actualContainer, code, {}) }) - .catch((error) => { + .catch((error: Error) => { log.error('Error while loading abcjs', error) }) }, [code]) diff --git a/src/components/markdown-renderer/replace-components/flow/flowchart/flowchart.tsx b/src/components/markdown-renderer/replace-components/flow/flowchart/flowchart.tsx index 130351303..9aba30a0e 100644 --- a/src/components/markdown-renderer/replace-components/flow/flowchart/flowchart.tsx +++ b/src/components/markdown-renderer/replace-components/flow/flowchart/flowchart.tsx @@ -46,7 +46,7 @@ export const FlowChart: React.FC = ({ code }) => { setError(true) } }) - .catch((error) => log.error('Error while loading flowchart.js', error)) + .catch((error: Error) => log.error('Error while loading flowchart.js', error)) return () => { Array.from(currentDiagramRef.children).forEach((value) => value.remove()) diff --git a/src/components/markdown-renderer/replace-components/gist/gist-frame.tsx b/src/components/markdown-renderer/replace-components/gist/gist-frame.tsx index b90356275..c552a1db2 100644 --- a/src/components/markdown-renderer/replace-components/gist/gist-frame.tsx +++ b/src/components/markdown-renderer/replace-components/gist/gist-frame.tsx @@ -21,7 +21,7 @@ export const GistFrame: React.FC = ({ id }) => { const [frameHeight, onStartResizing] = useResizeGistFrame(150) const onStart = useCallback( - (event) => { + (event: React.MouseEvent | React.TouchEvent) => { onStartResizing(event) }, [onStartResizing] diff --git a/src/components/markdown-renderer/replace-components/gist/use-resize-gist-frame.ts b/src/components/markdown-renderer/replace-components/gist/use-resize-gist-frame.ts index 607f0ed7b..df7db906e 100644 --- a/src/components/markdown-renderer/replace-components/gist/use-resize-gist-frame.ts +++ b/src/components/markdown-renderer/replace-components/gist/use-resize-gist-frame.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { useCallback, useEffect, useRef, useState } from 'react' +import React, { useCallback, useEffect, useRef, useState } from 'react' /** * Determines if the left mouse button is pressed in the given event @@ -22,7 +22,9 @@ const isLeftMouseButtonPressed = (mouseEvent: MouseEvent): boolean => { * @param moveEvent the vertical position of the mouse pointer or the first touch pointer. * @return the extracted vertical position. */ -const extractVerticalPointerPosition = (moveEvent: MouseEvent | TouchEvent): number => { +const extractVerticalPointerPosition = ( + moveEvent: React.MouseEvent | React.TouchEvent | MouseEvent | TouchEvent +): number => { if (isMouseEvent(moveEvent)) { return moveEvent.pageY } else { @@ -31,15 +33,15 @@ const extractVerticalPointerPosition = (moveEvent: MouseEvent | TouchEvent): num } /** - * Checks if the given {@link Event} is a {@link MouseEvent} + * Checks if the given {@link Event} is a {@link MouseEvent} or a {@link React.MouseEvent} * @param event the event to check - * @return {@code true} if the given event is a {@link MouseEvent} + * @return {@code true} if the given event is a {@link MouseEvent} or a {@link React.MouseEvent} */ -const isMouseEvent = (event: Event): event is MouseEvent => { +const isMouseEvent = (event: Event | React.UIEvent): event is MouseEvent | React.MouseEvent => { return (event as MouseEvent).buttons !== undefined } -export type PointerEvent = MouseEvent | TouchEvent +export type PointerEvent = React.MouseEvent | React.TouchEvent export type PointerEventHandler = (event: PointerEvent) => void /** @@ -69,7 +71,7 @@ export const useResizeGistFrame = (initialFrameHeight: number): [number, Pointer moveEvent.preventDefault() }, []) - const onStartResizing: PointerEventHandler = useCallback((event) => { + const onStartResizing = useCallback((event: React.MouseEvent | React.TouchEvent) => { lastYPosition.current = extractVerticalPointerPosition(event) }, []) diff --git a/src/components/markdown-renderer/replace-components/graphviz/graphviz-frame.tsx b/src/components/markdown-renderer/replace-components/graphviz/graphviz-frame.tsx index e3118e3eb..1e966e87c 100644 --- a/src/components/markdown-renderer/replace-components/graphviz/graphviz-frame.tsx +++ b/src/components/markdown-renderer/replace-components/graphviz/graphviz-frame.tsx @@ -56,7 +56,7 @@ export const GraphvizFrame: React.FC = ({ code }) => { showError(error as string) } }) - .catch((error) => { + .catch((error: Error) => { log.error('Error while loading graphviz', error) }) }, [code, error, frontendBaseUrl, showError]) diff --git a/src/components/markdown-renderer/replace-components/highlighted-fence/highlighted-code/highlighted-code.tsx b/src/components/markdown-renderer/replace-components/highlighted-fence/highlighted-code/highlighted-code.tsx index ce0e9c02e..e1c29f981 100644 --- a/src/components/markdown-renderer/replace-components/highlighted-fence/highlighted-code/highlighted-code.tsx +++ b/src/components/markdown-renderer/replace-components/highlighted-fence/highlighted-code/highlighted-code.tsx @@ -58,7 +58,7 @@ export const HighlightedCode: React.FC = ({ code, language )) setDom(replacedDom) }) - .catch((error) => { + .catch((error: Error) => { log.error('Error while loading highlight.js', error) }) }, [code, language, startLineNumber]) diff --git a/src/components/markdown-renderer/replace-components/markmap/markmap-frame.tsx b/src/components/markdown-renderer/replace-components/markmap/markmap-frame.tsx index 16bd13a36..9e89c0658 100644 --- a/src/components/markdown-renderer/replace-components/markmap/markmap-frame.tsx +++ b/src/components/markdown-renderer/replace-components/markmap/markmap-frame.tsx @@ -60,7 +60,7 @@ export const MarkmapFrame: React.FC = ({ code }) => { log.error(error) } }) - .catch((error) => { + .catch((error: Error) => { log.error('Error while loading markmap', error) }) }, [code]) diff --git a/src/components/markdown-renderer/replace-components/mermaid/mermaid-chart.tsx b/src/components/markdown-renderer/replace-components/mermaid/mermaid-chart.tsx index f44ad9b5c..bfb4858e2 100644 --- a/src/components/markdown-renderer/replace-components/mermaid/mermaid-chart.tsx +++ b/src/components/markdown-renderer/replace-components/mermaid/mermaid-chart.tsx @@ -34,7 +34,7 @@ export const MermaidChart: React.FC = ({ code }) => { mermaid.default.initialize({ startOnLoad: false }) mermaidInitialized = true }) - .catch((error) => { + .catch((error: Error) => { log.error('Error while loading mermaid', error) }) } diff --git a/src/components/markdown-renderer/replace-components/vega-lite/vega-chart.tsx b/src/components/markdown-renderer/replace-components/vega-lite/vega-chart.tsx index ec72de9fa..b2ca5daf7 100644 --- a/src/components/markdown-renderer/replace-components/vega-lite/vega-chart.tsx +++ b/src/components/markdown-renderer/replace-components/vega-lite/vega-chart.tsx @@ -61,7 +61,7 @@ export const VegaChart: React.FC = ({ code }) => { showError(t('renderer.vega-lite.errorJson')) } }) - .catch((error) => { + .catch((error: Error) => { log.error('Error while loading vega-light', error) }) }, [code, showError, t]) diff --git a/src/components/profile-page/access-tokens/profile-access-tokens.tsx b/src/components/profile-page/access-tokens/profile-access-tokens.tsx index 365203ff7..34be58332 100644 --- a/src/components/profile-page/access-tokens/profile-access-tokens.tsx +++ b/src/components/profile-page/access-tokens/profile-access-tokens.tsx @@ -39,7 +39,7 @@ export const ProfileAccessTokens: React.FC = () => { setShowAddedModal(true) setNewTokenLabel('') }) - .catch((error) => { + .catch((error: Error) => { log.error(error) setError(true) }) @@ -52,7 +52,7 @@ export const ProfileAccessTokens: React.FC = () => { .then(() => { setSelectedForDeletion(0) }) - .catch((error) => { + .catch((error: Error) => { log.error(error) setError(true) }) diff --git a/src/redux/history/methods.ts b/src/redux/history/methods.ts index ccda6b7b8..443c9f3e1 100644 --- a/src/redux/history/methods.ts +++ b/src/redux/history/methods.ts @@ -162,7 +162,7 @@ const loadLocalHistory = (): HistoryEntry[] => { const localV1Json = window.localStorage.getItem('notehistory') if (localV1Json) { try { - const localV1History = JSON.parse(JSON.parse(localV1Json)) as V1HistoryEntry[] + const localV1History = JSON.parse(JSON.parse(localV1Json) as string) as V1HistoryEntry[] window.localStorage.removeItem('notehistory') return convertV1History(localV1History) } catch (error) { diff --git a/src/service-worker-registration.ts b/src/service-worker-registration.ts index a42104c99..c8ce6af80 100644 --- a/src/service-worker-registration.ts +++ b/src/service-worker-registration.ts @@ -109,7 +109,7 @@ function registerValidSW(swUrl: string, config?: Config) { } } }) - .catch((error) => { + .catch((error: Error) => { log.error('Error during service worker registration', error) }) }