fix sonar

Author: basseche

src/components/dialogs/limits/limits-constants.ts

@@ -6,18 +6,14 @@
  */
 
 export enum LimitsPropertyName {
-    LIMITS_TYPE = 'LimitsType',
-    ASSOCIATION = 'association',
-    ORIGIN = 'origin',
+    LIMITS_TYPE = 'Limit type',
 }
 
 export function getPropertyAvatar(type: string): string {
     const transformedType: LimitsPropertyName | undefined = type as LimitsPropertyName;
 
     const descriptions: Record<LimitsPropertyName, string> = {
         [LimitsPropertyName.LIMITS_TYPE]: 'Ty',
-        [LimitsPropertyName.ASSOCIATION]: 'As',
-        [LimitsPropertyName.ORIGIN]: 'Pr',
     };
 
     return descriptions[transformedType] ?? transformedType.substring(0, 2);

src/components/dialogs/limits/limits-pane-utils.ts

@@ -268,7 +268,7 @@ export const combineFormAndMapServerLimitsGroups = (
     }
 
     // adds all the operational limits groups from mapServerBranch THAT ARE NOT DELETED by the netmod
-    mapServerBranch.currentLimits?.forEach((currentLimit: CurrentLimitsData) => {
+    for (const currentLimit of mapServerBranch.currentLimits) {
         const equivalentFromNetMod = updatedOpLG.find(
             (opLG: OperationalLimitsGroupFormInfos) =>
                 currentLimit.id === opLG.name && currentLimit.applicability === opLG[APPLICABIlITY]
@@ -286,7 +286,7 @@ export const combineFormAndMapServerLimitsGroups = (
                 },
             });
         }
-    });
+    }
 
     return updatedOpLG;
 };

src/components/dialogs/limits/limits-properties-side-stack.tsx

@@ -36,8 +36,8 @@ export function LimitsPropertiesSideStack({ formName, disabled }: Readonly<Limit
                 }
                 if (!limitsProperties?.length) {
                     setValue(formName, [{ name: propertyName, value: propertyValue }]);
-                } else if (limitsProperties.find((l) => l.name === propertyName)) {
-                    setEditorError(intl.formatMessage({ id: 'UsedPropertyName' }));
+                } else if (limitsProperties.some((l) => l.name === propertyName)) {
+                    setEditorError(intl.formatMessage({ id: 'NameUnique' }));
                     return;
                 } else {
                     setValue(formName, [...limitsProperties, { name: propertyName, value: propertyValue }]);
@@ -74,7 +74,7 @@ export function LimitsPropertiesSideStack({ formName, disabled }: Readonly<Limit
                         disabled={disabled}
                     />
                 ))}
-                {!isEditing ? (
+                {!isEditing && (
                     <IconButton
                         color="primary"
                         sx={{ verticalAlign: 'center' }}
@@ -83,8 +83,6 @@ export function LimitsPropertiesSideStack({ formName, disabled }: Readonly<Limit
                     >
                         <AddCircle />
                     </IconButton>
-                ) : (
-                    ''
                 )}
             </Stack>
             {isEditing && !disabled ? (
@@ -117,12 +115,18 @@ export function LimitsPropertiesSideStack({ formName, disabled }: Readonly<Limit
                     <TextField
                         size="small"
                         label={intl.formatMessage({ id: 'PropertyValue' })}
-                        sx={{ flex: 1 }}
+                        sx={{ flex: 1, verticalAlign: 'center' }}
                         onKeyDown={handleKeyPress}
                         onChange={(event) => setPropertyValue(event.target.value)}
                     />
                     {hovered && (
-                        <IconButton sx={{ verticalAlign: 'center' }} onClick={() => setIsEditing(false)}>
+                        <IconButton
+                            sx={{ verticalAlign: 'center' }}
+                            onClick={() => {
+                                setIsEditing(false);
+                                setEditorError('');
+                            }}
+                        >
                             <Delete />
                         </IconButton>
                     )}

src/components/utils/utils.ts

@@ -155,7 +155,7 @@ export const formatToTemporaryLimitsFormInfos = (temporaryLimits: TemporaryLimit
 export const formatCompleteCurrentLimit = (completeLimitsGroups: CurrentLimitsData[]) => {
     const formattedCompleteLimitsGroups: OperationalLimitsGroup[] = [];
     if (completeLimitsGroups) {
-        completeLimitsGroups.forEach((elt: CurrentLimitsData) => {
+        for (const elt of completeLimitsGroups) {
             if (isNotBlankOrEmpty(elt.id)) {
                 formattedCompleteLimitsGroups.push({
                     [ID]: elt.id + elt.applicability,
@@ -169,7 +169,7 @@ export const formatCompleteCurrentLimit = (completeLimitsGroups: CurrentLimitsDa
                     },
                 });
             }
-        });
+        }
     }
     return formattedCompleteLimitsGroups;
 };

src/services/network-modification-types.ts

@@ -306,7 +306,7 @@ export interface CurrentLimitsData {
     applicability?: string;
     limitsProperties?: LimitsProperty[];
     permanentLimit: number | null;
-    temporaryLimits: TemporaryLimit[]; // TODO : not exactly the right type Limit is more convenient
+    temporaryLimits: TemporaryLimit[];
 }
 
 export interface SubstationModificationInfo {

src/translations/en.json

@@ -916,7 +916,7 @@
     "SelectedOperationalLimitGroup": "Active limit set",
     "SelectedOperationalLimitGroups": "Active limit sets",
     "Applicability": "Applicability",
-    "UsedPropertyName": "Property name already used",
+    "NameUnique": "Name should be unique",
 
     "CreateTwoWindingsTransformer": "Create a 2 windings transformer",
     "ModifyTwoWindingsTransformer": "Modify a 2 windings transformer",

src/translations/fr.json

@@ -901,7 +901,7 @@
     "operationalLimitsGroup1WithProperties": "Jeu de limites actif côté 1 ayant la propriété",
     "operationalLimitsGroup2WithProperties": "Jeu de limites actif côté 2 ayant la propriété",
     "Applicability": "Applicable sur",
-    "UsedPropertyName": "Nom de propriété déjà utilisé",
+    "NameUnique": "Le nom doit être unique",
 
     "qMaxAtNominalVMustBeGreaterThanZero": "La valeur Q installée à tension nominale doit être supérieure à 0",
     "powerFactorMaxValueError": "La valeur du coefficient Q/P doit être inférieure à 1",