diff --git a/ui-admin/src/js/components/types/form/entitytype/EntityTypeFormPreviewProperty.jsx b/ui-admin/src/js/components/types/form/entitytype/EntityTypeFormPreviewProperty.jsx index ff44cd5ec28f1bd66e4a8da825493b082d46143f..de25bfdad19b0649770d497aea9b1970851d8e24 100644 --- a/ui-admin/src/js/components/types/form/entitytype/EntityTypeFormPreviewProperty.jsx +++ b/ui-admin/src/js/components/types/form/entitytype/EntityTypeFormPreviewProperty.jsx @@ -282,7 +282,12 @@ class EntityTypeFormPreviewProperty extends React.PureComponent { dataType === openbis.DataType.HYPERLINK || dataType === openbis.DataType.TIMESTAMP || dataType === openbis.DataType.DATE || - dataType === openbis.DataType.XML + dataType === openbis.DataType.XML || + dataType === openbis.DataType.ARRAY_STRING || + dataType === openbis.DataType.ARRAY_INTEGER || + dataType === openbis.DataType.ARRAY_REAL || + dataType === openbis.DataType.ARRAY_TIMESTAMP || + dataType === openbis.DataType.JSON ) { return this.renderVarcharProperty() } else if ( diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js index e8a273ca0ee9d693877efcca8e526329fe8328fc..4266047457ed3cccd53d37652622eec149973299 100644 --- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js +++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js @@ -933,7 +933,7 @@ var FormUtil = new function() { $component = this._getNumberInputField(propertyType.code, propertyType.description, '1', propertyType.mandatory); } else if (propertyType.dataType === "MATERIAL") { $component = this._getInputField("text", propertyType.code, propertyType.description, null, propertyType.mandatory); - } else if (propertyType.dataType === "MULTILINE_VARCHAR") { + } else if (["MULTILINE_VARCHAR", "JSON"].includes(propertyType.dataType)) { $component = this._getTextBox(propertyType.code, propertyType.description, propertyType.mandatory); if(profile.isForcedMonospaceFont(propertyType)) { $component.css("font-family", "Consolas, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace"); @@ -945,8 +945,10 @@ var FormUtil = new function() { } else if (propertyType.dataType === "DATE") { $component = this._getDatePickerField(propertyType.code, propertyType.description, propertyType.mandatory, true, timestampValue); } else if (propertyType.dataType === "VARCHAR") { - $component = this._getInputField("text", propertyType.code, propertyType.description, null, propertyType.mandatory); - } else if (propertyType.dataType === "XML") { + $component = this._getInputField("text", propertyType.code, propertyType.description, null, propertyType.mandatory); + } else if (['ARRAY_STRING', 'ARRAY_INTEGER', 'ARRAY_REAL', 'ARRAY_TIMESTAMP'].includes(propertyType.dataType)) { + $component = this._getInputField("text", propertyType.code, propertyType.description, null, propertyType.mandatory); + } else if (propertyType.dataType === "XML") { $component = this._getTextBox(propertyType.code, propertyType.description, propertyType.mandatory); } else if (propertyType.dataType === "SAMPLE") { var sampleTypeCode = propertyType.sampleTypeCode;