Skip to content

Commit c92496c

Browse files
authored
Allow editing description from filter edition dialogs (#591)
* Allow Editing description from filter dialogs Signed-off-by: basseche <[email protected]>
1 parent 6b0e2ef commit c92496c

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dependencies": {
88
"@emotion/react": "^11.11.4",
99
"@emotion/styled": "^11.11.5",
10-
"@gridsuite/commons-ui": "0.76.2",
10+
"@gridsuite/commons-ui": "0.77",
1111
"@hookform/resolvers": "^3.3.4",
1212
"@mui/icons-material": "^5.15.14",
1313
"@mui/lab": "5.0.0-alpha.169",

src/components/directory-content-dialog.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ function DirectoryContentDialog(
156156
setActiveElement(event.data);
157157
setOpenDescModificationDialog(true);
158158
} else if (childrenMetadata[event.data.elementUuid] !== undefined) {
159+
setActiveElement(event.data);
159160
setElementName(childrenMetadata[event.data.elementUuid].elementName);
160161
const subtype = childrenMetadata[event.data.elementUuid].specificMetadata.type as unknown as string;
161162
/** set active directory on the store because it will be used while editing the contingency name */
@@ -283,7 +284,7 @@ function DirectoryContentDialog(
283284
/>
284285
);
285286
}
286-
if (currentExplicitNamingFilterId !== undefined) {
287+
if (currentExplicitNamingFilterId !== undefined && activeElement) {
287288
return (
288289
<ExplicitNamingFilterEditionDialog
289290
id={currentExplicitNamingFilterId}
@@ -298,10 +299,11 @@ function DirectoryContentDialog(
298299
activeDirectory={activeDirectory}
299300
elementExists={elementExists}
300301
language={languageLocal}
302+
description={activeElement.description}
301303
/>
302304
);
303305
}
304-
if (currentExpertFilterId !== undefined) {
306+
if (currentExpertFilterId !== undefined && activeElement) {
305307
return (
306308
<ExpertFilterEditionDialog
307309
id={currentExpertFilterId}
@@ -316,6 +318,7 @@ function DirectoryContentDialog(
316318
activeDirectory={activeDirectory}
317319
elementExists={elementExists}
318320
language={languageLocal}
321+
description={activeElement.description}
319322
/>
320323
);
321324
}

0 commit comments

Comments
 (0)