Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

fix(frontend:layout): update `hasSubmenus` based on visible sidebar submenus

johaven22a9bcaba4e6
diff --git a/frontend/src/app/applications/spaces/spaces.constants.ts b/frontend/src/app/applications/spaces/spaces.constants.ts
index eef95487..9d583a33 100644
--- a/frontend/src/app/applications/spaces/spaces.constants.ts
+++ b/frontend/src/app/applications/spaces/spaces.constants.ts
@@ -112,6 +112,7 @@ export const SPACES_MENU: AppMenu = {
icon: SPACES_ICON.SHARES,
link: SPACES_PATH.SPACES_SHARES,
matchLink: new RegExp(`^${SPACES_PATH.SPACES_SHARES}|^${SPACES_PATH.SHARED}|^${SPACES_PATH.LINKS}`),
+ hasSubmenus: true,
submenus: [
{
id: USER_PERMISSION.SHARES_ADMIN,
diff --git a/frontend/src/app/applications/users/user.service.ts b/frontend/src/app/applications/users/user.service.ts
index 55294eef..05c1d9cd 100644
--- a/frontend/src/app/applications/users/user.service.ts
+++ b/frontend/src/app/applications/users/user.service.ts
@@ -274,6 +274,7 @@ export class UserService {
if (menu.submenus?.length) {
this.setMenusVisibility(menu.submenus)
}
+ menu.hasSubmenus = !!menu.submenus?.some((submenu) => !submenu.hide)
// updates the files menu link based on user permissions
if (menu.title === SPACES_TITLE.FILES) {
for (const submenu of menu.submenus) {
diff --git a/frontend/src/app/layout/layout.interfaces.ts b/frontend/src/app/layout/layout.interfaces.ts
index e9517206..24d8d80e 100644
--- a/frontend/src/app/layout/layout.interfaces.ts
+++ b/frontend/src/app/layout/layout.interfaces.ts
@@ -35,6 +35,7 @@ export interface AppMenu {
// prop must be an attribute of the userService
checks?: { negate?: boolean; prop: 'user'; value: UserStatus }[]
submenus?: AppMenu[]
+ hasSubmenus?: boolean
}
export interface TabMenu {
diff --git a/frontend/src/app/layout/layout.service.ts b/frontend/src/app/layout/layout.service.ts
index e9b084c1..78f2fe23 100644
--- a/frontend/src/app/layout/layout.service.ts
+++ b/frontend/src/app/layout/layout.service.ts
@@ -142,10 +142,6 @@ export class LayoutService {
return window.innerWidth !== 0 && window.innerWidth < this.screenMediumSize
}
- isSmallerScreen() {
- return window.innerWidth !== 0 && window.innerWidth < this.screenSmallSize
- }
-
toggleTheme() {
this.setTheme(this.switchTheme.getValue() === themeLight ? themeDark : themeLight)
}
diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.html b/frontend/src/app/layout/sidebar/sidebar.left.component.html
index f3dfa295..c3dacf75 100644
--- a/frontend/src/app/layout/sidebar/sidebar.left.component.html
+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.html
@@ -56,7 +56,7 @@
<ng-template #MenuTemplate let-menu="menu">
<fa-icon [icon]="menu.icon" [animation]="menu.iconAnimated ? 'spin' : null"></fa-icon>
<span l10nTranslate>{{ menu.title }}</span>
- @if (menu?.submenus?.length) {
+ @if (menu.hasSubmenus) {
<span class="ms-auto opacity-75"><fa-icon [icon]="icons.faChevronDown" size="sm"></fa-icon></span>
}
@if (menu.count) {
@@ -74,7 +74,7 @@
<ng-container [ngTemplateOutlet]="MenuTemplate" [ngTemplateOutletContext]="{menu: menu}"></ng-container>
</a>
</div>
- @if (menu.submenus?.length) {
+ @if (menu.hasSubmenus) {
@for (submenu of menu.submenus; track submenu.title) {
@if (!submenu.hide) {
<div class="menu submenu" [class.active]="submenu.isActive">