From 010f766de9d190eefda5742af2d1cb2a3a3b751a Mon Sep 17 00:00:00 2001 From: olav Date: Wed, 9 Feb 2022 13:39:18 +0100 Subject: [PATCH] refactor: replace ts-ignore with ts-expect-error (#681) * refactor: replace ts-ignore with ts-expect-error * refactor: remove unused ts-expect-errors --- .../admin/api-token/CreateApiToken/CreateApiToken.tsx | 1 - .../project-roles/CreateProjectRole/CreateProjectRole.tsx | 1 - .../src/component/admin/users/CreateUser/CreateUser.tsx | 1 - .../src/component/admin/users/UserForm/UserForm.styles.ts | 2 +- .../src/component/common/FormTemplate/FormTemplate.tsx | 1 - .../src/component/common/ToastRenderer/Toast/Toast.tsx | 2 +- .../src/component/common/ToastRenderer/ToastRenderer.tsx | 2 +- .../component/context/ContextForm/ContextForm.styles.ts | 2 +- .../environments/CreateEnvironment/CreateEnvironment.tsx | 3 +-- .../EnvironmentForm/EnvironmentForm.styles.ts | 2 +- .../EnvironmentTypeSelector.styles.ts | 2 +- .../src/component/feature/CreateFeature/CreateFeature.tsx | 1 - .../src/component/feature/EditFeature/EditFeature.tsx | 1 - .../component/feature/FeatureForm/FeatureForm.styles.ts | 4 ++-- .../feature/FeatureToggleListNew/FeatureToggleListNew.tsx | 6 +++--- .../feature/FeatureView/FeatureStatus/FeatureStatus.tsx | 1 - .../FeatureVariantsList/FeatureVariantsList.tsx | 2 -- .../project/Project/CreateProject/CreateProject.tsx | 1 - .../project/Project/ProjectForm/ProjectForm.style.ts | 2 +- .../component/tagTypes/TagTypeForm/TagTypeForm.styles.ts | 2 +- .../src/hooks/api/getters/httpErrorResponseHandler.ts | 8 ++++---- frontend/src/hooks/useToast.tsx | 2 +- 22 files changed, 19 insertions(+), 30 deletions(-) diff --git a/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx b/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx index 48dbea2295..b100bf1668 100644 --- a/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx +++ b/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx @@ -12,7 +12,6 @@ import { useState } from 'react'; import { scrollToTop } from '../../../common/util'; const CreateApiToken = () => { - /* @ts-ignore */ const { setToastApiError } = useToast(); const { uiConfig } = useUiConfig(); const history = useHistory(); diff --git a/frontend/src/component/admin/project-roles/CreateProjectRole/CreateProjectRole.tsx b/frontend/src/component/admin/project-roles/CreateProjectRole/CreateProjectRole.tsx index aaab8c7344..78048e0ab0 100644 --- a/frontend/src/component/admin/project-roles/CreateProjectRole/CreateProjectRole.tsx +++ b/frontend/src/component/admin/project-roles/CreateProjectRole/CreateProjectRole.tsx @@ -9,7 +9,6 @@ import PermissionButton from '../../../common/PermissionButton/PermissionButton' import { ADMIN } from '../../../providers/AccessProvider/permissions'; const CreateProjectRole = () => { - /* @ts-ignore */ const { setToastData, setToastApiError } = useToast(); const { uiConfig } = useUiConfig(); const history = useHistory(); diff --git a/frontend/src/component/admin/users/CreateUser/CreateUser.tsx b/frontend/src/component/admin/users/CreateUser/CreateUser.tsx index b49fc833b9..2cc34cda67 100644 --- a/frontend/src/component/admin/users/CreateUser/CreateUser.tsx +++ b/frontend/src/component/admin/users/CreateUser/CreateUser.tsx @@ -12,7 +12,6 @@ import PermissionButton from '../../../common/PermissionButton/PermissionButton' import { ADMIN } from '../../../providers/AccessProvider/permissions'; const CreateUser = () => { - /* @ts-ignore */ const { setToastApiError } = useToast(); const { uiConfig } = useUiConfig(); const history = useHistory(); diff --git a/frontend/src/component/admin/users/UserForm/UserForm.styles.ts b/frontend/src/component/admin/users/UserForm/UserForm.styles.ts index b36d6d2706..40cd85cf5e 100644 --- a/frontend/src/component/admin/users/UserForm/UserForm.styles.ts +++ b/frontend/src/component/admin/users/UserForm/UserForm.styles.ts @@ -38,7 +38,7 @@ export const useStyles = makeStyles(theme => ({ position: 'relative', }, errorMessage: { - //@ts-ignore + // @ts-expect-error fontSize: theme.fontSizes.smallBody, color: theme.palette.error.main, position: 'absolute', diff --git a/frontend/src/component/common/FormTemplate/FormTemplate.tsx b/frontend/src/component/common/FormTemplate/FormTemplate.tsx index dd731ae928..14adaef1d4 100644 --- a/frontend/src/component/common/FormTemplate/FormTemplate.tsx +++ b/frontend/src/component/common/FormTemplate/FormTemplate.tsx @@ -24,7 +24,6 @@ const FormTemplate: React.FC = ({ loading, formatApiCode, }) => { - // @ts-ignore-next-line const { setToastData } = useToast(); const styles = useStyles(); const smallScreen = useMediaQuery(`(max-width:${900}px)`); diff --git a/frontend/src/component/common/ToastRenderer/Toast/Toast.tsx b/frontend/src/component/common/ToastRenderer/Toast/Toast.tsx index 1c11cd10db..0a1d83160e 100644 --- a/frontend/src/component/common/ToastRenderer/Toast/Toast.tsx +++ b/frontend/src/component/common/ToastRenderer/Toast/Toast.tsx @@ -8,7 +8,7 @@ import ConditionallyRender from '../../ConditionallyRender'; import Close from '@material-ui/icons/Close'; const Toast = ({ title, text, type, confetti }: IToastData) => { - // @ts-ignore + // @ts-expect-error const { setToast } = useContext(UIContext); const styles = useStyles(); diff --git a/frontend/src/component/common/ToastRenderer/ToastRenderer.tsx b/frontend/src/component/common/ToastRenderer/ToastRenderer.tsx index 0decb11ff3..924c9dd4a1 100644 --- a/frontend/src/component/common/ToastRenderer/ToastRenderer.tsx +++ b/frontend/src/component/common/ToastRenderer/ToastRenderer.tsx @@ -7,7 +7,7 @@ import AnimateOnMount from '../AnimateOnMount/AnimateOnMount'; import Toast from './Toast/Toast'; const ToastRenderer = () => { - // @ts-ignore-next-line + // @ts-expect-error const { toastData, setToast } = useContext(UIContext); const commonStyles = useCommonStyles(); const styles = useStyles(); diff --git a/frontend/src/component/context/ContextForm/ContextForm.styles.ts b/frontend/src/component/context/ContextForm/ContextForm.styles.ts index 36fdaf4039..7ba6779c28 100644 --- a/frontend/src/component/context/ContextForm/ContextForm.styles.ts +++ b/frontend/src/component/context/ContextForm/ContextForm.styles.ts @@ -54,7 +54,7 @@ export const useStyles = makeStyles(theme => ({ position: 'relative', }, errorMessage: { - //@ts-ignore + // @ts-expect-error fontSize: theme.fontSizes.smallBody, color: theme.palette.error.main, position: 'absolute', diff --git a/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx b/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx index 8cafcb6d68..3c519bb0d2 100644 --- a/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx +++ b/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx @@ -16,7 +16,6 @@ import { ADMIN } from '../../providers/AccessProvider/permissions'; import useProjectRolePermissions from '../../../hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions'; const CreateEnvironment = () => { - /* @ts-ignore */ const { setToastApiError, setToastData } = useToast(); const { uiConfig } = useUiConfig(); const history = useHistory(); @@ -76,7 +75,7 @@ const CreateEnvironment = () => { ({ position: 'relative', }, errorMessage: { - //@ts-ignore + // @ts-expect-error fontSize: theme.fontSizes.smallBody, color: theme.palette.error.main, position: 'absolute', diff --git a/frontend/src/component/environments/EnvironmentForm/EnvironmentTypeSelector/EnvironmentTypeSelector.styles.ts b/frontend/src/component/environments/EnvironmentForm/EnvironmentTypeSelector/EnvironmentTypeSelector.styles.ts index 3e19ac92b1..60e0b52518 100644 --- a/frontend/src/component/environments/EnvironmentForm/EnvironmentTypeSelector/EnvironmentTypeSelector.styles.ts +++ b/frontend/src/component/environments/EnvironmentForm/EnvironmentTypeSelector/EnvironmentTypeSelector.styles.ts @@ -6,7 +6,7 @@ export const useStyles = makeStyles(theme => ({ }, formHeader: { fontWeight: 'bold', - //@ts-ignore + // @ts-expect-error fontSize: theme.fontSizes.bodySize, marginTop: '1.5rem', marginBottom: '0.5rem', diff --git a/frontend/src/component/feature/CreateFeature/CreateFeature.tsx b/frontend/src/component/feature/CreateFeature/CreateFeature.tsx index eceaff9c83..2fe8477254 100644 --- a/frontend/src/component/feature/CreateFeature/CreateFeature.tsx +++ b/frontend/src/component/feature/CreateFeature/CreateFeature.tsx @@ -12,7 +12,6 @@ import { useContext } from 'react'; import UIContext from '../../../contexts/UIContext'; const CreateFeature = () => { - /* @ts-ignore */ const { setToastData, setToastApiError } = useToast(); const { setShowFeedback } = useContext(UIContext); const { uiConfig } = useUiConfig(); diff --git a/frontend/src/component/feature/EditFeature/EditFeature.tsx b/frontend/src/component/feature/EditFeature/EditFeature.tsx index b1cbeeb4dd..bb971d0bcf 100644 --- a/frontend/src/component/feature/EditFeature/EditFeature.tsx +++ b/frontend/src/component/feature/EditFeature/EditFeature.tsx @@ -12,7 +12,6 @@ import PermissionButton from '../../common/PermissionButton/PermissionButton'; import { UPDATE_FEATURE } from '../../providers/AccessProvider/permissions'; const EditFeature = () => { - /* @ts-ignore */ const { setToastData, setToastApiError } = useToast(); const { uiConfig } = useUiConfig(); const history = useHistory(); diff --git a/frontend/src/component/feature/FeatureForm/FeatureForm.styles.ts b/frontend/src/component/feature/FeatureForm/FeatureForm.styles.ts index f7020d7398..c2770e7da1 100644 --- a/frontend/src/component/feature/FeatureForm/FeatureForm.styles.ts +++ b/frontend/src/component/feature/FeatureForm/FeatureForm.styles.ts @@ -38,7 +38,7 @@ export const useStyles = makeStyles(theme => ({ marginBottom: '0.5rem', }, typeDescription: { - //@ts-ignore + // @ts-expect-error fontSize: theme.fontSizes.smallBody, color: theme.palette.grey[600], top: '-13px', @@ -55,7 +55,7 @@ export const useStyles = makeStyles(theme => ({ position: 'relative', }, errorMessage: { - //@ts-ignore + // @ts-expect-error fontSize: theme.fontSizes.smallBody, color: theme.palette.error.main, position: 'absolute', diff --git a/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNew.tsx b/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNew.tsx index 9b6b3f73cf..eaebceccea 100644 --- a/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNew.tsx +++ b/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNew.tsx @@ -24,7 +24,7 @@ interface IFeatureToggleListNewProps { projectId: string; } -//@ts-ignore +// @ts-expect-error const sortList = (list, sortOpt) => { if (!list) { return list; @@ -33,7 +33,7 @@ const sortList = (list, sortOpt) => { return list; } if (sortOpt.type === 'string') { - //@ts-ignore + // @ts-expect-error return list.sort((a, b) => { const fieldA = a[sortOpt.field]?.toUpperCase(); const fieldB = b[sortOpt.field]?.toUpperCase(); @@ -49,7 +49,7 @@ const sortList = (list, sortOpt) => { }); } if (sortOpt.type === 'date') { - //@ts-ignore + // @ts-expect-error return list.sort((a, b) => { const fieldA = new Date(a[sortOpt.field]); const fieldB = new Date(b[sortOpt.field]); diff --git a/frontend/src/component/feature/FeatureView/FeatureStatus/FeatureStatus.tsx b/frontend/src/component/feature/FeatureView/FeatureStatus/FeatureStatus.tsx index 1a954982fb..b7b25230c9 100644 --- a/frontend/src/component/feature/FeatureView/FeatureStatus/FeatureStatus.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureStatus/FeatureStatus.tsx @@ -75,7 +75,6 @@ const FeatureStatus = ({ { try { const res = await patchFeatureVariants(projectId, featureId, patch); - // @ts-ignore const { variants } = await res.json(); mutate(FEATURE_CACHE_KEY, { ...feature, variants }, false); setToastData({ @@ -204,7 +203,6 @@ const FeatureOverviewVariants = () => { if (patch.length === 0) return; try { const res = await patchFeatureVariants(projectId, featureId, patch); - // @ts-ignore const { variants } = await res.json(); mutate(FEATURE_CACHE_KEY, { ...feature, variants }, false); setToastData({ diff --git a/frontend/src/component/project/Project/CreateProject/CreateProject.tsx b/frontend/src/component/project/Project/CreateProject/CreateProject.tsx index c22425b5ad..eed75ece87 100644 --- a/frontend/src/component/project/Project/CreateProject/CreateProject.tsx +++ b/frontend/src/component/project/Project/CreateProject/CreateProject.tsx @@ -10,7 +10,6 @@ import PermissionButton from '../../../common/PermissionButton/PermissionButton' import { CREATE_PROJECT } from '../../../providers/AccessProvider/permissions'; const CreateProject = () => { - /* @ts-ignore */ const { setToastData, setToastApiError } = useToast(); const { refetch } = useUser(); const { uiConfig } = useUiConfig(); diff --git a/frontend/src/component/project/Project/ProjectForm/ProjectForm.style.ts b/frontend/src/component/project/Project/ProjectForm/ProjectForm.style.ts index e5e5e19a86..6b8a221e3a 100644 --- a/frontend/src/component/project/Project/ProjectForm/ProjectForm.style.ts +++ b/frontend/src/component/project/Project/ProjectForm/ProjectForm.style.ts @@ -38,7 +38,7 @@ export const useStyles = makeStyles(theme => ({ position: 'relative', }, errorMessage: { - //@ts-ignore + // @ts-expect-error fontSize: theme.fontSizes.smallBody, color: theme.palette.error.main, position: 'absolute', diff --git a/frontend/src/component/tagTypes/TagTypeForm/TagTypeForm.styles.ts b/frontend/src/component/tagTypes/TagTypeForm/TagTypeForm.styles.ts index f56f4b180b..36b212badf 100644 --- a/frontend/src/component/tagTypes/TagTypeForm/TagTypeForm.styles.ts +++ b/frontend/src/component/tagTypes/TagTypeForm/TagTypeForm.styles.ts @@ -38,7 +38,7 @@ export const useStyles = makeStyles(theme => ({ position: 'relative', }, errorMessage: { - //@ts-ignore + // @ts-expect-error fontSize: theme.fontSizes.smallBody, color: theme.palette.error.main, position: 'absolute', diff --git a/frontend/src/hooks/api/getters/httpErrorResponseHandler.ts b/frontend/src/hooks/api/getters/httpErrorResponseHandler.ts index b9a2f84db6..ac51696510 100644 --- a/frontend/src/hooks/api/getters/httpErrorResponseHandler.ts +++ b/frontend/src/hooks/api/getters/httpErrorResponseHandler.ts @@ -5,15 +5,15 @@ const handleErrorResponses = (target: string) => async (res: Response) => { ); // Try to resolve body, but don't rethrow res.json is not a function try { - // @ts-ignore + // @ts-expect-error error.info = await res.json(); } catch (e) { - // @ts-ignore + // @ts-expect-error error.info = {}; } - // @ts-ignore + // @ts-expect-error error.status = res.status; - // @ts-ignore + // @ts-expect-error error.statusText = res.statusText; throw error; } diff --git a/frontend/src/hooks/useToast.tsx b/frontend/src/hooks/useToast.tsx index e4ce229faf..bdcade0916 100644 --- a/frontend/src/hooks/useToast.tsx +++ b/frontend/src/hooks/useToast.tsx @@ -20,7 +20,7 @@ interface IToastOptions { } const useToast = () => { - // @ts-ignore + // @ts-expect-error const { setToast } = useContext(UIContext); const hideToast = () =>