Merge pull request #611 from pe4cey/3.0-vis-element-png

Fix png download

Author: oskarhane

src/browser/modules/Stream/CypherFrame/index.jsx

@@ -168,7 +168,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}
@@ -215,9 +218,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}
       />
     )
   }

src/browser/modules/Stream/FrameTitlebar.jsx

@@ -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>