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.

Sign up for GitHub

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

Jump to bottom

Use filter table tree for Available Views view implementation #1128

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use filter table tree for Available Views view implementation #1128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion packages/react-components/src/components/utils/filter-tree/table-cell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,15 @@ export class TableCell extends React.Component<TableCellProps> {
content = node.labels[index];
}

const title = node.showTooltip ? node.labels[index] : undefined;
let title = undefined;

if (node.showTooltip) {
if (node.tooltips !== undefined) {
title = node.tooltips[index];
} else {
title = node.labels[index];
}
}
return (
<td key={this.props.index + '-td-' + this.props.node.id}>
<span title={title}>
Expand Down
1 change: 1 addition & 0 deletions packages/react-components/src/components/utils/filter-tree/tree-node.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ export interface TreeNode {
id: number;
parentId: number;
labels: string[];
tooltips?: string[];
children: Array<TreeNode>;
isRoot: boolean;
showTooltip?: boolean;
Expand Down
126 changes: 95 additions & 31 deletions packages/react-components/src/trace-explorer/trace-explorer-views-widget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import { OutputDescriptor } from 'tsp-typescript-client/lib/models/output-descri
import { Experiment } from 'tsp-typescript-client/lib/models/experiment';
import { ITspClientProvider } from 'traceviewer-base/lib/tsp-client-provider';
import { ExperimentManager } from 'traceviewer-base/lib/experiment-manager';
import { AvailableViewsComponent } from '../components/utils/available-views-component';
import { FilterTree } from '../components/utils/filter-tree/tree';
import { TreeNode } from '../components/utils/filter-tree/tree-node';
import { getAllExpandedNodeIds } from '../components/utils/filter-tree/utils';

export interface ReactAvailableViewsProps {
id: string;
Expand All @@ -15,13 +17,18 @@ export interface ReactAvailableViewsProps {
}

export interface ReactAvailableViewsState {
availableOutputDescriptors: OutputDescriptor[];
treeNodes: TreeNode[];
collapsedNodes: number[];
orderedNodes: number[];
selectedOutput: number;
}

export class ReactAvailableViewsWidget extends React.Component<ReactAvailableViewsProps, ReactAvailableViewsState> {
private _selectedExperiment: Experiment | undefined;
private _experimentManager: ExperimentManager;

private _nodeIdToOutput: { [key: number]: OutputDescriptor } = {};

private _onExperimentSelected = (experiment: Experiment): void => this.doHandleExperimentSelectedSignal(experiment);
private _onExperimentClosed = (experiment: Experiment): void => this.doHandleExperimentClosedSignal(experiment);

Expand All @@ -33,7 +40,10 @@ export class ReactAvailableViewsWidget extends React.Component<ReactAvailableVie
});
signalManager().on(Signals.EXPERIMENT_SELECTED, this._onExperimentSelected);
signalManager().on(Signals.EXPERIMENT_CLOSED, this._onExperimentClosed);
this.state = { availableOutputDescriptors: [] };
this._nodeIdToOutput = {};
this.state = { treeNodes: [], collapsedNodes: [], orderedNodes: [], selectedOutput: -1 };
this.onToggleCollapse = this.onToggleCollapse.bind(this);
this.onOrderChange = this.onOrderChange.bind(this);
}

componentWillUnmount(): void {
Expand All @@ -44,54 +54,75 @@ export class ReactAvailableViewsWidget extends React.Component<ReactAvailableVie
render(): React.ReactNode {
return (
<div className="trace-explorer-views">
<AvailableViewsComponent
traceID={this._selectedExperiment?.UUID}
outputDescriptors={this.state.availableOutputDescriptors}
onContextMenuEvent={this.handleContextMenuEvent}
onOutputClicked={this.handleOutputClicked}
highlightAfterSelection={true}
></AvailableViewsComponent>
<div className="trace-explorer-panel-content">{this.renderOutputs()}</div>
</div>
);
}

protected handleOutputClicked = (outputDescriptor: OutputDescriptor): void =>
this.doHandleOutputClicked(outputDescriptor);
protected handleContextMenuEvent = (
e: React.MouseEvent<HTMLDivElement>,
output: OutputDescriptor | undefined
): void => this.doHandleContextMenuEvent(e, output);
private renderOutputs() {
if (this.state.treeNodes) {
return (
<FilterTree
collapsedNodes={this.state.collapsedNodes}
className="table-tree avail-views-table"
nodes={this.state.treeNodes}
onToggleCollapse={this.onToggleCollapse}
onOrderChange={this.onOrderChange}
selectedRow={this.state.selectedOutput}
showCheckboxes={false}
showFilter={true}
showHeader={true}
hideFillers={true}
onRowClick={id => {
this.handleOutputClicked(id);
}}
onContextMenu={this.handleContextMenuEvent}
headers={[{ title: 'Name', sortable: true, resizable: true }]}
/>
);
}
return <></>;
}
protected handleOutputClicked = (id: number): void => this.doHandleOutputClicked(id);
protected handleContextMenuEvent = (e: React.MouseEvent<HTMLDivElement>, id: number | undefined): void =>
this.doHandleContextMenuEvent(e, id);

private doHandleOutputClicked(selectedOutput: OutputDescriptor) {
private doHandleOutputClicked(id: number) {
const selectedOutput: OutputDescriptor = this._nodeIdToOutput[id];
this.setState({ selectedOutput: id });
if (selectedOutput && this._selectedExperiment) {
signalManager().fireOutputAddedSignal(
new OutputAddedSignalPayload(selectedOutput, this._selectedExperiment)
);
if (selectedOutput.type !== 'NONE') {
signalManager().fireOutputAddedSignal(
new OutputAddedSignalPayload(selectedOutput, this._selectedExperiment)
);
}
}
}

protected doHandleContextMenuEvent(
event: React.MouseEvent<HTMLDivElement>,
output: OutputDescriptor | undefined
): void {
if (this.props.contextMenuRenderer && output) {
this.props.contextMenuRenderer(event, output);
protected doHandleContextMenuEvent(event: React.MouseEvent<HTMLDivElement>, id: number | undefined): void {
if (id !== undefined) {
const output: OutputDescriptor = this._nodeIdToOutput[id];
if (this.props.contextMenuRenderer && output) {
this.props.contextMenuRenderer(event, output);
}
}
event.preventDefault();
event.stopPropagation();
}

protected doHandleExperimentSelectedSignal(experiment: Experiment | undefined): void {
if (this._selectedExperiment?.UUID !== experiment?.UUID || this.state.availableOutputDescriptors.length === 0) {
if (this._selectedExperiment?.UUID !== experiment?.UUID || this.state.treeNodes.length === 0) {
this._selectedExperiment = experiment;
this.setState({ availableOutputDescriptors: [] });
this._nodeIdToOutput = {};
this.setState({ treeNodes: [] });
this.updateAvailableViews();
}
}

protected doHandleExperimentClosedSignal(experiment: Experiment | undefined): void {
if (this._selectedExperiment?.UUID === experiment?.UUID) {
this.setState({ availableOutputDescriptors: [] });
this._nodeIdToOutput = {};
this.setState({ treeNodes: [] });
}
}

Expand All @@ -102,9 +133,24 @@ export class ReactAvailableViewsWidget extends React.Component<ReactAvailableVie
const signalExperiment: Experiment | undefined = this._selectedExperiment;
if (signalExperiment) {
outputs = await this.getOutputDescriptors(signalExperiment);
this.setState({ availableOutputDescriptors: outputs });
const entries: TreeNode[] = [];
outputs.forEach((output, index) => {
const node: TreeNode = {
id: index,
parentId: -1,
labels: [output?.name],
tooltips: [output?.description],
children: [],
isRoot: true,
showTooltip: true
};
entries.push(node);
this._nodeIdToOutput[index] = output;
});
this.setState({ treeNodes: entries });
} else {
this.setState({ availableOutputDescriptors: [] });
this._nodeIdToOutput = {};
this.setState({ treeNodes: [] });
}
}

Expand All @@ -117,4 +163,22 @@ export class ReactAvailableViewsWidget extends React.Component<ReactAvailableVie

return outputDescriptors;
}

private onToggleCollapse(id: number, nodes: TreeNode[]) {
let newList = [...this.state.collapsedNodes];

const exist = this.state.collapsedNodes.find(expandId => expandId === id);

if (exist !== undefined) {
newList = newList.filter(collapsed => id !== collapsed);
} else {
newList = newList.concat(id);
}
const orderedIds = getAllExpandedNodeIds(nodes, newList);
this.setState({ collapsedNodes: newList, orderedNodes: orderedIds });
}

private onOrderChange(ids: number[]): void {
this.setState({ orderedNodes: ids });
}
}
11 changes: 11 additions & 0 deletions packages/react-components/style/output-components-style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,17 @@ canvas {
font-weight: normal;
}

.avail-views-table {
border: 0px;
width: 100%;
}

.avail-views-table td {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}

.table-tree tr.selected td {
background-color: var(--trace-viewer-selection-background) !important;
}
Expand Down
Loading