Skip to content
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

EPMRPP-77582 || Long organization name fix #3123

Merged
merged 3 commits into from
Jun 7, 2022
Merged

EPMRPP-77582 || Long organization name fix #3123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4dac09
EPMRPP-77582 || Long organization name fix
tr1ble Jun 6, 2022
705ea40
EPMRPP-77582 || Code review fixes - 1
tr1ble Jun 7, 2022
a2402c3
EPMRPP-77582 || Code review fixes - 2
tr1ble Jun 7, 2022
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
4 changes: 3 additions & 1 deletion app/src/pages/admin/projectsPage/projectsGrid/projectsGridColumns.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ ProjectTypeColumn.defaultProps = {
};

export const OrganizationColumn = ({ className, value }) => (
<div className={cx('projects-col', className)}>{value.organization}</div>
<div className={cx('projects-col', className)} title={value.organization}>
{value.organization}
</div>
);
OrganizationColumn.propTypes = {
className: PropTypes.string.isRequired,
Expand Down
6 changes: 5 additions & 1 deletion app/src/pages/admin/projectsPage/projectsPanelView/projectPanel/projectPanel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,16 @@ export class ProjectPanel extends Component {
} = this.props;
const { value: relativeTime, unit } = getRelativeUnits(new Date(lastRun).getTime());

const organization = this.getOrganization();

return (
<div className={cx('container')}>
<div className={cx('info-block')}>
<div className={cx('header')}>
{this.getProjectIcon(entryType)}
<span className={cx('header-stretch-item', 'gray-text')}>{this.getOrganization()}</span>
<span className={cx('header-stretch-item', 'gray-text')} title={organization}>
{organization}
</span>
<span className={cx('header-item')}>
<ProjectMenu project={this.props.project} />
</span>
Expand Down
3 changes: 3 additions & 0 deletions app/src/pages/admin/projectsPage/projectsPanelView/projectPanel/projectPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@

.header-stretch-item {
flex: 1 1 auto;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
AmsterGet marked this conversation as resolved.
Show resolved Hide resolved
}

.hr {
Expand Down