Commit 5e1b1d8e authored by Matija Obreza's avatar Matija Obreza
Browse files

Minor UI fixes

- Markdown for bibRef
- Step renamed to "Upload new descriptors"
parent ef9cb1ef
Pipeline #7039 passed with stages
in 5 minutes and 57 seconds
...@@ -422,7 +422,7 @@ class DetailInfo extends React.Component<IDetailInfoProps, any> { ...@@ -422,7 +422,7 @@ class DetailInfo extends React.Component<IDetailInfoProps, any> {
<List> <List>
{ dataset.descriptors.map((descriptor: Descriptor) => ( { dataset.descriptors.map((descriptor: Descriptor) => (
<ListItem key={ descriptor.uuid } className=""> <ListItem key={ descriptor.uuid } className="">
<ListItemText primary={ <DescriptorLink to={ descriptor } /> } <ListItemText primary={ <DescriptorLink to={ descriptor }><Markdown source={ descriptor.title } /></DescriptorLink> }
secondary={ descriptor.description && <Markdown source={ descriptor.description } /> } /> secondary={ descriptor.description && <Markdown source={ descriptor.description } /> } />
</ListItem> </ListItem>
)) } )) }
......
...@@ -208,7 +208,7 @@ class DetailInfo extends React.Component<IDetailInfoProps, any> { ...@@ -208,7 +208,7 @@ class DetailInfo extends React.Component<IDetailInfoProps, any> {
<PropertiesItem title="URL:">{ <ExternalLink link={ descriptorList.url }>{ descriptorList.url }</ExternalLink> }</PropertiesItem> } <PropertiesItem title="URL:">{ <ExternalLink link={ descriptorList.url }>{ descriptorList.url }</ExternalLink> }</PropertiesItem> }
{ descriptorList.bibliographicCitation && { descriptorList.bibliographicCitation &&
<PropertiesItem title="Bibliographic citation:">{ descriptorList.bibliographicCitation }</PropertiesItem> } <PropertiesItem title="Bibliographic citation:"><Markdown source={ descriptorList.bibliographicCitation } /></PropertiesItem> }
{ (descriptorList.publisher === null && descriptorList.owner) && { (descriptorList.publisher === null && descriptorList.owner) &&
<PropertiesItem title="Maintained by:"><PartnerLink to={ descriptorList.owner } /></PropertiesItem> } <PropertiesItem title="Maintained by:"><PartnerLink to={ descriptorList.owner } /></PropertiesItem> }
......
...@@ -90,7 +90,8 @@ class DescriptorListForm extends React.Component<any, any> { ...@@ -90,7 +90,8 @@ class DescriptorListForm extends React.Component<any, any> {
<Field name="bibliographicCitation" <Field name="bibliographicCitation"
label="Bibliographic citation" label="Bibliographic citation"
placeholder="Complete bibliographic citation of the crop descriptor. Use APA formatting style (https://owl.english.purdue.edu/owl/resource/560/01/)" placeholder="Complete bibliographic citation of the crop descriptor. Use APA formatting style (https://owl.english.purdue.edu/owl/resource/560/01/)"
component={ TextField } component={ MarkdownField }
basicMarkdown
multiline multiline
/> />
......
...@@ -15,15 +15,15 @@ const steps = [ ...@@ -15,15 +15,15 @@ const steps = [
}, },
{ {
id: 2, id: 2,
name: 'Select registered descriptors', name: 'Upload new descriptors',
path: 'edit/select-descriptors', path: 'edit/import-descriptors',
component: ImportDescriptorsStep, component: ImportDescriptorsStep,
exact: true, exact: true,
}, },
{ {
id: 3, id: 3,
name: 'Import descriptors', name: 'Select existing descriptors',
path: 'edit/import-descriptors', path: 'edit/select-descriptors',
component: SelectDescriptorsStep, component: SelectDescriptorsStep,
exact: true, exact: true,
}, },
......
...@@ -201,7 +201,7 @@ const DescriptorCard = ({complete = true, compact, descriptor, classes, classNam ...@@ -201,7 +201,7 @@ const DescriptorCard = ({complete = true, compact, descriptor, classes, classNam
<PropertiesItem title="Classification:">{ T(`descriptor.category.${descriptor.category}`) }</PropertiesItem> <PropertiesItem title="Classification:">{ T(`descriptor.category.${descriptor.category}`) }</PropertiesItem>
) } ) }
{ displayPref.dataType && ( { displayPref.dataType && (
<PropertiesItem title=" Data type:">{ T(`descriptor.dataType.${descriptor.dataType}`) }</PropertiesItem> <PropertiesItem title="Data type:">{ T(`descriptor.dataType.${descriptor.dataType}`) }</PropertiesItem>
) } ) }
</Properties> </Properties>
</Grid> </Grid>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment