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

Jump to bottom

Fixes #22075 - move activateTooltips logic to react #5117

Merged
merged 1 commit into from
Jan 2, 2018
Merged

Fixes #22075 - move activateTooltips logic to react #5117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
"react": "^16.2.0",
"react-bootstrap": "^0.31.5",
"react-dom": "^16.2.0",
"react-ellipsis-with-tooltip": "^1.0.3",
"react-numeric-input": "^2.0.7",
"react-onclickoutside": "^6.6.2",
"react-redux": "^5.0.2",
Expand Down
5 changes: 4 additions & 1 deletion webpack/assets/javascripts/react_app/components/bookmarks/Bookmark.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import URI from 'urijs';
import { MenuItem } from 'patternfly-react';
import EllipisWithTooltip from 'react-ellipsis-with-tooltip';

const Bookmark = ({ text, query }) => {
const handleClick = (e) => {
Expand All @@ -11,7 +12,9 @@ const Bookmark = ({ text, query }) => {
window.Turbolinks.visit(uri.toString());
};

return <MenuItem onClick={handleClick}>{text}</MenuItem>;
return <MenuItem onClick={handleClick}>
<EllipisWithTooltip>{text}</EllipisWithTooltip>
</MenuItem>;
};

export default Bookmark;
9 changes: 8 additions & 1 deletion ...ack/assets/javascripts/react_app/components/bookmarks/__snapshots__/bookmark.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,14 @@ exports[`bookmark should create a link to a bookmark 1`] = `
role="menuitem"
tabIndex="-1"
>
label
<EllipisWithTooltip>
<div
className="ellipsis"
onMouseEnter={[Function]}
>
label
</div>
</EllipisWithTooltip>
</a>
</SafeAnchor>
</li>
Expand Down
76 changes: 71 additions & 5 deletions ...ck/assets/javascripts/react_app/components/bookmarks/__snapshots__/bookmarks.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,14 @@ exports[`bookmarks should include existing bookmarks for the current controller
role="menuitem"
tabIndex="-1"
>
1111
<EllipisWithTooltip>
<div
className="ellipsis"
onMouseEnter={[Function]}
>
1111
</div>
</EllipisWithTooltip>
</a>
</SafeAnchor>
</li>
Expand Down Expand Up @@ -463,7 +470,14 @@ exports[`bookmarks should include existing bookmarks for the current controller
role="menuitem"
tabIndex="-1"
>
1122
<EllipisWithTooltip>
<div
className="ellipsis"
onMouseEnter={[Function]}
>
1122
</div>
</EllipisWithTooltip>
</a>
</SafeAnchor>
</li>
Expand Down Expand Up @@ -765,7 +779,14 @@ exports[`bookmarks should not allow creating a new bookmark for users who dont h
role="menuitem"
tabIndex="-1"
>
1111
<EllipisWithTooltip>
<div
className="ellipsis"
onMouseEnter={[Function]}
>
1111
</div>
</EllipisWithTooltip>
</a>
</SafeAnchor>
</li>
Expand Down Expand Up @@ -802,7 +823,14 @@ exports[`bookmarks should not allow creating a new bookmark for users who dont h
role="menuitem"
tabIndex="-1"
>
1122
<EllipisWithTooltip>
<div
className="ellipsis"
onMouseEnter={[Function]}
>
1122
</div>
</EllipisWithTooltip>
</a>
</SafeAnchor>
</li>
Expand Down Expand Up @@ -1051,7 +1079,45 @@ exports[`bookmarks should show an error message if loading failed 1`] = `
Saved Bookmarks
</li>
</MenuItem>
Failed to load bookmarks: %s
<MenuItem
bsClass="dropdown"
disabled={false}
divider={false}
header={false}
key=".$bookmarks-errors"
onKeyDown={[Function]}
onSelect={[Function]}
>
<li
className=""
role="presentation"
>
<SafeAnchor
componentClass="a"
onClick={[Function]}
onKeyDown={[Function]}
role="menuitem"
tabIndex="-1"
>
<a
href="#"
onClick={[Function]}
onKeyDown={[Function]}
role="menuitem"
tabIndex="-1"
>
<EllipisWithTooltip>
<div
className="ellipsis"
onMouseEnter={[Function]}
>
Failed to load bookmarks: %s
</div>
</EllipisWithTooltip>
</a>
</SafeAnchor>
</li>
</MenuItem>
<MenuItem
bsClass="dropdown"
disabled={false}
Expand Down
7 changes: 6 additions & 1 deletion webpack/assets/javascripts/react_app/components/bookmarks/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import { connect } from 'react-redux';
import { Dropdown, MenuItem, Spinner } from 'patternfly-react';
import EllipisWithTooltip from 'react-ellipsis-with-tooltip';
import SearchModal from './SearchModal';
import Bookmark from './Bookmark';
import * as BookmarkActions from '../../redux/actions/bookmarks';
Expand Down Expand Up @@ -53,7 +54,11 @@ class BookmarkContainer extends React.Component {
))) || <MenuItem disabled> {__('None found')}</MenuItem>)}
{status === STATUS.ERROR &&
// eslint-disable-next-line no-undef
Jed.sprintf(__('Failed to load bookmarks: %s'), errors)}
<MenuItem key="bookmarks-errors">
<EllipisWithTooltip>
{window.Jed.sprintf(__('Failed to load bookmarks: %s'), errors)}
</EllipisWithTooltip>
</MenuItem>}
<MenuItem divider={true} />
{canCreate && (
<MenuItem key="newBookmark" id="newBookmark" onClick={this.onClick.bind(this)}>
Expand Down