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

2 files changed, 13 insertions, 7 deletions

diff --git a/app/assets/javascripts/pages/users/user_overview_block.js b/app/assets/javascripts/pages/users/user_overview_block.js
index eec2b5ca8e5..e9ecec717d6 100644
--- a/app/assets/javascripts/pages/users/user_overview_block.js
+++ b/app/assets/javascripts/pages/users/user_overview_block.js
@@ -29,18 +29,21 @@ export default class UserOverviewBlock {
 
   render(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;
 
-    const loadingEl = document.querySelector(`${this.container} .loading`);
+    const loadingEl = containerEl.querySelector('.loading');
 
     if (count && count > 0) {
-      document.querySelector(`${this.container} .js-view-all`).classList.remove('hide');
+      containerEl.querySelector('.js-view-all').classList.remove('hide');
     } else {
-      document
-        .querySelector(`${this.container} .nothing-here-block`)
-        .classList.add('text-left', 'p-0');
+      const nothingHereBlock = containerEl.querySelector('.nothing-here-block');
+
+      if (nothingHereBlock) {
+        nothingHereBlock.classList.add('text-left', 'p-0');
+      }
     }
 
     loadingEl.classList.add('hide');
diff --git a/app/views/events/_events.html.haml b/app/views/events/_events.html.haml
index 68c19df092d..6ae4c334f7f 100644
--- a/app/views/events/_events.html.haml
+++ b/app/views/events/_events.html.haml
@@ -1 +1,4 @@
-= render partial: 'events/event', collection: @events
+- if @events.present?
+  = render partial: 'events/event', collection: @events
+- else
+  .nothing-here-block= _("No activities found")