jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't trim messages

Browse Source 
Summary: Don't trim messages to allow indentation using spaces. (e.g. for dispalying hierarchical data)

Reviewed By: jknoxville

Differential Revision: D13895630

fbshipit-source-id: 2c0e075bdecb6ab850a8ed7ed52c8423fa9343f2
This commit is contained in:
Daniel Büchele
2019-01-31 05:45:08 -08:00
committed by Facebook Github Bot
parent 5aff7cf0f1
commit 88cc299811
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/logs/index.js
View File

@@ -317,10 +317,6 @@ export function processEntry(
} { } {
const {icon, style} = LOG_TYPES[(entry.type: string)] || LOG_TYPES.debug; const {icon, style} = LOG_TYPES[(entry.type: string)] || LOG_TYPES.debug;
// clean message
const message = entry.message.trim();
entry.type === 'error';
// build the item, it will either be batched or added straight away // build the item, it will either be batched or added straight away
return { return {
entry, entry,
@@ -340,7 +336,9 @@ export function processEntry(
), ),
}, },
message: { message: {
value: <HiddenScrollText code={true}>{message}</HiddenScrollText>, value: (
<HiddenScrollText code={true}>{entry.message}</HiddenScrollText>
),
}, },
tag: { tag: {
value: <HiddenScrollText code={true}>{entry.tag}</HiddenScrollText>, value: <HiddenScrollText code={true}>{entry.tag}</HiddenScrollText>,
@@ -363,7 +361,7 @@ export function processEntry(
isFilterable: true, isFilterable: true,
}, },
}, },
height: getLineCount(message) * 15 + 10, // 15px per line height + 8px padding height: getLineCount(entry.message) * 15 + 10, // 15px per line height + 8px padding
style, style,
type: entry.type, type: entry.type,
filterValue: entry.message, filterValue: entry.message,
@@ -470,10 +468,9 @@ export default class LogTable extends FlipperDevicePlugin<
} }
incrementCounterIfNeeded = (entry: DeviceLogEntry) => { incrementCounterIfNeeded = (entry: DeviceLogEntry) => {
const message = entry.message.trim();
let counterUpdated = false; let counterUpdated = false;
const counters = this.state.counters.map(counter => { const counters = this.state.counters.map(counter => {
if (message.match(counter.expression)) { if (entry.message.match(counter.expression)) {
counterUpdated = true; counterUpdated = true;
if (counter.notify) { if (counter.notify) {
new window.Notification(`${counter.label}`, { new window.Notification(`${counter.label}`, {