From a395263b33d124814a0166d1beacf0601e89ca7f Mon Sep 17 00:00:00 2001 From: prakashdurlabhji Date: Sat, 18 Apr 2020 21:18:10 +0530 Subject: [PATCH 1/4] issue 3868 fix --- .../components/projectsCard/ProjectCardBody.jsx | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/projects/components/projectsCard/ProjectCardBody.jsx b/src/projects/components/projectsCard/ProjectCardBody.jsx index dfc9431f8..71599fdca 100644 --- a/src/projects/components/projectsCard/ProjectCardBody.jsx +++ b/src/projects/components/projectsCard/ProjectCardBody.jsx @@ -1,7 +1,7 @@ import React from 'react' import PT from 'prop-types' import TextTruncate from 'react-text-truncate' -import { Link } from 'react-router-dom' +import { withRouter } from 'react-router-dom' import ProjectStatus from '../../../components/ProjectStatus/ProjectStatus' import editableProjectStatus from '../../../components/ProjectStatus/editableProjectStatus' import { @@ -17,7 +17,7 @@ import _ from 'lodash' const EnhancedProjectStatus = editableProjectStatus(ProjectStatus) function ProjectCardBody({ project, projectCanBeActive, currentMemberRole, descLinesCount = 8, - onChangeStatus, isSuperUser, showLink, showLinkURL, canEditStatus = true, hideStatus }) { + onChangeStatus, isSuperUser, showLink, showLinkURL, canEditStatus = true, hideStatus, history }) { if (!project) return null const canEdit = canEditStatus && ( @@ -31,6 +31,13 @@ function ProjectCardBody({ project, projectCanBeActive, currentMemberRole, descL ], currentMemberRole) > -1))) ) + const goToProjectDetails = (evt, projectDetailsURL) => { + evt.stopPropagation(); + evt.preventDefault(); + evt.nativeEvent.stopImmediatePropagation(); + history.push(projectDetailsURL) + } + const progress = _.get(process, 'percent', 0) const projectDetailsURL = project.version === 'v3' @@ -44,7 +51,7 @@ function ProjectCardBody({ project, projectCanBeActive, currentMemberRole, descL line={descLinesCount} truncateText="..." text={_.unescape(project.description)} - textTruncateChild={showLink ? read more : read more} + textTruncateChild={showLink ? { goToProjectDetails(evt, projectDetailsURL) }}>read more : read more} /> {!hideStatus &&
{(project.status !== PROJECT_STATUS_ACTIVE || progress === 0) && @@ -82,4 +89,4 @@ ProjectCardBody.propTypes = { hideStatus: PT.bool } -export default ProjectCardBody +export default withRouter(ProjectCardBody) From ac6bf7d03cb56ecbbdf6a89f2cc7b843c0399e49 Mon Sep 17 00:00:00 2001 From: prakashdurlabhji Date: Mon, 20 Apr 2020 16:01:06 +0530 Subject: [PATCH 2/4] 3868 patch fix --- .../components/projectsCard/ProjectCardBody.jsx | 12 ++++++------ .../components/projectsCard/ProjectCardBody.scss | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/projects/components/projectsCard/ProjectCardBody.jsx b/src/projects/components/projectsCard/ProjectCardBody.jsx index 71599fdca..daf2dcbff 100644 --- a/src/projects/components/projectsCard/ProjectCardBody.jsx +++ b/src/projects/components/projectsCard/ProjectCardBody.jsx @@ -31,11 +31,11 @@ function ProjectCardBody({ project, projectCanBeActive, currentMemberRole, descL ], currentMemberRole) > -1))) ) - const goToProjectDetails = (evt, projectDetailsURL) => { - evt.stopPropagation(); - evt.preventDefault(); - evt.nativeEvent.stopImmediatePropagation(); - history.push(projectDetailsURL) + const goToProjectDetails = (evt, showLinkURL, projectDetailsURL) => { + evt.stopPropagation() + evt.preventDefault() + evt.nativeEvent.stopImmediatePropagation() + history.push(showLinkURL || projectDetailsURL) } const progress = _.get(process, 'percent', 0) @@ -51,7 +51,7 @@ function ProjectCardBody({ project, projectCanBeActive, currentMemberRole, descL line={descLinesCount} truncateText="..." text={_.unescape(project.description)} - textTruncateChild={showLink ? { goToProjectDetails(evt, projectDetailsURL) }}>read more : read more} + textTruncateChild={showLink ? { goToProjectDetails(evt, showLinkURL, projectDetailsURL) }}>read more : read more} /> {!hideStatus &&
{(project.status !== PROJECT_STATUS_ACTIVE || progress === 0) && diff --git a/src/projects/components/projectsCard/ProjectCardBody.scss b/src/projects/components/projectsCard/ProjectCardBody.scss index 52f6a683d..662b4fe78 100644 --- a/src/projects/components/projectsCard/ProjectCardBody.scss +++ b/src/projects/components/projectsCard/ProjectCardBody.scss @@ -13,6 +13,7 @@ .read-more-link { white-space: nowrap; color: $tc-dark-blue; + cursor: pointer; } } From c209c4ec6f4c314afaa0528f40faf5d1a7114bb3 Mon Sep 17 00:00:00 2001 From: prakashdurlabhji Date: Mon, 20 Apr 2020 16:08:11 +0530 Subject: [PATCH 3/4] 3868 scss fix --- src/projects/components/projectsCard/ProjectCardBody.jsx | 2 +- src/projects/components/projectsCard/ProjectCardBody.scss | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/projects/components/projectsCard/ProjectCardBody.jsx b/src/projects/components/projectsCard/ProjectCardBody.jsx index daf2dcbff..0b906d2e3 100644 --- a/src/projects/components/projectsCard/ProjectCardBody.jsx +++ b/src/projects/components/projectsCard/ProjectCardBody.jsx @@ -51,7 +51,7 @@ function ProjectCardBody({ project, projectCanBeActive, currentMemberRole, descL line={descLinesCount} truncateText="..." text={_.unescape(project.description)} - textTruncateChild={showLink ? { goToProjectDetails(evt, showLinkURL, projectDetailsURL) }}>read more : read more} + textTruncateChild={showLink ? { goToProjectDetails(evt, showLinkURL, projectDetailsURL) }}>read more : read more} /> {!hideStatus &&
{(project.status !== PROJECT_STATUS_ACTIVE || progress === 0) && diff --git a/src/projects/components/projectsCard/ProjectCardBody.scss b/src/projects/components/projectsCard/ProjectCardBody.scss index 662b4fe78..bc89cda81 100644 --- a/src/projects/components/projectsCard/ProjectCardBody.scss +++ b/src/projects/components/projectsCard/ProjectCardBody.scss @@ -13,7 +13,10 @@ .read-more-link { white-space: nowrap; color: $tc-dark-blue; - cursor: pointer; + + & .link { + cursor: pointer; + } } } From 49ead23367cc923bc31a8cad352f5d49d1968472 Mon Sep 17 00:00:00 2001 From: prakashdurlabhji Date: Mon, 20 Apr 2020 19:31:37 +0530 Subject: [PATCH 4/4] patch fix --- src/projects/components/projectsCard/ProjectCardBody.jsx | 2 +- src/projects/components/projectsCard/ProjectCardBody.scss | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/projects/components/projectsCard/ProjectCardBody.jsx b/src/projects/components/projectsCard/ProjectCardBody.jsx index 0b906d2e3..daf2dcbff 100644 --- a/src/projects/components/projectsCard/ProjectCardBody.jsx +++ b/src/projects/components/projectsCard/ProjectCardBody.jsx @@ -51,7 +51,7 @@ function ProjectCardBody({ project, projectCanBeActive, currentMemberRole, descL line={descLinesCount} truncateText="..." text={_.unescape(project.description)} - textTruncateChild={showLink ? { goToProjectDetails(evt, showLinkURL, projectDetailsURL) }}>read more : read more} + textTruncateChild={showLink ? { goToProjectDetails(evt, showLinkURL, projectDetailsURL) }}>read more : read more} /> {!hideStatus &&
{(project.status !== PROJECT_STATUS_ACTIVE || progress === 0) && diff --git a/src/projects/components/projectsCard/ProjectCardBody.scss b/src/projects/components/projectsCard/ProjectCardBody.scss index bc89cda81..662b4fe78 100644 --- a/src/projects/components/projectsCard/ProjectCardBody.scss +++ b/src/projects/components/projectsCard/ProjectCardBody.scss @@ -13,10 +13,7 @@ .read-more-link { white-space: nowrap; color: $tc-dark-blue; - - & .link { - cursor: pointer; - } + cursor: pointer; } }