Skip to content

Fix png download #611

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

Merged
oskarhane merged 2 commits into from
Aug 7, 2017
Merged

Fix png download #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3413f8d
Update state flag when vis element is assigned
pe4cey Jul 3, 2017
fa35e87
Display png download when in visualization view
pe4cey Aug 3, 2017
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: 6 additions & 3 deletions src/browser/modules/Stream/CypherFrame/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,10 @@ export class CypherFrame extends Component {
result={result}
setParentState={this.setState.bind(this)}
frameHeight={this.state.frameHeight}
assignVisElement={(svgElement, graphElement) => { this.visElement = {svgElement, graphElement} }}
assignVisElement={(svgElement, graphElement) => {
this.visElement = {svgElement, graphElement}
this.setState({hasVis: true})
}}
initialNodeDisplay={this.props.initialNodeDisplay}
autoComplete={this.props.autoComplete}
maxNeighbours={this.props.maxNeighbours}
Expand Down Expand Up @@ -212,9 +215,9 @@ export class CypherFrame extends Component {
header={frame}
contents={frameContents}
statusbar={statusBar}
exportData={this.state.exportData}
exportData={(this.state.openView !== viewTypes.VISUALIZATION) ? this.state.exportData : null}
onResize={this.onResize.bind(this)}
visElement={this.visElement}
visElement={(this.state.hasVis && (this.state.openView === viewTypes.VISUALIZATION)) ? this.visElement : null}
/>
)
}
Expand Down
10 changes: 7 additions & 3 deletions src/browser/modules/Stream/FrameTitlebar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,17 @@ class FrameTitlebar extends Component {
</DottedLineHover>
</StyledFrameCommand>
<FrameTitlebarButtonSection>
<Render if={frame.type === 'cypher' && props.exportData}>
<Render if={frame.type === 'cypher' && (props.exportData || props.visElement)}>
<DropdownButton>
<DownloadIcon />
<DropdownList>
<DropdownContent>
<DropdownItem onClick={() => this.exportPNG()}>Export PNG</DropdownItem>
<DropdownItem download='export.csv' href={this.state.csvData}>Export CSV</DropdownItem>
<Render if={props.visElement}>
<DropdownItem onClick={() => this.exportPNG()}>Export PNG</DropdownItem>
</Render>
<Render if={props.exportData}>
<DropdownItem download='export.csv' href={this.state.csvData}>Export CSV</DropdownItem>
</Render>
</DropdownContent>
</DropdownList>
</DropdownButton>
Expand Down