X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Flaunchpad%2Fsrc%2FrecordViewer%2FrecordNavigator.jsx;h=edb4dbbfd9c84eaa3bba399fd8e39cdc55f650da;hb=e6825390de34e1cb4681c8f613cbdcf700dc58ce;hp=6c765011422b7a58fbf4d02b76ebe7aa5ee2487c;hpb=8b97db143299720e1da99a1366a6c7b7f2ad782d;p=osm%2FUI.git

diff --git a/skyquake/plugins/launchpad/src/recordViewer/recordNavigator.jsx b/skyquake/plugins/launchpad/src/recordViewer/recordNavigator.jsx
index 6c7650114..edb4dbbfd 100644
--- a/skyquake/plugins/launchpad/src/recordViewer/recordNavigator.jsx
+++ b/skyquake/plugins/launchpad/src/recordViewer/recordNavigator.jsx
@@ -32,6 +32,27 @@ export default class RecordNavigator extends React.Component{
       console.log('Bad logo path, using default');
       e.target.src = require('style/img/catalog-default.svg');
   }
+
+  getDescriptorTypeFromRecordType = (recordType) => {
+      if (recordType == 'nsr') {
+          return 'nsd';
+      } else if (recordType == 'vnfr') {
+          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;
+  }
+
   render(){
     let navClass = 'catalogItems';
 
@@ -60,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, 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>
@@ -77,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, 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>