Visualize composite modifications #538

Mathieu-Deharbe · 2024-10-08T13:53:16Z

Uses : gridsuite/commons-ui#573

Calls :
gridsuite/explore-server#102
gridsuite/network-modification-server#541

Signed-off-by: Mathieu DEHARBE <[email protected]>

...ialogs/network-modification/composite-modification/composite-modification-edition-dialog.tsx

etiennehomer

Later we will need the whole NetworkModificationTreePane in commons-ui... To be discussed if it's ok to put it in this lib. Or let's create a lib for big business components ?

etiennehomer · 2024-10-29T13:26:19Z

...ialogs/network-modification/composite-modification/composite-modification-edition-dialog.tsx

+                {modifications && (
+                    <List sx={unscrollableDialogStyles.scrollableContent}>
+                        {modifications.map((modification: NetworkModificationMetadata) => (
+                            <>


There are missing keys.
<React.Fragment key={imodification.uuid}> ?
And remove it from ListItem ?

and then you have to remove the key from the ListItem as the React.Fragment managing the key

ghazwarhili · 2024-10-29T13:43:55Z

...ialogs/network-modification/composite-modification/composite-modification-edition-dialog.tsx

+            return null;
+        }
+        return intl.formatMessage(
+            { id: 'network_modifications.' + modif.type },


network_modifications.${modif.type}

Yes done. eslint is forcing me to do it now anyway !

ghazwarhili · 2024-10-29T13:45:50Z

...ialogs/network-modification/composite-modification/composite-modification-edition-dialog.tsx

+                ...computeLabel(modif),
+            }
+        );
+    };


const labelData = { ...modif, ...computeLabel(modif), }; return intl.formatMessage( { id: `network_modifications.${modif.type}` }, labelData ); };

ghazwarhili · 2024-10-29T13:52:25Z

...ialogs/network-modification/composite-modification/composite-modification-edition-dialog.tsx

+                {modifications && (
+                    <List sx={unscrollableDialogStyles.scrollableContent}>
+                        {modifications.map((modification: NetworkModificationMetadata) => (
+                            <>


and then you have to remove the key from the ListItem as the React.Fragment managing the key

ghazwarhili · 2024-10-29T14:00:36Z

...ialogs/network-modification/composite-modification/composite-modification-edition-dialog.tsx

+        );
+    };
+
+    const renderNetworkModificationsList = () => {


render.. could be improved, it doesn't clearly convey what the function does
maybe (generate or create)NetworkModificationsList or something else

This is just a copy paste. Maybe the original author used "render" because it contains jsx anchor code ?
Anyway I prefer generate so ok.

ghazwarhili · 2024-10-29T14:02:02Z

...ialogs/network-modification/composite-modification/composite-modification-edition-dialog.tsx

+    broadcastChannel: BroadcastChannel;
+}
+
+export const CompositeModificationEditionDialog: FunctionComponent<CompositeModificationEditionDialogProps> = ({


only Edition ? it could be just CompositeModificationDialog

Ok. It should be enough, at least for now. And I am tired of those huge names.

ghazwarhili · 2024-10-29T14:12:01Z

...ialogs/network-modification/composite-modification/composite-modification-edition-dialog.tsx

+            .catch((errorMessage) => {
+                snackError({
+                    messageTxt: errorMessage,
+                    headerId: 'contingencyListEditingError',


contingencyListEditingError ?
it is copy paste forgetten

Oops ! Well seen thank you. Done.

ghazwarhili · 2024-10-29T14:12:47Z

.../dialogs/network-modification/composite-modification/composite-modification-edition-form.tsx

+import { AppState } from 'redux/reducer';
+import Box from '@mui/material/Box';
+
+const CompositeModificationEditionForm = () => {


CompositeModificationForm ?

ghazwarhili · 2024-10-29T14:14:37Z

src/components/directory-content.tsx

+                    <CompositeModificationEditionDialog
+                        open={true}
+                        titleId={'compositeModification'}
+                        // @ts-expect-error TODO: manage null case(s) here


Done in a very simple and straightforward way. If it ever happens it will cause a regular error during the fetch.

I didn't change the other TODOs on the same subject that are in the same switch.

ghazwarhili · 2024-10-29T14:15:44Z

src/utils/elementType.ts

@@ -11,6 +11,10 @@ export const FilterType = {
    EXPERT: { id: 'EXPERT', label: 'filter.expert' },
 };

+export const NetworkModificationType = {
+    COMPOSITE: { id: 'COMPOSITE_MODIFICATION', label: 'compositeModification' },


compositeNetworkModification

reverted to "MODIFICATION"

ghazwarhili · 2024-10-29T14:16:34Z

src/utils/rest-api.ts

+/**
+ * Get the basic data of the network modifications contained in a composite modification
+ */
+export function getCompositeModificationContent(id: string) {


fetchNetworkCompositeModification

OK for fetch but this is the content of the composite modification that we are fetching, not the composite modification itself, which we already have.

Mathieu-Deharbe · 2024-10-30T13:49:58Z

Later we will need the whole NetworkModificationTreePane in commons-ui... To be discussed if it's ok to put it in this lib. Or let's create a lib for big business components ?

Yes we will need to migrate this as well.
The discussion about whether or not commons-ui should in the end contain everything... is a big debate.

Signed-off-by: Mathieu DEHARBE <[email protected]>

etiennehomer · 2024-11-05T13:21:58Z

src/translations/en.json

@@ -145,7 +147,8 @@
    "download.message.studies": "studies",
    "download.message.others": "others",
    "download.error": "An error occurred while downloading element {elementName}",
-    "MODIFICATION": "Composite modification",
+    "MODIFICATION": "Network modification",


I think it's ok but you can check with PO.
And you can change the key with "networkModification"

etiennehomer · 2024-11-05T13:27:46Z

src/translations/fr.json

-    "editContingencyList": "Editer la liste d'aléas",
-    "editFilter": "Editer le filtre",
+    "editContingencyList": "Éditer la liste d'aléas",
+    "editFilter": "Éditer le filtre",


Ok to keep it. But for lisibility of PR, tracability of the code, it's always harmful to change things that have nothing to do with the PR's subject

Signed-off-by: Mathieu DEHARBE <[email protected]>

sonarqubecloud · 2024-11-13T10:19:09Z

Quality Gate passed

Issues
1 New issue
0 Accepted issues

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

See analysis details on SonarQube Cloud

Mathieu-Deharbe and others added 6 commits October 8, 2024 15:47

visualize

208daf7

Signed-off-by: Mathieu DEHARBE <[email protected]>

better css list and scroll system

79600b0

Signed-off-by: Mathieu DEHARBE <[email protected]>

better display of the network modification label

0f08acd

Signed-off-by: Mathieu DEHARBE <[email protected]>

respect spaces and strong anchors

75e8df4

Signed-off-by: Mathieu DEHARBE <[email protected]>

correct localisation imports

86831c6

Signed-off-by: Mathieu DEHARBE <[email protected]>

Merge branch 'main' into visualize-composite-modifications

5cca28c

Mathieu-Deharbe mentioned this pull request Oct 21, 2024

migrate network modification list display gridsuite/commons-ui#606

Merged

post conflict solving in commons-ui

8be793a

Signed-off-by: Mathieu DEHARBE <[email protected]>

Mathieu-Deharbe mentioned this pull request Oct 22, 2024

migrate network modification list display gridsuite/gridstudy-app#2342

Merged

Mathieu-Deharbe and others added 4 commits October 24, 2024 13:42

Merge branch 'main' into visualize-composite-modifications

0982dfa

post auto review

19b39f1

Signed-off-by: Mathieu DEHARBE <[email protected]>

allows to change composite modification name

a3b92e0

Signed-off-by: Mathieu DEHARBE <[email protected]>

change url

00b9ff9

Signed-off-by: Mathieu DEHARBE <[email protected]>

Mathieu-Deharbe requested review from ghazwarhili and etiennehomer October 24, 2024 16:31

prettier

62703c9

Signed-off-by: Mathieu DEHARBE <[email protected]>

etiennehomer reviewed Oct 29, 2024

View reviewed changes

...ialogs/network-modification/composite-modification/composite-modification-edition-dialog.tsx Outdated Show resolved Hide resolved

etiennehomer reviewed Oct 29, 2024

View reviewed changes

ghazwarhili reviewed Oct 29, 2024

View reviewed changes

Mathieu-Deharbe and others added 9 commits October 30, 2024 14:53

Merge branch 'main' into visualize-composite-modifications

9a373bc

adapt to the new eslint standard

e212512

Signed-off-by: Mathieu DEHARBE <[email protected]>

corrections post Ghazwa review

dd6c719

Signed-off-by: Mathieu DEHARBE <[email protected]>

some renaming

14107da

Signed-off-by: Mathieu DEHARBE <[email protected]>

Merge branch 'main' into visualize-composite-modifications

f263799

handle null case

ab6cad7

Signed-off-by: Mathieu DEHARBE <[email protected]>

better test syntax

68d5494

Signed-off-by: Mathieu DEHARBE <[email protected]>

Merge branch 'main' into visualize-composite-modifications

ca1f475

updated endpoint

618d372

Signed-off-by: Mathieu DEHARBE <[email protected]>

corrects getModificationLabel

0e06eeb

Signed-off-by: Mathieu DEHARBE <[email protected]>

etiennehomer approved these changes Nov 5, 2024

View reviewed changes

Mathieu-Deharbe and others added 2 commits November 6, 2024 14:34

Merge branch 'main' into visualize-composite-modifications

2ae94b8

revert MODIFICATION localization

cd382e5

Signed-off-by: Mathieu DEHARBE <[email protected]>

ghazwarhili approved these changes Nov 8, 2024

View reviewed changes

Mathieu-Deharbe added 2 commits November 12, 2024 17:44

Merge branch 'main' into visualize-composite-modifications

3a62a60

Merge branch 'main' into visualize-composite-modifications

068a7c1

Mathieu-Deharbe merged commit ce0e79a into main Nov 13, 2024
4 checks passed

Mathieu-Deharbe deleted the visualize-composite-modifications branch November 13, 2024 10:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Visualize composite modifications #538

Visualize composite modifications #538

Mathieu-Deharbe commented Oct 8, 2024

etiennehomer left a comment •

edited

Loading

etiennehomer Oct 29, 2024

ghazwarhili Oct 29, 2024

Mathieu-Deharbe Oct 30, 2024

ghazwarhili Oct 29, 2024

Mathieu-Deharbe Oct 30, 2024 •

edited

Loading

ghazwarhili Oct 29, 2024

ghazwarhili Oct 29, 2024

ghazwarhili Oct 29, 2024

Mathieu-Deharbe Oct 30, 2024

ghazwarhili Oct 29, 2024

Mathieu-Deharbe Oct 30, 2024

ghazwarhili Oct 29, 2024

Mathieu-Deharbe Oct 30, 2024

ghazwarhili Oct 29, 2024

ghazwarhili Oct 29, 2024

Mathieu-Deharbe Oct 31, 2024

ghazwarhili Oct 29, 2024

Mathieu-Deharbe Oct 30, 2024

Mathieu-Deharbe Nov 6, 2024

ghazwarhili Oct 29, 2024

Mathieu-Deharbe Oct 30, 2024

Mathieu-Deharbe commented Oct 30, 2024

etiennehomer Nov 5, 2024

etiennehomer Nov 5, 2024

sonarqubecloud bot commented Nov 13, 2024

Visualize composite modifications #538

Visualize composite modifications #538

Conversation

Mathieu-Deharbe commented Oct 8, 2024

etiennehomer left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mathieu-Deharbe Oct 30, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mathieu-Deharbe commented Oct 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Nov 13, 2024

Quality Gate passed

etiennehomer left a comment •

edited

Loading

Mathieu-Deharbe Oct 30, 2024 •

edited

Loading