File tree Expand file tree Collapse file tree 4 files changed +24
-1
lines changed Expand file tree Collapse file tree 4 files changed +24
-1
lines changed Original file line number Diff line number Diff line change @@ -15,16 +15,21 @@ import {
15
15
CONTINGENCY_LIST_EQUIPMENTS ,
16
16
FieldConstants ,
17
17
} from '@gridsuite/commons-ui' ;
18
+ import { elementExists } from 'utils/rest-api' ;
19
+ import { useSelector } from 'react-redux' ;
18
20
19
21
const CriteriaBasedEditionForm = ( ) => {
20
22
const emptyValues = getCriteriaBasedFormData ( ) ;
23
+ const activeDirectory = useSelector ( ( state ) => state . activeDirectory ) ;
21
24
return (
22
25
< Grid container spacing = { 2 } marginTop = { 'auto' } >
23
26
< Grid item xs = { 12 } >
24
27
< UniqueNameInput
25
28
name = { FieldConstants . NAME }
26
29
label = { 'nameProperty' }
27
30
elementType = { ElementType . CONTINGENCY_LIST }
31
+ activeDirectory = { activeDirectory }
32
+ elementExists = { elementExists }
28
33
/>
29
34
</ Grid >
30
35
< CriteriaBasedForm
Original file line number Diff line number Diff line change @@ -13,15 +13,20 @@ import {
13
13
UniqueNameInput ,
14
14
FieldConstants ,
15
15
} from '@gridsuite/commons-ui' ;
16
+ import { useSelector } from 'react-redux' ;
17
+ import { elementExists } from 'utils/rest-api' ;
16
18
17
19
const ExplicitNamingEditionForm = ( ) => {
20
+ const activeDirectory = useSelector ( ( state ) => state . activeDirectory ) ;
18
21
return (
19
22
< Grid container spacing = { 2 } marginTop = { 'auto' } >
20
23
< Grid item xs = { 12 } >
21
24
< UniqueNameInput
22
25
name = { FieldConstants . NAME }
23
26
label = { 'nameProperty' }
24
27
elementType = { ElementType . CONTINGENCY_LIST }
28
+ activeDirectory = { activeDirectory }
29
+ elementExists = { elementExists }
25
30
/>
26
31
</ Grid >
27
32
< ExplicitNamingForm />
Original file line number Diff line number Diff line change @@ -13,15 +13,20 @@ import {
13
13
ElementType ,
14
14
FieldConstants ,
15
15
} from '@gridsuite/commons-ui' ;
16
+ import { elementExists } from 'utils/rest-api' ;
17
+ import { useSelector } from 'react-redux' ;
16
18
17
19
const ScriptEditionForm = ( ) => {
20
+ const activeDirectory = useSelector ( ( state ) => state . activeDirectory ) ;
18
21
return (
19
22
< Grid container spacing = { 2 } marginTop = { 'auto' } >
20
23
< Grid item xs = { 12 } >
21
24
< UniqueNameInput
22
25
name = { FieldConstants . NAME }
23
26
label = { 'nameProperty' }
24
27
elementType = { ElementType . CONTINGENCY_LIST }
28
+ activeDirectory = { activeDirectory }
29
+ elementExists = { elementExists }
25
30
/>
26
31
</ Grid >
27
32
< ScriptInputForm name = { FieldConstants . SCRIPT } />
Original file line number Diff line number Diff line change @@ -16,7 +16,9 @@ import {
16
16
CustomMuiDialog ,
17
17
FieldConstants ,
18
18
} 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' ;
20
22
21
23
const schema = yup . object ( ) . shape ( {
22
24
[ FieldConstants . NAME ] : yup . string ( ) . trim ( ) . required ( 'nameEmpty' ) ,
@@ -80,6 +82,10 @@ const CopyToScriptDialog: React.FunctionComponent<CopyToScriptDialogProps> = ({
80
82
const nameError = errors [ FieldConstants . NAME ] ;
81
83
const isValidating = errors . root ?. isValidating ;
82
84
85
+ const activeDirectory = useSelector (
86
+ ( state : ReduxState ) => state . activeDirectory
87
+ ) ;
88
+
83
89
const onSubmit = ( data : FormData ) => {
84
90
onValidate ( id , data [ FieldConstants . NAME ] ) ;
85
91
} ;
@@ -143,6 +149,8 @@ const CopyToScriptDialog: React.FunctionComponent<CopyToScriptDialogProps> = ({
143
149
label = { 'nameProperty' }
144
150
elementType = { ElementType . CONTINGENCY_LIST }
145
151
autoFocus
152
+ activeDirectory = { activeDirectory }
153
+ elementExists = { elementExists }
146
154
/>
147
155
) }
148
156
</ Grid >
You can’t perform that action at this time.
0 commit comments