Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
amundsen_dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Surendar Reddy Mangannagari
amundsen_dev
Commits
fcf7ed0f
Unverified
Commit
fcf7ed0f
authored
May 14, 2020
by
Marcos Iglesias
Committed by
GitHub
May 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes the user search icon (#447)
parent
ebd6a96d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
13 deletions
+14
-13
_icons.scss
amundsen_application/static/css/_icons.scss
+6
-5
index.spec.tsx
...plication/static/js/components/ProfilePage/index.spec.tsx
+4
-4
index.tsx
...en_application/static/js/components/ProfilePage/index.tsx
+4
-4
No files found.
amundsen_application/static/css/_icons.scss
View file @
fcf7ed0f
...
...
@@ -20,6 +20,11 @@ $dashboards: (
mode
:
"/static/images/icons/logo-mode.svg"
);
// Map of User names and icon paths
$users
:
(
users
:
"/static/images/icons/users.svg"
,
);
// Given a Map of key/value pairs, generates a new class
@mixin
iconBackgrounds
(
$map
){
@each
$name
,
$url
in
$map
{
...
...
@@ -42,6 +47,7 @@ span.icon {
// Generate Icons
@include
iconBackgrounds
(
$data-stores
);
@include
iconBackgrounds
(
$dashboards
);
@include
iconBackgrounds
(
$users
);
}
img
.icon
{
...
...
@@ -177,11 +183,6 @@ img.icon {
mask-image
:
url("/static/images/icons/Up.svg")
;
}
&
.icon-users
{
-webkit-mask-image
:
url("/static/images/icons/users.svg")
;
mask-image
:
url("/static/images/icons/users.svg")
;
}
&
.icon-more
{
-webkit-mask-image
:
url("/static/images/icons/More.svg")
;
mask-image
:
url("/static/images/icons/More.svg")
;
...
...
amundsen_application/static/js/components/ProfilePage/
tests/
index.spec.tsx
→
amundsen_application/static/js/components/ProfilePage/index.spec.tsx
View file @
fcf7ed0f
...
...
@@ -9,7 +9,7 @@ import Breadcrumb from 'components/common/Breadcrumb';
import
Flag
from
'components/common/Flag'
;
import
ResourceList
from
'components/common/ResourceList'
;
import
TabsComponent
from
'components/common/TabsComponent'
;
import
{
mapDispatchToProps
,
mapStateToProps
,
ProfilePage
,
ProfilePageProps
,
RouteProps
}
from
'.
./
'
;
import
{
mapDispatchToProps
,
mapStateToProps
,
ProfilePage
,
ProfilePageProps
,
RouteProps
}
from
'.'
;
import
globalState
from
'fixtures/globalState'
;
import
{
getMockRouterProps
}
from
'fixtures/mockRouter'
;
...
...
@@ -23,7 +23,7 @@ import {
OWNED_SOURCE
,
READ_LABEL
,
READ_SOURCE
,
}
from
'.
.
/constants'
;
}
from
'./constants'
;
jest
.
mock
(
'config/config-utils'
,
()
=>
({
getDisplayNameByResource
:
jest
.
fn
(()
=>
'Resource'
),
...
...
@@ -370,7 +370,7 @@ describe('ProfilePage', () => {
});
it
(
'renders email link with correct text'
,
()
=>
{
expect
(
wrapper
.
find
(
'#email-link'
).
find
(
'
span
'
).
text
()).
toEqual
(
'test@test.com'
);
expect
(
wrapper
.
find
(
'#email-link'
).
find
(
'
.email-link-label
'
).
text
()).
toEqual
(
'test@test.com'
);
});
it
(
'renders profile link with correct href'
,
()
=>
{
...
...
@@ -378,7 +378,7 @@ describe('ProfilePage', () => {
});
it
(
'renders profile link with correct text'
,
()
=>
{
expect
(
wrapper
.
find
(
'#profile-link'
).
find
(
'
span
'
).
text
()).
toEqual
(
'Employee Profile'
);
expect
(
wrapper
.
find
(
'#profile-link'
).
find
(
'
.profile-link-label
'
).
text
()).
toEqual
(
'Employee Profile'
);
});
});
});
...
...
amundsen_application/static/js/components/ProfilePage/index.tsx
View file @
fcf7ed0f
...
...
@@ -219,21 +219,21 @@ export class ProfilePage extends React.Component<ProfilePageProps, ProfilePageSt
user
.
is_active
&&
<
a
id=
"email-link"
href=
{
`mailto:${user.email}`
}
className=
'btn btn-flat-icon header-link'
target=
'_blank'
>
<
img
className=
'icon icon-dark icon-mail'
/>
<
span
className=
"body-2"
>
{
user
.
email
}
</
span
>
<
span
className=
"
email-link-label
body-2"
>
{
user
.
email
}
</
span
>
</
a
>
}
{
user
.
is_active
&&
user
.
profile_url
&&
<
a
id=
"profile-link"
href=
{
user
.
profile_url
}
className=
'btn btn-flat-icon header-link'
target=
'_blank'
>
<
img
className=
'icon icon-dark icon-users'
/>
<
span
className=
"body-2"
>
Employee Profile
</
span
>
<
span
className=
'icon icon-dark icon-users'
/>
<
span
className=
"
profile-link-label
body-2"
>
Employee Profile
</
span
>
</
a
>
}
{
user
.
github_username
&&
<
a
id=
"github-link"
href=
{
`https://github.com/${user.github_username}`
}
className=
'btn btn-flat-icon header-link'
target=
'_blank'
>
<
img
className=
'icon icon-dark icon-github'
/>
<
span
className=
"body-2"
>
Github
</
span
>
<
span
className=
"
github-link-label
body-2"
>
Github
</
span
>
</
a
>
}
</
div
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment