Skip to content

Commit 676210b

Browse files
authored
Fix the renaming of contingency (#463)
Signed-off-by: TOURI ANIS <[email protected]>
1 parent c2b8c48 commit 676210b

File tree

4 files changed

+24
-1
lines changed

4 files changed

+24
-1
lines changed

src/components/dialogs/contingency-list/edition/criteria-based/criteria-based-edition-form.jsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,21 @@ import {
1515
CONTINGENCY_LIST_EQUIPMENTS,
1616
FieldConstants,
1717
} from '@gridsuite/commons-ui';
18+
import { elementExists } from 'utils/rest-api';
19+
import { useSelector } from 'react-redux';
1820

1921
const CriteriaBasedEditionForm = () => {
2022
const emptyValues = getCriteriaBasedFormData();
23+
const activeDirectory = useSelector((state) => state.activeDirectory);
2124
return (
2225
<Grid container spacing={2} marginTop={'auto'}>
2326
<Grid item xs={12}>
2427
<UniqueNameInput
2528
name={FieldConstants.NAME}
2629
label={'nameProperty'}
2730
elementType={ElementType.CONTINGENCY_LIST}
31+
activeDirectory={activeDirectory}
32+
elementExists={elementExists}
2833
/>
2934
</Grid>
3035
<CriteriaBasedForm

src/components/dialogs/contingency-list/edition/explicit-naming/explicit-naming-edition-form.jsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,20 @@ import {
1313
UniqueNameInput,
1414
FieldConstants,
1515
} from '@gridsuite/commons-ui';
16+
import { useSelector } from 'react-redux';
17+
import { elementExists } from 'utils/rest-api';
1618

1719
const ExplicitNamingEditionForm = () => {
20+
const activeDirectory = useSelector((state) => state.activeDirectory);
1821
return (
1922
<Grid container spacing={2} marginTop={'auto'}>
2023
<Grid item xs={12}>
2124
<UniqueNameInput
2225
name={FieldConstants.NAME}
2326
label={'nameProperty'}
2427
elementType={ElementType.CONTINGENCY_LIST}
28+
activeDirectory={activeDirectory}
29+
elementExists={elementExists}
2530
/>
2631
</Grid>
2732
<ExplicitNamingForm />

src/components/dialogs/contingency-list/edition/script/script-edition-form.jsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,20 @@ import {
1313
ElementType,
1414
FieldConstants,
1515
} from '@gridsuite/commons-ui';
16+
import { elementExists } from 'utils/rest-api';
17+
import { useSelector } from 'react-redux';
1618

1719
const ScriptEditionForm = () => {
20+
const activeDirectory = useSelector((state) => state.activeDirectory);
1821
return (
1922
<Grid container spacing={2} marginTop={'auto'}>
2023
<Grid item xs={12}>
2124
<UniqueNameInput
2225
name={FieldConstants.NAME}
2326
label={'nameProperty'}
2427
elementType={ElementType.CONTINGENCY_LIST}
28+
activeDirectory={activeDirectory}
29+
elementExists={elementExists}
2530
/>
2631
</Grid>
2732
<ScriptInputForm name={FieldConstants.SCRIPT} />

src/components/dialogs/copy-to-script-dialog.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ import {
1616
CustomMuiDialog,
1717
FieldConstants,
1818
} from '@gridsuite/commons-ui';
19-
import { getNameCandidate } from 'utils/rest-api';
19+
import { elementExists, getNameCandidate } from 'utils/rest-api';
20+
import { useSelector } from 'react-redux';
21+
import { ReduxState } from 'redux/reducer.type';
2022

2123
const schema = yup.object().shape({
2224
[FieldConstants.NAME]: yup.string().trim().required('nameEmpty'),
@@ -80,6 +82,10 @@ const CopyToScriptDialog: React.FunctionComponent<CopyToScriptDialogProps> = ({
8082
const nameError = errors[FieldConstants.NAME];
8183
const isValidating = errors.root?.isValidating;
8284

85+
const activeDirectory = useSelector(
86+
(state: ReduxState) => state.activeDirectory
87+
);
88+
8389
const onSubmit = (data: FormData) => {
8490
onValidate(id, data[FieldConstants.NAME]);
8591
};
@@ -143,6 +149,8 @@ const CopyToScriptDialog: React.FunctionComponent<CopyToScriptDialogProps> = ({
143149
label={'nameProperty'}
144150
elementType={ElementType.CONTINGENCY_LIST}
145151
autoFocus
152+
activeDirectory={activeDirectory}
153+
elementExists={elementExists}
146154
/>
147155
)}
148156
</Grid>

0 commit comments

Comments
 (0)