fix: use modal instead of menu inside of a split pane

Closes #234

frontend/app/src/app/modules/menu/context/context-menu-modal.animations.ts

@@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2025 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
 import {Animation, AnimationController} from '@ionic/angular';
 
 /**

frontend/app/src/app/modules/menu/context/context-menu-modal.component.spec.ts

@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2025 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+/* eslint-disable @typescript-eslint/no-non-null-assertion,@typescript-eslint/no-explicit-any */
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {FormsModule} from '@angular/forms';
+import {CommonModule} from '@angular/common';
+import {TranslateModule} from '@ngx-translate/core';
+import {IonicModule} from '@ionic/angular';
+import {SCThingType} from '@openstapps/core';
+import {ContextMenuModalComponent} from './context-menu-modal.component';
+import {ContextMenuService} from './context-menu.service';
+import {FilterContext, SortContext} from './context-type';
+import {provideIonicAngular, ModalController} from '@ionic/angular/standalone';
+import {BehaviorSubject, of} from 'rxjs';
+import {addIcons} from 'ionicons';
+import {swapVertical, trash} from 'ionicons/icons';
+
+describe('ContextMenuModalComponent', () => {
+  let fixture: ComponentFixture<ContextMenuModalComponent>;
+  let component: ContextMenuModalComponent;
+  let modalControllerSpy: jasmine.SpyObj<ModalController>;
+  let contextMenuServiceMock: Partial<ContextMenuService>;
+
+  // Register used icons (suppress warnings)
+  addIcons({
+    delete: trash,
+    sort: swapVertical,
+  });
+
+  beforeEach(async () => {
+    modalControllerSpy = jasmine.createSpyObj<ModalController>('ModalController', ['dismiss']);
+
+    contextMenuServiceMock = {
+      filterOptions: new BehaviorSubject<FilterContext | undefined>(getFilterContextType()),
+      sortOptions: new BehaviorSubject<SortContext | undefined>(getSortContextType()),
+      filterContextChanged$: of(getFilterContextType()),
+      sortContextChanged$: of(getSortContextType()),
+      contextFilterChanged: jasmine.createSpy(),
+      contextSortChanged: jasmine.createSpy(),
+    };
+
+    await TestBed.configureTestingModule({
+      declarations: [ContextMenuModalComponent],
+      imports: [CommonModule, FormsModule, TranslateModule.forRoot(), IonicModule.forRoot()],
+      providers: [
+        provideIonicAngular(),
+        {
+          provide: ModalController,
+          useValue: modalControllerSpy,
+        },
+        {
+          provide: ContextMenuService,
+          useValue: contextMenuServiceMock,
+        },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ContextMenuModalComponent);
+    component = fixture.componentInstance;
+
+    component.contextMenuService = contextMenuServiceMock as ContextMenuService;
+    component.translator = {
+      translatedPropertyValue: () => 'translated',
+    } as any;
+
+    fixture.detectChanges();
+  });
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should load initial sort and filter context', () => {
+    expect(component.sortOption?.value).toBe('relevance');
+    expect(component.filterOption?.options?.length).toBeGreaterThan(0);
+  });
+
+  it('should display sort items', () => {
+    const sortItems = fixture.nativeElement.querySelectorAll('.sort-item');
+    expect(sortItems.length).toBe(component.sortOption.values.length);
+  });
+
+  it('should update and reverse sort value on click', () => {
+    const value = component.sortOption.values[1]; // "name", reversible
+    component.sortChanged(component.sortOption, value);
+    expect(component.sortOption.value).toBe('name');
+    expect(component.sortOption.reversed).toBeFalse();
+
+    component.sortChanged(component.sortOption, value);
+    expect(component.sortOption.reversed).toBeTrue();
+  });
+
+  it('should call contextFilterChanged when filter is reset', () => {
+    component.filterOption.options[0].buckets[0].checked = true;
+    component.resetFilter(component.filterOption);
+    const allUnchecked = component.filterOption.options.every(opt =>
+      opt.buckets.every(bucket => !bucket.checked),
+    );
+    expect(allUnchecked).toBeTrue();
+    expect(contextMenuServiceMock.contextFilterChanged).toHaveBeenCalled();
+  });
+
+  it('should dismiss the modal', () => {
+    component.dismiss();
+    expect(modalControllerSpy.dismiss).toHaveBeenCalled();
+  });
+});
+
+/**
+ *
+ */
+function getSortContextType(): SortContext {
+  return {
+    name: 'sort',
+    reversed: false,
+    value: 'relevance',
+    values: [
+      {value: 'relevance', reversible: false},
+      {value: 'name', reversible: true},
+      {value: 'date', reversible: true},
+      {value: 'type', reversible: true},
+    ],
+  };
+}
+
+/**
+ *
+ */
+function getFilterContextType(): FilterContext {
+  return {
+    name: 'filter',
+    compact: false,
+    options: facetsMock
+      .filter(facet => facet.buckets.length > 0)
+      .map((facet, i) => ({
+        buckets: facet.buckets.map(bucket => ({
+          count: bucket.count,
+          key: bucket.key,
+          checked: false,
+        })),
+        compact: false,
+        field: facet.field,
+        onlyOnType: facet.onlyOnType,
+        info: {
+          onlyOnType: facet.onlyOnType,
+          field: facet.field,
+          sortOrder: i,
+        },
+      })),
+  };
+}
+
+const facetsMock = [
+  {
+    buckets: [
+      {count: 10, key: 'lecture'},
+      {count: 5, key: 'seminar'},
+    ],
+    field: 'type',
+    onlyOnType: SCThingType.AcademicEvent,
+  },
+  {
+    buckets: [{count: 7, key: 'research'}],
+    field: 'categories',
+    onlyOnType: SCThingType.AcademicEvent,
+  },
+];

frontend/app/src/app/modules/menu/context/context-menu-modal.component.ts

@@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2025 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
 import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
 import {SCLanguage, SCThingTranslator, SCThingType, SCTranslations} from '@openstapps/core';
 import {ContextMenuService} from './context-menu.service';
@@ -31,7 +45,7 @@ export class ContextMenuModalComponent implements OnInit, OnDestroy {
 
   constructor(
     private translateService: TranslateService,
-    private readonly modalCtrl: ModalController,
+    private readonly modalController: ModalController,
   ) {
     this.language = this.translateService.currentLang as keyof SCTranslations<SCLanguage>;
     this.translator = new SCThingTranslator(this.language);
@@ -108,6 +122,6 @@ export class ContextMenuModalComponent implements OnInit, OnDestroy {
   }
 
   dismiss() {
-    this.modalCtrl.dismiss();
+    this.modalController.dismiss();
   }
 }

frontend/app/src/app/modules/menu/context/context-menu-modal.html

@@ -1,3 +1,17 @@
+<!--
+~ Copyright (C) 2025 StApps
+~ This program is free software: you can redistribute it and/or modify it
+~ under the terms of the GNU General Public License as published by the Free
+~ Software Foundation, version 3.
+~
+~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ more details.
+~
+~ You should have received a copy of the GNU General Public License along with
+~ this program. If not, see <https://www.gnu.org/licenses/>.
+-->
 <ion-header>
   <ion-toolbar color="primary" mode="ios">
     <ion-label class="ion-padding-horizontal">

frontend/app/src/app/modules/menu/context/context-menu.component.spec.ts

@@ -1,303 +0,0 @@
-/*
- * Copyright (C) 2023 StApps
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <https://www.gnu.org/licenses/>.
- */
-/* eslint-disable @typescript-eslint/no-non-null-assertion, @typescript-eslint/ban-ts-comment */
-import {APP_BASE_HREF, CommonModule, Location, LocationStrategy, PathLocationStrategy} from '@angular/common';
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {FormsModule} from '@angular/forms';
-import {ChildrenOutletContexts, RouterModule, UrlSerializer} from '@angular/router';
-import {TranslateModule} from '@ngx-translate/core';
-import {SCFacet, SCThingType} from '@openstapps/core';
-import {ContextMenuComponent} from './context-menu.component';
-import {SettingsModule} from '../../settings/settings.module';
-import {ContextMenuService} from './context-menu.service';
-import {FilterContext, SortContext} from './context-type';
-import {Component} from '@angular/core';
-import {By} from '@angular/platform-browser';
-import {provideIonicAngular} from '@ionic/angular/standalone';
-
-@Component({
-  template: `<ion-content id="foo"></ion-content><stapps-context contentId="foo"></stapps-context> `,
-})
-class ContextMenuContainerComponent {}
-
-describe('ContextMenuComponent', async () => {
-  let fixture: ComponentFixture<ContextMenuContainerComponent>;
-  let instance: ContextMenuComponent;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [ContextMenuComponent, ContextMenuContainerComponent],
-      providers: [
-        provideIonicAngular(),
-        ChildrenOutletContexts,
-        Location,
-        UrlSerializer,
-        ContextMenuService,
-        {provide: LocationStrategy, useClass: PathLocationStrategy},
-        {provide: APP_BASE_HREF, useValue: '/'},
-      ],
-      imports: [
-        FormsModule,
-        TranslateModule.forRoot(),
-        CommonModule,
-        SettingsModule,
-        RouterModule.forRoot([]),
-      ],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(ContextMenuContainerComponent);
-    instance = fixture.debugElement.query(By.directive(ContextMenuComponent)).componentInstance;
-  });
-
-  it('should show items in sort context', () => {
-    instance.sortOption = getSortContextType();
-    fixture.detectChanges();
-    const sort: HTMLElement = fixture.debugElement.nativeElement.querySelector('.context-sort');
-    expect(sort!.querySelector('ion-radio')?.textContent).toContain('relevance');
-  });
-
-  it('should show items in filter context', () => {
-    instance.filterOption = getFilterContextType();
-    fixture.detectChanges();
-    const filter: HTMLElement = fixture.debugElement.nativeElement.querySelector('.context-filter');
-    const filterItem = filter.querySelector('.filter-group');
-    expect(filterItem!.querySelector('ion-list-header')!.textContent).toContain('Type');
-  });
-
-  it('should set sort context value and reverse on click', () => {
-    instance.sortOption = getSortContextType();
-    fixture.detectChanges();
-    const sort: HTMLElement = fixture.debugElement.nativeElement.querySelector('.context-sort');
-    // @ts-expect-error not relevant for this case
-    const sortItem: HTMLElement = sort.querySelectorAll('.sort-item')[1];
-    sortItem!.click();
-    expect(instance.sortOption.value).toEqual('name');
-    expect(instance.sortOption.reversed).toBe(false);
-
-    // click again for reverse
-    sortItem!.click();
-    expect(instance.sortOption.reversed).toBe(true);
-  });
-
-  it('should show all filterable facets', () => {
-    // get set facets with non empty buckets
-    const facets: SCFacet[] = getFilterContextType().options;
-
-    instance.filterOption = getFilterContextType();
-    fixture.detectChanges();
-    // get filter context div
-    const filter: HTMLElement = fixture.debugElement.nativeElement.querySelector('.context-filter');
-    // get all filter groups that represent a facet
-    const filterGroups = filter.querySelectorAll('.filter-group');
-
-    expect(filterGroups.length).toEqual(facets.length);
-
-    for (const facet of facets) {
-      let filterGroup;
-
-      // get filter option for facets field
-      // eslint-disable-next-line unicorn/no-array-for-each
-      filterGroups.forEach(element => {
-        if (
-          element
-            .querySelector('ion-list-header')!
-            .textContent!.toString()
-            .toLowerCase()
-            .includes(facet.field)
-        ) {
-          filterGroup = element;
-          return;
-        }
-      });
-
-      expect(filterGroup).toBeDefined();
-
-      const filterItems = filterGroup!.querySelectorAll('.filter-item-label');
-
-      if (filterItems.length !== facet.buckets.length) {
-        console.log(JSON.stringify(facet));
-      }
-      expect(filterItems.length).toEqual(facet.buckets.length);
-
-      // check all buckets are shown
-      for (const bucket of facet.buckets) {
-        let filterItem;
-
-        for (let i = 0; i < filterItems.length; i++) {
-          if (
-            filterItems.item(i).textContent!.toString().toLowerCase().indexOf(bucket.key.toLowerCase()) > 0
-          ) {
-            filterItem = filterItems.item(i);
-            break;
-          }
-        }
-        expect(filterItem).toBeDefined();
-      }
-    }
-  });
-
-  it('should reset filter', () => {
-    instance.filterOption = getFilterContextType();
-    instance.filterOption.options = [
-      {
-        field: 'type',
-        buckets: [{count: 10, key: 'date series', checked: true}],
-        info: {
-          onlyOnType: SCThingType.AcademicEvent,
-          field: 'date series',
-          sortOrder: 0,
-        },
-      },
-    ];
-
-    fixture.detectChanges();
-
-    // click reset button
-    const resetButton: HTMLElement = fixture.debugElement.nativeElement.querySelector('.resetFilterButton');
-    resetButton.click();
-
-    expect(instance.filterOption.options[0].buckets[0].checked).toEqual(false);
-  });
-});
-
-/**
- *
- */
-function getSortContextType(): SortContext {
-  return {
-    name: 'sort',
-    reversed: false,
-    value: 'relevance',
-    values: [
-      {
-        reversible: false,
-        value: 'relevance',
-      },
-      {
-        reversible: true,
-        value: 'name',
-      },
-      {
-        reversible: true,
-        value: 'date',
-      },
-      {
-        reversible: true,
-        value: 'type',
-      },
-    ],
-  };
-}
-
-/**
- *
- */
-function getFilterContextType(): FilterContext {
-  return {
-    name: 'filter',
-    compact: false,
-    options: facetsMock
-      .filter(facet => facet.buckets.length > 0)
-      .map((facet, i) => {
-        return {
-          buckets: facet.buckets.map(bucket => {
-            return {
-              count: bucket.count,
-              key: bucket.key,
-              checked: false,
-            };
-          }),
-          compact: false,
-          field: facet.field,
-          onlyOnType: facet.onlyOnType,
-          info: {
-            onlyOnType: facet.onlyOnType,
-            field: facet.field,
-            sortOrder: i,
-          },
-        };
-      }),
-  };
-}
-
-const facetsMock: SCFacet[] = [
-  {
-    buckets: [
-      {
-        count: 60,
-        key: 'academic event',
-      },
-      {
-        count: 160,
-        key: 'message',
-      },
-      {
-        count: 151,
-        key: 'date series',
-      },
-      {
-        count: 106,
-        key: 'dish',
-      },
-      {
-        count: 20,
-        key: 'building',
-      },
-    ],
-    field: 'type',
-  },
-  {
-    buckets: [
-      {
-        count: 12,
-        key: 'Max Mustermann',
-      },
-      {
-        count: 2,
-        key: 'Foo Bar',
-      },
-    ],
-    field: 'performers',
-    onlyOnType: SCThingType.AcademicEvent,
-  },
-  {
-    buckets: [
-      {
-        count: 5,
-        key: 'colloquium',
-      },
-      {
-        count: 15,
-        key: 'course',
-      },
-    ],
-    field: 'categories',
-    onlyOnType: SCThingType.AcademicEvent,
-  },
-  {
-    buckets: [
-      {
-        count: 5,
-        key: 'employees',
-      },
-      {
-        count: 15,
-        key: 'students',
-      },
-    ],
-    field: 'audiences',
-    onlyOnType: SCThingType.Message,
-  },
-];

frontend/app/src/app/modules/menu/context/context-menu.service.spec.ts

@@ -12,14 +12,13 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-
 import {TestBed} from '@angular/core/testing';
-
 import {ContextMenuService} from './context-menu.service';
 import {SCFacet} from '@openstapps/core';
 import {FilterContext, SortContext} from './context-type';
 import {ThingTranslateModule} from '../../../translation/thing-translate.module';
 import {TranslateModule} from '@ngx-translate/core';
+import {firstValueFrom, filter} from 'rxjs';
 
 describe('ContextMenuService', () => {
   let service: ContextMenuService;
@@ -36,39 +35,39 @@ describe('ContextMenuService', () => {
     expect(service).toBeTruthy();
   });
 
-  it('should update filterOptions', done => {
+  it('should update filterOptions', async () => {
-    service.filterContextChanged$.subscribe(result => {
-      expect(result).toBeDefined();
-      done();
-    });
     service.updateContextFilter(facetsMock);
+
+    const result = await firstValueFrom(service.filterContextChanged$.pipe(filter(Boolean)));
+
+    expect(result).toBeDefined();
   });
 
-  it('should update filterQuery', done => {
+  it('should update filterQuery', async () => {
-    service.filterContextChanged$.subscribe(result => {
-      expect(result).toBeDefined();
-      expect(service.contextFilter.options[0].buckets.length).toEqual(
-        filterContext.options[0].buckets.length,
-      );
-      done();
-    });
     service.updateContextFilter(facetsMock);
+    const result = await firstValueFrom(service.filterContextChanged$.pipe(filter(Boolean)));
+
+    expect(result).toBeDefined();
+
+    const current = service.contextFilter;
+
+    expect(current.options[0].buckets.length).toEqual(filterContext.options[0].buckets.length);
   });
 
-  it('should update sortOptions', done => {
+  it('should update sortOptions', async () => {
-    service.sortContextChanged$.subscribe(result => {
-      expect(result).toBeDefined();
-      done();
-    });
     service.setContextSort(sortContext);
+
+    const result = await firstValueFrom(service.sortContextChanged$.pipe(filter(Boolean)));
+
+    expect(result).toBeDefined();
   });
 
-  it('should update sortQuery', done => {
+  it('should update sortQuery', async () => {
-    service.sortContextChanged$.subscribe(result => {
-      expect(result).toBeDefined();
-      done();
-    });
     service.setContextSort(sortContext);
+
+    const result = await firstValueFrom(service.sortContextChanged$.pipe(filter(Boolean)));
+
+    expect(result).toBeDefined();
   });
 });
 

frontend/app/src/app/modules/schedule/page/calendar-view.html

@@ -14,10 +14,10 @@
 -->
 <div class="header">
   <ion-button fill="clear" class="left-button" (click)="mainSwiper.pageBackwards()">
-    <ion-icon slot="icon-only" name="navigate_before"></ion-icon>
+    <ion-icon slot="icon-only" name="chevron_left"></ion-icon>
   </ion-button>
   <ion-button fill="clear" class="right-button" (click)="mainSwiper.pageForward()">
-    <ion-icon slot="icon-only" name="navigate_next"></ion-icon>
+    <ion-icon slot="icon-only" name="chevron_right"></ion-icon>
   </ion-button>
   <infinite-swiper
     class="header-swiper"

frontend/app/src/app/modules/schedule/page/schedule-view.html

@@ -14,10 +14,10 @@
 -->
 <div class="header">
   <ion-button fill="clear" class="left-button" (click)="mainSwiper.swiperRef.slidePrev()">
-    <ion-icon slot="icon-only" name="navigate_before"></ion-icon>
+    <ion-icon slot="icon-only" name="chevron_left"></ion-icon>
   </ion-button>
   <ion-button fill="clear" class="right-button" (click)="mainSwiper.swiperRef.slideNext()">
-    <ion-icon slot="icon-only" name="navigate_next"></ion-icon>
+    <ion-icon slot="icon-only" name="chevron_right"></ion-icon>
   </ion-button>
   <swiper
     class="header-swiper"

frontend/app/src/environments/environment.production.ts

@@ -21,7 +21,7 @@ export const environment = {
   backend_url: 'https://mobile.server.uni-frankfurt.de',
   app_host: 'mobile.app.uni-frankfurt.de',
   custom_url_scheme: 'de.anyschool.app',
-  backend_version: '3.3.0',
+  backend_version: '4.0.0',
   production: true,
 };