Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
fix(frontend:search): keep spaces navigation visible during search
johavenad61c70900c7
diff --git a/frontend/src/app/applications/search/search.constants.ts b/frontend/src/app/applications/search/search.constants.tsindex 9dafd415..0a74b8f2 100644--- a/frontend/src/app/applications/search/search.constants.ts+++ b/frontend/src/app/applications/search/search.constants.ts@@ -1,6 +1,7 @@import type { LucideIcon } from '@lucide/angular'import { LucideSearch } from '@lucide/angular'import { AppMenu } from '../../layout/layout.interfaces'+import { SPACES_MENU } from '../spaces/spaces.constants'export const SEARCH_PATH = {BASE: 'search'@@ -13,5 +14,5 @@ export const SEARCH_MENU: AppMenu = {title: SEARCH_TITLE,link: SEARCH_PATH.BASE,icon: SEARCH_ICON,- submenus: []+ navigationMenu: SPACES_MENU} as constdiff --git a/frontend/src/app/layout/layout.interfaces.ts b/frontend/src/app/layout/layout.interfaces.tsindex 90cdda6a..915d06cf 100644--- a/frontend/src/app/layout/layout.interfaces.ts+++ b/frontend/src/app/layout/layout.interfaces.ts@@ -62,6 +62,8 @@ export interface AppMenu {count?: { value: Observable<any> & BehaviorSubject<any>; level: string }// prop must be an attribute of the userServicechecks?: { negate?: boolean; prop: 'user'; value: UserStatus }[]+ // Allows an application to display another application's navigation while remaining active.+ navigationMenu?: AppMenusubmenus?: AppMenuEntry[]hasSubmenus?: boolean}diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.html b/frontend/src/app/layout/sidebar/sidebar.left.component.htmlindex 6ed4fa30..39b47f9e 100644--- a/frontend/src/app/layout/sidebar/sidebar.left.component.html+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.html@@ -46,18 +46,18 @@<div class="menus-content"><div class="menus-group"><div class="menus-top">- @for (menu of currentMenu.submenus; track $index; let menuIndex = $index) {+ @for (menu of navigationSubmenus; track $index; let menuIndex = $index) {@if (menu.placement !== 'bottom') {<ng-container [ngTemplateOutlet]="MenuEntry"- [ngTemplateOutletContext]="{menus: currentMenu.submenus, menu: menu, menuIndex: menuIndex}"></ng-container>+ [ngTemplateOutletContext]="{menus: navigationSubmenus, menu: menu, menuIndex: menuIndex}"></ng-container>}}</div><div class="menus-bottom">- @for (menu of currentMenu.submenus; track $index; let menuIndex = $index) {+ @for (menu of navigationSubmenus; track $index; let menuIndex = $index) {@if (menu.placement === 'bottom') {<ng-container [ngTemplateOutlet]="MenuEntry"- [ngTemplateOutletContext]="{menus: currentMenu.submenus, menu: menu, menuIndex: menuIndex}"></ng-container>+ [ngTemplateOutletContext]="{menus: navigationSubmenus, menu: menu, menuIndex: menuIndex}"></ng-container>}}</div>diff --git a/frontend/src/app/layout/sidebar/sidebar.left.component.ts b/frontend/src/app/layout/sidebar/sidebar.left.component.tsindex 2b1f3262..ce376efe 100644--- a/frontend/src/app/layout/sidebar/sidebar.left.component.ts+++ b/frontend/src/app/layout/sidebar/sidebar.left.component.ts@@ -90,6 +90,10 @@ export class SideBarLeftComponent implements OnDestroy {this.updateDynamicTitle()}+ protected get navigationSubmenus(): AppMenuEntry[] {+ return (this.currentMenu?.navigationMenu ?? this.currentMenu)?.submenus ?? []+ }+protected showMenuSeparator(menus: AppMenuEntry[] | undefined, separatorIndex: number, separator: AppMenuEntry): boolean {if (!menus?.length || !isAppMenuSeparator(separator)) {return false