projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RIFT-16086, 16089, support folder names with spaces
[osm/UI.git]
/
skyquake
/
plugins
/
composer
/
src
/
src
/
libraries
/
model
/
DescriptorModelMetaProperty.js
diff --git
a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js
b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js
index
8fe51d9
..
4318c5b
100644
(file)
--- 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';
'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'
import guid from './../guid'
import changeCase from 'change-case'
import InstanceCounter from './../InstanceCounter'
@@
-69,7
+70,7
@@
export default {
return !/^(leaf|leaf_list)$/.test(property.type);
},
isSimpleList(property = {}) {
return !/^(leaf|leaf_list)$/.test(property.type);
},
isSimpleList(property = {}) {
- return _
.
includes(DescriptorModelFields.simpleList, property.name);
+ return _includes(DescriptorModelFields.simpleList, property.name);
},
isPrimativeDataType(property = {}) {
const Property = this;
},
isPrimativeDataType(property = {}) {
const Property = this;
@@
-155,7
+156,7
@@
export default {
if (uiState.name === 'name') {
return changeCase.param(parentMeta.name) + '-' + InstanceCounter.count(parentMeta[':qualified-type']);
}
if (uiState.name === 'name') {
return changeCase.param(parentMeta.name) + '-' + InstanceCounter.count(parentMeta[':qualified-type']);
}
- if (_
.isArray(parentMeta.key) && _.
includes(parentMeta.key, uiState.name)) {
+ if (_
isArray(parentMeta.key) && _
includes(parentMeta.key, uiState.name)) {
if (/uuid/.test(uiState['data-type'])) {
return guid();
}
if (/uuid/.test(uiState['data-type'])) {
return guid();
}