Skip to content
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.

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

chore: remove support for renderer logs #112

Merged
merged 4 commits into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions src/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export type RepeatedCounts = Record<string, number>;
export enum LogType {
ALL = 'all',
BROWSER = 'browser',
RENDERER = 'renderer',
PRELOAD = 'preload',
WEBAPP = 'webapp',
STATE = 'state',
Expand All @@ -28,7 +27,6 @@ export type SelectableLogType = Exclude<LogType, LogType.UNKNOWN>;

export const LOG_TYPES_TO_PROCESS = [
LogType.BROWSER,
LogType.RENDERER,
LogType.WEBAPP,
LogType.PRELOAD,
LogType.INSTALLER,
Expand Down Expand Up @@ -136,7 +134,6 @@ export interface MergedLogFile extends BaseFile {
export interface MergedFilesLoadStatus {
all: boolean;
browser: boolean;
renderer: boolean;
preload: boolean;
webapp: boolean;
mobile: boolean;
Expand Down
16 changes: 1 addition & 15 deletions src/renderer/components/app-core.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export class CoreApplication extends React.Component<
this.state = {
processedLogFiles: {
browser: [],
renderer: [],
preload: [],
webapp: [],
state: [],
Expand Down Expand Up @@ -184,9 +183,6 @@ export class CoreApplication extends React.Component<
await mergeLogFiles(processedLogFiles.browser, LogType.BROWSER).then(
setMergedFile,
);
await mergeLogFiles(processedLogFiles.renderer, LogType.RENDERER).then(
setMergedFile,
);
await mergeLogFiles(processedLogFiles.preload, LogType.PRELOAD).then(
setMergedFile,
);
Expand All @@ -195,12 +191,7 @@ export class CoreApplication extends React.Component<
);

const merged = this.props.state.mergedLogFiles as MergedLogFiles;
const toMerge = [
merged.browser,
merged.renderer,
merged.preload,
merged.webapp,
];
const toMerge = [merged.browser, merged.preload, merged.webapp];

mergeLogFiles(toMerge, LogType.ALL).then((r) => setMergedFile(r));
}
Expand Down Expand Up @@ -242,11 +233,6 @@ export class CoreApplication extends React.Component<
mergedLogFiles.browser &&
mergedLogFiles.browser.logEntries
),
renderer: !!(
mergedLogFiles &&
mergedLogFiles.renderer &&
mergedLogFiles.renderer.logEntries
),
preload: !!(
mergedLogFiles &&
mergedLogFiles.preload &&
Expand Down
7 changes: 0 additions & 7 deletions src/renderer/components/log-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -639,13 +639,6 @@ export class LogTable extends React.Component<LogTableProps, LogTableState> {
className="Meta Color-Browser ts_icon ts_icon_power_off"
/>
);
} else if (entry.logType === 'renderer') {
prefix = (
<i
title="Renderer Log"
className="Meta Color-Renderer ts_icon ts_icon_laptop"
/>
);
} else if (entry.logType === 'webapp') {
prefix = (
<i
Expand Down
22 changes: 2 additions & 20 deletions src/renderer/components/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ const enum NODE_ID {
ALL = 'all-desktop',
STATE = 'state',
BROWSER = 'browser',
RENDERER = 'renderer',
PRELOAD = 'preload',
TRACE = 'trace',
WEBAPP = 'webapp',
Expand Down Expand Up @@ -97,15 +96,6 @@ const DEFAULT_NODES: Array<ITreeNode> = [
label: 'Chromium',
isExpanded: true,
},
{
id: NODE_ID.RENDERER,
hasCaret: true,
icon: 'applications',
label: 'Renderer Process',
isExpanded: true,
childNodes: [],
nodeData: { type: LogType.RENDERER },
},
{
id: NODE_ID.PRELOAD,
hasCaret: true,
Expand Down Expand Up @@ -178,13 +168,6 @@ export class Sidebar extends React.Component<SidebarProps, SidebarState> {
state,
processedLogFiles.browser.map((file) => Sidebar.getFileNode(file, props)),
);
Sidebar.setChildNodes(
NODE_ID.RENDERER,
state,
processedLogFiles.renderer.map((file) =>
Sidebar.getFileNode(file, props),
),
);
Sidebar.setChildNodes(
NODE_ID.PRELOAD,
state,
Expand Down Expand Up @@ -496,10 +479,9 @@ export class Sidebar extends React.Component<SidebarProps, SidebarState> {
return;
}

// Renderer and Preload is on their way out, so let's not show
// Preload is on their way out, so let's not show
// these categories if we don't have files for them
const hideIfEmpty =
searchId === NODE_ID.PRELOAD || searchId === NODE_ID.RENDERER;
const hideIfEmpty = searchId === NODE_ID.PRELOAD;
if (childNodes.length === 0 && hideIfEmpty) {
state.nodes = state.nodes.filter(({ id }) => searchId !== id);
}
Expand Down
20 changes: 4 additions & 16 deletions src/renderer/processor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export function mergeLogFiles(
}

/**
* Takes a logfile and returns the file's type (browser/renderer/webapp/preload/mobile).
* Takes a logfile and returns the file's type (browser/webapp/preload/mobile).
*
* @param {UnzippedFile} logFile
* @returns {LogType}
Expand All @@ -173,22 +173,11 @@ export function getTypeForFile(
fileName.startsWith('webview')
) {
return LogType.PRELOAD;
} else if (
fileName.startsWith('renderer') ||
fileName === 'epics-renderer.log' ||
fileName.startsWith('google') ||
fileName.startsWith('onedrive') ||
fileName.startsWith('box') ||
fileName.startsWith('dropbox') ||
fileName.startsWith('unknown') ||
fileName.endsWith('window-console.log') ||
fileName.endsWith('chrome-console.log')
) {
return LogType.RENDERER;
} else if (
fileName.startsWith('webapp') ||
fileName.startsWith('app.slack') ||
fileName.startsWith('console')
fileName.startsWith('console') ||
fileName.startsWith('unknown')
) {
return LogType.WEBAPP;
} else if (
Expand Down Expand Up @@ -231,7 +220,6 @@ export function getTypeForFile(
export function getTypesForFiles(logFiles: UnzippedFiles): SortedUnzippedFiles {
const result: SortedUnzippedFiles = {
browser: [],
renderer: [],
webapp: [],
preload: [],
state: [],
Expand Down Expand Up @@ -732,7 +720,7 @@ export function matchLineShipItMac(line: string): MatchResult | undefined {
}

/**
* Matches an Electron line (Browser, Renderer, Preload)
* Matches an Electron line (Browser, Preload)
*
* @param {string} line
* @returns {(MatchResult | undefined)}
Expand Down
5 changes: 0 additions & 5 deletions src/renderer/styles/colors.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
color: #e32072;
}

.Color-Renderer {
color: #7fd1e0;
}

.Color-Webapp {
color: #42c299;
}
Expand All @@ -20,7 +16,6 @@

// Using a method allows us to alias
@browser_color: #e32072;
@renderer_color: #7fd1e0;
@webapp_color: #42c299;
@preload_color: #f8b82c;
@mention_yellow: #fff3b8;
Expand Down
1 change: 0 additions & 1 deletion src/utils/get-first-logfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ export function getFirstLogFile(
): SelectableLogFile {
if (files) {
if (files.browser && files.browser.length > 0) return files.browser[0];
if (files.renderer && files.renderer.length > 0) return files.renderer[0];
if (files.preload && files.preload.length > 0) return files.preload[0];
if (files.webapp && files.webapp.length > 0) return files.webapp[0];
if (files.netlog && files.netlog.length > 0) return files.netlog[0];
Expand Down
22 changes: 0 additions & 22 deletions test/renderer/processor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,6 @@ describe('getTypesForFiles', () => {
fullPath: '_',
size: 0,
},
{
fileName: 'renderer-1.log',
fullPath: '_',
size: 0,
},
{
fileName: 'renderer-2.log',
fullPath: '_',
size: 0,
},
{
fileName: 'webapp.log',
fullPath: '_',
Expand Down Expand Up @@ -177,7 +167,6 @@ describe('getTypesForFiles', () => {

const result = getTypesForFiles(files as UnzippedFiles);
expect(result.browser).toHaveLength(1);
expect(result.renderer).toHaveLength(2);
expect(result.webapp).toHaveLength(1);
expect(result.preload).toHaveLength(1);
expect(result.state).toHaveLength(3);
Expand All @@ -200,17 +189,6 @@ describe('getTypeForFile', () => {
).toEqual('browser');
});

it('should get the type for renderer log files', () => {
expect(
getTypeForFile({
...base,
fileName: 'renderer-12.log',
fullPath: '_',
size: 0,
}),
).toEqual('renderer');
});

it('should get the type for webapp log files', () => {
expect(
getTypeForFile({
Expand Down
9 changes: 0 additions & 9 deletions test/utils/get-first-logfile.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const fakeFile: ProcessedLogFile = {

const files: ProcessedLogFiles = {
browser: [],
renderer: [],
webapp: [],
preload: [],
state: [],
Expand All @@ -32,7 +31,6 @@ const files: ProcessedLogFiles = {
describe('getFirstLogFile', () => {
afterEach(() => {
files.browser = [];
files.renderer = [];
files.webapp = [];
files.state = [];
});
Expand All @@ -44,13 +42,6 @@ describe('getFirstLogFile', () => {
expect(getFirstLogFile(files)).toEqual(fakeFile);
});

it('should return the first logfile (renderer if available)', () => {
fakeFile.logType = LogType.RENDERER;
files.renderer = [fakeFile];

expect(getFirstLogFile(files)).toEqual(fakeFile);
});

it('should return the first logfile (webapp if available)', () => {
fakeFile.logType = LogType.WEBAPP;
files.webapp = [fakeFile];
Expand Down