Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Website
Commits
b13dc3ab
Commit
b13dc3ab
authored
Dec 26, 2018
by
Matija Obreza
Browse files
Fix: Uploading descriptor definitions
- requires creator - skip `published` column - render UOM in DescriptorCard
parent
db1df18d
Changes
3
Show whitespace changes
Inline
Side-by-side
src/descriptors/ui/c/DescriptorCard.tsx
View file @
b13dc3ab
...
...
@@ -151,8 +151,9 @@ const DescriptorCard = ({ complete = true, compact, descriptor, classes, classNa
title
=
{
descriptor
.
uuid
?
<
DescriptorLink
to
=
{
descriptor
}
>
<
Markdown
basic
source
=
{
descriptor
.
title
||
t
(
'
descriptors.public.c.card.untitled
'
)
}
/>
{
descriptor
.
uom
&&
` [
${
descriptor
.
uom
}
]`
}
</
DescriptorLink
>
:
<
Markdown
basic
source
=
{
descriptor
.
title
}
/>
||
t
(
'
descriptors.public.c.card.untitled
'
)
:
<
Markdown
basic
source
=
{
descriptor
.
title
}
/>
||
t
(
'
descriptors.public.c.card.untitled
'
)
}
/>
<
CardContent
>
...
...
src/descriptors/ui/c/DescriptorParser.tsx
View file @
b13dc3ab
...
...
@@ -116,11 +116,11 @@ class DescriptorParser extends React.Component<IDescriptorParser, any> {
headers
:
[
'
crop
'
,
'
versionTag
'
,
'
title
'
,
'
category
'
,
'
description
'
,
'
dataType
'
,
'
integerOnly
'
,
'
minValue
'
,
'
maxValue
'
,
'
vocabularyId
'
,
'
code
'
,
'
code_title
'
,
'
code_description
'
,
'
published
'
,
'
columnName
'
,
'
uom
'
,
'
headingNumber
'
],
'
columnName
'
,
'
uom
'
,
'
headingNumber
'
],
})
.
subscribe
((
jsonObj
)
=>
{
// console.log('CSV Sourced Descriptor:', jsonObj);
if
(
jsonObj
.
minValue
)
{
jsonObj
.
minValue
=
+
jsonObj
.
minValue
;
}
...
...
src/descriptors/ui/dashboard/EditPage.tsx
View file @
b13dc3ab
...
...
@@ -38,9 +38,9 @@ class DescriptorEditPage extends React.Component<IDescriptorEditPageProps, any>
log
(
'
onSave
'
,
updatedDescriptor
);
if
(
updatedDescriptor
.
uuid
&&
updatedDescriptor
.
version
)
{
delete
updatedDescriptor
.
owner
;
}
//
if (updatedDescriptor.uuid && updatedDescriptor.version) {
//
delete updatedDescriptor.owner;
//
}
saveDescriptor
(
updatedDescriptor
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment