Skip to content

Commit

Permalink
🚨 Fix tsc errors
Browse files Browse the repository at this point in the history
  • Loading branch information
0x46616c6b committed May 20, 2024
1 parent 8d7742d commit 28e25f9
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 28 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
- name: Install Dependencies
run: yarn install --frozen-lockfile

- name: TSC
run: yarn run tsc

- name: Test
run: yarn run coverage

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"build": "vite build",
"dev": "vite",
"preview": "vite preview",
"tsc": "tsc",
"test": "vitest",
"coverage": "vitest run --coverage",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0"
Expand Down
4 changes: 2 additions & 2 deletions src/components/message/MessageAttachments.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ImageList, ImageListItem } from '@mui/material'
import { FC, useCallback, useState } from 'react'
import Lightbox from 'react-image-lightbox'
import { Message } from '../../api/Message'
import 'react-image-lightbox/style.css'
import { Message } from '../../api/Message'

interface Props {
message: Message
Expand All @@ -11,7 +11,7 @@ interface Props {
const MessageAttachements: FC<Props> = ({ message }) => {
const [imageLightboxOpen, setImageLightboxOpen] = useState<boolean>(false)
const [imageIndex, setImageIndex] = useState<number>(0)
const attachments = message.attachments
const attachments = message.attachments || []

const openImageLightbox = useCallback(() => setImageLightboxOpen(true), [])
const closeImageLightbox = useCallback(() => setImageLightboxOpen(false), [])
Expand Down
1 change: 0 additions & 1 deletion src/components/message/MessageFormCounter.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react'
import { render, screen } from '@testing-library/react'
import MessageFormCounter from './MessageFormCounter'

Expand Down
6 changes: 3 additions & 3 deletions src/components/ticker/LocationSearch.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { FC, useRef, useState } from 'react'
import { Autocomplete, TextField } from '@mui/material'
import React, { FC, useRef, useState } from 'react'

interface SearchResult {
place_id: number
Expand Down Expand Up @@ -28,7 +28,7 @@ const LocationSearch: FC<Props> = ({ callback }) => {
const [options, setOptions] = useState<SearchResult[]>([])
const previousController = useRef<AbortController>()

const handleInputChange = (event: React.SyntheticEvent, value: string) => {
const handleInputChange = (_: React.SyntheticEvent, value: string) => {
if (previousController.current) {
previousController.current.abort()
}
Expand All @@ -44,7 +44,7 @@ const LocationSearch: FC<Props> = ({ callback }) => {
})
}

const handleChange = (event: React.SyntheticEvent, value: SearchResult | null) => {
const handleChange = (_: React.SyntheticEvent, value: SearchResult | null) => {
if (value) {
callback({ title: value?.display_name, lat: value?.lat, lon: value?.lon })
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/ticker/TickerModalForm.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Tab, Tabs } from '@mui/material'
import React, { FC, useState } from 'react'
import { Ticker } from '../../api/Ticker'
import Modal from '../common/Modal'
import TabPanel from '../common/TabPanel'
import TickerForm from './form/TickerForm'
import TickerSocialConnections from './TickerSocialConnections'
import Modal from '../common/Modal'
import TickerForm from './form/TickerForm'

interface Props {
onClose: () => void
Expand All @@ -15,7 +15,7 @@ interface Props {
const TickerModalForm: FC<Props> = ({ onClose, open, ticker }) => {
const [tabValue, setTabValue] = useState<number>(0)

const handleTabChange = (e: React.SyntheticEvent, value: number) => {
const handleTabChange = (_: React.SyntheticEvent, value: number) => {
setTabValue(value)
}

Expand Down
6 changes: 3 additions & 3 deletions src/theme/ThemeProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { FC, ReactNode } from 'react'
import { ThemeProvider as MUIThemeProvider, createTheme, StyledEngineProvider, CssBaseline, alpha } from '@mui/material'
import { CssBaseline, ThemeProvider as MUIThemeProvider, StyledEngineProvider, alpha, createTheme } from '@mui/material'
import { FC, ReactNode } from 'react'
import GlobalStyles from './GlobalStyles'
import customShadows from './customShadows'
import palette from './palette'
import shadows from './shadows'
import typography from './typography'
import customShadows from './customShadows'

const theme = createTheme({
palette: palette,
Expand Down
12 changes: 6 additions & 6 deletions src/views/SettingsView.test.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { render, screen } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import sign from 'jwt-encode'
import { MemoryRouter } from 'react-router'
import { vi } from 'vitest'
import { AuthProvider } from '../contexts/AuthContext'
import sign from 'jwt-encode'
import SettingsView from './SettingsView'
import userEvent from '@testing-library/user-event'
import { vi } from 'vitest'

describe('SettingsView', function () {
const jwt = sign({ id: 1, email: 'louis@systemli.org', roles: ['admin', 'user'] }, 'secret')
Expand Down Expand Up @@ -38,7 +38,7 @@ describe('SettingsView', function () {

beforeEach(() => {
vi.spyOn(window.localStorage.__proto__, 'getItem').mockReturnValue(jwt)
fetch.resetMocks()
fetchMock.resetMocks()
})

function setup() {
Expand All @@ -61,7 +61,7 @@ describe('SettingsView', function () {
}

test('renders settings and open dialogs', async function () {
fetch.mockIf(/^http:\/\/localhost:8080\/.*$/, (request: Request) => {
fetchMock.mockIf(/^http:\/\/localhost:8080\/.*$/, (request: Request) => {
if (request.url.endsWith('/admin/settings/inactive_settings')) {
return Promise.resolve(inactiveSettingsResponse)
}
Expand Down Expand Up @@ -114,7 +114,7 @@ describe('SettingsView', function () {
})

test('settings could not fetched', async function () {
fetch.mockReject(new Error('network error'))
fetchMock.mockReject(new Error('network error'))
setup()

const loaders = screen.getAllByText(/loading/i)
Expand Down
2 changes: 1 addition & 1 deletion src/views/TickerView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const TickerView: FC = () => {
)
}

const ticker = data?.data.ticker
const ticker = data?.data?.ticker

return (
<Layout>
Expand Down
18 changes: 9 additions & 9 deletions src/views/UsersView.test.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { render, screen } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import sign from 'jwt-encode'
import { MemoryRouter } from 'react-router'
import { vi } from 'vitest'
import { AuthProvider } from '../contexts/AuthContext'
import UsersView from './UsersView'
import sign from 'jwt-encode'
import userEvent from '@testing-library/user-event'
import { vi } from 'vitest'

describe('UsersView', function () {
const jwt = sign({ id: 1, email: 'louis@systemli.org', roles: ['admin', 'user'] }, 'secret')

beforeEach(() => {
vi.spyOn(window.localStorage.__proto__, 'getItem').mockReturnValue(jwt)
fetch.resetMocks()
fetchMock.resetMocks()
})

function setup() {
Expand All @@ -35,7 +35,7 @@ describe('UsersView', function () {
}

test('renders list', async function () {
fetch.mockResponseOnce(
fetchMock.mockResponseOnce(
JSON.stringify({
data: {
users: [
Expand All @@ -57,15 +57,15 @@ describe('UsersView', function () {

test('open new users dialog', async function () {
setup()
fetch.mockIf(
fetchMock.mockIf(
/\/v1\/admin\/users/i,
JSON.stringify({
data: {
users: [],
},
})
)
fetch.mockIf(
fetchMock.mockIf(
/\/v1\/admin\/tickers/i,
JSON.stringify({
data: {
Expand All @@ -91,7 +91,7 @@ describe('UsersView', function () {
})

test('open dialog for existing user', async function () {
fetch.mockIf(
fetchMock.mockIf(
/\/v1\/admin\/users/i,
JSON.stringify({
data: {
Expand Down Expand Up @@ -154,7 +154,7 @@ describe('UsersView', function () {
})

test('user list could not fetched', async function () {
fetch.mockReject(new Error('network error'))
fetchMock.mockReject(new Error('network error'))
setup()

expect(screen.getByText(/loading/i)).toBeInTheDocument()
Expand Down

0 comments on commit 28e25f9

Please sign in to comment.