Skip to content

Fix UI for REF on the project details page: Issue #3212 #3315

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
maxceem merged 6 commits into from
Sep 21, 2019
Merged

Fix UI for REF on the project details page: Issue #3212 #3315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fabe610
use component tool tip
suppermancool Sep 19, 2019
9755618
Fix UI for REF on the project details page #3212
suppermancool Sep 19, 2019
7344f93
Merge branch 'cf19' into issue-3212
suppermancool Sep 20, 2019
a4691ad
show tooltip component
suppermancool Sep 20, 2019
fb19c83
fix tooltip width
suppermancool Sep 20, 2019
b1e4c74
remove redundant code
suppermancool Sep 20, 2019
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
31 changes: 24 additions & 7 deletions src/components/ProjectInfo/ProjectInfo.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import MobileExpandable from '../MobileExpandable/MobileExpandable'
import MediaQuery from 'react-responsive'
import { SCREEN_BREAKPOINT_MD, PROJECT_STATUS_ACTIVE, PHASE_STATUS_ACTIVE, PHASE_STATUS_REVIEWED, PROJECT_ROLE_OWNER, PROJECT_ROLE_CUSTOMER } from '../../config/constants'
import ReviewProjectButton from '../../projects/detail/components/ReviewProjectButton'
import Tooltip from 'appirio-tech-react-components/components/Tooltip/Tooltip'
import { TOOLTIP_DEFAULT_DELAY } from '../../config/constants'

import './ProjectInfo.scss'

Expand Down Expand Up @@ -51,24 +53,39 @@ class ProjectInfo extends Component {
return (
<div className="project-info">
<div className="project-status">
<div>
<div styleName="project-name">{_.unescape(project.name)}</div>
<div className="project-status-time">Created {moment(project.createdAt).format('MMM DD, YYYY')}</div>
{!!code && <div className="project-status-ref">{_.unescape(code)}</div>}
<div styleName="project-name">{_.unescape(project.name)}</div>

<div styleName="project-status-bottom">
<div className="project-status-time">
Created {moment(project.createdAt).format('MMM DD, YYYY')}
</div>
{!!code &&
<div styleName="tooltip-target-container">
<Tooltip styleName="tooltip" theme="light" tooltipDelay={TOOLTIP_DEFAULT_DELAY}>
<div className="tooltip-target">
<div className="project-status-ref">{_.unescape(code)}</div>
</div>
<div className="tooltip-body">
<span>{_.unescape(code)}</span>
</div>
</Tooltip>
</div>

}
</div>
</div>
{showDeleteConfirm &&
{showDeleteConfirm && (
<DeleteProjectModal
onCancel={toggleProjectDelete}
onConfirm={onConfirmDelete}
/>
}
)}
{showReviewBtn ? (
reviewButtonSection
) : (
<MobileExpandable title="DESCRIPTION" defaultOpen>
<MediaQuery minWidth={SCREEN_BREAKPOINT_MD}>
{(matches) => (
{matches => (
<ProjectCardBody
project={project}
projectCanBeActive={projectCanBeActive}
Expand Down
44 changes: 44 additions & 0 deletions src/components/ProjectInfo/ProjectInfo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
@import '~tc-ui/src/styles/tc-includes';

:global {
.sticky-inner-wrapper {
z-index: 1;
}

.project-info {
display: flex;
flex-direction: column;
Expand Down Expand Up @@ -40,6 +44,8 @@
margin-bottom: 10px;
padding-left: 4 * $base_unit;
padding-right: 4 * $base_unit;
display: flex;
flex-direction: column;
}

.project-status-header {
Expand All @@ -60,6 +66,7 @@
text-transform: uppercase;
white-space: nowrap;
float: left;
margin-right: 10px;
}

.project-status-ref {
Expand All @@ -74,6 +81,9 @@
margin-top: $base-unit;
white-space: nowrap;
float: right;
overflow: hidden;
text-overflow: ellipsis;
max-width: 100%;
}

.project-card-body {
Expand Down Expand Up @@ -110,3 +120,37 @@
text-overflow: ellipsis;
overflow: hidden;
}

.project-status-bottom {
display: flex;
justify-content: space-between;
}

.tooltip-target-container {
flex: 1;
width: 0;
display: flex;
justify-content: flex-end;

:global {
.tooltip-target {
height: 100%;
}

.tooltip-body {
display: flex;

span {
width: 200px;
white-space: normal;
display: flex;
justify-content: center;
}
}
}
}

.tooltip {
max-width: 100%;
height: 100%;
}
14 changes: 12 additions & 2 deletions src/projects/list/components/Projects/ProjectsGridView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import GridView from '../../../../components/Grid/GridView'
import UserTooltip from '../../../../components/User/UserTooltip'
import {
PROJECTS_LIST_PER_PAGE, SORT_OPTIONS, PROJECT_STATUS_COMPLETED, DATE_TO_USER_FIELD_MAP, PHASE_STATUS_REVIEWED,
PHASE_STATUS_ACTIVE, PROJECT_STATUS_ACTIVE
PHASE_STATUS_ACTIVE, PROJECT_STATUS_ACTIVE, TOOLTIP_DEFAULT_DELAY
} from '../../../../config/constants'
import { getProjectTemplateByKey } from '../../../../helpers/templates'
import TextTruncate from 'react-text-truncate'
Expand All @@ -23,6 +23,7 @@ import editableProjectStatus from '../../../../components/ProjectStatus/editable
import ProjectManagerAvatars from './ProjectManagerAvatars'
import ProjectTypeIcon from '../../../../components/ProjectTypeIcon'
import IconProjectStatusTitle from '../../../../assets/icons/status-ico.svg'
import Tooltip from 'appirio-tech-react-components/components/Tooltip/Tooltip'

import './ProjectsGridView.scss'
import NotificationBadge from '../../../../components/NotificationBadge/NotificationBadge'
Expand Down Expand Up @@ -118,7 +119,16 @@ const ProjectsGridView = props => {
const code = _.get(item, 'details.utm.code', '')
return (
<div className="spacing time-container">
<span className="txt-gray-md">{code}</span>
<div className="code-tooltip-container">
<Tooltip theme="light" tooltipDelay={TOOLTIP_DEFAULT_DELAY}>
<div className="tooltip-target">
<span className="txt-gray-md">{code}</span>
</div>
<div className="tooltip-body">
<span>{code}</span>
</div>
</Tooltip>
</div>
</div>
)
}
Expand Down
36 changes: 36 additions & 0 deletions src/projects/list/components/Projects/ProjectsGridView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,42 @@ $screen-one-column: 720px;
.item-ref-code {
flex: 1 3 100px;
min-width: 100px;

.time-container {
display: flex;
width: 100%;
padding-right: 10px;

.code-tooltip-container {
display: flex;
width: 100%;

.Tooltip {
max-width: 100%;

.tooltip-target {
display: flex;
}

.tooltip-body {
display: flex;

span {
width: 200px;
white-space: normal;
display: flex;
justify-content: center;
}
}
}
}

span {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}

.item-status-date {
Expand Down