From d3e853cf7fb2b748d1ddb904dbed2290134388f8 Mon Sep 17 00:00:00 2001 From: olav Date: Thu, 11 Aug 2022 11:26:08 +0200 Subject: [PATCH] refactor: fix some @ts-expect-errors (#1216) * refactor: fix AddonMultiSelector errors * refactor: fix FeatureOverviewTags errors * refactor: fix EditProjectRole error * refactor: fix ProjectCard error --- .../addons/AddonForm/AddonForm.styles.tsx | 5 -- .../AddonMultiSelector/AddonMultiSelector.tsx | 15 +++--- .../EditProjectRole/EditProjectRole.tsx | 3 +- .../FeatureOverviewTags.tsx | 47 +++++++++---------- .../project/ProjectCard/ProjectCard.tsx | 10 ++-- 5 files changed, 37 insertions(+), 43 deletions(-) diff --git a/frontend/src/component/addons/AddonForm/AddonForm.styles.tsx b/frontend/src/component/addons/AddonForm/AddonForm.styles.tsx index 21b97f4357..4ae328f0bc 100644 --- a/frontend/src/component/addons/AddonForm/AddonForm.styles.tsx +++ b/frontend/src/component/addons/AddonForm/AddonForm.styles.tsx @@ -1,6 +1,5 @@ import { styled } from '@mui/system'; import { FormControlLabel, TextField } from '@mui/material'; -import Autocomplete from '@mui/material/Autocomplete'; export const StyledForm = styled('form')({ display: 'flex', @@ -9,10 +8,6 @@ export const StyledForm = styled('form')({ gap: '1rem', }); -export const StyledAutocomplete = styled(Autocomplete)({ - paddingBottom: '36px', - marginTop: '0px', -}); export const StyledFormSection = styled('section')({ marginBottom: '36px', }); diff --git a/frontend/src/component/addons/AddonForm/AddonMultiSelector/AddonMultiSelector.tsx b/frontend/src/component/addons/AddonForm/AddonMultiSelector/AddonMultiSelector.tsx index 6019204c23..e7c29889d5 100644 --- a/frontend/src/component/addons/AddonForm/AddonMultiSelector/AddonMultiSelector.tsx +++ b/frontend/src/component/addons/AddonForm/AddonMultiSelector/AddonMultiSelector.tsx @@ -7,7 +7,13 @@ import { AutocompleteRenderOptionState, } from '@mui/material/Autocomplete'; import { styled } from '@mui/system'; -import { capitalize, Checkbox, Paper, TextField } from '@mui/material'; +import { + capitalize, + Checkbox, + Paper, + TextField, + Autocomplete, +} from '@mui/material'; import CheckBoxOutlineBlankIcon from '@mui/icons-material/CheckBoxOutlineBlank'; import CheckBoxIcon from '@mui/icons-material/CheckBox'; import { ConditionallyRender } from '../../../common/ConditionallyRender/ConditionallyRender'; @@ -16,7 +22,6 @@ import { StyledHelpText, StyledSelectAllFormControlLabel, StyledTitle, - StyledAutocomplete, } from '../AddonForm.styles'; export interface IAddonMultiSelectorProps { @@ -153,19 +158,18 @@ export const AddonMultiSelector: VFC = ({ condition={selectAllEnabled} show={} /> - label} fullWidth groupBy={() => 'Select/Deselect all'} renderGroup={renderGroup} PaperComponent={CustomPaper} - //@ts-expect-error renderOption={renderOption} renderInput={renderInput} value={ @@ -176,7 +180,6 @@ export const AddonMultiSelector: VFC = ({ ) } onChange={(_, input) => { - //@ts-expect-error const state = input.map(({ value }) => value); onChange(state); }} diff --git a/frontend/src/component/admin/projectRoles/EditProjectRole/EditProjectRole.tsx b/frontend/src/component/admin/projectRoles/EditProjectRole/EditProjectRole.tsx index f739274204..f00d947fe7 100644 --- a/frontend/src/component/admin/projectRoles/EditProjectRole/EditProjectRole.tsx +++ b/frontend/src/component/admin/projectRoles/EditProjectRole/EditProjectRole.tsx @@ -6,7 +6,7 @@ import useProjectRolesApi from 'hooks/api/actions/useProjectRolesApi/useProjectR import useProjectRole from 'hooks/api/getters/useProjectRole/useProjectRole'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import useToast from 'hooks/useToast'; -import { IPermission } from 'interfaces/user'; +import { IPermission } from 'interfaces/project'; import { useNavigate } from 'react-router-dom'; import useProjectRoleForm from '../hooks/useProjectRoleForm'; import ProjectRoleForm from '../ProjectRoleForm/ProjectRoleForm'; @@ -43,7 +43,6 @@ const EditProjectRole = () => { useEffect(() => { const initialCheckedPermissions = role?.permissions?.reduce( (acc: { [key: string]: IPermission }, curr: IPermission) => { - // @ts-expect-error acc[getRoleKey(curr)] = curr; return acc; }, diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewTags/FeatureOverviewTags.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewTags/FeatureOverviewTags.tsx index fe4b17f198..ad5e890a63 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewTags/FeatureOverviewTags.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewTags/FeatureOverviewTags.tsx @@ -18,7 +18,7 @@ import AccessContext from 'contexts/AccessContext'; import { formatUnknownError } from 'utils/formatUnknownError'; import { useRequiredPathParam } from 'hooks/useRequiredPathParam'; -interface IFeatureOverviewTagsProps extends React.HTMLProps { +interface IFeatureOverviewTagsProps extends React.HTMLProps { projectId: string; } @@ -119,32 +119,29 @@ const FeatureOverviewTags: React.FC = ({ ); return ( - <> - {/* @ts-expect-error */} -
- { - setShowDelDialog(false); - setSelectedTag({ type: '', value: '' }); - }} - onClick={() => { - setShowDelDialog(false); - handleDelete(); - setSelectedTag({ type: '', value: '' }); - }} - title="Are you sure you want to delete this tag?" - /> +
+ { + setShowDelDialog(false); + setSelectedTag({ type: '', value: '' }); + }} + onClick={() => { + setShowDelDialog(false); + handleDelete(); + setSelectedTag({ type: '', value: '' }); + }} + title="Are you sure you want to delete this tag?" + /> -
- 0} - show={tags.map(renderTag)} - elseShow={

No tags to display

} - /> -
+
+ 0} + show={tags.map(renderTag)} + elseShow={

No tags to display

} + />
- +
); }; diff --git a/frontend/src/component/project/ProjectCard/ProjectCard.tsx b/frontend/src/component/project/ProjectCard/ProjectCard.tsx index 815432ea0f..3c4bc2cd43 100644 --- a/frontend/src/component/project/ProjectCard/ProjectCard.tsx +++ b/frontend/src/component/project/ProjectCard/ProjectCard.tsx @@ -36,13 +36,13 @@ export const ProjectCard = ({ const { classes } = useStyles(); const { hasAccess } = useContext(AccessContext); const { isOss } = useUiConfig(); - const [anchorEl, setAnchorEl] = useState(null); + const [anchorEl, setAnchorEl] = useState(null); const [showDelDialog, setShowDelDialog] = useState(false); const navigate = useNavigate(); - // @ts-expect-error - const handleClick = e => { - e.preventDefault(); - setAnchorEl(e.currentTarget); + + const handleClick = (event: React.SyntheticEvent) => { + event.preventDefault(); + setAnchorEl(event.currentTarget); }; const canDeleteProject =