From 835ee2a046d3aedd2440fc0b59b725ce0c560f13 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 19 Oct 2022 14:35:28 +0100 Subject: [PATCH] [WIFI-11223] Latest axios TS fixes Signed-off-by: Charles --- src/components/Buttons/DeviceActionDropdown/RebootButton.tsx | 2 +- src/components/Buttons/DeviceActionDropdown/index.tsx | 4 ++-- src/hooks/Network/Account.ts | 2 +- src/hooks/Network/Blacklist.ts | 2 +- src/hooks/Network/Commands.ts | 2 +- src/hooks/Network/DefaultConfigurations.ts | 2 +- src/hooks/Network/DeviceLogs.ts | 2 +- src/hooks/Network/Devices.ts | 2 +- src/hooks/Network/Endpoints.ts | 2 +- src/hooks/Network/Firmware.ts | 2 +- src/hooks/Network/GoogleAuthenticator.ts | 2 +- src/hooks/Network/HealthChecks.ts | 2 +- src/hooks/Network/Inventory.ts | 2 +- src/hooks/Network/Login.ts | 2 +- src/hooks/Network/Statistics.ts | 2 +- src/hooks/Network/System.ts | 2 +- src/hooks/Network/Users.ts | 2 +- src/hooks/useMutationResult.ts | 2 +- src/models/Axios.ts | 3 +++ src/pages/DefaultConfigurations/List/Actions.tsx | 2 +- src/pages/DefaultConfigurations/List/CreateModal.tsx | 2 +- src/pages/DefaultConfigurations/List/EditModal.tsx | 2 +- .../Device/LogsCard/CommandHistory/useCommandHistoryTable.tsx | 2 +- src/pages/Device/LogsCard/HealthCheckHistory/DeleteModal.tsx | 2 +- src/pages/Device/LogsCard/LogHistory/DeleteModal.tsx | 2 +- src/pages/LoginPage/LoginForm.tsx | 2 +- src/pages/LoginPage/MfaForm.tsx | 2 +- vite.config.ts | 2 +- 28 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 src/models/Axios.ts diff --git a/src/components/Buttons/DeviceActionDropdown/RebootButton.tsx b/src/components/Buttons/DeviceActionDropdown/RebootButton.tsx index f7321c3..9b7f84d 100644 --- a/src/components/Buttons/DeviceActionDropdown/RebootButton.tsx +++ b/src/components/Buttons/DeviceActionDropdown/RebootButton.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { MenuItem, useToast } from '@chakra-ui/react'; -import { AxiosError } from 'axios'; import { useTranslation } from 'react-i18next'; import { useControllerStore } from 'contexts/ControllerSocketProvider/useStore'; import { useRebootDevice } from 'hooks/Network/Devices'; import { useMutationResult } from 'hooks/useMutationResult'; +import { AxiosError } from 'models/Axios'; import { GatewayDevice } from 'models/Device'; type Props = { diff --git a/src/components/Buttons/DeviceActionDropdown/index.tsx b/src/components/Buttons/DeviceActionDropdown/index.tsx index b6e304c..77659bf 100644 --- a/src/components/Buttons/DeviceActionDropdown/index.tsx +++ b/src/components/Buttons/DeviceActionDropdown/index.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { IconButton, Menu, MenuButton, MenuItem, MenuList, Spinner, Tooltip } from '@chakra-ui/react'; -import { AxiosError } from 'axios'; import { Wrench } from 'phosphor-react'; import { useTranslation } from 'react-i18next'; import RebootMenuItem from './RebootButton'; import { useBlinkDevice, useGetDeviceRtty } from 'hooks/Network/Devices'; import { useMutationResult } from 'hooks/useMutationResult'; +import { AxiosError } from 'models/Axios'; import { GatewayDevice } from 'models/Device'; interface Props { @@ -36,7 +36,7 @@ const DeviceActionDropdown = ({ size, }: Props) => { const { t } = useTranslation(); - const { refetch: getRtty, isLoading: isRtty } = useGetDeviceRtty({ + const { refetch: getRtty, isInitialLoading: isRtty } = useGetDeviceRtty({ serialNumber: device.serialNumber, extraId: 'inventory-modal', }); diff --git a/src/hooks/Network/Account.ts b/src/hooks/Network/Account.ts index 8c5ac7b..3cebe1a 100644 --- a/src/hooks/Network/Account.ts +++ b/src/hooks/Network/Account.ts @@ -1,11 +1,11 @@ import { Dispatch, SetStateAction } from 'react'; import { useToast } from '@chakra-ui/react'; import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { useTranslation } from 'react-i18next'; import { v4 as uuid } from 'uuid'; import { User } from '../../models/User'; import { axiosSec } from 'constants/axiosInstances'; +import { AxiosError } from 'models/Axios'; import { Note } from 'models/Note'; import { Preference } from 'models/Preference'; diff --git a/src/hooks/Network/Blacklist.ts b/src/hooks/Network/Blacklist.ts index 5c3ced2..8553e53 100644 --- a/src/hooks/Network/Blacklist.ts +++ b/src/hooks/Network/Blacklist.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { axiosGw } from 'constants/axiosInstances'; +import { AxiosError } from 'models/Axios'; import { PageInfo } from 'models/Table'; const getBlacklistCount = () => diff --git a/src/hooks/Network/Commands.ts b/src/hooks/Network/Commands.ts index c16bec9..00d67b9 100644 --- a/src/hooks/Network/Commands.ts +++ b/src/hooks/Network/Commands.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { axiosGw } from 'constants/axiosInstances'; +import { AxiosError } from 'models/Axios'; export type DeviceCommandHistory = { UUID: string; diff --git a/src/hooks/Network/DefaultConfigurations.ts b/src/hooks/Network/DefaultConfigurations.ts index 2a33abf..4224a0a 100644 --- a/src/hooks/Network/DefaultConfigurations.ts +++ b/src/hooks/Network/DefaultConfigurations.ts @@ -1,7 +1,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { axiosGw } from 'constants/axiosInstances'; import { useEndpointStatus } from 'hooks/useEndpointStatus'; +import { AxiosError } from 'models/Axios'; import { DeviceConfiguration } from 'models/Device'; export type DefaultConfigurationResponse = { diff --git a/src/hooks/Network/DeviceLogs.ts b/src/hooks/Network/DeviceLogs.ts index 2c1765f..cfbf739 100644 --- a/src/hooks/Network/DeviceLogs.ts +++ b/src/hooks/Network/DeviceLogs.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { axiosGw } from 'constants/axiosInstances'; +import { AxiosError } from 'models/Axios'; export type DeviceLog = { UUID: string; diff --git a/src/hooks/Network/Devices.ts b/src/hooks/Network/Devices.ts index 0375a84..9b8efd3 100644 --- a/src/hooks/Network/Devices.ts +++ b/src/hooks/Network/Devices.ts @@ -1,11 +1,11 @@ import { useToast } from '@chakra-ui/react'; import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { useTranslation } from 'react-i18next'; import { v4 as uuid } from 'uuid'; import { axiosGw } from 'constants/axiosInstances'; import { useAuth } from 'contexts/AuthProvider'; import { useEndpointStatus } from 'hooks/useEndpointStatus'; +import { AxiosError } from 'models/Axios'; import { DeviceRttyApiResponse, GatewayDevice, WifiScanCommand, WifiScanResult } from 'models/Device'; import { Note } from 'models/Note'; import { PageInfo } from 'models/Table'; diff --git a/src/hooks/Network/Endpoints.ts b/src/hooks/Network/Endpoints.ts index c3feabd..ec54430 100644 --- a/src/hooks/Network/Endpoints.ts +++ b/src/hooks/Network/Endpoints.ts @@ -1,8 +1,8 @@ import { useToast } from '@chakra-ui/react'; import { useQuery } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { useTranslation } from 'react-i18next'; import { axiosGw, axiosProv, axiosSec } from 'constants/axiosInstances'; +import { AxiosError } from 'models/Axios'; export type EndpointApiResponse = { authenticationType: string; diff --git a/src/hooks/Network/Firmware.ts b/src/hooks/Network/Firmware.ts index dc1a1bc..db722a5 100644 --- a/src/hooks/Network/Firmware.ts +++ b/src/hooks/Network/Firmware.ts @@ -1,9 +1,9 @@ import { useToast } from '@chakra-ui/react'; import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { useTranslation } from 'react-i18next'; import { v4 as uuid } from 'uuid'; import { axiosFms, axiosGw } from 'constants/axiosInstances'; +import { AxiosError } from 'models/Axios'; import { Firmware } from 'models/Firmware'; import { Note } from 'models/Note'; diff --git a/src/hooks/Network/GoogleAuthenticator.ts b/src/hooks/Network/GoogleAuthenticator.ts index cedb08b..3a7611a 100644 --- a/src/hooks/Network/GoogleAuthenticator.ts +++ b/src/hooks/Network/GoogleAuthenticator.ts @@ -1,9 +1,9 @@ import { Buffer } from 'buffer'; import { useToast } from '@chakra-ui/react'; import { useMutation, useQuery } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { useTranslation } from 'react-i18next'; import { axiosSec } from 'constants/axiosInstances'; +import { AxiosError } from 'models/Axios'; export const useGetGoogleAuthenticatorQrCode = () => { const { t } = useTranslation(); diff --git a/src/hooks/Network/HealthChecks.ts b/src/hooks/Network/HealthChecks.ts index d5747ae..d7a4e2f 100644 --- a/src/hooks/Network/HealthChecks.ts +++ b/src/hooks/Network/HealthChecks.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { axiosGw } from 'constants/axiosInstances'; +import { AxiosError } from 'models/Axios'; export type HealthCheck = { UUID: string; diff --git a/src/hooks/Network/Inventory.ts b/src/hooks/Network/Inventory.ts index f9486ff..67ad48b 100644 --- a/src/hooks/Network/Inventory.ts +++ b/src/hooks/Network/Inventory.ts @@ -1,7 +1,7 @@ /* eslint-disable import/prefer-default-export */ import { useQuery } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { axiosProv } from 'constants/axiosInstances'; +import { AxiosError } from 'models/Axios'; import { Note } from 'models/Note'; export type InventoryTag = { diff --git a/src/hooks/Network/Login.ts b/src/hooks/Network/Login.ts index 402e496..af31304 100644 --- a/src/hooks/Network/Login.ts +++ b/src/hooks/Network/Login.ts @@ -1,8 +1,8 @@ import { useToast } from '@chakra-ui/react'; import { useMutation } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { useTranslation } from 'react-i18next'; import { axiosSec } from 'constants/axiosInstances'; +import { AxiosError } from 'models/Axios'; export interface ChangePasswordRequest { userId: string; diff --git a/src/hooks/Network/Statistics.ts b/src/hooks/Network/Statistics.ts index d51e518..e9d6f45 100644 --- a/src/hooks/Network/Statistics.ts +++ b/src/hooks/Network/Statistics.ts @@ -1,7 +1,7 @@ /* eslint-disable import/prefer-default-export */ import { useQuery } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { axiosGw } from 'constants/axiosInstances'; +import { AxiosError } from 'models/Axios'; type DeviceInterfaceStatistics = { clients: { diff --git a/src/hooks/Network/System.ts b/src/hooks/Network/System.ts index 12b9b01..a979c4d 100644 --- a/src/hooks/Network/System.ts +++ b/src/hooks/Network/System.ts @@ -1,8 +1,8 @@ import { useToast } from '@chakra-ui/react'; import { useMutation, useQuery } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import * as axios from 'axios'; import { useTranslation } from 'react-i18next'; +import { AxiosError } from 'models/Axios'; type System = { UI?: string; diff --git a/src/hooks/Network/Users.ts b/src/hooks/Network/Users.ts index a9b4306..e2ef078 100644 --- a/src/hooks/Network/Users.ts +++ b/src/hooks/Network/Users.ts @@ -1,8 +1,8 @@ import { useToast } from '@chakra-ui/react'; import { useMutation, useQuery } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { useTranslation } from 'react-i18next'; import { axiosSec } from 'constants/axiosInstances'; +import { AxiosError } from 'models/Axios'; import { User } from 'models/User'; const getAvatarPromises = (userList: User[]) => { diff --git a/src/hooks/useMutationResult.ts b/src/hooks/useMutationResult.ts index 9ee86e9..81a048f 100644 --- a/src/hooks/useMutationResult.ts +++ b/src/hooks/useMutationResult.ts @@ -1,9 +1,9 @@ import { useCallback, useMemo } from 'react'; import { useToast } from '@chakra-ui/react'; import { useQueryClient } from '@tanstack/react-query'; -import { AxiosError } from 'axios'; import { useTranslation } from 'react-i18next'; import { v4 as uuid } from 'uuid'; +import { AxiosError } from 'models/Axios'; export type UseMutationResultProps = { objName: string; diff --git a/src/models/Axios.ts b/src/models/Axios.ts new file mode 100644 index 0000000..5e0567f --- /dev/null +++ b/src/models/Axios.ts @@ -0,0 +1,3 @@ +import { AxiosError as Err } from 'axios'; + +export type AxiosError = Err<{ ErrorDescription: string; ErrorCode: number }>; diff --git a/src/pages/DefaultConfigurations/List/Actions.tsx b/src/pages/DefaultConfigurations/List/Actions.tsx index dbc64db..2bc97a0 100644 --- a/src/pages/DefaultConfigurations/List/Actions.tsx +++ b/src/pages/DefaultConfigurations/List/Actions.tsx @@ -17,10 +17,10 @@ import { useDisclosure, useToast, } from '@chakra-ui/react'; -import { AxiosError } from 'axios'; import { MagnifyingGlass, Trash } from 'phosphor-react'; import { useTranslation } from 'react-i18next'; import { DefaultConfigurationResponse, useDeleteDefaultConfig } from 'hooks/Network/DefaultConfigurations'; +import { AxiosError } from 'models/Axios'; type Props = { config: DefaultConfigurationResponse; diff --git a/src/pages/DefaultConfigurations/List/CreateModal.tsx b/src/pages/DefaultConfigurations/List/CreateModal.tsx index aa226dc..34c03dc 100644 --- a/src/pages/DefaultConfigurations/List/CreateModal.tsx +++ b/src/pages/DefaultConfigurations/List/CreateModal.tsx @@ -1,6 +1,5 @@ import * as React from 'react'; import { Box, SimpleGrid, useBoolean, useDisclosure, useToast } from '@chakra-ui/react'; -import { AxiosError } from 'axios'; import { Formik, FormikProps } from 'formik'; import { useTranslation } from 'react-i18next'; import { v4 as uuid } from 'uuid'; @@ -16,6 +15,7 @@ import { DefaultConfigurationResponse, useCreateDefaultConfig } from 'hooks/Netw import { useGetDeviceTypes } from 'hooks/Network/Firmware'; import { useFormModal } from 'hooks/useFormModal'; import { useFormRef } from 'hooks/useFormRef'; +import { AxiosError } from 'models/Axios'; const CreateDefaultConfigurationModal = () => { const { t } = useTranslation(); diff --git a/src/pages/DefaultConfigurations/List/EditModal.tsx b/src/pages/DefaultConfigurations/List/EditModal.tsx index f997151..c1dec13 100644 --- a/src/pages/DefaultConfigurations/List/EditModal.tsx +++ b/src/pages/DefaultConfigurations/List/EditModal.tsx @@ -1,6 +1,5 @@ import * as React from 'react'; import { Box, SimpleGrid, useBoolean, UseDisclosureReturn, useToast } from '@chakra-ui/react'; -import { AxiosError } from 'axios'; import { Formik, FormikProps } from 'formik'; import { useTranslation } from 'react-i18next'; import { v4 as uuid } from 'uuid'; @@ -15,6 +14,7 @@ import { DefaultConfigurationResponse, useUpdateDefaultConfig } from 'hooks/Netw import { useGetDeviceTypes } from 'hooks/Network/Firmware'; import { useFormModal } from 'hooks/useFormModal'; import { useFormRef } from 'hooks/useFormRef'; +import { AxiosError } from 'models/Axios'; type Props = { modalProps: UseDisclosureReturn; diff --git a/src/pages/Device/LogsCard/CommandHistory/useCommandHistoryTable.tsx b/src/pages/Device/LogsCard/CommandHistory/useCommandHistoryTable.tsx index 35b945d..9451926 100644 --- a/src/pages/Device/LogsCard/CommandHistory/useCommandHistoryTable.tsx +++ b/src/pages/Device/LogsCard/CommandHistory/useCommandHistoryTable.tsx @@ -1,11 +1,11 @@ import * as React from 'react'; import { Badge, Box, HStack, IconButton, Tooltip, useDisclosure, useToast } from '@chakra-ui/react'; -import { AxiosError } from 'axios'; import { MagnifyingGlass, Trash } from 'phosphor-react'; import { useTranslation } from 'react-i18next'; import FormattedDate from 'components/InformationDisplays/FormattedDate'; import { uppercaseFirstLetter } from 'helpers/stringHelper'; import { DeviceCommandHistory, useDeleteCommand, useGetCommandHistory } from 'hooks/Network/Commands'; +import { AxiosError } from 'models/Axios'; import { Column } from 'models/Table'; type Props = { diff --git a/src/pages/Device/LogsCard/HealthCheckHistory/DeleteModal.tsx b/src/pages/Device/LogsCard/HealthCheckHistory/DeleteModal.tsx index dd69a3b..8a2a8ab 100644 --- a/src/pages/Device/LogsCard/HealthCheckHistory/DeleteModal.tsx +++ b/src/pages/Device/LogsCard/HealthCheckHistory/DeleteModal.tsx @@ -1,12 +1,12 @@ import * as React from 'react'; import { Alert, AlertIcon, Box, Button, Center, useDisclosure, useToast } from '@chakra-ui/react'; -import { AxiosError } from 'axios'; import ReactDatePicker from 'react-datepicker'; import { useTranslation } from 'react-i18next'; import { DeleteButton } from 'components/Buttons/DeleteButton'; import { Modal } from 'components/Modals/Modal'; import 'react-datepicker/dist/react-datepicker.css'; import { useDeleteHealthChecks } from 'hooks/Network/HealthChecks'; +import { AxiosError } from 'models/Axios'; const CustomInputButton = React.forwardRef( ({ value, onClick }: { value: string; onClick: () => void }, ref: React.LegacyRef) => ( diff --git a/src/pages/Device/LogsCard/LogHistory/DeleteModal.tsx b/src/pages/Device/LogsCard/LogHistory/DeleteModal.tsx index 4c4438f..4fc6578 100644 --- a/src/pages/Device/LogsCard/LogHistory/DeleteModal.tsx +++ b/src/pages/Device/LogsCard/LogHistory/DeleteModal.tsx @@ -1,12 +1,12 @@ import * as React from 'react'; import { Alert, AlertIcon, Box, Button, Center, useDisclosure, useToast } from '@chakra-ui/react'; -import { AxiosError } from 'axios'; import ReactDatePicker from 'react-datepicker'; import { useTranslation } from 'react-i18next'; import 'react-datepicker/dist/react-datepicker.css'; import { DeleteButton } from 'components/Buttons/DeleteButton'; import { Modal } from 'components/Modals/Modal'; import { useDeleteLogs } from 'hooks/Network/DeviceLogs'; +import { AxiosError } from 'models/Axios'; const CustomInputButton = React.forwardRef( ({ value, onClick }: { value: string; onClick: () => void }, ref: React.LegacyRef) => ( diff --git a/src/pages/LoginPage/LoginForm.tsx b/src/pages/LoginPage/LoginForm.tsx index 964a493..50a4409 100644 --- a/src/pages/LoginPage/LoginForm.tsx +++ b/src/pages/LoginPage/LoginForm.tsx @@ -15,7 +15,6 @@ import { Link, SimpleGrid, } from '@chakra-ui/react'; -import { AxiosError } from 'axios'; import { Formik, Field, Form } from 'formik'; import { useTranslation } from 'react-i18next'; import * as Yup from 'yup'; @@ -23,6 +22,7 @@ import { StringField } from 'components/Form/Fields/StringField'; import { useAuth } from 'contexts/AuthProvider'; import { useLogin } from 'hooks/Network/Login'; import { useApiRequirements } from 'hooks/useApiRequirements'; +import { AxiosError } from 'models/Axios'; import { FormFieldProps } from 'models/FormField'; import { LoginFormProps } from 'models/Login'; diff --git a/src/pages/LoginPage/MfaForm.tsx b/src/pages/LoginPage/MfaForm.tsx index e6b301b..e9564c3 100644 --- a/src/pages/LoginPage/MfaForm.tsx +++ b/src/pages/LoginPage/MfaForm.tsx @@ -15,10 +15,10 @@ import { PinInput, PinInputField, } from '@chakra-ui/react'; -import { AxiosError } from 'axios'; import { useTranslation } from 'react-i18next'; import { useAuth } from 'contexts/AuthProvider'; import { useSendPhoneCode, useSendVerifyCode } from 'hooks/Network/Login'; +import { AxiosError } from 'models/Axios'; import { LoginFormProps } from 'models/Login'; export interface MfaFormProps { diff --git a/vite.config.ts b/vite.config.ts index 488602a..815a3c5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -49,7 +49,7 @@ export default defineConfig({ chunkSizeWarningLimit: 1000, }, server: { - port: 3001, + port: 3000, open: true, }, esbuild: {