add view all button, add dropdown for contentviews

3 files changed, 146 insertions, 50 deletions

diff --git a/web/src/js/components/ContentView/ContentViews.jsx b/web/src/js/components/ContentView/ContentViews.jsx
index 3b2af0a9..43aece46 100644
--- a/web/src/js/components/ContentView/ContentViews.jsx
+++ b/web/src/js/components/ContentView/ContentViews.jsx
@@ -1,4 +1,6 @@
-import React, { PropTypes } from 'react'
+import React, { PropTypes, Component } from 'react'
+import { connect } from 'react-redux'
+import { setContentViewDescription, setShowFullContent } from '../../ducks/ui/flow'
 import ContentLoader from './ContentLoader'
 import { MessageUtils } from '../../flow/utils'
 import CodeEditor from './CodeEditor'
@@ -27,32 +29,63 @@ function Edit({ content, onChange }) {
 }
 Edit = ContentLoader(Edit)
 
+class ViewServer extends Component {
+    constructor(props){
+        super(props)
+        this.maxLines = 80
+    }
 
-function ViewServer(props){
-    const {content, contentView, message} = props
-    let data = JSON.parse(content)
+    componentWillMount(){
+        this.setContentView(this.props)
+    }
+    componentWillReceiveProps(nextProps){
+        this.setContentView(nextProps)
+    }
+    setContentView(props){
+        try {
+            this.data = JSON.parse(props.content)
+        }catch(err) {
+            this.data= {lines: [], description: err.message}
+        }
 
-    return <div>
-            {contentView != data.description &&
-                <div className="alert alert-warning">{data.description}</div>
-            }
-            <pre>
-                {data.lines.map((line, i) =>
-                    <div key={`line${i}`}>
-                        {line.map((tuple, j) =>
-                            <span key={`tuple${j}`} className={tuple[0]}>
-                                {tuple[1]}
-                            </span>
-                        )}
-                    </div>
-                )}
-            </pre>
+        props.setContentViewDescription(props.contentView != this.data.description ? this.data.description : '')
+
+        let isFullContentShown = this.data.lines.length < this.maxLines
+        if (isFullContentShown) props.setShowFullContent(true)
+    }
+    render() {
+        const {content, contentView, message} = this.props
+
+        let lines = this.props.showFullContent ? this.data.lines : this.data.lines.slice(0, this.maxLines)
+
+        return <div>
+                <pre>
+                    {lines.map((line, i) =>
+                        <div key={`line${i}`}>
+                            {line.map((tuple, j) =>
+                                <span key={`tuple${j}`} className={tuple[0]}>
+                                    {tuple[1]}
+                                </span>
+                            )}
+                        </div>
+                    )}
+                </pre>
             {ViewImage.matches(message) &&
-                <ViewImage {...props} />
+            <ViewImage {...this.props} />
             }
         </div>
+    }
+
 }
 
-ViewServer = ContentLoader(ViewServer)
+ViewServer = connect(
+    state => ({
+        showFullContent: state.ui.flow.showFullContent
+    }),
+    {
+        setContentViewDescription,
+        setShowFullContent
+    }
+)(ContentLoader(ViewServer))
 
 export { Edit, ViewServer, ViewImage }
diff --git a/web/src/js/components/ContentView/ShowFullContentButton.jsx b/web/src/js/components/ContentView/ShowFullContentButton.jsx
new file mode 100644
index 00000000..a0217d32
--- /dev/null
+++ b/web/src/js/components/ContentView/ShowFullContentButton.jsx
@@ -0,0 +1,29 @@
+import React, { Component, PropTypes } from 'react'
+import { connect } from 'react-redux'
+import { render } from 'react-dom';
+import Button from '../common/Button';
+import { setShowFullContent } from '../../ducks/ui/flow'
+
+
+
+ShowFullContentButton.propTypes = {
+        setShowFullContent: PropTypes.func.isRequired,
+        showFullContent: PropTypes.bool.isRequired
+}
+
+function ShowFullContentButton ( {setShowFullContent, showFullContent} ){
+
+    return (
+        !showFullContent && <Button isXs={true} onClick={() => setShowFullContent(true)} text="Show full content"/>
+    )
+}
+
+export default connect(
+    state => ({
+        showFullContent: state.ui.flow.showFullContent
+    }),
+    {
+        setShowFullContent
+    }
+)(ShowFullContentButton)
+
diff --git a/web/src/js/components/ContentView/ViewSelector.jsx b/web/src/js/components/ContentView/ViewSelector.jsx
index c5670328..1959ec1e 100644
--- a/web/src/js/components/ContentView/ViewSelector.jsx
+++ b/web/src/js/components/ContentView/ViewSelector.jsx
@@ -1,48 +1,82 @@
-import React, { PropTypes } from 'react'
+import React, { PropTypes, Component } from 'react'
 import classnames from 'classnames'
 import { connect } from 'react-redux'
 import * as ContentViews from './ContentViews'
-import { setContentView } from "../../ducks/ui/flow";
+import { setContentView, setContentViewSelectorOpen } from "../../ducks/ui/flow";
 
 
-function ViewButton({ name, setContentView, children, activeView }) {
+function ViewItem({ name, setContentView, children }) {
     return (
-        <button
-            onClick={() => setContentView(name)}
-            className={classnames('btn btn-default', { active: name === activeView })}>
-            {children}
-        </button>
+        <li>
+            <a href="#" onClick={() => setContentView(name)}>
+                {children}
+            </a>
+        </li>
     )
 }
-ViewButton = connect(state => ({
-    activeView: state.ui.flow.contentView
-}), {
-    setContentView
-})(ViewButton)
 
 
-ViewSelector.propTypes = {
-    message: PropTypes.object.isRequired,
-}
-function ViewSelector({contentViews, isEdit }) {
-    let edit = ContentViews.Edit.displayName
-    return (
-        <div className="view-selector btn-group btn-group-xs">
+/*ViewSelector.propTypes = {
+    contentViews: PropTypes.array.isRequired,
+    activeView: PropTypes.string.isRequired,
+    isEdit: PropTypes.bool.isRequired,
+    isContentViewSelectorOpen: PropTypes.bool.isRequired,
+    setContentViewSelectorOpen: PropTypes.func.isRequired
+}*/
 
-            {contentViews.map(name =>
-                <ViewButton key={name} name={name}>{name.toLowerCase().replace('_', ' ')}</ViewButton>
-            )}
 
-            {isEdit &&
-                <ViewButton key={edit} name={edit}>{edit.toLowerCase()}</ViewButton>
-            }
+class ViewSelector extends Component {
+      constructor(props, context) {
+        super(props, context)
+        this.close = this.close.bind(this)
+    }
+    close() {
+        this.props.setContentViewSelectorOpen(false)
+        document.removeEventListener('click', this.close)
+    }
 
-        </div>
-    )
+    onDropdown(e){
+        e.preventDefault()
+        this.props.setContentViewSelectorOpen(!this.props.isContentViewSelectorOpen)
+        document.addEventListener('click', this.close)
+    }
+
+    render() {
+        const {contentViews, activeView, isEdit, isContentViewSelectorOpen, setContentViewSelectorOpen, setContentView} = this.props
+        let edit = ContentViews.Edit.displayName
+
+        return (
+            <div className={classnames('dropup pull-left', { open: isContentViewSelectorOpen })}>
+                <a className="btn btn-default btn-xs"
+                   onClick={ e => this.onDropdown(e) }
+                   href="#">
+                    <b>View:</b> {activeView}<span className="caret"></span>
+                </a>
+                <ul className="dropdown-menu" role="menu">
+                    {contentViews.map(name =>
+                        <ViewItem key={name} setContentView={setContentView} name={name}>
+                            {name.toLowerCase().replace('_', ' ')}
+                        </ViewItem>
+                    )}
+                    {isEdit &&
+                    <ViewItem key={edit} setContentView={setContentView} name={edit}>
+                        {edit.toLowerCase()}
+                    </ViewItem>
+                    }
+                </ul>
+            </div>
+        )
+    }
 }
 
 export default connect (
     state => ({
         contentViews: state.settings.contentViews,
+        activeView: state.ui.flow.contentView,
         isEdit: !!state.ui.flow.modifiedFlow,
-    }))(ViewSelector)
+        isContentViewSelectorOpen: state.ui.flow.isContentViewSelectorOpen
+    }), {
+        setContentView,
+        setContentViewSelectorOpen
+    }
+)(ViewSelector)