diff --git a/ui-admin/src/js/components/types/form/entitytype/EntityTypeFormParametersProperty.jsx b/ui-admin/src/js/components/types/form/entitytype/EntityTypeFormParametersProperty.jsx index 7daf5b9f37091c8c7a3e59ac99025c0e2092b3dc..8fb37ec2736267f1770f9071b2341b56d218effb 100644 --- a/ui-admin/src/js/components/types/form/entitytype/EntityTypeFormParametersProperty.jsx +++ b/ui-admin/src/js/components/types/form/entitytype/EntityTypeFormParametersProperty.jsx @@ -313,12 +313,27 @@ class EntityTypeFormParametersProperty extends React.PureComponent { }) } } else { - openbis.DataType.values.map(dataType => { - options.push({ - label: new DataType(dataType).getLabel(), - value: dataType + const objectType = this.getType().objectType.value; + if(objectType == 'materialType') { + //Filter out new data types for materials + const filtered = [openbis.DataType.ARRAY_STRING, openbis.DataType.ARRAY_INTEGER, + openbis.DataType.ARRAY_REAL, openbis.DataType.ARRAY_TIMESTAMP, openbis.DataType.JSON]; + openbis.DataType.values.map(dataType => { + if(!filtered.includes(dataType)) { + options.push({ + label: new DataType(dataType).getLabel(), + value: dataType + }) + } }) - }) + } else { + openbis.DataType.values.map(dataType => { + options.push({ + label: new DataType(dataType).getLabel(), + value: dataType + }) + }) + } } const { mode, classes } = this.props