X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Flaunchpad%2Fsrc%2FrecordViewer%2FrecordViewStore.js;h=3c446760fd6957859d153a2cfebc05f647bebef0;hp=fbdae39e09fa0d116e836a0f2445040b9e39f35c;hb=f07c8447b59c6fb520dca8e83c514f55116c8d5e;hpb=e29efc315df33d546237e270470916e26df391d6 diff --git a/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js b/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js index fbdae39e0..3c446760f 100644 --- a/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js +++ b/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js @@ -192,12 +192,23 @@ class RecordViewStore { let parameterList = []; const filterAndAddByValue = (paramObj) => { + let nameValuePair = null; + if (paramObj['value'] != undefined) { - parameterList.push({ + nameValuePair = { name: paramObj.name, value: paramObj.value - }); + }; + } else if (paramObj['default-value'] != undefined) { + nameValuePair = { + name: paramObj.name, + value: paramObj['default-value'] + } } + if (nameValuePair) { + parameterList.push(nameValuePair); + } + return paramObj['value'] != undefined; } @@ -328,7 +339,6 @@ class RecordViewStore { triggerEditVirtualLink(params) { this.editVirtualLink(params); } - } @@ -397,7 +407,8 @@ function connectionManager(type, connection) { name: nsrs.name, id: nsrs.id, nsd_name: nsrs.nsd_name, - type: 'nsr' + type: 'nsr', + logo: nsrs.nsd && nsrs.nsd.logo }); // Scaled VNFRs @@ -414,10 +425,12 @@ function connectionManager(type, connection) { sgInstance['vnfrs'] && sgInstance['vnfrs'].map((vnfr, vnfrIndex) => { scaledVnfrs.push(vnfr); + let vnfrObj = _.findWhere(nsrs.vnfrs, {id: vnfr}); scaledVnfNav.vnfr.push({ - name: _.findWhere(nsrs.vnfrs, {id: vnfr})['short-name'], + name: vnfrObj['short-name'], id: vnfr, - type: 'vnfr' + type: 'vnfr', + logo: vnfrObj['vnfd'] && vnfrObj['vnfd']['logo'] }); }); nav.push(scaledVnfNav); @@ -430,7 +443,8 @@ function connectionManager(type, connection) { nav.push({ name: vnfr["short-name"], id: vnfr.id, - type: 'vnfr' + type: 'vnfr', + logo: vnfr['vnfd'] && vnfr['vnfd']['logo'] }); } });