projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "RIFT-15245: Vnfd-id edit in VNF composer behaves strangely"
[osm/UI.git]
/
skyquake
/
plugins
/
composer
/
src
/
src
/
components
/
EditDescriptorModelProperties.js
diff --git
a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
index
7965e25
..
4ee4345
100644
(file)
--- a/
skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
+++ b/
skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
@@
-47,12
+47,12
@@
import imgRemove from '../../../node_modules/open-iconic/svg/trash.svg'
import '../styles/EditDescriptorModelProperties.scss'
function getDescriptorMetaBasicForType(type) {
import '../styles/EditDescriptorModelProperties.scss'
function getDescriptorMetaBasicForType(type) {
- const basicPropertiesFilter = d => _.
contain
s(DESCRIPTOR_MODEL_FIELDS[type], d.name);
+ const basicPropertiesFilter = d => _.
include
s(DESCRIPTOR_MODEL_FIELDS[type], d.name);
return DescriptorModelMetaFactory.getModelMetaForType(type, basicPropertiesFilter) || {properties: []};
}
function getDescriptorMetaAdvancedForType(type) {
return DescriptorModelMetaFactory.getModelMetaForType(type, basicPropertiesFilter) || {properties: []};
}
function getDescriptorMetaAdvancedForType(type) {
- const advPropertiesFilter = d => !_.
contain
s(DESCRIPTOR_MODEL_FIELDS[type], d.name);
+ const advPropertiesFilter = d => !_.
include
s(DESCRIPTOR_MODEL_FIELDS[type], d.name);
return DescriptorModelMetaFactory.getModelMetaForType(type, advPropertiesFilter) || {properties: []};
}
return DescriptorModelMetaFactory.getModelMetaForType(type, advPropertiesFilter) || {properties: []};
}
@@
-205,7
+205,7
@@
export default function EditDescriptorModelProperties(props) {
}
if (isLeafRef) {
}
if (isLeafRef) {
- let fullFieldKey = fieldKey;
+ let fullFieldKey =
_.isArray(fieldKey) ? fieldKey.join(':') :
fieldKey;
let containerRef = container;
while (containerRef.parent) {
fullFieldKey = containerRef.parent.key + ':' + fullFieldKey;
let containerRef = container;
while (containerRef.parent) {
fullFieldKey = containerRef.parent.key + ':' + fullFieldKey;