Skip to content

Commit

Permalink
better explanation to github organization users
Browse files Browse the repository at this point in the history
  • Loading branch information
alesanchezr committed Apr 12, 2023
1 parent 28b6e51 commit 4aa6c91
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 6 additions & 2 deletions src/app/views/admin/github-form/OrganizationUsers.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,16 @@ const OrganizationUsers = ({ organization }) => {
const item = items[tableMeta.rowIndex];
return (
<div>
{item.user !== null && <h5 className="mb-0"><Link to={"/admissions/students/"+item.user.id}>{(item.user.first_name | item.user.email) + " " + item.user.last_name}</Link></h5>}
{item.user !== null ?
<h5 className="mb-0"><Link to={"/admissions/students/"+item.user.id}>{(item.user.first_name && item.user.first_name != '') ? item.user.first_name + " " + item.user.last_name : item.user.email}</Link></h5>
:
<h5 className="mb-0 text-danger">Not a 4Geeks user<HelpIcon message={`This user was found on github organization but no matching user was found on 4Geeks.com platform`} /></h5>
}
{item.github ?
<small className="px-1 py-2px bg-light-green text-green border-radius-4">{item.github.username}</small>
: item.username ? <>
<small className="bg-warning px-1 border-radius-4">Backup github found: {item.username}</small>
<HelpIcon message={`User has not github connected but we found a username, probably from a previous connection. We can work with this username but its recommended to ask student to re-connect.`} />
<HelpIcon message={`User has no github connected but we found a username, probably from a previous connection. We can work with this username but its recommended to ask user to re-connect.`} />
</>
: <>
<small className="bg-danger px-1 border-radius-4">No username found</small>
Expand Down
2 changes: 1 addition & 1 deletion src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
margin: 0;
}

.red {
.red, .text-danger {
color: red;
}

Expand Down

1 comment on commit 4aa6c91

@vercel
Copy link

@vercel vercel bot commented on 4aa6c91 Apr 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.