#883 Captions are clickable

metasfresh · Jun 22, 2017 · 0e2126f · 0e2126f
1 parent ae66ab5
commit 0e2126f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/src/components/board/Card.js b/src/components/board/Card.js
@@ -73,7 +73,8 @@ class Card extends Component {
     renderCard = () => {
         const {
             caption, description, users, placeholder, connectDragSource,
-            connectDropTarget, onDelete, cardId, laneId
+            connectDropTarget, onDelete, cardId, laneId, onCaptionClick,
+            documentPath
         } = this.props;
 
         const {mouseOn} = this.state;
@@ -87,7 +88,10 @@ class Card extends Component {
                         className="pointer meta-icon-close-1 float-xs-right"
                         onClick={() => onDelete(laneId, cardId)}
                     />}
-                    <b>{caption}</b>
+                    <b
+                        className="pointer"
+                        onClick={() => onCaptionClick(documentPath)}
+                    >{caption}</b>
                     <p>{description}</p>
                     {users.map((user, i) =>
                         <Avatar

diff --git a/src/components/board/Lane.js b/src/components/board/Lane.js
@@ -9,7 +9,7 @@ class Lane extends Component {
     render() {
         const {
             caption, cards, laneId, onHover, onDrop, targetIndicator, onReject,
-            onDelete, placeholder
+            onDelete, placeholder, onCaptionClick
         } = this.props;
 
         if(placeholder){
@@ -35,7 +35,7 @@ class Lane extends Component {
                         index={i}
                         {...{
                             laneId, onHover, onDrop, onReject, targetIndicator,
-                            onDelete
+                            onDelete, onCaptionClick
                         }}
                         {...card} />
                     )}

diff --git a/src/components/board/Lanes.js b/src/components/board/Lanes.js
@@ -8,7 +8,8 @@ class Lanes extends Component {
 
     render() {
         const {
-            lanes, onDrop, onHover, onReject, onDelete, targetIndicator
+            lanes, onDrop, onHover, onReject, onDelete, targetIndicator,
+            onCaptionClick
         } = this.props;
 
         if(!lanes) return false;
@@ -19,7 +20,8 @@ class Lanes extends Component {
                     <Lane
                         key={i}
                         {...{
-                            onDrop, onHover, onDelete, onReject, targetIndicator
+                            onDrop, onHover, onDelete, onReject,
+                            targetIndicator, onCaptionClick
                         }}
                         {...lane}
                     />)

diff --git a/src/containers/Board.js b/src/containers/Board.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 import update from 'immutability-helper';
+import {push} from 'react-router-redux';
 
 import {getData, patchRequest, deleteRequest} from '../actions/GenericActions';
 import {connectWS, disconnectWS} from '../actions/WindowActions';
@@ -131,6 +132,16 @@ class Board extends Component {
             }
         }));
     }
+
+    handleCaptionClick = (docPath) => {
+        const {dispatch} = this.props;
+        if(!docPath) return;
+
+        dispatch(push(
+            '/window/' + docPath.windowId +
+            (docPath.documentId ? '/' + docPath.documentId : '') 
+        ))
+    }
 
     handleDelete = (laneId, cardId) => {
         const {board} = this.state;
@@ -151,7 +162,7 @@ class Board extends Component {
 
     render() {
         const {
-            modal, rawModal, breadcrumb, indicator
+            modal, rawModal, breadcrumb, indicator, dispatch
         } = this.props;
 
         const {
@@ -193,6 +204,7 @@ class Board extends Component {
                             onHover={this.handleHover}
                             onReject={this.clearTargetIndicator}
                             onDelete={this.handleDelete}
+                            onCaptionClick={this.handleCaptionClick}
                             lanes={board && board.lanes}
                         />
                     </div>