From e6825390de34e1cb4681c8f613cbdcf700dc58ce Mon Sep 17 00:00:00 2001
From: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Date: Mon, 21 Nov 2016 18:04:27 -0500
Subject: [PATCH] RIFT-15032: launchpad UI - RIFT.ware DEB install - Viewport -
 icons for nsr

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
---
 .../src/recordViewer/recordNavigator.jsx      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/skyquake/plugins/launchpad/src/recordViewer/recordNavigator.jsx b/skyquake/plugins/launchpad/src/recordViewer/recordNavigator.jsx
index 50ef061ee..edb4dbbfd 100644
--- a/skyquake/plugins/launchpad/src/recordViewer/recordNavigator.jsx
+++ b/skyquake/plugins/launchpad/src/recordViewer/recordNavigator.jsx
@@ -35,10 +35,21 @@ export default class RecordNavigator extends React.Component{
 
   getDescriptorTypeFromRecordType = (recordType) => {
       if (recordType == 'nsr') {
-        return 'nsd';
+          return 'nsd';
       } else if (recordType == 'vnfr') {
-        return 'vnfd';
+          return 'vnfd';
       }
+
+      return null;
+  }
+
+  getDescriptorIdFromRecord = (record) => {
+      if (record.type && record.type == 'nsr') {
+          return nsr.nsd && nsr.nsd.id;
+      } else if (record.type && record.type == 'vnfr') {
+          return vnfr.vnfd && vnfr.vnfd.id;
+      }
+
       return null;
   }
 
@@ -70,7 +81,7 @@ export default class RecordNavigator extends React.Component{
             <div key={'id' + k + '-' + vnfr.id}  onClick={self.props.loadRecord.bind(self,vnfr)} className={iClassName}>
               <img
                   onError={self.handleImageError}
-                  src={Utils.cleanImageDataURI(vnfr.logo, self.getDescriptorTypeFromRecordType(vnfr.type), vnfr.id)}
+                  src={Utils.cleanImageDataURI(vnfr.logo, self.getDescriptorTypeFromRecordType(vnfr.type), getDescriptorIdFromRecord(vnfr))}
               />
               <section id={vnfr.id}>
               <h1 title={vnfr.name}>{vnfr.name}</h1>
@@ -87,7 +98,7 @@ export default class RecordNavigator extends React.Component{
           <div key={'id' + k + '-' + n.id}  onClick={self.props.loadRecord.bind(self,n)} className={itemClassName}>
             <img
                 onError={self.handleImageError}
-                src={Utils.cleanImageDataURI(n.logo, self.getDescriptorTypeFromRecordType(n.type), n.id)}
+                src={Utils.cleanImageDataURI(n.logo, self.getDescriptorTypeFromRecordType(n.type), self.getDescriptorIdFromRecord(n))}
             />
             <section id={n.id}>
             <h1 title={n.name}>{n.name}</h1>
-- 
2.17.1