Commit bb444211 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '55755-user-activity-is-stuck-loading-when-there-is-none' into 'master'

Resolve "User activity is stuck loading when there is none"

Closes #55755

See merge request gitlab-org/gitlab-ce!24063
parents dab5eaf8 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');
......
= render partial: 'events/event', collection: @events - if @events.present?
= render partial: 'events/event', collection: @events
- else
.nothing-here-block= _("No activities found")
---
title: Hide spinner on empty activites list on user profile overview
merge_request: 24063
author:
type: other
...@@ -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 ""
......
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment