projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Support new package file management scheme - lots of changes"
[osm/UI.git]
/
skyquake
/
plugins
/
launchpad
/
src
/
recordViewer
/
recordViewStore.js
diff --git
a/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js
b/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js
index
3c44676
..
72609e4
100644
(file)
--- 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 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() {
class RecordViewStore {
constructor() {
@@
-136,7
+138,7
@@
class RecordViewStore {
let vnfrIndex = data.vnfrIndex;
let configPrimitiveIndex = data.configPrimitiveIndex;
let payload = {};
let vnfrIndex = data.vnfrIndex;
let configPrimitiveIndex = data.configPrimitiveIndex;
let payload = {};
- let isValid =
fals
e;
+ let isValid =
tru
e;
let configPrimitive = vnfrs[vnfrIndex]['vnf-configuration']['service-primitive'][configPrimitiveIndex];
payload['name'] = '';
let configPrimitive = vnfrs[vnfrIndex]['vnf-configuration']['service-primitive'][configPrimitiveIndex];
payload['name'] = '';
@@
-144,7
+146,7
@@
class RecordViewStore {
payload['vnf-list'] = [];
payload['triggered-by'] = 'vnf-primitive';
let parameters = [];
payload['vnf-list'] = [];
payload['triggered-by'] = 'vnf-primitive';
let parameters = [];
- configPrimitive['parameter'].map((parameter) => {
+ configPrimitive['parameter']
&& configPrimitive['parameter']
.map((parameter) => {
if(!isValid) {
isValid = validateParameter(parameter);
}
if(!isValid) {
isValid = validateParameter(parameter);
}
@@
-157,8
+159,11
@@
class RecordViewStore {
let vnfPrimitive = [];
vnfPrimitive[0] = {
name: configPrimitive['name'],
let vnfPrimitive = [];
vnfPrimitive[0] = {
name: configPrimitive['name'],
- index: configPrimitiveIndex,
- parameter: parameters
+ index: configPrimitiveIndex
+ };
+
+ if (parameters.length > 0) {
+ vnfPrimitive[0].parameter = parameters;
}
payload['vnf-list'].push({
}
payload['vnf-list'].push({
@@
-408,7
+413,8
@@
function connectionManager(type, connection) {
id: nsrs.id,
nsd_name: nsrs.nsd_name,
type: 'nsr',
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
});
// Scaled VNFRs
@@
-425,12
+431,13
@@
function connectionManager(type, connection) {
sgInstance['vnfrs'] && sgInstance['vnfrs'].map((vnfr, vnfrIndex) => {
scaledVnfrs.push(vnfr);
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,
type: 'vnfr',
scaledVnfNav.vnfr.push({
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);
});
});
nav.push(scaledVnfNav);
@@
-439,12
+446,13
@@
function connectionManager(type, connection) {
// Non-scaled VNFRs
nsrs.vnfrs.map(function(vnfr, vnfrIndex) {
// 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,
type: 'vnfr',
nav.push({
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']
});
}
});
});
}
});
@@
-455,7
+463,7
@@
function connectionManager(type, connection) {
};
}
};
}
- navigatorState = _
.
extend(navigatorState, {
+ navigatorState = _extend(navigatorState, {
recordData: recordData,
recordType: type,
cardLoading: false,
recordData: recordData,
recordType: type,
cardLoading: false,
@@
-466,4
+474,4
@@
function connectionManager(type, connection) {
};
}
};
}
-export default Alt.createStore(RecordViewStore);
+export default Alt.createStore(RecordViewStore
, 'RecordViewStore'
);