diff options
author | srichman333 <sarah_n_richman@brown.edu> | 2023-07-12 22:59:46 -0400 |
---|---|---|
committer | srichman333 <sarah_n_richman@brown.edu> | 2023-07-12 22:59:46 -0400 |
commit | aa7642006598bd47b415d4d2452dd4d226ab3ac5 (patch) | |
tree | 2c286d148965a74d504c130b3566d8cae2dc1a55 /src | |
parent | c5740deae879fffdc46a862b81be2c96ae9366b4 (diff) |
brushing/linking for histograms + pie charts
Diffstat (limited to 'src')
-rw-r--r-- | src/client/views/nodes/DataVizBox/DataVizBox.tsx | 1 | ||||
-rw-r--r-- | src/client/views/nodes/DataVizBox/components/Histogram.tsx | 6 | ||||
-rw-r--r-- | src/client/views/nodes/DataVizBox/components/PieChart.tsx | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/client/views/nodes/DataVizBox/DataVizBox.tsx b/src/client/views/nodes/DataVizBox/DataVizBox.tsx index e6d08d47f..25098baf1 100644 --- a/src/client/views/nodes/DataVizBox/DataVizBox.tsx +++ b/src/client/views/nodes/DataVizBox/DataVizBox.tsx @@ -133,6 +133,7 @@ export class DataVizBox extends ViewBoxAnnotatableComponent<FieldViewProps>() { } render() { + if (!this.layoutDoc._dataVizView) this.layoutDoc._dataVizView = this.dataVizView; return !this.pairs?.length ? ( <div>Loading...</div> ) : ( diff --git a/src/client/views/nodes/DataVizBox/components/Histogram.tsx b/src/client/views/nodes/DataVizBox/components/Histogram.tsx index 0ea492ff1..b6ae15709 100644 --- a/src/client/views/nodes/DataVizBox/components/Histogram.tsx +++ b/src/client/views/nodes/DataVizBox/components/Histogram.tsx @@ -305,7 +305,7 @@ export class Histogram extends React.Component<HistogramProps> { bins.forEach(d => d.x0 = d.x0!) xAxis = d3.axisBottom(x) .ticks(numBins-1) - .tickFormat( i => uniqueArr[i.valueOf]) + .tickFormat( i => uniqueArr[i]) .tickPadding(10) translateXAxis = eachRectWidth / 2; } @@ -355,11 +355,11 @@ export class Histogram extends React.Component<HistogramProps> { render() { return ( - this.props.axes.length >= 1 ? ( + this.props.axes.length >= 1 && (this.incomingSelected? this.incomingSelected.length>0 : true) ? ( <div ref={this._histogramRef} className="chart-container"> <span> {`Selected: ${Object.keys(this._histogramData[0])[0]}`}</span> </div> - ) : <span className="chart-container"> {'first use table view to select an axis to plot'}</span> + ) : <span className="chart-container"> {'first use table view to select a column to graph'}</span> ); } diff --git a/src/client/views/nodes/DataVizBox/components/PieChart.tsx b/src/client/views/nodes/DataVizBox/components/PieChart.tsx index 121e6db3d..3ca49a46c 100644 --- a/src/client/views/nodes/DataVizBox/components/PieChart.tsx +++ b/src/client/views/nodes/DataVizBox/components/PieChart.tsx @@ -14,7 +14,6 @@ import { PinProps, PresBox } from "../../trails"; import { Docs } from "../../../../documents/Documents"; import { List } from "../../../../../fields/List"; import './Chart.scss'; -import { ChatCompletionResponseMessageRoleEnum } from "openai"; export interface PieChartProps { rootDoc: Doc; @@ -281,11 +280,11 @@ export class PieChart extends React.Component<PieChartProps> { render() { return ( - this.props.axes.length >= 1 ? ( + this.props.axes.length >= 1 && (this.incomingSelected? this.incomingSelected.length>0 : true) ? ( <div ref={this._piechartRef} className="chart-container"> <span> {`Selected: ${Object.keys(this._piechartData[0])[0]}`}</span> </div> - ) : <span className="chart-container"> {'first use table view to select an axis to plot'}</span> + ) : <span className="chart-container"> {'first use table view to select a column to graph'}</span> ); } |