killed the concept of customizable column sets per device in device logs

Summary:
No device was using this feature, so doesn't look like there is a reason to keep it.

...if somebody was about to use this feature, let me know :). But probably, if we need this, a much more simple solution is to determine the visible columns with a simple switch on device type in the logs plugin, even though that is strictly speaking less scalable. But the current solution feels a bit over-engineered for something that is not really used.

Marked [interesting] as I might be missing some background concept which would make this relevant as well.

Reviewed By: jknoxville, nikoant

Differential Revision: D22763507

fbshipit-source-id: ecdbc779cbbfa3b0b72c80b459b12c1a25bf3fc4
This commit is contained in:
Michel Weststrate
2020-08-04 07:44:56 -07:00
committed by Facebook GitHub Bot
parent d538b66088
commit 94eaaf5dca
7 changed files with 4 additions and 46 deletions

View File

@@ -70,10 +70,6 @@ export default class AndroidDevice extends BaseDevice {
pidAppMapping: {[key: number]: string} = {}; pidAppMapping: {[key: number]: string} = {};
private recordingProcess?: Promise<string>; private recordingProcess?: Promise<string>;
supportedColumns(): Array<string> {
return ['date', 'pid', 'tid', 'tag', 'message', 'type', 'time'];
}
reverse(ports: [number, number]): Promise<void> { reverse(ports: [number, number]): Promise<void> {
return Promise.all( return Promise.all(
ports.map((port) => ports.map((port) =>

View File

@@ -95,10 +95,6 @@ export default class BaseDevice {
} }
} }
supportedColumns(): Array<string> {
return ['date', 'pid', 'tid', 'tag', 'message', 'type', 'time'];
}
addLogListener(callback: DeviceLogListener): Symbol { addLogListener(callback: DeviceLogListener): Symbol {
const id = Symbol(); const id = Symbol();
this.logListeners.set(id, callback); this.logListeners.set(id, callback);

View File

@@ -75,10 +75,6 @@ export default class IOSDevice extends BaseDevice {
} }
} }
supportedColumns(): Array<string> {
return ['date', 'pid', 'tid', 'tag', 'message', 'type', 'time'];
}
startLogListener(retries: number = 3) { startLogListener(retries: number = 3) {
if (this.deviceType === 'physical') { if (this.deviceType === 'physical') {
return; return;

View File

@@ -15,8 +15,4 @@ export default class MacDevice extends BaseDevice {
} }
teardown() {} teardown() {}
supportedColumns(): Array<string> {
return [];
}
} }

View File

@@ -15,8 +15,4 @@ export default class WindowsDevice extends BaseDevice {
} }
teardown() {} teardown() {}
supportedColumns(): Array<string> {
return [];
}
} }

View File

@@ -9,9 +9,6 @@
import { import {
TableBodyRow, TableBodyRow,
TableColumnOrder,
TableColumnSizes,
TableColumns,
TableRowSortOrder, TableRowSortOrder,
Props as PluginProps, Props as PluginProps,
BaseAction, BaseAction,
@@ -39,7 +36,7 @@ import {
import LogWatcher from './LogWatcher'; import LogWatcher from './LogWatcher';
import React from 'react'; import React from 'react';
import {Icon, LogCount, HiddenScrollText} from './logComponents'; import {Icon, LogCount, HiddenScrollText} from './logComponents';
import {pad, getLineCount, keepKeys} from './logUtils'; import {pad, getLineCount} from './logUtils';
const LOG_WATCHER_LOCAL_STORAGE_KEY = 'LOG_WATCHER_LOCAL_STORAGE_KEY'; const LOG_WATCHER_LOCAL_STORAGE_KEY = 'LOG_WATCHER_LOCAL_STORAGE_KEY';
@@ -404,9 +401,6 @@ export default class LogTable extends FlipperDevicePlugin<
}; };
tableRef: ManagedTableClass | undefined; tableRef: ManagedTableClass | undefined;
columns: TableColumns;
columnSizes: TableColumnSizes;
columnOrder: TableColumnOrder;
logListener: Symbol | undefined; logListener: Symbol | undefined;
batch: Array<{ batch: Array<{
@@ -418,12 +412,6 @@ export default class LogTable extends FlipperDevicePlugin<
constructor(props: PluginProps<PersistedState>) { constructor(props: PluginProps<PersistedState>) {
super(props); super(props);
const supportedColumns = this.device.supportedColumns();
this.columns = keepKeys(COLUMNS, supportedColumns);
this.columnSizes = keepKeys(COLUMN_SIZE, supportedColumns);
this.columnOrder = INITIAL_COLUMN_ORDER.filter((obj) =>
supportedColumns.includes(obj.key),
);
const initialState = addEntriesToState( const initialState = addEntriesToState(
this.device this.device
@@ -595,9 +583,9 @@ export default class LogTable extends FlipperDevicePlugin<
innerRef={this.setTableRef} innerRef={this.setTableRef}
floating={false} floating={false}
multiline={true} multiline={true}
columnSizes={this.columnSizes} columnSizes={COLUMN_SIZE}
columnOrder={this.columnOrder} columnOrder={INITIAL_COLUMN_ORDER}
columns={this.columns} columns={COLUMNS}
rows={this.state.rows} rows={this.state.rows}
highlightedRows={this.state.highlightedRows} highlightedRows={this.state.highlightedRows}
onRowHighlighted={this.onRowHighlighted} onRowHighlighted={this.onRowHighlighted}

View File

@@ -20,16 +20,6 @@ export function getLineCount(str: string): number {
return count; return count;
} }
export function keepKeys<A>(obj: A, keys: Array<string>): A {
const result: A = {} as A;
for (const key in obj) {
if (keys.includes(key)) {
result[key] = obj[key];
}
}
return result;
}
export function pad(chunk: any, len: number): string { export function pad(chunk: any, len: number): string {
let str = String(chunk); let str = String(chunk);
while (str.length < len) { while (str.length < len) {