Change framework event seperator to .

Summary: Its easier this way since this is how they come out of android internally, also a bit nicer to display the full string this way

Reviewed By: lblasa

Differential Revision: D48346954

fbshipit-source-id: 997dd3922159683fcdf4b5f5f288702a5d998dc4
This commit is contained in:
Luke De Feo
2023-08-21 04:24:16 -07:00
committed by Facebook GitHub Bot
parent 7b6aff245a
commit 3cd6079c24
2 changed files with 8 additions and 4 deletions

View File

@@ -78,6 +78,7 @@ function getAllLeaves(treeSelectNode: TreeSelectNode) {
return result; return result;
} }
export const frameworkEventSeparator = '.';
/** /**
* transformed flat event type data structure into tree * transformed flat event type data structure into tree
*/ */
@@ -85,7 +86,7 @@ export function buildTreeSelectData(eventTypes: string[]): TreeSelectNode[] {
const root: TreeSelectNode = buildTreeSelectNode('root', 'root'); const root: TreeSelectNode = buildTreeSelectNode('root', 'root');
eventTypes.forEach((eventType) => { eventTypes.forEach((eventType) => {
const eventSubtypes = eventType.split(':'); const eventSubtypes = eventType.split(frameworkEventSeparator);
let currentNode = root; let currentNode = root;
// Find the parent node for the current id // Find the parent node for the current id
@@ -101,7 +102,7 @@ export function buildTreeSelectData(eventTypes: string[]): TreeSelectNode[] {
if (!foundChild) { if (!foundChild) {
const newNode: TreeSelectNode = buildTreeSelectNode( const newNode: TreeSelectNode = buildTreeSelectNode(
eventSubtypes[i], eventSubtypes[i],
eventSubtypes.slice(0, i + 1).join(':'), eventSubtypes.slice(0, i + 1).join(frameworkEventSeparator),
); );
currentNode.children.push(newNode); currentNode.children.push(newNode);
@@ -112,7 +113,9 @@ export function buildTreeSelectData(eventTypes: string[]): TreeSelectNode[] {
currentNode.children.push( currentNode.children.push(
buildTreeSelectNode( buildTreeSelectNode(
eventSubtypes[eventSubtypes.length - 1], eventSubtypes[eventSubtypes.length - 1],
eventSubtypes.slice(0, eventSubtypes.length).join(':'), eventSubtypes
.slice(0, eventSubtypes.length)
.join(frameworkEventSeparator),
), ),
); );
}); });

View File

@@ -17,6 +17,7 @@ import {FrameworkEvent, ClientNode} from '../../../ClientTypes';
import React, {ReactNode} from 'react'; import React, {ReactNode} from 'react';
import {StackTraceInspector} from './StackTraceInspector'; import {StackTraceInspector} from './StackTraceInspector';
import {Descriptions, Tag} from 'antd'; import {Descriptions, Tag} from 'antd';
import {frameworkEventSeparator} from '../../shared/FrameworkEventsTreeSelect';
type Props = { type Props = {
node: ClientNode; node: ClientNode;
@@ -131,7 +132,7 @@ function formatDuration(nanoseconds: number): string {
} }
} }
function eventTypeToName(eventType: string) { function eventTypeToName(eventType: string) {
return eventType.slice(eventType.lastIndexOf('.') + 1); return eventType.slice(eventType.lastIndexOf(frameworkEventSeparator) + 1);
} }
function threadToColor(thread?: string) { function threadToColor(thread?: string) {