diff --git a/component/api/src/main/java/io/meeds/social/navigation/model/SidebarConfiguration.java b/component/api/src/main/java/io/meeds/social/navigation/model/SidebarConfiguration.java index 3e7b6a29127..4ef44e4d3a7 100644 --- a/component/api/src/main/java/io/meeds/social/navigation/model/SidebarConfiguration.java +++ b/component/api/src/main/java/io/meeds/social/navigation/model/SidebarConfiguration.java @@ -36,6 +36,8 @@ public class SidebarConfiguration implements Cloneable { private SidebarMode defaultMode; + private SidebarMode userMode; + private List allowedModes; private List items; @@ -44,6 +46,7 @@ public class SidebarConfiguration implements Cloneable { public SidebarConfiguration clone() { // NOSONAR return new SidebarConfiguration(allowUserCustomHome, defaultMode, + userMode, new ArrayList<>(allowedModes), new ArrayList<>(items)); } diff --git a/component/core/src/main/java/io/meeds/social/navigation/service/NavigationConfigurationInitService.java b/component/core/src/main/java/io/meeds/social/navigation/service/NavigationConfigurationInitService.java index ad74caf1a11..78f8bbff23b 100644 --- a/component/core/src/main/java/io/meeds/social/navigation/service/NavigationConfigurationInitService.java +++ b/component/core/src/main/java/io/meeds/social/navigation/service/NavigationConfigurationInitService.java @@ -95,6 +95,7 @@ private NavigationConfiguration buildDefaultNavigationConfiguration() { getDefaultTopbarApplications()); SidebarConfiguration sidebarConfiguration = new SidebarConfiguration(allowUserCustomHome, defaultMode, + null, Arrays.asList(SidebarMode.values()), getDefaultNavigations()); return new NavigationConfiguration(topbarConfiguration, sidebarConfiguration); diff --git a/component/core/src/main/java/io/meeds/social/navigation/service/NavigationConfigurationService.java b/component/core/src/main/java/io/meeds/social/navigation/service/NavigationConfigurationService.java index 515d7b1c2c5..473cbeb0e9a 100644 --- a/component/core/src/main/java/io/meeds/social/navigation/service/NavigationConfigurationService.java +++ b/component/core/src/main/java/io/meeds/social/navigation/service/NavigationConfigurationService.java @@ -21,10 +21,12 @@ import java.util.List; import java.util.Locale; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import io.meeds.social.navigation.constant.SidebarItemType; +import io.meeds.social.navigation.constant.SidebarMode; import io.meeds.social.navigation.model.NavigationConfiguration; import io.meeds.social.navigation.model.SidebarConfiguration; import io.meeds.social.navigation.model.SidebarItem; @@ -100,7 +102,33 @@ public TopbarConfiguration getTopbarConfiguration(String username, Locale locale * settings */ public SidebarConfiguration getSidebarConfiguration(String username, Locale locale) { - return getConfiguration(username, locale, true).getSidebar(); + SidebarConfiguration sidebarConfiguration = getConfiguration(username, locale, true).getSidebar(); + if (StringUtils.isNotBlank(username)) { + SidebarMode mode = getSidebarUserMode(username, sidebarConfiguration); + sidebarConfiguration.setUserMode(mode); + } + return sidebarConfiguration; + } + + /** + * Retrieves the preferred mode of sidebar by a user + * + * @param username User name as identifier + * @return preferred {@link SidebarMode} or default if not set by user yet + */ + public SidebarMode getSidebarUserMode(String username) { + NavigationConfiguration configuration = navigationConfigurationStorage.getConfiguration(defaultTopbarApplications); + return getSidebarUserMode(username, configuration.getSidebar()); + } + + /** + * Updates the preferred mode of sidebar by the user + * + * @param username User name as identifier + * @param mode Preferred {@link SidebarMode} by the user + */ + public void updateSidebarUserMode(String username, SidebarMode mode) { + navigationConfigurationStorage.updateSidebarUserMode(username, mode); } /** @@ -112,6 +140,16 @@ public void updateConfiguration(NavigationConfiguration navigationConfiguration) navigationConfigurationStorage.updateConfiguration(navigationConfiguration); } + private SidebarMode getSidebarUserMode(String username, SidebarConfiguration sidebarConfiguration) { + SidebarMode mode = navigationConfigurationStorage.getSidebarUserMode(username); + if (sidebarConfiguration != null + && (mode == null + || !sidebarConfiguration.getAllowedModes().contains(mode))) { + mode = sidebarConfiguration.getDefaultMode(); + } + return mode; + } + @SneakyThrows private SidebarItem expandSidebarItem(SidebarItem item, String username, Locale locale) { return getPlugin(item.getType()).resolveProperties(item, username, locale); diff --git a/component/core/src/main/java/io/meeds/social/navigation/storage/NavigationConfigurationStorage.java b/component/core/src/main/java/io/meeds/social/navigation/storage/NavigationConfigurationStorage.java index 9ddbd8ea05e..8fe134d961d 100644 --- a/component/core/src/main/java/io/meeds/social/navigation/storage/NavigationConfigurationStorage.java +++ b/component/core/src/main/java/io/meeds/social/navigation/storage/NavigationConfigurationStorage.java @@ -31,6 +31,7 @@ import org.exoplatform.commons.api.settings.data.Context; import org.exoplatform.commons.api.settings.data.Scope; +import io.meeds.social.navigation.constant.SidebarMode; import io.meeds.social.navigation.constant.TopbarItemType; import io.meeds.social.navigation.model.NavigationConfiguration; import io.meeds.social.navigation.model.TopbarApplication; @@ -41,10 +42,12 @@ public class NavigationConfigurationStorage { private static final String SETTING_KEY = "configuration"; - private static final Scope SETTING_GLOBAL_SCOPE = Scope.GLOBAL.id("NavigationConfiguration"); + private static final String SETTING_USER_MODE_KEY = "sidebarMode"; private static final Context SETTING_GLOBAL_CONTEXT = Context.GLOBAL.id("NavigationConfiguration"); + private static final Scope SETTING_SCOPE = Scope.APPLICATION.id("NavigationConfiguration"); + private static final NavigationConfiguration NULL_VALUE = new NavigationConfiguration(); @Autowired @@ -62,7 +65,7 @@ public NavigationConfiguration getConfiguration(List defaultA public void updateConfiguration(NavigationConfiguration navigationConfiguration) { try { settingService.set(SETTING_GLOBAL_CONTEXT, - SETTING_GLOBAL_SCOPE, + SETTING_SCOPE, SETTING_KEY, SettingValue.create(JsonUtils.toJsonString(navigationConfiguration))); } finally { @@ -70,8 +73,23 @@ public void updateConfiguration(NavigationConfiguration navigationConfiguration) } } + public SidebarMode getSidebarUserMode(String username) { + SettingValue settingValue = settingService.get(Context.USER.id(username), + SETTING_SCOPE, + SETTING_USER_MODE_KEY); + return settingValue == null || settingValue.getValue() == null ? null : + SidebarMode.valueOf(settingValue.getValue().toString()); + } + + public void updateSidebarUserMode(String username, SidebarMode mode) { + settingService.set(Context.USER.id(username), + SETTING_SCOPE, + SETTING_USER_MODE_KEY, + SettingValue.create(mode.name())); + } + private NavigationConfiguration retrieveNavigationConfiguration(List defaultApplications) { - SettingValue settingValue = settingService.get(SETTING_GLOBAL_CONTEXT, SETTING_GLOBAL_SCOPE, SETTING_KEY); + SettingValue settingValue = settingService.get(SETTING_GLOBAL_CONTEXT, SETTING_SCOPE, SETTING_KEY); if (settingValue == null || settingValue.getValue() == null) { return NULL_VALUE; } else { diff --git a/component/service/src/main/java/io/meeds/social/navigation/rest/NavigationConfigurationRest.java b/component/service/src/main/java/io/meeds/social/navigation/rest/NavigationConfigurationRest.java index 7463b1e6b8b..2b5ed28aeab 100644 --- a/component/service/src/main/java/io/meeds/social/navigation/rest/NavigationConfigurationRest.java +++ b/component/service/src/main/java/io/meeds/social/navigation/rest/NavigationConfigurationRest.java @@ -25,14 +25,17 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import io.meeds.social.navigation.constant.SidebarMode; import io.meeds.social.navigation.model.NavigationConfiguration; import io.meeds.social.navigation.model.SidebarConfiguration; import io.meeds.social.navigation.model.TopbarConfiguration; import io.meeds.social.navigation.service.NavigationConfigurationService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; @@ -71,10 +74,7 @@ public TopbarConfiguration getTopbarConfiguration(HttpServletRequest request) { } @GetMapping("/sidebar") - @Secured("users") - @Operation(summary = "Retrieve Sidebar settings", - method = "GET", - description = "This retrieves the configuration of Sidebar switch user roles") + @Operation(summary = "Retrieve Sidebar settings", method = "GET", description = "This retrieves the configuration of Sidebar switch user roles") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Request fulfilled"), }) @@ -82,6 +82,19 @@ public SidebarConfiguration getSidebarConfiguration(HttpServletRequest request) return navigationConfigurationService.getSidebarConfiguration(request.getRemoteUser(), request.getLocale()); } + @PutMapping(path = "/sidebar/mode", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE) + @Secured("users") + @Operation(summary = "Retrieve Sidebar settings", method = "GET", description = "This retrieves the configuration of Sidebar switch user roles") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Request fulfilled"), + }) + public void updateSidebarUserMode(HttpServletRequest request, + @Parameter(description = "User preferred Sidebar Mode") + @RequestParam("mode") + SidebarMode mode) { + navigationConfigurationService.updateSidebarUserMode(request.getRemoteUser(), mode); + } + @PutMapping(consumes = MediaType.APPLICATION_JSON_VALUE) @Secured("administrators") @Operation(summary = "Updates Topbar and Sidebar settings", diff --git a/webapp/src/main/resources/locale/portal/HamburgerMenu_en.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_en.properties index a28d6966a8c..3c40c8cb33e 100644 --- a/webapp/src/main/resources/locale/portal/HamburgerMenu_en.properties +++ b/webapp/src/main/resources/locale/portal/HamburgerMenu_en.properties @@ -15,6 +15,7 @@ menu.role.navigation.first.level=First Level Navigation menu.role.navigation.second.level=Second Level Navigation menu.expand=Keep the menu opened menu.collapse=Collapse the menu +menu.reduce=Keep icons only menu.createNewSpace=Create a space menu.seeMySpaces=See my spaces menu.spaces.joinOrCreateSpace=Join or create a space diff --git a/webapp/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp index e3a9e672c25..4ef1d984b0b 100644 --- a/webapp/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp @@ -1,3 +1,5 @@ +<%@page import="io.meeds.social.navigation.constant.SidebarMode"%> +<%@page import="io.meeds.social.navigation.service.NavigationConfigurationService"%> <%@page import="org.exoplatform.social.core.identity.model.Identity"%> <%@page import="io.meeds.social.util.JsonUtils"%> <%@page import="org.exoplatform.social.notification.service.SpaceWebNotificationService"%> @@ -12,44 +14,38 @@ <%@page import="org.exoplatform.commons.api.settings.SettingService"%> <%@page import="org.exoplatform.container.ExoContainerContext"%> <%@page import="io.meeds.social.space.template.service.SpaceTemplateService"%> -<%@ page import="org.exoplatform.social.webui.Utils"%> +<%@page import="org.exoplatform.social.webui.Utils"%> <% - boolean canCreateSpace = ExoContainerContext.getService(SpaceTemplateService.class).canCreateSpace(request.getRemoteUser()); - SettingValue stickySettingValue = ExoContainerContext.getService(SettingService.class).get(Context.USER.id(request.getRemoteUser()), Scope.APPLICATION.id("HamburgerMenu"), "Sticky"); - boolean sticky = stickySettingValue == null ? Boolean.parseBoolean(System.getProperty("io.meeds.userPrefs.HamburgerMenu.sticky", "false")) : Boolean.parseBoolean(stickySettingValue.getValue().toString()); - PortalRequestContext rcontext = (PortalRequestContext) PortalRequestContext.getCurrentInstance(); - PortalHttpServletResponseWrapper responseWrapper = (PortalHttpServletResponseWrapper) rcontext.getResponse(); - if (rcontext.getRequest().getParameter("sticky") != null) { - sticky = StringUtils.equals("true", rcontext.getRequest().getParameter("sticky")); - } UserPortalConfigService portalConfigService = ExoContainerContext.getService(UserPortalConfigService.class); - SpaceWebNotificationService spaceWebNotificationService = ExoContainerContext.getService(SpaceWebNotificationService.class); + + SidebarMode mode = ExoContainerContext.getService(NavigationConfigurationService.class).getSidebarUserMode(request.getRemoteUser()); + Identity viewerIdentity = Utils.getViewerIdentity(); String avatarUrl = viewerIdentity == null ? "" : viewerIdentity.getProfile().getAvatarUrl(); - Map unreadPerSpace = spaceWebNotificationService.countUnreadItemsBySpace(request.getRemoteUser()); + Map unreadPerSpace = ExoContainerContext.getService(SpaceWebNotificationService.class) + .countUnreadItemsBySpace(request.getRemoteUser()); - String defaultHomePath = "/portal/" + rcontext.getPortalOwner(); - String defaultUserPath = defaultHomePath; + String defaultUserPath; if (StringUtils.equals(rcontext.getPortalOwner(), "public")) { defaultUserPath = "/portal/public"; } else { defaultUserPath = portalConfigService.getUserHomePage(request.getRemoteUser()); if (defaultUserPath == null) { defaultUserPath = portalConfigService.computePortalPath(rcontext.getRequest()); - if (defaultUserPath == null) { - defaultUserPath = defaultHomePath; - } } } + if (defaultUserPath == null) { + defaultUserPath = "/portal/" + rcontext.getPortalOwner(); + } - responseWrapper.addHeader("Link", "; rel=preload; as=fetch; crossorigin=use-credentials", false); + ((PortalHttpServletResponseWrapper) rcontext.getResponse()).addHeader("Link", "; rel=preload; as=fetch; crossorigin=use-credentials", false); %>
- <% if (sticky) { %> + <% if (mode != SidebarMode.HIDDEN) { %>
\ No newline at end of file diff --git a/webapp/src/main/webapp/WEB-INF/jsp/portlet/topbarLogo.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/topbarLogo.jsp index bf2097a74c3..0da7198ea9c 100644 --- a/webapp/src/main/webapp/WEB-INF/jsp/portlet/topbarLogo.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/topbarLogo.jsp @@ -99,11 +99,11 @@
<% if (space == null) { %> <% if (logoPath != null) { %> - + <% } %> -
<%= logoTitle%> diff --git a/webapp/src/main/webapp/skin/less/portlet/HamburgerMenu/Style.less b/webapp/src/main/webapp/skin/less/portlet/HamburgerMenu/Style.less index b1baa26004c..e0df370af76 100644 --- a/webapp/src/main/webapp/skin/less/portlet/HamburgerMenu/Style.less +++ b/webapp/src/main/webapp/skin/less/portlet/HamburgerMenu/Style.less @@ -59,57 +59,8 @@ color: @toolbarLightIconColor !important; margin: 0 auto; } - .accountTitleWrapper { - border-bottom: 1px solid #f9f9f9; - .accountTitleItem { - max-width: 100%; - &:before { - display: none!important; - } - &:hover { - &:before { - opacity: 0; - } - } - &:focus { - &:before { - opacity: 0; - } - } - .accountTitleLabel { - color: @toolbarLightLinkHoverColor; - font-size: 0.9rem!important; - } - .externalFlagClass { - color: @baseColorLight; - font-weight: normal; - } - } - } - .v-list-item--active:before { - content: ''; - width: 8px; - background:@secondaryColor; - position: absolute; - left: 0 ~'; /** orientation=lt */ '; - right: 0 ~'; /** orientation=rt */ '; - opacity: 1 !important; - } } #HamburgerMenuSpaceLeftNavigationActions i.v-icon { font-size: 20px !important; } - -@media (min-width: @minDesktop) { - .HamburgerMenuSticky { - #UITopBarContainerParent { - position: relative; - } - /* added for page loading phase */ - #ParentSiteLeftContainer { - min-width: 310px; - background-color: @lightWhite; - } - } -} diff --git a/webapp/src/main/webapp/vue-apps/common/components/ExoDrawer.vue b/webapp/src/main/webapp/vue-apps/common/components/ExoDrawer.vue index 2d743133cc1..d12604b06bb 100644 --- a/webapp/src/main/webapp/vue-apps/common/components/ExoDrawer.vue +++ b/webapp/src/main/webapp/vue-apps/common/components/ExoDrawer.vue @@ -172,6 +172,10 @@ export default { type: Boolean, default: false, }, + permanent: { + type: Boolean, + default: false, + }, }, data: () => ({ initialized: false, @@ -226,29 +230,34 @@ export default { this.$emit('expand-updated', this.expand); }, drawer() { - if (this.drawer) { - document.dispatchEvent(new CustomEvent('drawerOpened')); - if (!this.initialized) { - this.initialized = true; - } - eXo.openedDrawers.push(this); - this.$emit('opened'); - if (this.disablePullToRefresh) { - document.body.style.overscrollBehaviorY = 'contain'; - } - } else { - document.dispatchEvent(new CustomEvent('drawerClosed')); - if (eXo.openedDrawers) { - const currentOpenedDrawerIndex = eXo.openedDrawers.indexOf(this); - if (currentOpenedDrawerIndex >= 0) { - eXo.openedDrawers.splice(currentOpenedDrawerIndex, 1); + if (!this.permanent) { + if (this.drawer) { + document.dispatchEvent(new CustomEvent('drawerOpened')); + if (!this.initialized) { + this.initialized = true; + } + eXo.openedDrawers.push(this); + this.$emit('opened'); + if (this.disablePullToRefresh) { + document.body.style.overscrollBehaviorY = 'contain'; + } + } else { + document.dispatchEvent(new CustomEvent('drawerClosed')); + if (eXo.openedDrawers) { + const currentOpenedDrawerIndex = eXo.openedDrawers.indexOf(this); + if (currentOpenedDrawerIndex >= 0) { + eXo.openedDrawers.splice(currentOpenedDrawerIndex, 1); + } + } + this.$emit('closed'); + if (this.disablePullToRefresh) { + document.body.style.overscrollBehaviorY = ''; } } - this.$emit('closed'); - if (this.disablePullToRefresh) { - document.body.style.overscrollBehaviorY = ''; - } + } else if (!this.initialized) { + this.initialized = true; } + this.$emit('input', this.drawer); this.expand = this.expanded; }, diff --git a/webapp/src/main/webapp/vue-apps/common/main.js b/webapp/src/main/webapp/vue-apps/common/main.js index 1a2817cea05..8b9595c259d 100644 --- a/webapp/src/main/webapp/vue-apps/common/main.js +++ b/webapp/src/main/webapp/vue-apps/common/main.js @@ -154,7 +154,7 @@ export function init(i18n) { }).$mount(drawersOverlayElement); } } - let parentNotificationsElement = document.querySelector('#bottom-all-container'); + let parentNotificationsElement = document.querySelector('#vuetify-apps') || document.querySelector('#bottom-all-container'); let alertNotificationsElement = parentNotificationsElement?.querySelector('#alert-notifications'); if (!alertNotificationsElement) { if (!parentNotificationsElement) { diff --git a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigation.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/Sidebar.vue similarity index 85% rename from webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigation.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/Sidebar.vue index f049ac0ca48..8393077f3c0 100644 --- a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigation.vue +++ b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/Sidebar.vue @@ -24,21 +24,22 @@ color="transaprent" class="HamburgerNavigationMenu" flat> - -
+
+
+ + + +
diff --git a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/SidebarMenu.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/SidebarMenu.vue deleted file mode 100644 index 58ae5f38f3c..00000000000 --- a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/SidebarMenu.vue +++ /dev/null @@ -1,213 +0,0 @@ - - - \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/dialog/SidebarHomeDialog.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/dialog/SidebarHomeDialog.vue new file mode 100644 index 00000000000..701e5340726 --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/dialog/SidebarHomeDialog.vue @@ -0,0 +1,88 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationFirstLevel.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/drawer/SidebarFirstLevel.vue similarity index 77% rename from webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationFirstLevel.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/drawer/SidebarFirstLevel.vue index 27f82ff4ec6..5ce3417c7d1 100644 --- a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationFirstLevel.vue +++ b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/drawer/SidebarFirstLevel.vue @@ -20,7 +20,7 @@ --> \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/list/SidebarListContent.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/list/SidebarListContent.vue new file mode 100644 index 00000000000..71789a2f77c --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/list/SidebarListContent.vue @@ -0,0 +1,84 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/list/SidebarListFooter.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/list/SidebarListFooter.vue new file mode 100644 index 00000000000..a8cc07d8202 --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/list/SidebarListFooter.vue @@ -0,0 +1,138 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/list/SidebarListHeader.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/list/SidebarListHeader.vue new file mode 100644 index 00000000000..d50ba189dfb --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/list/SidebarListHeader.vue @@ -0,0 +1,111 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/SidebarMenuItem.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/list/SidebarListItem.vue similarity index 82% rename from webapp/src/main/webapp/vue-apps/hamburger-menu/components/SidebarMenuItem.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/list/SidebarListItem.vue index fa91708f216..15021544ae6 100644 --- a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/SidebarMenuItem.vue +++ b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/list/SidebarListItem.vue @@ -23,7 +23,7 @@
- @@ -37,19 +37,20 @@ target: item.target, value: item.url, }" + :class="$root.iconCollapse && 'mx-0 px-0'" :disabled="!item.url" class="d-flex"> - + {{ item.icon || 'fa-folder' }} - - + + {{ $t(item.name) }} - @@ -66,7 +67,10 @@ :disabled="!item.url" class="d-flex" dense> - + - - + + {{ item.name }} + v-if="toggleArrow && $root.expand" + class="my-auto align-center" + @mousedown.stop.prevent + @mouseup.stop.prevent> + + + + fa-house-user + + + @@ -242,6 +273,7 @@ export default { }, async retrieveSpace(refresh) { this.space = await this.$spaceService.getSpaceById(this.id, 'member,managers,favorite,unread,muted', refresh); + this.$set(this.$root.unreadPerSpace, this.space.id, this.space.unread && Number(this.space.unread) || 0); }, }, }; diff --git a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentDrawer.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/parent/SidebarParentDrawer.vue similarity index 60% rename from webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentDrawer.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/parent/SidebarParentDrawer.vue index 2daf82c4f3d..cfbc63009b4 100644 --- a/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentDrawer.vue +++ b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/parent/SidebarParentDrawer.vue @@ -20,12 +20,13 @@ --> @@ -58,10 +57,6 @@ export default { type: Boolean, default: false, }, - spaceUnreadItems: { - type: Object, - default: null - }, selectedName: { type: String, default: null diff --git a/webapp/src/main/webapp/vue-apps/space-top-bannerlogo/main.js b/webapp/src/main/webapp/vue-apps/space-top-bannerlogo/main.js index 3b087de28f2..d323d109530 100644 --- a/webapp/src/main/webapp/vue-apps/space-top-bannerlogo/main.js +++ b/webapp/src/main/webapp/vue-apps/space-top-bannerlogo/main.js @@ -50,8 +50,12 @@ export function init(params) { class="full-height" />`, created() { document.addEventListener('space-settings-updated', this.refreshSpaceSettings); + document.addEventListener('homeLinkUpdated', this.updateUserHome); }, methods: { + updateUserHome(event) { + this.homePath = event?.detail; + }, refreshSpaceSettings(event) { const space = event?.detail; if (space) {