feat: allow using Search Chat per organization

l3s-learnweb · Nov 28, 2023 · ebd5274 · ebd5274
1 parent 1e1bd8c
commit ebd5274
Show file tree

Hide file tree

Showing 9 changed files with 158 additions and 125 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "video.js": "^8.6.1"
   },
   "devDependencies": {
-    "esbuild": "^0.19.2",
+    "esbuild": "^0.19.8",
     "esbuild-sass-plugin": "^2.16.0",
     "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
         <maven.dependency.jdbi3.version>3.41.3</maven.dependency.jdbi3.version>
         <maven.dependency.flyway.version>10.0.1</maven.dependency.flyway.version>
         <maven.dependency.log4j.version>2.21.1</maven.dependency.log4j.version>
-        <maven.dependency.sentry.version>6.33.1</maven.dependency.sentry.version>
+        <maven.dependency.sentry.version>6.34.0</maven.dependency.sentry.version>
         <maven.dependency.junit.version>5.10.1</maven.dependency.junit.version>
         <maven.dependency.mockito.version>5.7.0</maven.dependency.mockito.version>
 

diff --git a/src/main/java/de/l3s/learnweb/search/SearchChatBean.java b/src/main/java/de/l3s/learnweb/search/SearchChatBean.java
@@ -41,6 +41,7 @@ public class SearchChatBean extends ApplicationBean implements Serializable {
 
     public void onLoad() throws InterwebException {
         BeanAssert.authorized(isLoggedIn());
+        BeanAssert.hasPermission(getUser().isModerator() || getUserBean().isSearchChatEnabled());
         interweb = getLearnweb().getInterweb();
 
         newChat();
@@ -65,8 +66,8 @@ public void sendMessage() throws InterwebException {
         message = null;
 
         interweb.chatComplete(conversation);
-        if (!conversations.contains(conversation)) {
-            conversations.add(0, conversation);
+        if (!getConversations().contains(conversation)) {
+            getConversations().add(0, conversation);
         }
     }
 

diff --git a/src/main/java/de/l3s/learnweb/user/Organisation.java b/src/main/java/de/l3s/learnweb/user/Organisation.java
@@ -54,6 +54,7 @@ public enum Option {
         Search_Disable_alternative_sources,
         Resource_Disallow_editing,
         Resource_Disable_video_preview,
+        Search_Chat_enabled,
     }
 
     private int id;

diff --git a/src/main/java/de/l3s/learnweb/user/UserBean.java b/src/main/java/de/l3s/learnweb/user/UserBean.java
@@ -496,6 +496,10 @@ public boolean isLoggingEnabled() {
         return !getActiveOrganisation().map(o -> o.getOption(Option.Privacy_Logging_disabled)).orElse(true);
     }
 
+    public boolean isSearchChatEnabled() {
+        return getActiveOrganisation().map(o -> o.getOption(Option.Search_Chat_enabled)).orElse(false);
+    }
+
     public boolean isTrackingEnabled() {
         if (StringUtils.isEmpty(getTrackerApiKey())) {
             return false;

diff --git a/src/main/resources/de/l3s/learnweb/lang/messages.properties b/src/main/resources/de/l3s/learnweb/lang/messages.properties
@@ -1643,6 +1643,8 @@ video_guide = Video guide
 
 videos = Videos
 
+chat = Chat
+
 visualization = Visualization
 
 votes = {0, choice, 0#Not rated yet|1#One vote|1<{0} Votes}

diff --git a/src/main/webapp/lw/search.xhtml b/src/main/webapp/lw/search.xhtml
@@ -1,6 +1,7 @@
 <ui:composition template="/WEB-INF/templates/layout/template.xhtml"
                 xmlns:h="jakarta.faces.html"
                 xmlns:f="jakarta.faces.core"
+                xmlns:faces="jakarta.faces"
                 xmlns:p="http://primefaces.org/ui"
                 xmlns:ui="jakarta.faces.facelets">
 
@@ -62,6 +63,14 @@
                     <f:param name="query" value="#{searchBean.query}"/>
                 </h:link>
             </li>
+            <li class="filter" faces:rendered="#{userBean.searchChatEnabled}">
+                <h:link outcome="search/chat">
+                     <span class="filter-title">
+                        <span class="text-truncate">#{msg.chat}</span>
+                    </span>
+                    <f:param name="query" value="#{searchBean.query}"/>
+                </h:link>
+            </li>
         </ul>
 
         <h:form id="search_source_carousel" styleClass="bg-medium p-2" rendered="#{searchBean.showAlternativeSources}">

diff --git a/src/main/webapp/lw/search/chat.xhtml b/src/main/webapp/lw/search/chat.xhtml
@@ -53,7 +53,7 @@
             <li class="filter active">
                 <h:link disabled="true">
                      <span class="filter-title">
-                        <span class="text-truncate">#{msg.Chat}</span>
+                        <span class="text-truncate">#{msg.chat}</span>
                     </span>
                     <f:param name="query" value="#{searchChatBean.query}"/>
                 </h:link>