Add color map to DirectoryItemInput so we can give different color by equipmentType and add Fields needed for contingency list by filter #839

basseche · 2025-08-22T14:01:57Z

No description provided.

… equipment type and add new Fields for Aleas by filter Signed-off-by: basseche <[email protected]>

Signed-off-by: basseche <[email protected]>

flomillot · 2025-09-17T15:38:51Z

src/components/inputs/reactHookForm/DirectoryItemsInput.tsx

        fields: elements,
        append,
        remove,
    } = useFieldArray({


À mon avis il n'y a plus besoin de renommer fields ici vu qu'il est déjà renommé en bas, autant garder le nom d'origine ici plutôt que de le changer 2 fois

ok renommage enlevé

src/components/inputs/reactHookForm/DirectoryItemsInput.tsx

flomillot · 2025-09-17T15:54:57Z

src/components/inputs/reactHookForm/DirectoryItemsInput.tsx

+                                            item.specificMetadata?.equipmentType &&
+                                            equipmentColorsMap?.has(item.specificMetadata?.equipmentType)
+                                                ? equipmentColorsMap.get(item.specificMetadata.equipmentType)
+                                                : undefined,


Suggested change

item.specificMetadata?.equipmentType &&

equipmentColorsMap?.has(item.specificMetadata?.equipmentType)

? equipmentColorsMap.get(item.specificMetadata.equipmentType)

: undefined,

equipmentColorsMap?.get(item.specificMetadata?.equipmentType)

Corrigez moi si je me trompe mais je crois que du coup ça revient exactement a la même chose

pas vraiment car si item.specificMetadata?.equipmentType est null ou undefined il y a possibilité de crash.

Non ça renvoit juste undefined (j'ai testé avant d'écrire le commentaire :p )
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map/get#return_value

flomillot · 2025-09-17T16:00:06Z

src/components/inputs/reactHookForm/DirectoryItemsInput.tsx

-                                }
-                            />
+                        {elementsWithMetaData.map((item, index) => (
+                            <Box key={`Box${item.id}`} sx={{ display: 'flex', flexDirection: 'column', gap: 1 }}>


C'est pas quelque chose dont on risque d'avoir besoin ailleurs ? il faudrait peut-être sortir ce code et en faire un composant ?

le but de cela est de mettre une couleur pour les chip et le type en HelperText en dessous. Pour le moment cette caractéristique n'est utilisée que par le formulaire des aléas. Je ne sais pas si on aurait besoin de ça ailleurs dans le futur. Le fait de faire une composant séparé j'y ai pensé, mais ça fait tout de même un certain pourcentage de duplication de code.

Pourquoi duplication, quel code serait dupliqué ? Au contraire sortir le code en un composant permettra de limiter la duplication de code dans le futur, et d'alléger DirectoryItemsInput.
Mais bon pas grave au pire on pourra le faire dans une autre US quand on en aura besoin.

src/components/inputs/reactHookForm/DirectoryItemsInput.tsx

flomillot · 2025-09-17T16:39:44Z

src/components/inputs/reactHookForm/DirectoryItemsInput.tsx

    } = useFieldArray({
        name,
    });
+    const elementsWithMetaData: TreeViewFinderNodeProps[] = elements as unknown as TreeViewFinderNodeProps[];


On est sûr que les champs correspondent toujours à ce type TreeViewFinderNodeProps ?
J'ai essayé de remonter pour voir où se composant était utilisé et franchement j'ai toujours aucune idée d'à quoi ressemble ce formulaire.
En tout cas rien que le nom est bizarre, d'après le nom c'est censé être utilisé uniquement dans l'arbre mais je vois qu'il est un peu partout...

normalement ça utilise DirectoryItemSelector, qui lui utilise TreeViewFinder les elements récupérer ont bien ce type.

flomillot · 2025-09-17T16:44:25Z

src/utils/types/equipmentType.ts

+        return '';
+    }
+    return equipmentType !== EquipmentType.HVDC_LINE
+        ? (BASE_EQUIPMENTS[equipmentType as EquipmentType]?.label ?? '')


Pourquoi ne pas rajouter ce type d'équipement dans BASE_EQUIPMENTS ?

parce que BASE_EQUIPMENTS est utilisé un peu partout je suppose et il ne faut pas modifier des listes uniquement pour notre besoin d'affichage de type.

Pour moi il faut l'ajouter, sinon je vois pas l’intérêt de maintenir une liste d’équipement, si on commence à faire des if comme ça c'est pas maintenable, mais bon peut être que je me trompe...
@thangqp a créé cette liste, peut être peut il donner son avis ?

autre enum utilisée finalement

Signed-off-by: Thang PHAM <[email protected]>

src/components/inputs/reactHookForm/DirectoryItemsInput.tsx

Co-authored-by: Thang PHAM <[email protected]>

Signed-off-by: Thang PHAM <[email protected]>

sonarqubecloud · 2025-09-24T12:59:05Z

Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

Add color map to DirectoryItemInput so we can give different color by…

a5b7d63

… equipment type and add new Fields for Aleas by filter Signed-off-by: basseche <[email protected]>

basseche self-assigned this Aug 22, 2025

basseche added 2 commits August 22, 2025 16:15

Merge branch 'main' into contingencyListByFilter

af23c4d

Merge branch 'main' into contingencyListByFilter

154a34e

basseche added 3 commits September 2, 2025 16:47

fix directoryItemsInput

cef7aef

Improve interface

e1105c2

Signed-off-by: basseche <[email protected]>

restore useless changes

3274603

Signed-off-by: basseche <[email protected]>

basseche force-pushed the contingencyListByFilter branch 3 times, most recently from b0f47df to 5b94394 Compare September 4, 2025 07:58

remove useless changes

bf01977

Signed-off-by: basseche <[email protected]>

basseche force-pushed the contingencyListByFilter branch from 5b94394 to bf01977 Compare September 4, 2025 07:59

basseche added 2 commits September 9, 2025 15:09

add field

20e1f4d

Improve Function

1c942b0

Merge branch 'main' into contingencyListByFilter

5dfb28d

basseche mentioned this pull request Sep 11, 2025

Add new contingency list by filter gridsuite/gridexplore-app#711

Merged

basseche requested review from thangqp and Mathieu-Deharbe September 16, 2025 08:30

basseche added 3 commits September 16, 2025 10:30

Merge branch 'main' into contingencyListByFilter

1387f3f

Merge branch 'main' into contingencyListByFilter

de3b700

Merge branch 'main' into contingencyListByFilter

4cd653e

flomillot self-requested a review September 17, 2025 15:18

flomillot reviewed Sep 17, 2025

View reviewed changes

review

fcdec69

basseche requested review from flomillot and removed request for Mathieu-Deharbe September 22, 2025 13:33

basseche and others added 2 commits September 22, 2025 17:06

add element not found

6c0770a

merge from main

9f2f6e2

Signed-off-by: Thang PHAM <[email protected]>

basseche added 4 commits September 23, 2025 14:10

Merge branch 'main' into contingencyListByFilter

c488c87

review

89d1391

review2

a0a380b

review

88f6146

thangqp reviewed Sep 23, 2025

View reviewed changes

src/components/inputs/reactHookForm/DirectoryItemsInput.tsx Outdated Show resolved Hide resolved

src/components/inputs/reactHookForm/DirectoryItemsInput.tsx Outdated Show resolved Hide resolved

basseche and others added 6 commits September 23, 2025 18:02

Update src/components/inputs/reactHookForm/DirectoryItemsInput.tsx

ff49f89

Co-authored-by: Thang PHAM <[email protected]>

fix build

d3488e3

Merge branch 'main' into contingencyListByFilter

6fd4573

review

759ed02

fix regression

1e50e3f

move condition

606d27f

Signed-off-by: Thang PHAM <[email protected]>

thangqp self-requested a review September 24, 2025 12:57

thangqp approved these changes Sep 24, 2025

View reviewed changes

basseche merged commit 9d2d4df into main Sep 24, 2025
5 checks passed

basseche deleted the contingencyListByFilter branch September 24, 2025 13:01

Add color map to DirectoryItemInput so we can give different color by equipmentType and add Fields needed for contingency list by filter #839

Add color map to DirectoryItemInput so we can give different color by equipmentType and add Fields needed for contingency list by filter #839

Uh oh!

Conversation

basseche commented Aug 22, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

sonarqubecloud bot commented Sep 24, 2025

Quality Gate passed

Uh oh!

Uh oh!

Uh oh!