@@ -25,7 +25,7 @@ type ModalProps = {
2525
2626const hasNoFieldValues = ( values : Reference ) => {
2727 if ( ! values ) return true ;
28- return _ . isEmpty ( values ?. referenceType ?. code ) && _ . isEmpty ( values ?. source ?. uri ) ;
28+ return _ . isEmpty ( values ?. referenceType ?. uri ) && _ . isEmpty ( values ?. source ?. uri ) ;
2929} ;
3030
3131export const ReferenceTable = ( { searchEnv } : Props ) => {
@@ -59,12 +59,13 @@ export const ReferenceTable = ({ searchEnv }: Props) => {
5959 values ?. references . map ( ( ref : Reference , index ) => (
6060 < Table . Row key = { `references-${ index } ` } >
6161 < Table . Cell >
62- { getTranslateText ( relations . find ( ( rel ) => rel . code === ref ?. referenceType ?. code ) ?. label ) ??
63- ref ?. referenceType ?. code }
62+ { getTranslateText ( relations . find ( ( rel ) => rel . uri === ref ?. referenceType ?. uri ) ?. label ) ??
63+ ref ?. referenceType ?. uri }
6464 </ Table . Cell >
6565 < Table . Cell >
66- { getTranslateText ( selectedValues ?. find ( ( item ) => item . uri === ref ?. source ?. uri ) ?. title ) ??
67- ref ?. source ?. uri }
66+ { selectedValues ?. find ( ( item ) => item . uri === ref ?. source ?. uri ) ?. title
67+ ? getTranslateText ( selectedValues ?. find ( ( item ) => item . uri === ref ?. source ?. uri ) ?. title )
68+ : ref ?. source ?. uri }
6869 </ Table . Cell >
6970 < Table . Cell >
7071 < div className = { styles . set } >
@@ -87,7 +88,7 @@ export const ReferenceTable = ({ searchEnv }: Props) => {
8788 < div >
8889 < FieldModal
8990 searchEnv = { searchEnv }
90- template = { { source : { uri : '' } , referenceType : { code : '' } } }
91+ template = { { source : { uri : '' } , referenceType : { uri : '' } } }
9192 type = { 'new' }
9293 onSuccess = { ( formValues ) =>
9394 setFieldValue (
@@ -167,19 +168,19 @@ const FieldModal = ({ template, type, onSuccess, searchEnv, selectedUri }: Modal
167168 < Modal . Content className = { cn ( styles . modalContent , styles . fieldContainer ) } >
168169 < Combobox
169170 label = { localization . datasetForm . fieldLabel . relationType }
170- onValueChange = { ( value ) => setFieldValue ( `referenceType.code ` , value . toString ( ) ) }
171- value = { values . referenceType ?. code ? [ values . referenceType ?. code ] : [ ] }
171+ onValueChange = { ( value ) => setFieldValue ( `referenceType.uri ` , value . toString ( ) ) }
172+ value = { values . referenceType ?. uri ? [ values . referenceType ?. uri ] : [ ] }
172173 placeholder = { `${ localization . datasetForm . fieldLabel . choseRelation } ...` }
173174 portal = { false }
174175 size = 'sm'
175- error = { errors ?. referenceType ?. code }
176+ error = { errors ?. referenceType ?. uri }
176177 virtual
177178 >
178179 < Combobox . Empty > { localization . search . noHits } </ Combobox . Empty >
179180 { relations . map ( ( relation ) => (
180181 < Combobox . Option
181- key = { relation ?. code }
182- value = { relation ?. code }
182+ key = { relation ?. uri }
183+ value = { relation ?. uri }
183184 description = { `${ relation ?. uriAsPrefix } (${ relation ?. uri } )` }
184185 >
185186 { getTranslateText ( relation ?. label ) }
0 commit comments