Skip to content

Fix profile hover url when enterprise url is set #49

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
crspeller merged 2 commits into from
Feb 22, 2019
Merged

Fix profile hover url when enterprise url is set #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fcd0ed
Fixed profile hover url when enterprise url is set
sandeepsukhani Feb 22, 2019
9ba961d
Fixed style check error in props validation
sandeepsukhani Feb 22, 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
1 change: 1 addition & 0 deletions webapp/src/components/user_attribute/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ function mapStateToProps(state, ownProps) {
return {
id,
username: user.username,
enterpriseURL: state['plugins-github'].enterpriseURL,
};
}

Expand Down
7 changes: 6 additions & 1 deletion webapp/src/components/user_attribute/user_attribute.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export default class UserAttribute extends React.PureComponent {
static propTypes = {
id: PropTypes.string.isRequired,
username: PropTypes.string,
enterpriseURL: PropTypes.string,
actions: PropTypes.shape({
getGitHubUser: PropTypes.func.isRequired,
}).isRequired,
Expand All @@ -17,6 +18,10 @@ export default class UserAttribute extends React.PureComponent {

render() {
const username = this.props.username;
let baseURL = 'https://github.com';
if (this.props.enterpriseURL) {
baseURL = this.props.enterpriseURL;
}

if (!username) {
return null;
Expand All @@ -25,7 +30,7 @@ export default class UserAttribute extends React.PureComponent {
return (
<div style={style.container}>
<a
href={'https://github.com/' + username}
href={baseURL + '/' + username}
target='_blank'
rel='noopener noreferrer'
>
Expand Down