Skip to content
Snippets Groups Projects
Commit 7acff761 authored by piotr.kupczyk@id.ethz.ch's avatar piotr.kupczyk@id.ethz.ch
Browse files

SSDM-7583 : ObjectTypeForm - improve a logic for showing/hiding 'Initial...

SSDM-7583 : ObjectTypeForm - improve a logic for showing/hiding 'Initial value' field (still requires refactor as it is duplicated in two places)
parent 3aa8b13b
No related branches found
No related tags found
No related merge requests found
...@@ -145,10 +145,18 @@ export default class ObjectTypeHandlerValidate { ...@@ -145,10 +145,18 @@ export default class ObjectTypeHandlerValidate {
) )
} }
const wasMandatory = property.original ? property.original.mandatory : false const typeIsUsed = type.usages > 0
const isMandatory = property.mandatory const propertyIsNew = !property.original
const propertyIsMandatory = property.mandatory
if (property.usages > 0 && !wasMandatory && isMandatory) { const propertyWasMandatory = property.original
? property.original.mandatory
: false
if (
typeIsUsed &&
propertyIsMandatory &&
(propertyIsNew || !propertyWasMandatory)
) {
this.validateNotEmpty( this.validateNotEmpty(
'Initial Value', 'Initial Value',
'initialValueForExistingEntities', 'initialValueForExistingEntities',
......
...@@ -468,12 +468,20 @@ class ObjectTypeParametersProperty extends React.PureComponent { ...@@ -468,12 +468,20 @@ class ObjectTypeParametersProperty extends React.PureComponent {
} }
renderInitialValue(property) { renderInitialValue(property) {
const { classes } = this.props const { classes, type } = this.props
const wasMandatory = property.original ? property.original.mandatory : false const typeIsUsed = type.usages > 0
const isMandatory = property.mandatory const propertyIsNew = !property.original
const propertyIsMandatory = property.mandatory
if (property.usages > 0 && !wasMandatory && isMandatory) { const propertyWasMandatory = property.original
? property.original.mandatory
: false
if (
typeIsUsed &&
propertyIsMandatory &&
(propertyIsNew || !propertyWasMandatory)
) {
return ( return (
<div className={classes.field}> <div className={classes.field}>
<TextField <TextField
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment