status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Limit the number of commands/logs we keep

This commit is contained in:
Anthony Laibe 2018-10-08 12:00:12 +01:00 committed by Pascal Precht
parent 0e4248cca8
commit 36602c30b6
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embark-ui/src/components/Console.js
View File

@ -43,7 +43,7 @@ class Console extends Component {
<Tab title={process.name} key={process.name}>
<Logs>
{
processLogs.filter((item) => item.name === process.name)
processLogs.reverse().filter((item) => item.name === process.name)
.map((item, i) => <p key={i} className={item.logLevel}
dangerouslySetInnerHTML={{__html: convert.toHtml(item.msg)}}></p>)
}

13
embark-ui/src/reducers/index.js
View File

@ -38,7 +38,7 @@ const sorter = {
return ((BN_FACTOR * b.blockNumber) + b.transactionIndex) - ((BN_FACTOR * a.blockNumber) + a.transactionIndex);
},
processLogs: function(a, b) {
return a.timestamp - b.timestamp;
return b.timestamp - a.timestamp;
},
contractLogs: function(a, b) {
return a.timestamp - b.timestamp;
@ -47,7 +47,7 @@ const sorter = {
return a.time - b.time;
},
commands: function(a, b) {
return b.timestamp - a.timestamp;
return a.timestamp - b.timestamp;
},
files: function(a, b) {
if (a.name < b.name) return -1;
@ -60,6 +60,9 @@ const filtrer = {
processes: function(process, index, self) {
return index === self.findIndex((t) => t.name === process.name);
},
processLogs: function(_processLog, index) {
return index <= MAX_ELEMENTS
},
contracts: function(contract, index, self) {
return index === self.findIndex((t) => t.className === contract.className);
},
@ -107,7 +110,7 @@ function entities(state = entitiesDefaultState, action) {
let filter = filtrer[name] || (() => true);
let sort = sorter[name] || (() => true);
if (action[name] && action[name].length > 1) {
return {...state, [name]: [...action[name], ...state[name]].filter(filter).sort(sort)};
return {...state, [name]: [...action[name], ...state[name]].sort(sort).filter(filter)};
}
if (action[name] && action[name].length === 1) {
let entity = action[name][0];
@ -115,12 +118,12 @@ function entities(state = entitiesDefaultState, action) {
if (entity[entityName] && entity[entityName].length > 0) {
let entityFilter = filtrer[entityName] || (() => true);
let entitySort = sorter[entityName] || (() => true);
acc[entityName] = [...entity[entityName], ...state[entityName]].filter(entityFilter).sort(entitySort);
acc[entityName] = [...entity[entityName], ...state[entityName]].sort(entitySort).filter(entityFilter);
}
return acc;
}, {});
return {
...state, ...nested, [name]: [...action[name], ...state[name]].filter(filter).sort(sort)
...state, ...nested, [name]: [...action[name], ...state[name]].sort(sort).filter(filter)
};
}
}