X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Flaunchpad%2Fsrc%2FrecordViewer%2FrecordViewStore.js;h=b9cd86c08496df43571d75dadb25d7e963f5c52f;hb=refs%2Ftags%2Fv3.0.0rc2;hp=a7770a7fa725746b200572e08434ed2c4828f14d;hpb=13f32c0c3cbad3b1d70d20342f44c65328c91ec9;p=osm%2FUI.git diff --git a/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js b/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js index a7770a7fa..b9cd86c08 100644 --- a/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js +++ b/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js @@ -20,7 +20,9 @@ import RecordViewSource from './recordViewSource.js'; // import source // import AppHeaderActions from 'widgets/header/headerActions.js'; import Alt from '../alt'; -import _ from 'underscore'; +import _find from 'lodash/find'; +import _indexOf from 'lodash/indexOf'; +import _extend from 'lodash/extend'; class RecordViewStore { constructor() { @@ -137,7 +139,7 @@ class RecordViewStore { let configPrimitiveIndex = data.configPrimitiveIndex; let payload = {}; let isValid = true; - let configPrimitive = vnfrs[vnfrIndex]['vnf-configuration']['service-primitive'][configPrimitiveIndex]; + let configPrimitive = vnfrs[vnfrIndex]['vnf-configuration']['config-primitive'][configPrimitiveIndex]; payload['name'] = ''; payload['nsr_id_ref'] = vnfrs[vnfrIndex]['nsr-id-ref']; @@ -429,7 +431,7 @@ function connectionManager(type, connection) { sgInstance['vnfrs'] && sgInstance['vnfrs'].map((vnfr, vnfrIndex) => { scaledVnfrs.push(vnfr); - let vnfrObj = _.findWhere(nsrs.vnfrs, {id: vnfr}); + let vnfrObj = _find(nsrs.vnfrs, {id: vnfr}); scaledVnfNav.vnfr.push({ name: vnfrObj['short-name'], id: vnfr, @@ -444,7 +446,7 @@ function connectionManager(type, connection) { // Non-scaled VNFRs nsrs.vnfrs.map(function(vnfr, vnfrIndex) { - if (_.indexOf(scaledVnfrs, vnfr.id) == -1) { + if (_indexOf(scaledVnfrs, vnfr.id) == -1) { nav.push({ name: vnfr["short-name"], id: vnfr.id, @@ -461,7 +463,7 @@ function connectionManager(type, connection) { }; } - navigatorState = _.extend(navigatorState, { + navigatorState = _extend(navigatorState, { recordData: recordData, recordType: type, cardLoading: false, @@ -472,4 +474,4 @@ function connectionManager(type, connection) { }; } -export default Alt.createStore(RecordViewStore); +export default Alt.createStore(RecordViewStore, 'RecordViewStore');