Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
86b60538
Commit
86b60538
authored
Jan 02, 2019
by
Martin Wortschack
Committed by
Kushal Pandya
Jan 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "User activity is stuck loading when there is none"
parent
dab5eaf8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
7 deletions
+24
-7
app/assets/javascripts/pages/users/user_overview_block.js
app/assets/javascripts/pages/users/user_overview_block.js
+9
-6
app/views/events/_events.html.haml
app/views/events/_events.html.haml
+4
-1
changelogs/unreleased/55755-user-activity-is-stuck-loading-when-there-is-none.yml
...755-user-activity-is-stuck-loading-when-there-is-none.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/features/users/overview_spec.rb
spec/features/users/overview_spec.rb
+3
-0
No files found.
app/assets/javascripts/pages/users/user_overview_block.js
View file @
86b60538
...
@@ -29,18 +29,21 @@ export default class UserOverviewBlock {
...
@@ -29,18 +29,21 @@ export default class UserOverviewBlock {
render
(
data
)
{
render
(
data
)
{
const
{
html
,
count
}
=
data
;
const
{
html
,
count
}
=
data
;
const
contentList
=
document
.
querySelector
(
`
${
this
.
container
}
.overview-content-list`
);
const
containerEl
=
document
.
querySelector
(
this
.
container
);
const
contentList
=
containerEl
.
querySelector
(
'
.overview-content-list
'
);
contentList
.
innerHTML
+=
html
;
contentList
.
innerHTML
+=
html
;
const
loadingEl
=
document
.
querySelector
(
`
${
this
.
container
}
.loading`
);
const
loadingEl
=
containerEl
.
querySelector
(
'
.loading
'
);
if
(
count
&&
count
>
0
)
{
if
(
count
&&
count
>
0
)
{
document
.
querySelector
(
`
${
this
.
container
}
.js-view-all`
).
classList
.
remove
(
'
hide
'
);
containerEl
.
querySelector
(
'
.js-view-all
'
).
classList
.
remove
(
'
hide
'
);
}
else
{
}
else
{
document
const
nothingHereBlock
=
containerEl
.
querySelector
(
'
.nothing-here-block
'
);
.
querySelector
(
`
${
this
.
container
}
.nothing-here-block`
)
.
classList
.
add
(
'
text-left
'
,
'
p-0
'
);
if
(
nothingHereBlock
)
{
nothingHereBlock
.
classList
.
add
(
'
text-left
'
,
'
p-0
'
);
}
}
}
loadingEl
.
classList
.
add
(
'
hide
'
);
loadingEl
.
classList
.
add
(
'
hide
'
);
...
...
app/views/events/_events.html.haml
View file @
86b60538
=
render
partial:
'events/event'
,
collection:
@events
-
if
@events
.
present?
=
render
partial:
'events/event'
,
collection:
@events
-
else
.nothing-here-block
=
_
(
"No activities found"
)
changelogs/unreleased/55755-user-activity-is-stuck-loading-when-there-is-none.yml
0 → 100644
View file @
86b60538
---
title
:
Hide spinner on empty activites list on user profile overview
merge_request
:
24063
author
:
type
:
other
locale/gitlab.pot
View file @
86b60538
...
@@ -4416,6 +4416,9 @@ msgstr ""
...
@@ -4416,6 +4416,9 @@ msgstr ""
msgid "No"
msgid "No"
msgstr ""
msgstr ""
msgid "No activities found"
msgstr ""
msgid "No assignee"
msgid "No assignee"
msgstr ""
msgstr ""
...
...
spec/features/users/overview_spec.rb
View file @
86b60538
...
@@ -33,6 +33,8 @@ describe 'Overview tab on a user profile', :js do
...
@@ -33,6 +33,8 @@ describe 'Overview tab on a user profile', :js do
it
'does not show any entries in the list of activities'
do
it
'does not show any entries in the list of activities'
do
page
.
within
(
'.activities-block'
)
do
page
.
within
(
'.activities-block'
)
do
expect
(
page
).
to
have_selector
(
'.loading'
,
visible:
false
)
expect
(
page
).
to
have_content
(
'No activities found'
)
expect
(
page
).
not_to
have_selector
(
'.event-item'
)
expect
(
page
).
not_to
have_selector
(
'.event-item'
)
end
end
end
end
...
@@ -93,6 +95,7 @@ describe 'Overview tab on a user profile', :js do
...
@@ -93,6 +95,7 @@ describe 'Overview tab on a user profile', :js do
it
'it shows an empty project list with an info message'
do
it
'it shows an empty project list with an info message'
do
page
.
within
(
'.projects-block'
)
do
page
.
within
(
'.projects-block'
)
do
expect
(
page
).
to
have_selector
(
'.loading'
,
visible:
false
)
expect
(
page
).
to
have_content
(
'No projects found'
)
expect
(
page
).
to
have_content
(
'No projects found'
)
expect
(
page
).
not_to
have_selector
(
'.project-row'
)
expect
(
page
).
not_to
have_selector
(
'.project-row'
)
end
end
...
...
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