fix(sonar): fix code smells low

InseeFrLab · Dec 14, 2023 · 7193f42 · 7193f42
1 parent 2b1957d
commit 7193f42
Show file tree

Hide file tree

Showing 24 changed files with 169 additions and 174 deletions.
diff --git a/src/components/commons/LoopSurveyPage/LoopSurveyPageHeader/LoopSurveyPageHeader.tsx b/src/components/commons/LoopSurveyPage/LoopSurveyPageHeader/LoopSurveyPageHeader.tsx
@@ -19,13 +19,11 @@ const LoopSurveyPageHeader = (props: LoopSurveyPageHeaderProps) => {
                 <Box>
                     <Typography className={classes.infoText}>{label}</Typography>
                 </Box>
-                <Box>
+                <Box onClick={onClose} onKeyUp={onClose}>
                     <img
                         src={close}
                         alt={t("accessibility.asset.mui-icon.close")}
                         className={classes.actionIcon}
-                        onClick={onClose}
-                        onKeyUp={onClose}
                     />
                 </Box>
             </Box>

diff --git a/...mponents/commons/LoopSurveyPage/LoopSurveyPageSimpleHeader/LoopSurveyPageSimpleHeader.tsx b/...mponents/commons/LoopSurveyPage/LoopSurveyPageSimpleHeader/LoopSurveyPageSimpleHeader.tsx
@@ -16,13 +16,11 @@ const LoopSurveyPageSimpleHeader = (props: LoopSurveyPageSimpleHeaderProps) => {
     return (
         <Box className={cx(classes.headerBox)}>
             <Box>{simpleHeaderLabel}</Box>
-            <Box>
+            <Box onClick={onNavigateBack} onKeyUp={onNavigateBack}>
                 <img
                     src={close}
                     alt={t("accessibility.asset.mui-icon.close")}
                     className={classes.actionIcon}
-                    onClick={onNavigateBack}
-                    onKeyUp={onNavigateBack}
                 />
             </Box>
         </Box>

diff --git a/src/components/commons/SurveyPage/SurveyPageEditHeader/SurveyPageEditHeader.tsx b/src/components/commons/SurveyPage/SurveyPageEditHeader/SurveyPageEditHeader.tsx
@@ -47,13 +47,11 @@ const SurveyPageEditHeader = (props: SurveyPageEditHeaderProps) => {
                     ></Button>
                     <Typography className={classes.infoText}>{firstNamePrefix + firstName}</Typography>
                 </Box>
-                <Box>
+                <Box onClick={onEditSurvey} onKeyUp={onEditSurvey}>
                     <img
                         src={moreHorizontal}
                         alt={t("accessibility.asset.mui-icon.more-horizontal")}
                         className={classes.actionIcon}
-                        onClick={onEditSurvey}
-                        onKeyUp={onEditSurvey}
                     />
                     <Popover
                         id={id}

diff --git a/src/components/commons/SurveyPage/SurveyPageHeader/SurveyPageHeader.tsx b/src/components/commons/SurveyPage/SurveyPageHeader/SurveyPageHeader.tsx
@@ -19,13 +19,11 @@ const SurveyPageHeader = (props: SurveyPageHeaderProps) => {
             <Box>
                 <Typography className={classes.infoText}>{surveyDate + " - " + firstName}</Typography>
             </Box>
-            <Box>
+            <Box onClick={onNavigateBack} onKeyUp={onNavigateBack}>
                 <img
                     src={close}
                     alt={t("accessibility.asset.mui-icon.close")}
                     className={classes.actionIcon}
-                    onClick={onNavigateBack}
-                    onKeyUp={onNavigateBack}
                 />
             </Box>
         </Box>

diff --git a/src/components/commons/SurveyPage/SurveyPageSimpleHeader/SurveyPageSimpleHeader.tsx b/src/components/commons/SurveyPage/SurveyPageSimpleHeader/SurveyPageSimpleHeader.tsx
@@ -17,13 +17,11 @@ const SurveyPageSimpleHeader = (props: SurveyPageSimpleHeaderProps) => {
     return (
         <Box className={cx(classes.headerBox, backgroundWhite ? classes.headerWhiteBox : "")}>
             <Box>{simpleHeaderLabel}</Box>
-            <Box>
+            <Box onClick={onNavigateBack} onKeyUp={onNavigateBack}>
                 <img
                     src={close}
                     alt={t("accessibility.asset.mui-icon.close")}
                     className={classes.actionIcon}
-                    onClick={onNavigateBack}
-                    onKeyUp={onNavigateBack}
                     id="close-button"
                 />
             </Box>

diff --git a/src/components/edt/ActivityCard/ActivityOrRouteCard.tsx b/src/components/edt/ActivityCard/ActivityOrRouteCard.tsx
@@ -289,13 +289,11 @@ const ActivityOrRouteCard = (props: ActivityOrRouteCardProps) => {
                     {renderWithScreen(activityOrRoute, classes, renderInsideAlert, t)}
                 </Box>
                 {onEdit && onDelete && modifiable && (
-                    <Box className={classes.editBox}>
+                    <Box className={classes.editBox} onClick={onEditCard} onKeyUp={onEditCard}>
                         <img
                             src={moreHorizontal}
                             alt={t("accessibility.asset.mui-icon.more-horizontal")}
                             className={classes.actionIcon}
-                            onClick={onEditCard}
-                            onKeyUp={onEditCard}
                             aria-label="editCardToggle"
                         />
                         <Popover

diff --git a/src/components/edt/AddActivityOrRouteStepper/AddActivityOrRouteStepper.tsx b/src/components/edt/AddActivityOrRouteStepper/AddActivityOrRouteStepper.tsx
@@ -1,7 +1,6 @@
 import { makeStylesEdt } from "@inseefrlab/lunatic-edt";
 import { Box } from "@mui/material";
 import LinearProgress from "@mui/material/LinearProgress";
-import React from "react";
 import { useTranslation } from "react-i18next";
 
 interface AddActivityOrRouteStepperStepperProps {
@@ -25,7 +24,7 @@ const AddActivityOrRouteStepper = (props: AddActivityOrRouteStepperStepperProps)
     const { t } = useTranslation();
     const { classes } = useStyles();
     let stepIncrement = 100 / numberOfSteps;
-    const [progress, setProgress] = React.useState(stepIncrement * lastCompletedStepNumber);
+    const progress = stepIncrement * lastCompletedStepNumber;
 
     return (
         <Box className={classes.stepper}>

diff --git a/src/components/edt/DayCharacteristic/DayCharacteristic.tsx b/src/components/edt/DayCharacteristic/DayCharacteristic.tsx
@@ -27,7 +27,7 @@ const DayCharacteristics = (props: DayCharacteristicsProps) => {
     const id = openPopOver ? "edit-or-delete-popover" : undefined;
 
     const onEditIn = useCallback((e: React.MouseEvent) => {
-        onEdit && onEdit();
+        onEdit?.();
         e.stopPropagation();
     }, []);
 
@@ -51,13 +51,11 @@ const DayCharacteristics = (props: DayCharacteristicsProps) => {
                     {t("component.day-characteristic.title")}
                 </h2>
                 {onEdit && modifiable && (
-                    <Box className={classes.editBox}>
+                    <Box className={classes.editBox} onClick={onEditCard} onKeyUp={onEditCard}>
                         <img
                             src={moreHorizontal}
                             alt={t("accessibility.asset.mui-icon.more-horizontal")}
                             className={classes.actionIcon}
-                            onClick={onEditCard}
-                            onKeyUp={onEditCard}
                             aria-label="editCardToggle"
                         />
                         <Popover

diff --git a/src/components/edt/EndActivityStepper/EndActivityStepper.tsx b/src/components/edt/EndActivityStepper/EndActivityStepper.tsx
@@ -1,7 +1,6 @@
 import { makeStylesEdt } from "@inseefrlab/lunatic-edt";
 import { Box, CircularProgress } from "@mui/material";
 import Typography from "@mui/material/Typography";
-import React from "react";
 
 interface EndActivityStepperProps {
     numberOfSteps: number;
@@ -14,7 +13,7 @@ const EndActivityStepper = (props: EndActivityStepperProps) => {
     const { numberOfSteps, lastCompletedStepNumber, currentStepNumber, currentStepLabel } = props;
     const { classes } = useStyles();
     let stepIncrement = 100 / numberOfSteps;
-    const [progress] = React.useState(stepIncrement * lastCompletedStepNumber);
+    const progress = stepIncrement * lastCompletedStepNumber;
 
     return (
         <Box className={classes.stepper}>

diff --git a/src/components/edt/HelpMenu/HelpMenu.tsx b/src/components/edt/HelpMenu/HelpMenu.tsx
@@ -2,7 +2,6 @@ import { makeStylesEdt } from "@inseefrlab/lunatic-edt";
 import { Box, Modal } from "@mui/material";
 import { Default, Mobile } from "components/commons/Responsive/Responsive";
 import { LunaticModel } from "interface/lunatic/Lunatic";
-import React from "react";
 import HelpMenuInner from "./HelpMenuInner";
 
 interface HelpMenuProps {
@@ -28,37 +27,35 @@ const HelpMenu = (props: HelpMenuProps) => {
                 className={classes.shadowBackground}
                 sx={{ display: open ? "visible" : "none" }}
             ></Box>
-            <React.Fragment>
-                <Modal
-                    open={open}
-                    onClose={handleClose}
-                    aria-labelledby={labelledBy}
-                    aria-describedby={describedBy}
-                >
-                    <>
-                        <Default>
-                            <HelpMenuInner
-                                handleClose={handleClose}
-                                onClickContact={onClickContact}
-                                onClickInstall={onClickInstall}
-                                onClickHelp={onClickHelp}
-                                className={classes.modal}
-                                isMobile={false}
-                            />
-                        </Default>
-                        <Mobile>
-                            <HelpMenuInner
-                                handleClose={handleClose}
-                                onClickContact={onClickContact}
-                                onClickInstall={onClickInstall}
-                                onClickHelp={onClickHelp}
-                                className={classes.modal}
-                                isMobile={true}
-                            />
-                        </Mobile>
-                    </>
-                </Modal>
-            </React.Fragment>
+            <Modal
+                open={open}
+                onClose={handleClose}
+                aria-labelledby={labelledBy}
+                aria-describedby={describedBy}
+            >
+                <>
+                    <Default>
+                        <HelpMenuInner
+                            handleClose={handleClose}
+                            onClickContact={onClickContact}
+                            onClickInstall={onClickInstall}
+                            onClickHelp={onClickHelp}
+                            className={classes.modal}
+                            isMobile={false}
+                        />
+                    </Default>
+                    <Mobile>
+                        <HelpMenuInner
+                            handleClose={handleClose}
+                            onClickContact={onClickContact}
+                            onClickInstall={onClickInstall}
+                            onClickHelp={onClickHelp}
+                            className={classes.modal}
+                            isMobile={true}
+                        />
+                    </Mobile>
+                </>
+            </Modal>
         </>
     );
 };

diff --git a/src/components/edt/HouseholdCard/HouseholdCard.tsx b/src/components/edt/HouseholdCard/HouseholdCard.tsx
@@ -18,7 +18,6 @@ interface HouseholdCardProps {
     closedSurveyLabel: string;
     validatedSurveyLabel: string;
     dataHousehold: any;
-    onClick?: () => void;
     tabIndex: number;
 }