From 9e66a7588db120992b341274de308c69ac0e9ff7 Mon Sep 17 00:00:00 2001 From: KIRAN KASHALKAR Date: Mon, 21 Nov 2016 19:20:05 -0500 Subject: [PATCH] RIFT-15032: launchpad UI - RIFT.ware DEB install - Viewport - icons for nsr (this workflow is terrible) Signed-off-by: KIRAN KASHALKAR --- .../launchpad/src/recordViewer/recordNavigator.jsx | 14 ++------------ .../launchpad/src/recordViewer/recordViewStore.js | 9 ++++++--- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/skyquake/plugins/launchpad/src/recordViewer/recordNavigator.jsx b/skyquake/plugins/launchpad/src/recordViewer/recordNavigator.jsx index 92bb81f8e..95107ca98 100644 --- a/skyquake/plugins/launchpad/src/recordViewer/recordNavigator.jsx +++ b/skyquake/plugins/launchpad/src/recordViewer/recordNavigator.jsx @@ -43,16 +43,6 @@ export default class RecordNavigator extends React.Component{ return null; } - getDescriptorIdFromRecord = (record) => { - if (record.type && record.type == 'nsr') { - return record.nsd && record.nsd.id; - } else if (record.type && record.type == 'vnfr') { - return record.vnfd && record.vnfd.id; - } - - return null; - } - render(){ let navClass = 'catalogItems'; @@ -81,7 +71,7 @@ export default class RecordNavigator extends React.Component{

{vnfr.name}

@@ -98,7 +88,7 @@ export default class RecordNavigator extends React.Component{

{n.name}

diff --git a/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js b/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js index 3c446760f..b9f74990a 100644 --- a/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js +++ b/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js @@ -408,7 +408,8 @@ function connectionManager(type, connection) { id: nsrs.id, nsd_name: nsrs.nsd_name, type: 'nsr', - logo: nsrs.nsd && nsrs.nsd.logo + logo: nsrs.nsd && nsrs.nsd.logo, + logoId: nsrs.nsd && nsrs.nsd && nsrs.nsd.id }); // Scaled VNFRs @@ -430,7 +431,8 @@ function connectionManager(type, connection) { name: vnfrObj['short-name'], id: vnfr, type: 'vnfr', - logo: vnfrObj['vnfd'] && vnfrObj['vnfd']['logo'] + logo: vnfrObj['vnfd'] && vnfrObj['vnfd']['logo'], + logoId: vnfrObj['vnfd'] && vnfrObj['vnfd']['id'] }); }); nav.push(scaledVnfNav); @@ -444,7 +446,8 @@ function connectionManager(type, connection) { name: vnfr["short-name"], id: vnfr.id, type: 'vnfr', - logo: vnfr['vnfd'] && vnfr['vnfd']['logo'] + logo: vnfr['vnfd'] && vnfr['vnfd']['logo'], + logoId: vnfr['vnfd'] && vnfr['vnfd']['id'] }); } }); -- 2.25.1