fix review

exoplatform · Mar 19, 2024 · 2102069 · 2102069
1 parent c27f09e
commit 2102069
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 43 deletions.
diff --git a/...es/src/main/java/org/exoplatform/webconferencing/externalvisio/ExternalVisioProvider.java b/...es/src/main/java/org/exoplatform/webconferencing/externalvisio/ExternalVisioProvider.java
@@ -16,6 +16,7 @@
  */
 package org.exoplatform.webconferencing.externalvisio;
 
+import org.exoplatform.social.core.identity.model.Identity;
 import org.exoplatform.webconferencing.ActiveCallProvider;
 import org.exoplatform.webconferencing.CallProvider;
 import org.exoplatform.webconferencing.CallProviderException;
@@ -77,17 +78,9 @@ public UserInfo.IMInfo getIMInfo(String imId) throws CallProviderException {
   }
 
   @Override
-  public List<ActiveCallProvider> getActiveProvidersForSpace() {
-    List<ExternalVisioConnector> externalVisioConnectors = externalVisioConnectorService.getActiveExternalVisioConnectorsForSpace();
-
-    return externalVisioConnectors.stream().map(externalVisioConnector -> {
-      return new ActiveCallProvider(externalVisioConnector.getId().toString(), externalVisioConnector.getName(), null, false);
-    }).toList();
-  }
-  @Override
-  public List<ActiveCallProvider> getActiveProvidersForUser() {
-    List<ExternalVisioConnector> externalVisioConnectors = externalVisioConnectorService.getActiveExternalVisioConnectorsForUser();
-
+  public List<ActiveCallProvider> getActiveProviders(Identity identity) {
+    List<ExternalVisioConnector> externalVisioConnectors =
+                                                         externalVisioConnectorService.getActiveExternalVisioConnectors(identity);
     return externalVisioConnectors.stream().map(externalVisioConnector -> {
       return new ActiveCallProvider(externalVisioConnector.getId().toString(), externalVisioConnector.getName(), null, false);
     }).toList();

diff --git a/...ain/java/org/exoplatform/webconferencing/externalvisio/dao/ExternalVisioConnectorDAO.java b/...ain/java/org/exoplatform/webconferencing/externalvisio/dao/ExternalVisioConnectorDAO.java
@@ -18,6 +18,8 @@
 
 import javax.persistence.TypedQuery;
 import javax.persistence.NoResultException;
+
+import org.exoplatform.social.core.identity.model.Identity;
 import org.exoplatform.webconferencing.externalvisio.entity.ExternalVisioConnectorEntity;
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
 
@@ -39,26 +41,19 @@ public List<ExternalVisioConnectorEntity> getExternalVisioConnectors(boolean ena
     }
   }
 
-  public List<ExternalVisioConnectorEntity> getActiveExternalVisioConnectorsForSpace() {
-    TypedQuery<ExternalVisioConnectorEntity> query =
-            getEntityManager().createNamedQuery("ExternalVisioConnector.getActiveExternalVisioConnectorsForSpaces",
-                    ExternalVisioConnectorEntity.class);
-    try {
-      return query.getResultList();
-    } catch (NoResultException e) {
-      return Collections.emptyList();
+  public List<ExternalVisioConnectorEntity> getActiveExternalVisioConnectors(Identity identity) {
+    TypedQuery<ExternalVisioConnectorEntity> query = null;
+    if (identity.isSpace()) {
+      query = getEntityManager().createNamedQuery("ExternalVisioConnector.getActiveExternalVisioConnectorsForSpaces",
+                                                  ExternalVisioConnectorEntity.class);
+    } else if (identity.isUser()) {
+      query = getEntityManager().createNamedQuery("ExternalVisioConnector.getActiveExternalVisioConnectorsForUser",
+                                                  ExternalVisioConnectorEntity.class);
     }
-
-  }
-  public List<ExternalVisioConnectorEntity> getActiveExternalVisioConnectorsForUser() {
-    TypedQuery<ExternalVisioConnectorEntity> query =
-            getEntityManager().createNamedQuery("ExternalVisioConnector.getActiveExternalVisioConnectorsForUser",
-                    ExternalVisioConnectorEntity.class);
     try {
       return query.getResultList();
     } catch (NoResultException e) {
       return Collections.emptyList();
     }
-
   }
 }
diff --git a/.../org/exoplatform/webconferencing/externalvisio/service/ExternalVisioConnectorService.java b/.../org/exoplatform/webconferencing/externalvisio/service/ExternalVisioConnectorService.java
@@ -18,6 +18,7 @@
 
 import org.exoplatform.commons.ObjectAlreadyExistsException;
 import org.exoplatform.commons.exception.ObjectNotFoundException;
+import org.exoplatform.social.core.identity.model.Identity;
 import org.exoplatform.webconferencing.externalvisio.entity.ExternalVisioConnectorEntity;
 import org.exoplatform.webconferencing.externalvisio.rest.model.ExternalVisioConnector;
 import org.exoplatform.webconferencing.externalvisio.rest.model.ExternalVisioConnectors;
@@ -34,8 +35,5 @@ public interface ExternalVisioConnectorService {
 
   ExternalVisioConnector updateExternalVisioConnector(ExternalVisioConnectorEntity externalVisioConnectorEntity) throws ObjectNotFoundException;
 
-  List<ExternalVisioConnector> getActiveExternalVisioConnectorsForSpace();
-
-  List<ExternalVisioConnector> getActiveExternalVisioConnectorsForUser();
-
+  List<ExternalVisioConnector> getActiveExternalVisioConnectors(Identity identity);
 }
diff --git a/...latform/webconferencing/externalvisio/service/impl/ExternalVisioConnectorServiceImpl.java b/...latform/webconferencing/externalvisio/service/impl/ExternalVisioConnectorServiceImpl.java
@@ -21,6 +21,7 @@
 import org.exoplatform.commons.exception.ObjectNotFoundException;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
+import org.exoplatform.social.core.identity.model.Identity;
 import org.exoplatform.social.core.profileproperty.ProfilePropertyService;
 import org.exoplatform.social.core.profileproperty.model.ProfilePropertySetting;
 import org.exoplatform.webconferencing.externalvisio.dao.ExternalVisioConnectorDAO;
@@ -117,14 +118,9 @@ public ExternalVisioConnector updateExternalVisioConnector(ExternalVisioConnecto
   }
 
   @Override
-  public List<ExternalVisioConnector> getActiveExternalVisioConnectorsForSpace() {
-    List<ExternalVisioConnectorEntity> activeVisioConnectorEntityList = externalVisioConnectorDAO.getActiveExternalVisioConnectorsForSpace();
-    return activeVisioConnectorEntityList.stream().map(EntityBuilder::fromEntity).toList();
-  }
-
-  @Override
-  public List<ExternalVisioConnector> getActiveExternalVisioConnectorsForUser() {
-    List<ExternalVisioConnectorEntity> activeVisioConnectorEntityList = externalVisioConnectorDAO.getActiveExternalVisioConnectorsForUser();
+  public List<ExternalVisioConnector> getActiveExternalVisioConnectors(Identity identity) {
+    List<ExternalVisioConnectorEntity> activeVisioConnectorEntityList =
+                                                                      externalVisioConnectorDAO.getActiveExternalVisioConnectors(identity);
     return activeVisioConnectorEntityList.stream().map(EntityBuilder::fromEntity).toList();
   }
 

diff --git a/webapp/src/main/webapp/js/webconferencing-externalvisio.js b/webapp/src/main/webapp/js/webconferencing-externalvisio.js
@@ -80,10 +80,11 @@
         }
       };
 
-      var getActiveProviders = function(identityId, isUser, isSpace) {
+      var getActiveProviders = function(identityId) {
         const formData = new FormData();
-        formData.append('isUser', isUser);
-        formData.append('isSpace', isSpace);
+        formData.append('integratedConnector', false);
+        formData.append('configuredConnector', true);
+
         const params = new URLSearchParams(formData).toString();
         return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/webconferencing/${identityId}/providers?${params}`, {
           credentials: 'include',
@@ -109,9 +110,9 @@
               callSettings.isIntegratedConnector = false;
               let activeButtons = [];
               const identityId = context.isSpace ? context.spaceId : context.userId;
-              getActiveProviders(identityId, context.isUser, context.isSpace)
+              getActiveProviders(identityId)
               .then((activeProviders) => {
-                activeButtons = activeProviders.filter(provider => !provider.integratedConnector && provider.url);
+                activeButtons = activeProviders;
                 const buttonComponents = []; // Créer une liste pour stocker les composants Vue
 
                 activeButtons.forEach(p => {