don't show event stream even when logged in (fixes #280) (#321)

Co-authored-by: Luigi Marini <[email protected]>

Author: robkooper

CHANGELOG.md

@@ -7,11 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## 1.20.0 - 2022-02-07
 
 ### Fixed
-- conf file and code had incosistent spelling of BagIt. Now all have capital B and I.
+- Conf file and code had incosistent spelling of BagIt. Now all have capital B and I.
+- When event stream is disabled don't show for logged in user [#280](https://github.com/clowder-framework/clowder/issues/280)
 - three.js is no longer associated with application/octet-stream, now with models [#305](https://github.com/clowder-framework/clowder/issues/305)
 
 ### Changed
-- download of dataset/collection now has optional parameter bagit (default false) to download items in bagit format.
+- Download of dataset/collection now has optional parameter bagit (default false) to download items in bagit format.
 
 ## 1.19.5 - 2022-01-21
 

app/controllers/Application.scala

@@ -93,23 +93,21 @@ class Application @Inject()(files: FileService, collections: CollectionService,
     implicit val user = request.user
 
     var newsfeedEvents = List.empty[Event]
-    if (!play.Play.application().configuration().getBoolean("clowder.disable.events", false)) {
-      newsfeedEvents = user.fold(List.empty[Event])(u => events.getEvents(u.followedEntities, Some(20)))
-      newsfeedEvents = newsfeedEvents ::: events.getRequestEvents(user, Some(20))
-      if (user.isDefined) {
-        newsfeedEvents = (newsfeedEvents ::: events.getEventsByUser(user.get, Some(20)))
-          .sorted(Ordering.by((_: Event).created).reverse).distinct.take(20)
-      }
-    }
 
     user match {
       case Some(clowderUser) if (clowderUser.status == UserStatus.Inactive) => {
         Redirect(routes.Error.notActivated())
       }
       case Some(clowderUser) if !(clowderUser.status == UserStatus.Inactive) => {
-        newsfeedEvents = newsfeedEvents ::: events.getEventsByUser(clowderUser, Some(20))
-        if (play.Play.application().configuration().getBoolean("showCommentOnHomepage")) newsfeedEvents = newsfeedEvents ::: events.getCommentEvent(clowderUser, Some(20))
-        newsfeedEvents = newsfeedEvents.sorted(Ordering.by((_: Event).created).reverse).distinct.take(20)
+        if (!play.Play.application().configuration().getBoolean("clowder.disable.events", false)) {
+          newsfeedEvents = newsfeedEvents ::: events.getEventsByUser(clowderUser, Some(20))
+          newsfeedEvents = newsfeedEvents ::: events.getRequestEvents(user, Some(20))
+          newsfeedEvents = newsfeedEvents ::: events.getEvents(clowderUser.followedEntities, Some(20))
+          if (play.Play.application().configuration().getBoolean("showCommentOnHomepage")) {
+            newsfeedEvents = newsfeedEvents ::: events.getCommentEvent(clowderUser, Some(20))
+          }
+          newsfeedEvents = newsfeedEvents.sorted(Ordering.by((_: Event).created).reverse).distinct.take(20)
+        }
         val datasetsUser = datasets.listUser(12, Some(clowderUser), request.user.fold(false)(_.superAdminMode), clowderUser)
         val collectionList = collections.listUser(12, Some(clowderUser), request.user.fold(false)(_.superAdminMode), clowderUser)
         val collectionsWithThumbnails = collectionList.map { c =>

app/views/eventsList.scala.html

@@ -1,6 +1,7 @@
 @(newsfeed: List[models.Event])(implicit user: Option[models.User])
 @import _root_.util.Formatters
 @import play.api.i18n.Messages
+@import play.api.Play.current
 @for(event <- newsfeed) {
   <div class="panel panel-default">
     <div class="panel-body">
@@ -27,18 +28,25 @@
 }
 <script>
   $(document).ready(function() {
-    // the default number of event index. means there is no event for this user.
-    if(eventCount === 3){
-      @if( newsfeed.size < 1) {
-      $("#moreeventbutton").replaceWith("<p>You can follow <a [email protected]()>@Messages("users.title")</a>, <a href=@routes.Spaces.list("")>@Messages("spaces.title")</a>,"
-              + " <a [email protected]("")>@Messages("datasets.title")</a> and <a [email protected]("")>@Messages("collections.title")</a>."
-              + " Any updates on your followed instances will show here.</p>");
-      } else  {
-      @if( newsfeed.size < 20) { $("#moreeventbutton").replaceWith("<p>No more events.</p>");}
-      }
+    @if(play.Play.application().configuration().getBoolean("clowder.disable.events", false)) {
+      $("#moreeventbutton").replaceWith("<p>Event stream disabled.</p>");
     } else {
-      @if( newsfeed.size < 10) { $("#moreeventbutton").replaceWith("<p>No more events.</p>");}
+      // the default number of event index. means there is no event for this user.
+      if (eventCount === 3) {
+        @if( newsfeed.size < 1) {
+          $("#moreeventbutton").replaceWith("<p>You can follow <a [email protected]()>@Messages("users.title")</a>, <a href=@routes.Spaces.list("")>@Messages("spaces.title")</a>,"
+                  + " <a [email protected]("")>@Messages("datasets.title")</a> and <a [email protected]("")>@Messages("collections.title")</a>."
+                  + " Any updates on your followed instances will show here.</p>");
+        } else  {
+          @if( newsfeed.size < 20) {
+            $("#moreeventbutton").replaceWith("<p>No more events.</p>");
+          }
+        }
+      } else {
+        @if( newsfeed.size < 10) {
+          $("#moreeventbutton").replaceWith("<p>No more events.</p>");
+        }
+      }
     }
-
   });
-</script>
+</script>