Skip to content

upgrading lodash functions #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ManoMarks merged 2 commits into from
Aug 21, 2018
Merged

upgrading lodash functions #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c06563c
testing out moving to lodash 4
ManoMarks Aug 20, 2018
ecaf153
lodash.findWhere->lodash.find, lodash.pluck->lodash.map
ManoMarks Aug 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions dist/app.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dist/app.js.map
View file
Open in desktop

This file was deleted.

Binary file removed dist/favicon.ico
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"express": "^4.13.3",
"less": "^2.5.3",
"less-loader": "^2.0.0",
"lodash": "^3.10.1",
"lodash": "^4.17.10",
"normalize.css": "^3.0.3",
"request": "^2.65.0",
"superagent": "3.7.0",
Expand Down
8 changes: 4 additions & 4 deletions src/data-provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ let physicalStructProvider = ([initialNodes, initialContainers]) => {
let { uuid, node } = container;
let [nodeUuid] = uuidRegExp.exec(node);
_.find(root, (cluster) => {
let node = _.findWhere(cluster.children, { uuid: nodeUuid });
let node = _.find(cluster.children, { uuid: nodeUuid });
if (!node) return;

let target = _.findWhere(node.children, { uuid }) || {};
let target = _.find(node.children, { uuid }) || {};
if (!target) return;

Object.assign(target, container);
Expand Down Expand Up @@ -138,15 +138,15 @@ let physicalStructProvider = ([initialNodes, initialContainers]) => {
},

updateNodeCluster = (nodeCluster) => {
var currentCluster = _.findWhere(root, { uuid: nodeCluster.uuid });
var currentCluster = _.find(root, { uuid: nodeCluster.uuid });
Object.assign(currentCluster, nodeCluster);
},

addNode = (node) => {
let cloned = Object.assign({}, node);
cloned.children = [];
let clusterUuid = "clusterid";
let cluster = _.findWhere(root, { uuid: clusterUuid });
let cluster = _.find(root, { uuid: clusterUuid });
if (cluster) cluster.children.push(cloned);
},
updateNode = (node, state, spec) => {
Expand Down
8 changes: 4 additions & 4 deletions src/vis-logical/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function calculateLinks(services){

links.forEach((link,i) => {
const [uuid] = uuidRegExp.exec(link.from_service);
const source = _.findWhere(services,{ uuid });
const source = _.find(services,{ uuid });
if(!source) return;
serviceLinks.push({ source,target });
});
Expand Down Expand Up @@ -179,9 +179,9 @@ function restart(){

export default {
add(services){
console.log('CREATE', _.pluck(services,'name'));
console.log('CREATE', _.map(services,'name'));
var newServices = _.filter(
services,({uuid}) => !!!_.findWhere(NODES,{uuid})
services,({uuid}) => !!!_.find(NODES,{uuid})
);

NODES.push(...newServices);
Expand All @@ -191,7 +191,7 @@ export default {
update(service){
console.log('UPDATE', service.name);
let {uuid} = service;
let target = _.findWhere(NODES,{ uuid }) || {};
let target = _.find(NODES,{ uuid }) || {};
Object.assign(target,service);
LINKS = calculateLinks(NODES);
restart();
Expand Down