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

Fix to Graph.tsx and App.tsx to display client-side web application #287

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
58 changes: 35 additions & 23 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import './App.css';
* State declaration for <App />
*/
interface IState {
data: ServerRespond[],
data: ServerRespond[],
showGraph: boolean
}

/**
Expand All @@ -18,30 +19,41 @@ class App extends Component<{}, IState> {
constructor(props: {}) {
super(props);

this.state = {
// data saves the server responds.
// We use this state to parse data down to the child element (Graph) as element property
data: [],
};
}
this.state = {
// data saves the server responds.
// We use this state to parse data down to the child element (Graph) as element property
data: [],
showGraph: false
};
}

/**
* Render Graph react component with state.data parse as property data
*/
renderGraph() {
return (<Graph data={this.state.data}/>)
}
/**
* Render Graph react component with state.data parse as property data
*/
renderGraph() {
if (this.state.showGraph) {
return (<Graph data={this.state.data}/>)
}
}

/**
* Get new data from server and update the state with the new data
*/
getDataFromServer() {
DataStreamer.getData((serverResponds: ServerRespond[]) => {
// Update the state by creating a new array of data that consists of
// Previous data in the state and the new data from server
this.setState({ data: [...this.state.data, ...serverResponds] });
});
}
/**
* Get new data from server and update the state with the new data
*/
getDataFromServer() {
let x = 0;
const interval = setInterval(() => {
DataStreamer.getData((serverResponds: ServerRespond[]) => {
this.setState({
data: serverResponds,
showGraph: true
});
});
x++;
if (x > 1000) {
clearInterval(interval);
}
}, 100);
}

/**
* Render the App react component
Expand Down
23 changes: 15 additions & 8 deletions src/Graph.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ interface IProps {
* Perspective library adds load to HTMLElement prototype.
* This interface acts as a wrapper for Typescript compiler.
*/
interface PerspectiveViewerElement {
load: (table: Table) => void,
interface PerspectiveViewerElement extends HTMLElement {
load: (table: Table) => void,
}

/**
Expand All @@ -30,9 +30,9 @@ class Graph extends Component<IProps, {}> {
return React.createElement('perspective-viewer');
}

componentDidMount() {
// Get element to attach the table from the DOM.
const elem: PerspectiveViewerElement = document.getElementsByTagName('perspective-viewer')[0] as unknown as PerspectiveViewerElement;
componentDidMount() {
// Get element to attach the table from the DOM.
const elem = document.getElementsByTagName('perspective-viewer')[0] as unknown as PerspectiveViewerElement;

const schema = {
stock: 'string',
Expand All @@ -47,10 +47,17 @@ class Graph extends Component<IProps, {}> {
if (this.table) {
// Load the `table` in the `<perspective-viewer>` DOM reference.

// Add more Perspective configurations here.
elem.load(this.table);
// Add more Perspective configurations here.
elem.load(this.table);
elem.setAttribute("view", "y_line");
elem.setAttribute("column-pivots", '["stock"]');
elem.setAttribute("row_pivots", '["timestamp"]');
elem.setAttribute("columns", '["top_ask_price"]');
elem.setAttribute("aggregates",
'{"stock":"distinct_count", "top_ask_price":"avg", "top_bid_price":"avg", "timestamp":"distinct_count"}'
);
}
}
}

componentDidUpdate() {
// Everytime the data props is updated, insert the data into Perspective table
Expand Down