feat: Save Sites Display Order when Saving Sidebar - MEED-7902 - Meed…

…s-io/MIPs#159 (#4238) This change will allow to change display order index of sites when changing it in Sidebar configuration.
Meeds-io · Dec 6, 2024 · 47e4083 · 47e4083
1 parent ccaf98a
commit 47e4083
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 34 deletions.
diff --git a/.../java/io/meeds/social/navigation/listener/NavigationConfigurationSiteDisplayListener.java b/.../java/io/meeds/social/navigation/listener/NavigationConfigurationSiteDisplayListener.java
@@ -41,8 +41,7 @@
 import jakarta.annotation.PostConstruct;
 
 @Component
-public class NavigationConfigurationSiteDisplayListener
-    implements ListenerBase<NavigationConfiguration, NavigationConfiguration> {
+public class NavigationConfigurationSiteDisplayListener implements ListenerBase<NavigationConfiguration, NavigationConfiguration> {
 
   @Autowired
   private ListenerService listenerService;
@@ -77,8 +76,11 @@ public void onEvent(Event<NavigationConfiguration, NavigationConfiguration> even
 
     newSiteNames.forEach(siteName -> {
       PortalConfig site = layoutService.getPortalConfig(SiteKey.portal(siteName));
-      if (site != null && !site.isDisplayed()) {
+      int displayOrder = newSiteNames.indexOf(siteName) + 1;
+      if (site != null
+          && (!site.isDisplayed() || site.getDisplayOrder() != displayOrder)) {
         site.setDisplayed(true);
+        site.setDisplayOrder(displayOrder);
         layoutService.save(site);
       }
     });

diff --git a/webapp/src/main/webapp/WEB-INF/jsp/portlet/platformSettings.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/platformSettings.jsp
@@ -1,15 +1,12 @@
+<%@ page import="org.exoplatform.container.ExoContainerContext"%>
 <%@ page import="org.exoplatform.portal.config.UserPortalConfigService" %>
 <%@ page import="org.exoplatform.portal.application.PortalRequestContext" %>
-<%@ page import="org.exoplatform.portal.mop.service.LayoutService" %>
-<%@ page import="org.exoplatform.portal.config.model.PortalConfig" %>
 <%@ page import="org.exoplatform.web.application.RequestContext" %>
-<%@ page import="org.exoplatform.commons.utils.CommonsUtils" %>
 <%
-  PortalRequestContext requestContext = ((PortalRequestContext) RequestContext.getCurrentInstance());
-  PortalConfig administrationSite = CommonsUtils.getService(LayoutService.class).getPortalConfig("PORTAL", "administration");
-  String path = CommonsUtils.getService(UserPortalConfigService.class).computePortalSitePath("administration", requestContext.getRequest());
+String path = ExoContainerContext.getService(UserPortalConfigService.class)
+    .getDefaultSitePath("administration", request.getRemoteUser());
+  if (path != null) {
 %>
-<% if (administrationSite != null && !administrationSite.isDisplayed() && path != null) { %>
   <div class="VuetifyApp">
     <div data-app="true"
       class="v-application v-application--is-ltr theme--light"
@@ -22,7 +19,7 @@
         </a>
       </div>
       <script type="text/javascript">
-        require(['PORTLET/social/PlatformSettings'], app => app.init(`<%=path%>`));
+        require(['PORTLET/social/PlatformSettings'], app => app.init());
       </script>
     </div>
   </div>

diff --git a/webapp/src/main/webapp/WEB-INF/jsp/portlet/sidebar.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/sidebar.jsp
@@ -18,7 +18,7 @@
 <%@page import="io.meeds.social.space.template.service.SpaceTemplateService"%>
 <%@page import="org.exoplatform.social.webui.Utils"%>
 <%
-  PortalRequestContext rcontext = (PortalRequestContext) PortalRequestContext.getCurrentInstance();
+PortalRequestContext rcontext = (PortalRequestContext) PortalRequestContext.getCurrentInstance();
   UserPortalConfigService portalConfigService = ExoContainerContext.getService(UserPortalConfigService.class);
 
   NavigationConfigurationService navigationConfigurationService = ExoContainerContext.getService(NavigationConfigurationService.class);
@@ -37,7 +37,7 @@
   } else {
     defaultUserPath = portalConfigService.getUserHomePage(request.getRemoteUser());
     if (defaultUserPath == null) {
-      defaultUserPath = portalConfigService.computePortalPath(rcontext.getRequest());
+  defaultUserPath = portalConfigService.getDefaultPath(request.getRemoteUser());
     }
   }
   if (defaultUserPath == null) {

diff --git a/webapp/src/main/webapp/WEB-INF/jsp/portlet/topbarLogo.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/topbarLogo.jsp
@@ -32,7 +32,7 @@
 <%@ page import="org.exoplatform.social.core.identity.provider.OrganizationIdentityProvider" %>
 <%@ page import="java.util.Optional" %>
 <%
-  String spaceId = null;
+String spaceId = null;
   String portalPath = null;
   String titleClass = "";
   String imageClass = "";
@@ -64,13 +64,13 @@
     portalPath = "/portal/public";
   } else {
     if (sidebarConfiguration.isAllowUserCustomHome()) {
-      portalPath = portalConfigService.getUserHomePage(request.getRemoteUser());
+  portalPath = portalConfigService.getUserHomePage(request.getRemoteUser());
     }
     if (portalPath == null) {
-      portalPath = portalConfigService.computePortalPath(requestContext.getRequest());
-      if (portalPath == null) {
-        portalPath = defaultHomePath;
-      }
+  portalPath = portalConfigService.getDefaultPath(request.getRemoteUser());
+  if (portalPath == null) {
+    portalPath = defaultHomePath;
+  }
     }
   }
   titleClass = "company";
@@ -95,10 +95,10 @@
     membersNumber = space.getMembers().length;
     spaceDescription = Optional.ofNullable(space.getDescription()).orElse("");
     if (authenticatedUser != null) {
-      for(String username : space.getManagers()) {
-        Profile profile = identityManager.getOrCreateIdentity(OrganizationIdentityProvider.NAME, username).getProfile();
-        managers.add(profile);
-      }
+  for(String username : space.getManagers()) {
+    Profile profile = identityManager.getOrCreateIdentity(OrganizationIdentityProvider.NAME, username).getProfile();
+    managers.add(profile);
+  }
     }
   }
 
@@ -108,8 +108,8 @@
   boolean displaySiteName = topbarConfiguration.isDisplaySiteName();
   SidebarMode sidebarMode = sidebarConfiguration.getUserMode();
   SidebarItem sidebarItem = space == null ? sidebarConfiguration.getItems().stream().filter(item -> item.getUrl() != null
-      && item.getType() == SidebarItemType.SITE
-      && requestContext.getRequest().getRequestURI().toString().startsWith(item.getUrl()))
+  && item.getType() == SidebarItemType.SITE
+  && requestContext.getRequest().getRequestURI().toString().startsWith(item.getUrl()))
     .findFirst()
     .orElse(null)
     : null;
@@ -118,10 +118,10 @@
     && StringUtils.equals(sidebarItem.getProperties().get(AbstractLayoutSidebarPlugin.SITE_EXPAND_PAGES_PROP_NAME), "true")
     && CollectionUtils.isNotEmpty(sidebarItem.getItems())) {
     sidebarItem = sidebarItem.getItems().stream().filter(item -> item.getUrl() != null
-        && item.getType() == SidebarItemType.PAGE
-        && requestContext.getRequest().getRequestURI().toString().startsWith(item.getUrl()))
-      .findFirst()
-      .orElse(null);
+    && item.getType() == SidebarItemType.PAGE
+    && requestContext.getRequest().getRequestURI().toString().startsWith(item.getUrl()))
+  .findFirst()
+  .orElse(null);
     isSitePage = true;
   }
 %>

diff --git a/webapp/src/main/webapp/vue-apps/platform-settings/components/PlatformSettings.vue b/webapp/src/main/webapp/vue-apps/platform-settings/components/PlatformSettings.vue
@@ -3,8 +3,8 @@
     <v-tooltip bottom>
       <template #activator="{ on, attrs }">
         <v-btn
-          :href="$root.url"
           :aria-label="$t('platformSettings.label.openAdministration')"
+          href="/portal/administration"
           target="_blank"
           class="mx-2"
           icon

diff --git a/webapp/src/main/webapp/vue-apps/platform-settings/main.js b/webapp/src/main/webapp/vue-apps/platform-settings/main.js
@@ -33,12 +33,9 @@ const appId = 'platformSettings';
 const lang = window?.eXo?.env?.portal?.language || 'en';
 const i18NUrl = `/social/i18n/locale.portlet.PlatformSettings?lang=${lang}`;
 
-export function init(url) {
+export function init() {
   exoi18n.loadLanguageAsync(lang, i18NUrl).then(i18n => {
     Vue.createApp({
-      data: {
-        url,
-      },
       mounted() {
         this.$root.$applicationLoaded();
       },