feat: Application of CSS/JS to meta site - MEED-8163 - Meeds-io/MIPs#167 (#16)

Fix feedbacks

Author: AzmiTouil

ide-service/src/main/java/io/meeds/ide/service/StaticResourceService.java

@@ -21,6 +21,10 @@
 import io.meeds.ide.model.Widget;
 import io.meeds.ide.storage.WidgetStorage;
 import io.meeds.layout.service.LayoutAclService;
+import io.meeds.social.navigation.constant.SidebarItemType;
+import io.meeds.social.navigation.model.NavigationConfiguration;
+import io.meeds.social.navigation.service.NavigationConfigurationService;
+import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.portal.config.UserPortalConfigService;
 import org.exoplatform.portal.config.model.Application;
 import org.exoplatform.portal.config.model.TransientApplicationState;
@@ -32,41 +36,42 @@
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static io.meeds.ide.service.WidgetService.IDE_WIDGET_CREATED_EVENT;
 import static io.meeds.ide.service.WidgetService.NOT_ADMINISTRATOR_USER;
 
 @Service
 public class StaticResourceService {
 
-  public static final String      SITE_NAME  = "siteName";
+  public static final String             SITE_NAME              = "siteName";
 
-  public static final String      POSITION   = "position";
+  public static final String             POSITION               = "position";
 
-  public static final String      ENABLED    = "enabled";
+  public static final String             ENABLED                = "enabled";
 
-  public static final String      CONTENT_ID = "ide/WidgetPortlet";
+  public static final String             CONTENT_ID             = "ide/WidgetPortlet";
 
-  public static final String      WIDGET_ID  = "widgetId";
+  public static final String             WIDGET_ID              = "widgetId";
+
+  private static final String            SPACE_SITE_TYPE_PREFIX = "/spaces/";
 
   @Autowired
-  private LayoutAclService        layoutAclService;
+  private LayoutAclService               layoutAclService;
 
   @Autowired
-  private IdentityManager         identityManager;
+  private IdentityManager                identityManager;
 
   @Autowired
-  private ListenerService         listenerService;
+  private ListenerService                listenerService;
 
   @Autowired
-  private WidgetStorage           widgetStorage;
+  private WidgetStorage                  widgetStorage;
 
   @Autowired
-  private UserPortalConfigService userPortalConfigService;
+  private UserPortalConfigService        userPortalConfigService;
+
+  private NavigationConfigurationService navigationConfigurationService;
 
   public List<Widget> getStaticResources(String siteName, String username) throws IllegalAccessException {
     if (!layoutAclService.isAdministrator(username)) {
@@ -78,9 +83,10 @@ public List<Widget> getStaticResources(String siteName, String username) throws
   }
 
   public List<Application> getStaticResourceApplications(String siteName, String applicationPosition) {
-    List<Application> applications = new ArrayList<>();
-    applications.addAll(getApplicationsBySite(siteName, applicationPosition));
-    applications.addAll(getMetaSiteStaticResourceApplications(applicationPosition));
+    List<Application> applications = new ArrayList<>(getApplicationsBySite(siteName, applicationPosition));
+    if (isMetaSiteNavigation(siteName) || siteName.startsWith(SPACE_SITE_TYPE_PREFIX)) {
+      applications.addAll(getMetaSiteStaticResourceApplications(applicationPosition));
+    }
     return applications;
   }
 
@@ -119,6 +125,19 @@ private List<Widget> getWidgetsBySite(String siteName, String applicationPositio
     return widgets;
   }
 
+  private boolean isMetaSiteNavigation(String siteName) {
+    NavigationConfiguration navigationConfiguration = getNavigationConfigurationService().getConfiguration();
+    if (navigationConfiguration == null) {
+      return false;
+    }
+    return navigationConfiguration.getSidebar()
+                                  .getItems()
+                                  .stream()
+                                  .anyMatch(sidebarItem -> sidebarItem.getProperties() != null
+                                      && Objects.equals(sidebarItem.getProperties().get(SITE_NAME), siteName)
+                                      && SidebarItemType.SITE.equals(sidebarItem.getType()));
+  }
+
   private Map<String, String> createFilters(String siteName, String applicationPosition) {
     Map<String, String> filters = new LinkedHashMap<>();
     filters.put(SITE_NAME, siteName);
@@ -134,4 +153,11 @@ private Application toApplication(Widget widget) {
     app.setStorageId(String.valueOf(widget.getId()));
     return app;
   }
+
+  private NavigationConfigurationService getNavigationConfigurationService() {
+    if (navigationConfigurationService == null) {
+      navigationConfigurationService = CommonsUtils.getService(NavigationConfigurationService.class);
+    }
+    return navigationConfigurationService;
+  }
 }

ide-service/src/test/java/io/meeds/ide/service/StaticResourceServiceTest.java

@@ -25,12 +25,19 @@
 import static org.mockito.ArgumentMatchers.notNull;
 import static org.mockito.Mockito.*;
 
+import io.meeds.social.navigation.constant.SidebarItemType;
+import io.meeds.social.navigation.model.NavigationConfiguration;
+import io.meeds.social.navigation.model.SidebarConfiguration;
+import io.meeds.social.navigation.model.SidebarItem;
+import io.meeds.social.navigation.service.NavigationConfigurationService;
+import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.portal.config.UserPortalConfigService;
 import org.exoplatform.portal.config.model.Application;
 import org.exoplatform.portal.config.model.TransientApplicationState;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.MockedStatic;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -44,41 +51,41 @@
 import io.meeds.ide.storage.WidgetStorage;
 import io.meeds.layout.service.LayoutAclService;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @SpringBootTest(classes = { StaticResourceService.class, })
 @ExtendWith(MockitoExtension.class)
 class StaticResourceServiceTest {
 
-  private static final String     USERNAME  = "testUser";
+  private static final MockedStatic<CommonsUtils> COMMONS_UTILS_UTIL = mockStatic(CommonsUtils.class);
 
-  private static final String     SITE_NAME = "siteName";
+  private static final String            USERNAME  = "testUser";
+
+  private static final String            SITE_NAME = "siteName";
 
   @MockBean
-  private LayoutAclService        layoutAclService;
+  private LayoutAclService               layoutAclService;
 
   @MockBean
-  private IdentityManager         identityManager;
+  private IdentityManager                identityManager;
 
   @MockBean
-  private ListenerService         listenerService;
+  private ListenerService                listenerService;
 
   @MockBean
-  private WidgetStorage           widgetStorage;
+  private WidgetStorage                  widgetStorage;
 
   @MockBean
-  private UserPortalConfigService userPortalConfigService;
+  private UserPortalConfigService        userPortalConfigService;
 
   @Autowired
-  private StaticResourceService   staticResourceService;
+  private StaticResourceService          staticResourceService;
 
   @Mock
-  private Widget                  widget;
+  private Widget                         widget;
 
   @Mock
-  private Identity                identity;
+  private Identity                       identity;
 
   @Test
   void getStaticResources() throws IllegalAccessException {
@@ -117,6 +124,19 @@ void getStaticResourceApplications() {
     filters.put(POSITION, "END_OF_BODY");
     filters.put(ENABLED, "true");
 
+    NavigationConfigurationService navigationConfigurationService = mock(NavigationConfigurationService.class);
+    NavigationConfiguration navigationConfiguration = mock(NavigationConfiguration.class);
+    SidebarConfiguration sidebarConfiguration = mock(SidebarConfiguration.class);
+    List<SidebarItem> sidebarItems = new ArrayList<>();
+    SidebarItem sidebarItem1 = new SidebarItem();
+    sidebarItem1.setType(SidebarItemType.SITE);
+    sidebarItem1.setProperties(new HashMap<>() { { put(SITE_NAME, "siteName"); } });
+    sidebarItems.add(sidebarItem1);
+    when(navigationConfigurationService.getConfiguration()).thenReturn(navigationConfiguration);
+    when(navigationConfiguration.getSidebar()).thenReturn(sidebarConfiguration);
+    when(sidebarConfiguration.getItems()).thenReturn(sidebarItems);
+
+    COMMONS_UTILS_UTIL.when(() -> CommonsUtils.getService(NavigationConfigurationService.class)).thenReturn(navigationConfigurationService);
     when(widgetStorage.getWidgetsByProperties(filters)).thenReturn(List.of(widget));
 
     List<Application> apps = staticResourceService.getStaticResourceApplications("siteName", "END_OF_BODY");