X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Flibraries%2Fmodel%2FDescriptorModelMetaProperty.js;h=4318c5bebfb43a2c887c79d6c7fdadd1ca9f22e4;hb=61b1762cb6a657c5a8eb09d52fbf9a35a2a73aff;hp=8ba295a3d25382aa9cf60c308ddc1489afe76142;hpb=30879fffbecf6d78cde249fecf68f6335555711a;p=osm%2FUI.git diff --git a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js index 8ba295a3d..4318c5beb 100644 --- a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js +++ b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js @@ -23,7 +23,8 @@ 'use strict'; -import _ from 'lodash' +import _includes from 'lodash/includes' +import _isArray from 'lodash/isArray' import guid from './../guid' import changeCase from 'change-case' import InstanceCounter from './../InstanceCounter' @@ -32,6 +33,9 @@ import DescriptorTemplateFactory from './DescriptorTemplateFactory' import utils from '../utils' export default { + isBoolean(property = {}) { + return (typeof(property['data-type']) == 'string') && (property['data-type'].toLowerCase() == 'boolean') + }, isLeaf(property = {}) { return /leaf|choice/.test(property.type); }, @@ -66,7 +70,7 @@ export default { return !/^(leaf|leaf_list)$/.test(property.type); }, isSimpleList(property = {}) { - return _.contains(DescriptorModelFields.simpleList, property.name); + return _includes(DescriptorModelFields.simpleList, property.name); }, isPrimativeDataType(property = {}) { const Property = this; @@ -152,7 +156,7 @@ export default { if (uiState.name === 'name') { return changeCase.param(parentMeta.name) + '-' + InstanceCounter.count(parentMeta[':qualified-type']); } - if (_.isArray(parentMeta.key) && _.contains(parentMeta.key, uiState.name)) { + if (_isArray(parentMeta.key) && _includes(parentMeta.key, uiState.name)) { if (/uuid/.test(uiState['data-type'])) { return guid(); }