feat: improve search experience

Closes #234

backend/backend/config/b-tu/elasticsearchrc.js

@@ -8,8 +8,7 @@ const config = {
     database: {
       name: 'elasticsearch',
       query: {
-        minMatch: '60%',
-        queryType: 'query_string',
+        fields: ["name"]
       },
     },
   },

backend/backend/config/default/backend/boostings.js

@@ -39,7 +39,7 @@ const boostings = {
       type: SCThingType.AcademicEvent,
     },
     {
-      factor: 1.6,
+      factor: 2,
       type: SCThingType.Building,
     },
     {
@@ -85,7 +85,7 @@ const boostings = {
   ],
   place: [
     {
-      factor: 2,
+      factor: 3,
       type: SCThingType.Building,
     },
     {

backend/backend/config/default/elasticsearchrc.js

@@ -17,12 +17,21 @@ const config = {
       name: 'elasticsearch',
       version: '8.4.2',
       query: {
-        minMatch: '75%',
-        queryType: 'dis_max',
-        matchBoosting: 1.3,
-        fuzziness: 'AUTO',
-        cutoffFrequency: 0,
-        tieBreaker: 0,
+        type: 'best_fields',
+        fields: [
+          'identifiers^20',
+          'name^10',
+          'translations.*.name^10',
+          'alternateNames^10',
+          'translations.*.alternateNames^10',
+          'description^2',
+          'translations.*.description^2',
+          'categories^5',
+        ],
+      },
+      searchAsYouTypeQuery: {
+        type: 'phrase_prefix',
+        fields: ['name.completion', 'name.completion._2gram', 'name.completion._3gram'],
       },
     },
   },

backend/backend/src/storage/elasticsearch/elasticsearch.ts

@@ -20,6 +20,8 @@ import {
   IndicesGetAliasResponse,
   SearchHit,
   SearchResponse,
+  SearchTermSuggest,
+  SearchTermSuggestOption,
 } from '@elastic/elasticsearch/lib/api/types.js';
 import {SCConfigFile, SCSearchQuery, SCSearchResponse, SCThings, SCUuid} from '@openstapps/core';
 import {Logger} from '@openstapps/logger';
@@ -47,6 +49,9 @@ import {
 import {noUndefined} from './util/no-undefined.js';
 import {retryCatch, RetryOptions} from './util/retry.js';
 import {Feature, Point, Polygon} from 'geojson';
+import {parseSuggestions} from './util/parse-suggestions.js';
+import {buildScoringFunctions} from './query/boost/scoring-functions.js';
+import {buildFilter} from './query/filter.js';
 
 /**
  * A database interface for elasticsearch
@@ -355,6 +360,39 @@ export class Elasticsearch implements Database {
     throw new Error('You tried to PUT an non-existing object. PUT is only supported on existing objects.');
   }
 
+  public async searchAsYouType(parameters: SCSearchQuery): Promise<SCSearchResponse> {
+    const result = await this.client.search({
+      _source: 'name',
+      query: {
+        function_score: {
+          functions: buildScoringFunctions(this.config.internal.boostings, parameters.context),
+          query: {
+            bool: {
+              must: {
+                multi_match: {
+                  query: parameters.query,
+                  type: 'bool_prefix',
+                  fields: ['name.completion', 'name.completion._2gram', 'name.completion._3gram'],
+                },
+              },
+              should: [],
+              filter: parameters.filter === undefined ? undefined : buildFilter(parameters.filter),
+            },
+          },
+          score_mode: 'max',
+          boost_mode: 'multiply',
+        },
+      },
+      index: ACTIVE_INDICES_ALIAS,
+      allow_no_indices: true,
+      size: 5,
+    });
+
+    const suggestions = result.hits.hits.map(it => (it._source as any).name);
+    console.log(suggestions);
+    console.log(result.took);
+  }
+
   /**
    * Search all indexed data
    * @param parameters search query
@@ -364,18 +402,23 @@ export class Elasticsearch implements Database {
       throw new TypeError('Database is undefined. You have to configure the query build');
     }
 
-    const esConfig: ElasticsearchConfig = {
-      name: this.config.internal.database.name as 'elasticsearch',
-      version: this.config.internal.database.version as string,
-      query: this.config.internal.database.query as
-        | ElasticsearchQueryDisMaxConfig
-        | ElasticsearchQueryQueryStringConfig
-        | undefined,
-    };
+    const esConfig = this.config.internal.database as object as ElasticsearchConfig;
 
     const response: SearchResponse<SCThings> = await this.client.search({
       aggs: aggregations,
       query: buildQuery(parameters, this.config, esConfig),
+      suggest:
+        parameters.query === undefined
+          ? undefined
+          : {
+              text: parameters.query,
+              terms: {
+                term: {
+                  field: 'name',
+                  suggest_mode: 'missing',
+                },
+              },
+            },
       from: parameters.from,
       index: ACTIVE_INDICES_ALIAS,
       allow_no_indices: true,
@@ -395,6 +438,7 @@ export class Elasticsearch implements Database {
         response.aggregations === undefined
           ? []
           : parseAggregations(response.aggregations as Record<AggregateName, AggregationsMultiTermsBucket>),
+      suggestions: response.suggest === undefined ? undefined : parseSuggestions(response.suggest),
       pagination: {
         count: response.hits.hits.length,
         offset: typeof parameters.from === 'number' ? parameters.from : 0,

backend/backend/src/storage/elasticsearch/query/query.ts

@@ -30,84 +30,21 @@ export const buildQuery = function buildQuery(
   defaultConfig: SCConfigFile,
   elasticsearchConfig: ElasticsearchConfig,
 ): QueryDslQueryContainer {
-  // if config provides a minMatch parameter, we use query_string instead of a match query
-  let query;
-  if (elasticsearchConfig.query === undefined) {
-    query = {
-      query_string: {
-        analyzer: 'search_german',
-        default_field: 'name',
-        minimum_should_match: '90%',
-        query: typeof parameters.query === 'string' ? parameters.query : '*',
-      },
-    };
-  } else if (elasticsearchConfig.query.queryType === 'query_string') {
-    query = {
-      query_string: {
-        analyzer: 'search_german',
-        default_field: 'name',
-        minimum_should_match: elasticsearchConfig.query.minMatch,
-        query: typeof parameters.query === 'string' ? parameters.query : '*',
-      },
-    };
-  } else if (elasticsearchConfig.query.queryType === 'dis_max') {
-    if (typeof parameters.query === 'string' && parameters.query !== '*') {
-      query = {
-        dis_max: {
-          boost: 1.2,
-          queries: [
-            {
-              match: {
-                name: {
-                  boost: elasticsearchConfig.query.matchBoosting,
-                  fuzziness: elasticsearchConfig.query.fuzziness,
-                  query: parameters.query,
-                },
-              },
-            },
-            {
-              query_string: {
-                default_field: 'name',
-                minimum_should_match: elasticsearchConfig.query.minMatch,
-                query: parameters.query,
-              },
-            },
-          ],
-          tie_breaker: elasticsearchConfig.query.tieBreaker,
-        },
-      };
-    }
-  } else {
-    throw new Error(
-      'Unsupported query type. Check your config file and reconfigure your elasticsearch query',
-    );
-  }
-
-  const functionScoreQuery: QueryDslQueryContainer = {
+  return {
     function_score: {
       functions: buildScoringFunctions(defaultConfig.internal.boostings, parameters.context),
       query: {
         bool: {
-          minimum_should_match: 0, // if we have no should, nothing can match
-          must: [],
+          must:
+            parameters.query === undefined || parameters.query === '' || parameters.query === '*'
+              ? {match_all: {}}
+              : {multi_match: {...elasticsearchConfig.query, query: parameters.query}},
           should: [],
+          filter: parameters.filter === undefined ? undefined : buildFilter(parameters.filter),
         },
       },
-      score_mode: 'multiply',
+      score_mode: 'max',
+      boost_mode: 'multiply',
     },
   };
-
-  const mustMatch = functionScoreQuery.function_score?.query?.bool?.must;
-
-  if (Array.isArray(mustMatch)) {
-    if (query !== undefined) {
-      mustMatch.push(query);
-    }
-
-    if (parameters.filter !== undefined) {
-      mustMatch.push(buildFilter(parameters.filter));
-    }
-  }
-
-  return functionScoreQuery;
 };

backend/backend/src/storage/elasticsearch/types/elasticsearch-config.ts

@@ -13,68 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-/**
- * A configuration for using the Dis Max Query
- *
- * See https://www.elastic.co/guide/en/elasticsearch/reference/5.5/query-dsl-dis-max-query.html for further
- * explanation of what the parameters mean
- */
-export interface ElasticsearchQueryDisMaxConfig {
-  /**
-   * Relative (to a total number of documents) or absolute number to exclude meaningless matches that frequently appear
-   */
-  cutoffFrequency: number;
-
-  /**
-   * The maximum allowed Levenshtein Edit Distance (or number of edits)
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/common-options.html#fuzziness
-   */
-  fuzziness: number | string;
-
-  /**
-   * Increase the importance (relevance score) of a field
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/mapping-boost.html
-   */
-  matchBoosting: number;
-
-  /**
-   * Minimal number (or percentage) of words that should match in a query
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-minimum-should-match.html
-   */
-  minMatch: string;
-
-  /**
-   * Type of the query - in this case 'dis_max' which is a union of its subqueries
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-dis-max-query.html
-   */
-  queryType: 'dis_max';
-
-  /**
-   * Changes behavior of default calculation of the score when multiple results match
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-multi-match-query.html#tie-breaker
-   */
-  tieBreaker: number;
-}
-
-/**
- * A configuration for using Query String Query
- *
- * See https://www.elastic.co/guide/en/elasticsearch/reference/5.5/query-dsl-query-string-query.html for further
- * explanation of what the parameters mean
- */
-export interface ElasticsearchQueryQueryStringConfig {
-  /**
-   * Minimal number (or percentage) of words that should match in a query
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-minimum-should-match.html
-   */
-  minMatch: string;
-
-  /**
-   * Type of the query - in this case 'query_string' which uses a query parser in order to parse content
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-query-string-query.html
-   */
-  queryType: 'query_string';
-}
+import {QueryDslMultiMatchQuery} from '@elastic/elasticsearch/lib/api/types.js';
 
 /**
  * An config file for the elasticsearch database interface
@@ -105,7 +44,12 @@ export interface ElasticsearchConfig {
   /**
    * Configuration for using queries
    */
-  query?: ElasticsearchQueryDisMaxConfig | ElasticsearchQueryQueryStringConfig;
+  query: Omit<QueryDslMultiMatchQuery, 'query'>;
+
+  /**
+   *
+   */
+  searchAsYouTypeQuery: Omit<QueryDslMultiMatchQuery, 'query'>;
 
   /**
    * Version of the used elasticsearch

backend/backend/src/storage/elasticsearch/util/parse-suggestions.ts

@@ -0,0 +1,28 @@
+import {
+  SearchSuggest,
+  SearchTermSuggest,
+  SearchTermSuggestOption,
+  SuggestionName,
+} from '@elastic/elasticsearch/lib/api/types.js';
+import {SCSearchSuggestions} from '@openstapps/core';
+
+/**
+ * Parse ES Suggestions to SC Search Suggestions
+ */
+export function parseSuggestions(suggest: Record<SuggestionName, SearchSuggest[]>): SCSearchSuggestions {
+  const termsSuggestions =
+    suggest.terms === undefined
+      ? []
+      : (suggest.terms as SearchTermSuggest[])
+          ?.map(
+            ({text, options}) =>
+              [
+                text,
+                (options as SearchTermSuggestOption[] | undefined)?.map(({text}) => text) ?? [],
+              ] as const,
+          )
+          .filter(([, suggestions]) => suggestions.length > 0) ?? [];
+  return {
+    terms: termsSuggestions.length === 0 ? undefined : Object.fromEntries(termsSuggestions),
+  };
+}

frontend/app/cypress/integration/context-menu.spec.ts

@@ -14,6 +14,8 @@
  */
 
 describe('context menu', function () {
+  const contextMenuSelector = 'stapps-context-menu-modal';
+
   beforeEach(function () {
     cy.interceptSearch({
       extends: {query: 'a'},
@@ -33,21 +35,21 @@ describe('context menu', function () {
   });
 
   it('should sort', function () {
-    cy.get('stapps-context').within(() => {
+    cy.get(contextMenuSelector).within(() => {
       cy.contains('ion-item', 'Name').click();
       cy.wait('@search');
     });
   });
 
   it('should filter', function () {
-    cy.get('stapps-context').within(() => {
+    cy.get(contextMenuSelector).within(() => {
       cy.contains('ion-item', '(17) Akademische Veranstaltung').click();
       cy.wait('@search');
     });
   });
 
   it('should have a working delete button', function () {
-    cy.get('stapps-context').within(() => {
+    cy.get(contextMenuSelector).within(() => {
       cy.contains('ion-item', '(17) Akademische Veranstaltung').click();
 
       cy.get('.checkbox-checked').should('have.length', 1);
@@ -60,7 +62,7 @@ describe('context menu', function () {
   it('should truncate long category items', function () {
     cy.contains('ion-list', 'Akademische Veranstaltung / Kategorien').within(() => {
       cy.contains('ion-item', '(1) Tutorium').should('not.exist');
-      cy.get('div > ion-button').click();
+      cy.get('ion-button').click();
       cy.contains('ion-item', '(1) Tutorium').should('exist');
     });
   });

frontend/app/src/app/modules/data/list/search-page.component.ts

@@ -15,7 +15,12 @@
 import {Component, DestroyRef, inject, Input, OnInit} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {Keyboard} from '@capacitor/keyboard';
-import {AlertController, AnimationBuilder, AnimationController} from '@ionic/angular/standalone';
+import {
+  AlertController,
+  AnimationBuilder,
+  AnimationController,
+  ModalController,
+} from '@ionic/angular/standalone';
 import {Capacitor} from '@capacitor/core';
 import {
   SCFacet,
@@ -24,6 +29,7 @@ import {
   SCSearchQuery,
   SCSearchSort,
   SCThings,
+  SCSearchSuggestions,
 } from '@openstapps/core';
 import {NGXLogger} from 'ngx-logger';
 import {combineLatest, Subject} from 'rxjs';
@@ -36,6 +42,8 @@ import {PositionService} from '../../map/position.service';
 import {ConfigProvider} from '../../config/config.provider';
 import {searchPageSwitchAnimation} from './search-page-switch-animation';
 import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
+import {ContextMenuModalComponent} from '../../menu/context/context-menu-modal.component';
+import {enterAnimation, leaveAnimation} from '../../menu/context/context-menu-modal.animations';
 
 /**
  * SearchPageComponent queries things and shows list of things as search results and filter as context menu
@@ -110,6 +118,8 @@ export class SearchPageComponent implements OnInit {
    */
   items: Promise<SCThings[]>;
 
+  suggestions: SCSearchSuggestions | undefined;
+
   /**
    * Page size of queries
    */
@@ -173,7 +183,8 @@ export class SearchPageComponent implements OnInit {
     private readonly route: ActivatedRoute,
     protected positionService: PositionService,
     private readonly configProvider: ConfigProvider,
-    animationController: AnimationController,
+    protected animationController: AnimationController,
+    protected modalController: ModalController,
   ) {
     this.routeAnimation = searchPageSwitchAnimation(animationController);
   }
@@ -219,6 +230,7 @@ export class SearchPageComponent implements OnInit {
 
     try {
       const result = await this.dataProvider.search(searchOptions);
+      this.suggestions = result.suggestions;
       this.singleTypeResponse = result.facets.find(facet => facet.field === 'type')?.buckets.length === 1;
       if (append) {
         // append results
@@ -283,6 +295,12 @@ export class SearchPageComponent implements OnInit {
     this.contextMenuService.updateContextFilter(facets);
   }
 
+  applySuggestion(target: string, suggestion: string) {
+    this.queryText = this.queryText.replaceAll(target, suggestion);
+    this.suggestions = undefined;
+    this.searchStringChanged(this.queryText);
+  }
+
   ngOnInit(defaultListeners = true) {
     this.initialize();
     this.contextMenuService.setContextSort({
@@ -368,4 +386,20 @@ export class SearchPageComponent implements OnInit {
       this.searchStringChanged(term);
     }
   }
+
+  async openContextMenu(): Promise<void> {
+    const modal = await this.modalController.create({
+      component: ContextMenuModalComponent,
+      cssClass: 'context-menu-modal',
+      showBackdrop: true,
+      backdropDismiss: true,
+      enterAnimation: (baseElement: HTMLElement) => enterAnimation(baseElement, this.animationController),
+      leaveAnimation: (baseElement: HTMLElement) => leaveAnimation(baseElement, this.animationController),
+      componentProps: {
+        contextMenuService: this.contextMenuService,
+      },
+    });
+
+    await modal.present();
+  }
 }

frontend/app/src/app/modules/data/list/search-page.html

@@ -12,10 +12,6 @@
 ~ You should have received a copy of the GNU General Public License along with
 ~ this program. If not, see <https://www.gnu.org/licenses/>.
 -->
-
-@if (showContextMenu) {
-  <stapps-context contentId="data-list"></stapps-context>
-}
 <ion-header>
   @if (showDrawer && showTopToolbar) {
     <ion-toolbar color="primary" mode="ios">
@@ -41,7 +37,7 @@
     >
     </ion-searchbar>
     @if (showContextMenu) {
-      <ion-menu-button menu="context" auto-hide="false" slot="end">
+      <ion-menu-button menu="context" auto-hide="false" slot="end" (click)="openContextMenu()">
         <ion-icon name="tune"></ion-icon>
       </ion-menu-button>
     }
@@ -69,7 +65,23 @@
 </ion-header>
 
 <ion-content class="content">
+  <div class="suggestions">
+    @if (suggestions?.terms; as terms) {
+      <span>{{ 'search.SUGGESTIONS' | translate }}: </span>
+      @for (suggestion of terms | keyvalue; track suggestion) {
+        @for (term of suggestion.value; track term) {
+          @if ($index == 0) {
+            <b (click)="applySuggestion(suggestion.key, term)" class="suggestion">{{ term }}</b>
+          } @else {
+            <span (click)="applySuggestion(suggestion.key, term)" class="suggestion">{{ term }}</span>
+          }
+        }
+      }
+    }
+  </div>
+
   <div
+    class="hint"
     [class.no-results]="!showDefaultData && !items && !loading"
     [style.display]="!showDefaultData && !items && !loading ? 'block' : 'none'"
   >

frontend/app/src/app/modules/data/list/search-page.scss

@@ -46,7 +46,7 @@ ion-content {
   --background: var(--ion-background-color);
 }
 
-.content > div {
+.content > .hint {
   height: 100%;
 
   ion-label.centered-message-container {
@@ -60,3 +60,19 @@ ion-content {
 ion-header {
   background: var(--ion-color-primary);
 }
+
+.suggestions {
+  padding: var(--spacing-md);
+  padding-block-end: 0;
+}
+
+.suggestion {
+  cursor: pointer;
+}
+
+.suggestion + .suggestion::before {
+  cursor: text;
+  content: ',';
+  padding-inline-end: 0.25ch;
+  font-weight: normal;
+}

frontend/app/src/app/modules/favorites/favorites-page.component.ts

@@ -13,7 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {Component, OnInit} from '@angular/core';
-import {AlertController, AnimationController} from '@ionic/angular/standalone';
+import {AlertController, AnimationController, ModalController} from '@ionic/angular/standalone';
 import {ActivatedRoute, Router} from '@angular/router';
 import {NGXLogger} from 'ngx-logger';
 import {debounceTime, distinctUntilChanged, startWith, take} from 'rxjs/operators';
@@ -55,6 +55,7 @@ export class FavoritesPageComponent extends SearchPageComponent implements OnIni
     private favoritesService: FavoritesService,
     configProvider: ConfigProvider,
     animationController: AnimationController,
+    modalController: ModalController,
   ) {
     super(
       alertController,
@@ -68,6 +69,7 @@ export class FavoritesPageComponent extends SearchPageComponent implements OnIni
       positionService,
       configProvider,
       animationController,
+      modalController,
     );
   }
 

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

@@ -0,0 +1,68 @@
+/*
+ * 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';
+
+/**
+ * Defines the animation for showing a modal as a right-hand sidebar.
+ * @param baseElement The root element of the modal (including Shadow DOM).
+ * @param animationCtrl The Ionic AnimationController.
+ * @returns The configured Ionic animation.
+ */
+export const enterAnimation = (baseElement: HTMLElement, animationCtrl: AnimationController): Animation => {
+  const root = baseElement.shadowRoot;
+
+  const backdrop = root?.querySelector('ion-backdrop');
+  const wrapper = root?.querySelector('.modal-wrapper');
+
+  // The wrapper needs to be positioned on the right side
+  if (wrapper instanceof HTMLElement) {
+    Object.assign(wrapper.style, {
+      position: 'absolute',
+      top: '0',
+      right: '0',
+      height: '100%',
+      width: '304px',
+      maxWidth: '75%',
+      opacity: '1',
+    });
+  }
+
+  const backdropAnimation = animationCtrl
+    .create()
+    .addElement(backdrop!)
+    .fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
+
+  const wrapperAnimation = animationCtrl
+    .create()
+    .addElement(wrapper!)
+    .fromTo('transform', 'translateX(100%)', 'translateX(0)');
+
+  return animationCtrl
+    .create()
+    .addElement(baseElement)
+    .duration(400)
+    .easing('ease-out')
+    .addAnimation([backdropAnimation, wrapperAnimation]);
+};
+
+/**
+ * Defines the animation for hiding a modal by sliding it out to the right.
+ * @param baseElement The root element of the modal.
+ * @param animationCtrl The Ionic AnimationController.
+ * @returns The configured Ionic animation (reverse of enterAnimation).
+ */
+export const leaveAnimation = (baseElement: HTMLElement, animationCtrl: AnimationController): Animation => {
+  return enterAnimation(baseElement, animationCtrl).direction('reverse');
+};

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,5 +1,5 @@
 /*
- * Copyright (C) 2023 StApps
+ * 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.
@@ -12,76 +12,40 @@
  * 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 {Component, Input} from '@angular/core';
 import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
 import {SCLanguage, SCThingTranslator, SCThingType, SCTranslations} from '@openstapps/core';
 import {ContextMenuService} from './context-menu.service';
 import {FilterContext, FilterFacet, SortContext, SortContextOption} from './context-type.js';
 import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
+import {ModalController} from '@ionic/angular/standalone';
+import {Component, Input, OnInit, OnDestroy} from '@angular/core';
+import {Subject, takeUntil} from 'rxjs';
 
-/**
- * The context menu
- *
- * It can be configured with sorting types and filtering on facets
- *
- * Example:<br>
- *  `<stapps-context (optionChange)="onOptionChange($event)" (settingChange)="onSettingChange($event)"
- *  [sortOption]="SortContext" [filterOption]="FilterContext"></stapps-context>`
- */
 @Component({
-  selector: 'stapps-context',
-  templateUrl: 'context-menu.html',
+  selector: 'stapps-context-menu-modal',
+  templateUrl: './context-menu-modal.html',
 })
-export class ContextMenuComponent {
-  /**
-   * Id of the content the menu is used for
-   */
-  @Input()
-  contentId: string;
+export class ContextMenuModalComponent implements OnInit, OnDestroy {
+  @Input() contextMenuService: ContextMenuService;
 
-  /**
-   * Amount of filter options shown on compact view
-   */
   compactFilterOptionCount = 5;
 
-  /**
-   * Container for the filter context
-   */
   filterOption: FilterContext;
 
-  /**
-   * Picks facets based on the compact filter option and sorts
-   * them based on
-   *
-   * No specific type => Type name alphabetically => Bucket count
-   */
-  get facets(): FilterFacet[] {
-    return this.filterOption.options.filter(it => it.buckets.length > 0);
-  }
-
-  /**
-   * Possible languages to be used for translation
-   */
-  language: keyof SCTranslations<SCLanguage>;
-
-  /**
-   * Mapping of SCThingType
-   */
-  scThingType = SCThingType;
-
-  /**
-   * Container for the sort context
-   */
   sortOption: SortContext;
 
-  /**
-   * Core translator
-   */
+  language: keyof SCTranslations<SCLanguage>;
+
   translator: SCThingTranslator;
 
+  scThingType = SCThingType;
+
+  // Using a subject to manage subscriptions for clean-up
+  private readonly destroy$ = new Subject<void>();
+
   constructor(
     private translateService: TranslateService,
-    private readonly contextMenuService: ContextMenuService,
+    private readonly modalController: ModalController,
   ) {
     this.language = this.translateService.currentLang as keyof SCTranslations<SCLanguage>;
     this.translator = new SCThingTranslator(this.language);
@@ -90,43 +54,56 @@ export class ContextMenuComponent {
       this.language = event.lang as keyof SCTranslations<SCLanguage>;
       this.translator = new SCThingTranslator(this.language);
     });
-    this.contextMenuService.filterContextChanged$.pipe(takeUntilDestroyed()).subscribe(filterContext => {
-      this.filterOption = filterContext;
+  }
+
+  ngOnInit(): void {
+    const initialFilter = this.contextMenuService.filterOptions.getValue();
+    if (initialFilter) {
+      this.filterOption = initialFilter;
+    }
+
+    const initialSort = this.contextMenuService.sortOptions.getValue();
+    if (initialSort) {
+      this.sortOption = initialSort;
+    }
+
+    // Move the subscription logic here. It's now safe to access this.contextMenuService.
+    this.contextMenuService.filterContextChanged$.pipe(takeUntil(this.destroy$)).subscribe(fc => {
+      if (fc) {
+        this.filterOption = fc;
+      }
     });
-    this.contextMenuService.sortOptions.pipe(takeUntilDestroyed()).subscribe(sortContext => {
-      this.sortOption = sortContext;
+
+    this.contextMenuService.sortContextChanged$.pipe(takeUntil(this.destroy$)).subscribe(sc => {
+      if (sc) {
+        this.sortOption = sc;
+      }
     });
   }
 
-  /**
-   * Sets selected filter options and updates listener
-   */
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
+  get facets(): FilterFacet[] {
+    return this.filterOption?.options?.filter(it => it.buckets.length > 0) || [];
+  }
+
+  resetFilter(option: FilterContext) {
+    for (const facet of option.options) {
+      for (const bucket of facet.buckets) {
+        bucket.checked = false;
+      }
+    }
+    this.contextMenuService.contextFilterChanged(this.filterOption);
+  }
+
   filterChanged = () => {
     this.contextMenuService.contextFilterChanged(this.filterOption);
   };
 
-  /**
-   * Returns translated property value
-   */
-  getTranslatedPropertyValue(onlyForType: SCThingType, field: string, key?: string): string | undefined {
-    return this.translator.translatedPropertyValue(onlyForType, field, key);
-  }
-
-  /**
-   * Resets filter options
-   */
-  resetFilter = (option: FilterContext) => {
-    for (const filterFacet of option.options)
-      for (const filterBucket of filterFacet.buckets) {
-        filterBucket.checked = false;
-      }
-    this.contextMenuService.contextFilterChanged(this.filterOption);
-  };
-
-  /**
-   * Updates selected sort option and updates listener
-   */
-  sortChanged = (option: SortContext, value: SortContextOption) => {
+  sortChanged(option: SortContext, value: SortContextOption) {
     if (option.value === value.value) {
       if (value.reversible) {
         option.reversed = !option.reversed;
@@ -138,5 +115,13 @@ export class ContextMenuComponent {
       }
     }
     this.contextMenuService.contextSortChanged(option);
-  };
+  }
+
+  getTranslatedPropertyValue(onlyForType: SCThingType, field: string, key?: string): string | undefined {
+    return this.translator.translatedPropertyValue(onlyForType, field, key);
+  }
+
+  dismiss() {
+    this.modalController.dismiss();
+  }
 }

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

@@ -0,0 +1,104 @@
+<!--
+~ 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">
+      <h1 class="ion-padding-horizontal">{{ 'menu.context.title' | translate | titlecase }}</h1>
+    </ion-label>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <!-- Sort Context -->
+  <ion-list *ngIf="sortOption">
+    <ion-radio-group class="context-sort" [value]="0">
+      <ion-list-header>
+        <ion-icon name="sort"></ion-icon>
+        <ion-title>{{ 'menu.context.sort.title' | translate | titlecase }}</ion-title>
+      </ion-list-header>
+      <ion-item
+        class="sort-item"
+        *ngFor="let value of sortOption.values; let i = index"
+        (click)="sortChanged(sortOption, value)"
+      >
+        <ion-radio [value]="i">
+          {{ 'menu.context.sort.' + value.value | translate | titlecase }}
+          <span *ngIf="sortOption.value === value.value && value.reversible">
+            <ion-icon *ngIf="sortOption.reversed" name="arrow_downward"></ion-icon>
+            <ion-icon *ngIf="!sortOption.reversed" name="arrow_upward"></ion-icon>
+          </span>
+        </ion-radio>
+      </ion-item>
+    </ion-radio-group>
+  </ion-list>
+
+  <!-- Filter Context -->
+  <form class="context-filter" *ngIf="filterOption">
+    <ion-list-header>
+      <ion-icon name="filter_list"></ion-icon>
+      <ion-title>{{ 'menu.context.filter.title' | translate | titlecase }}</ion-title>
+      <ion-button class="resetFilterButton" fill="clear" color="dark" (click)="resetFilter(filterOption)">
+        <ion-icon name="delete"></ion-icon>
+      </ion-button>
+    </ion-list-header>
+
+    <ion-list class="filter-group" *ngFor="let facet of facets">
+      <ion-list-header class="h3">
+        <ion-label>
+          <span *ngIf="facet.info.onlyOnType"
+            ><b>{{ facet.info.onlyOnType | titlecase }}</b> /
+          </span>
+          {{ facet.info.field | titlecase }}
+        </ion-label>
+      </ion-list-header>
+
+      <ng-container
+        *ngFor="
+          let bucket of !facet.compact ? facet.buckets.slice(0, compactFilterOptionCount) : facet.buckets
+        "
+      >
+        <ion-item>
+          <ion-checkbox
+            [(ngModel)]="bucket.checked"
+            (ngModelChange)="filterChanged()"
+            [name]="facet.onlyOnType + '-' + facet.field + '-' + bucket.key"
+            [value]="{
+              field: facet.field,
+              value: bucket.key,
+              onlyOnType: facet.onlyOnType
+            }"
+            class="filter-item-label"
+          >
+            ({{ bucket.count }})
+            {{
+              facet.field === 'type'
+                ? (getTranslatedPropertyValue($any(bucket.key), 'type') | titlecase)
+                : (facet.onlyOnType && getTranslatedPropertyValue(facet.onlyOnType, facet.field, bucket.key)
+                  | titlecase)
+            }}
+          </ion-checkbox>
+        </ion-item>
+      </ng-container>
+
+      <ion-button
+        *ngIf="!facet.compact && facet.buckets.length > compactFilterOptionCount"
+        fill="clear"
+        (click)="facet.compact = true"
+      >
+        {{ 'menu.context.filter.showAll' | translate }}
+      </ion-button>
+    </ion-list>
+  </form>
+</ion-content>

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.html

@@ -1,114 +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/>.
--->
-
-<ion-menu type="overlay" menuId="context" contentId="{{ contentId }}" maxEdgeStart="0" side="end">
-  <ion-toolbar color="primary" mode="ios">
-    <ion-label class="ion-padding-horizontal">
-      <h1 class="ion-padding-horizontal">{{ 'menu.context.title' | translate | titlecase }}</h1>
-    </ion-label>
-  </ion-toolbar>
-  <ion-content>
-    <!-- Sort Context -->
-    <ion-list>
-      @if (sortOption) {
-        <ion-radio-group class="context-sort" [value]="0">
-          <ion-list-header>
-            <ion-icon name="sort"></ion-icon>
-            <ion-title>{{ 'menu.context.sort.title' | translate | titlecase }}</ion-title>
-          </ion-list-header>
-          @for (value of sortOption.values; track value; let i = $index) {
-            <ion-item class="sort-item" (click)="sortChanged(sortOption, sortOption.values[i])">
-              <ion-radio [value]="i">
-                {{ 'menu.context.sort.' + value.value | translate | titlecase }}
-                @if (sortOption.value === value.value && value.reversible) {
-                  <span>
-                    @if (sortOption.reversed) {
-                      <ion-icon name="arrow_downward"></ion-icon>
-                    }
-                    @if (!sortOption.reversed) {
-                      <ion-icon name="arrow_upward"></ion-icon>
-                    }
-                  </span>
-                }
-              </ion-radio>
-            </ion-item>
-          }
-        </ion-radio-group>
-      }
-    </ion-list>
-    <!--        Filter Context -->
-    @if (filterOption) {
-      <form class="context-filter">
-        <ion-list-header>
-          <ion-icon name="filter_list"></ion-icon>
-          <ion-title>{{ 'menu.context.filter.title' | translate | titlecase }}</ion-title>
-          <ion-button class="resetFilterButton" fill="clear" color="dark" (click)="resetFilter(filterOption)">
-            <ion-icon name="delete"></ion-icon>
-          </ion-button>
-        </ion-list-header>
-        @for (facet of facets; track facet) {
-          <ion-list class="filter-group">
-            <div>
-              <ion-list-header class="h3">
-                <ion-label>
-                  @if (facet.info.onlyOnType) {
-                    <span
-                      ><b>{{ facet.info.onlyOnType | titlecase }}</b> /
-                    </span>
-                  }
-                  {{ facet.info.field | titlecase }}
-                </ion-label>
-              </ion-list-header>
-              <div>
-                @for (
-                  bucket of !facet.compact ? facet.buckets.slice(0, compactFilterOptionCount) : facet.buckets;
-                  track bucket
-                ) {
-                  <ion-item>
-                    <ion-checkbox
-                      [(ngModel)]="bucket.checked"
-                      (ngModelChange)="filterChanged()"
-                      [name]="facet.onlyOnType + '-' + facet.field + '-' + bucket.key"
-                      [value]="{
-                        field: facet.field,
-                        value: bucket.key,
-                        onlyOnType: facet.onlyOnType
-                      }"
-                      class="filter-item-label"
-                    >
-                      ({{ bucket.count }})
-                      {{
-                        facet.field === 'type'
-                          ? (getTranslatedPropertyValue($any(bucket.key), 'type') | titlecase)
-                          : (facet.onlyOnType &&
-                              getTranslatedPropertyValue(facet.onlyOnType, facet.field, bucket.key)
-                            | titlecase)
-                      }}
-                    </ion-checkbox>
-                  </ion-item>
-                }
-                @if (!facet.compact && facet.buckets.length > compactFilterOptionCount) {
-                  <ion-button fill="clear" (click)="facet.compact = true">
-                    {{ 'menu.context.filter.showAll' | translate }}
-                  </ion-button>
-                }
-              </div>
-            </div>
-          </ion-list>
-        }
-      </form>
-    }
-  </ion-content>
-</ion-menu>

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 => {
-    service.filterContextChanged$.subscribe(result => {
-      expect(result).toBeDefined();
-      done();
-    });
+  it('should update filterOptions', async () => {
     service.updateContextFilter(facetsMock);
+
+    const result = await firstValueFrom(service.filterContextChanged$.pipe(filter(Boolean)));
+
+    expect(result).toBeDefined();
   });
 
-  it('should update filterQuery', done => {
-    service.filterContextChanged$.subscribe(result => {
-      expect(result).toBeDefined();
-      expect(service.contextFilter.options[0].buckets.length).toEqual(
-        filterContext.options[0].buckets.length,
-      );
-      done();
-    });
+  it('should update filterQuery', async () => {
     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 => {
-    service.sortContextChanged$.subscribe(result => {
-      expect(result).toBeDefined();
-      done();
-    });
+  it('should update sortOptions', async () => {
     service.setContextSort(sortContext);
+
+    const result = await firstValueFrom(service.sortContextChanged$.pipe(filter(Boolean)));
+
+    expect(result).toBeDefined();
   });
 
-  it('should update sortQuery', done => {
-    service.sortContextChanged$.subscribe(result => {
-      expect(result).toBeDefined();
-      done();
-    });
+  it('should update sortQuery', async () => {
     service.setContextSort(sortContext);
+
+    const result = await firstValueFrom(service.sortContextChanged$.pipe(filter(Boolean)));
+
+    expect(result).toBeDefined();
   });
 });
 

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

@@ -21,7 +21,7 @@ import {
   SCThingType,
   SCTranslations,
 } from '@openstapps/core';
-import {Subject} from 'rxjs';
+import {BehaviorSubject} from 'rxjs';
 import {FilterBucket, FilterContext, FilterFacet, SortContext, TransformedFacet} from './context-type';
 import {TranslateService} from '@ngx-translate/core';
 import {ThingTranslateService} from '../../../translation/thing-translate.service';
@@ -40,7 +40,7 @@ export class ContextMenuService {
   /**
    * Container for the filter context
    */
-  filterOptions = new Subject<FilterContext>();
+  filterOptions = new BehaviorSubject<FilterContext | undefined>(undefined);
 
   /**
    * Observable filterContext streams
@@ -50,7 +50,7 @@ export class ContextMenuService {
   /**
    * Container for the filter query (SCSearchFilter)
    */
-  filterQuery = new Subject<SCSearchFilter | undefined>();
+  filterQuery = new BehaviorSubject<SCSearchFilter | undefined>(undefined);
 
   /**
    * Observable filterContext streams
@@ -65,7 +65,7 @@ export class ContextMenuService {
   /**
    * Container for the sort context
    */
-  sortOptions = new Subject<SortContext>();
+  sortOptions = new BehaviorSubject<SortContext | undefined>(undefined);
 
   /**
    * Observable SortContext streams
@@ -75,7 +75,7 @@ export class ContextMenuService {
   /**
    * Container for the sort query
    */
-  sortQuery = new Subject<SCSearchSort[] | undefined>();
+  sortQuery = new BehaviorSubject<SCSearchSort[] | undefined>(undefined);
 
   /**
    * Observable SortContext streams

frontend/app/src/app/modules/menu/menu.module.ts

@@ -19,12 +19,13 @@ import {RouterModule} from '@angular/router';
 import {LayoutModule} from '@angular/cdk/layout';
 import {TranslateModule} from '@ngx-translate/core';
 import {SettingsModule} from '../settings/settings.module';
-import {ContextMenuComponent} from './context/context-menu.component';
 import {ContextMenuService} from './context/context-menu.service';
 import {
   IonButton,
+  IonButtons,
   IonCheckbox,
   IonContent,
+  IonHeader,
   IonItem,
   IonLabel,
   IonList,
@@ -39,13 +40,14 @@ import {
   IonToolbar,
 } from '@ionic/angular/standalone';
 import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
+import {ContextMenuModalComponent} from './context/context-menu-modal.component';
 
 /**
  * Menu module
  */
 @NgModule({
-  declarations: [ContextMenuComponent],
-  exports: [ContextMenuComponent],
+  declarations: [ContextMenuModalComponent],
+  exports: [ContextMenuModalComponent],
   imports: [
     CommonModule,
     IonIconDirective,
@@ -69,6 +71,8 @@ import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
     IonRadioGroup,
     IonContent,
     IonToolbar,
+    IonButtons,
+    IonHeader,
   ],
   providers: [ContextMenuService],
 })

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/assets/i18n/de.json

@@ -425,7 +425,8 @@
       "placeholder": "Veranstaltungen, Personen, Orte und mehr"
     },
     "instruction": "Finde alle Informationen rund ums Studium und den Campus",
-    "nothing_found": "Keine Ergebnisse"
+    "nothing_found": "Keine Ergebnisse",
+    "SUGGESTIONS": "Meintest du"
   },
   "hebisSearch": {
     "title": "Bibliothekssuche",

frontend/app/src/assets/i18n/en.json

@@ -425,7 +425,8 @@
       "placeholder": "Events, places, persons and more"
     },
     "instruction": "Find all information related to your studies and campus",
-    "nothing_found": "No results"
+    "nothing_found": "No results",
+    "SUGGESTIONS": "Did you mean"
   },
   "hebisSearch": {
     "title": "Library Search",

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,
 };
 

frontend/app/src/environments/environment.ts

@@ -18,7 +18,7 @@
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 
 export const environment = {
-  backend_url: 'https://mobile.server.uni-frankfurt.de',
+  backend_url: 'http://localhost:3000',
   app_host: 'mobile.app.uni-frankfurt.de',
   custom_url_scheme: 'de.anyschool.app',
   backend_version: '999.0.0',

packages/api-cli/README.md

@@ -23,7 +23,7 @@ node ./lib/cli.js e2e http://localhost:3000
 Example to clone the full database
 
 ```shell
-node app.js copy "*" https://mobile.app.uni-frankfurt.de http://localhost:3000 100
+node app.js copy "*" -a "999.0.0" https://mobile.server.uni-frankfurt.de http://localhost:3000 100
 ```
 
 ### Program arguments

packages/core/package.json

@@ -97,6 +97,8 @@
             "date",
             "validatable",
             "filterable",
+            "suggestable",
+            "completable",
             "inheritTags",
             "minLength",
             "pattern",

packages/core/src/protocol/search/result.ts

@@ -24,6 +24,11 @@ export interface SCSearchResult {
    */
   data: SCThings[];
 
+  /**
+   * Suggestions for query corrections
+   */
+  suggestions?: SCSearchSuggestions;
+
   /**
    * Facets (aggregations over all matching data)
    */
@@ -40,6 +45,18 @@ export interface SCSearchResult {
   stats: SCSearchResultSearchEngineStats;
 }
 
+/**
+ * Seach suggestions
+ *
+ * Not to be confused with search-as-you-type suggestions
+ */
+export interface SCSearchSuggestions {
+  /**
+   * Suggestions for query terms that might have been misspelled
+   */
+  terms?: Record<string, string[]>;
+}
+
 /**
  * Stores information about Pagination
  */

packages/core/src/things/abstract/thing.ts

@@ -63,7 +63,7 @@ export interface SCThingWithoutReferences {
   /**
    * Alternate names of the thing
    * @filterable
-   * @keyword
+   * @text
    */
   alternateNames?: string[];
 
@@ -92,6 +92,8 @@ export interface SCThingWithoutReferences {
    * @filterable
    * @minLength 1
    * @sortable ducet
+   * @completable
+   * @suggestable
    * @text
    */
   name: string;
@@ -240,6 +242,8 @@ export interface SCThingTranslatableProperties {
    * Translation of the name of the thing
    * @sortable ducet
    * @text
+   * @suggestable
+   * @completable
    */
   name?: string;
   /**

packages/es-mapping-generator/src/config/fieldmap.ts

@@ -43,6 +43,27 @@ export const fieldmap: ElasticsearchFieldmap = {
     },
     ignore: ['price'],
   },
+  suggestable: {
+    default: {
+      trigram: {
+        type: 'text',
+        analyzer: 'trigram',
+      },
+      reverse: {
+        type: 'text',
+        analyzer: 'reverse',
+      },
+    },
+    ignore: [],
+  },
+  completable: {
+    default: {
+      completion: {
+        type: 'search_as_you_type',
+      },
+    },
+    ignore: [],
+  },
 };
 
 export const filterableTagName = 'filterable';

packages/es-mapping-generator/src/config/settings.ts

@@ -19,4 +19,27 @@ export const settings: IndicesPutTemplateRequest['settings'] = {
   'max_result_window': 30_000,
   'number_of_replicas': 0,
   'number_of_shards': 1,
+  'index': {
+    analysis: {
+      analyzer: {
+        trigram: {
+          type: 'custom',
+          tokenizer: 'standard',
+          filter: ['lowercase', 'shingle'],
+        },
+        reverse: {
+          type: 'custom',
+          tokenizer: 'standard',
+          filter: ['lowercase', 'reverse'],
+        },
+      },
+      filter: {
+        shingle: {
+          type: 'shingle',
+          min_shingle_size: 2,
+          max_shingle_size: 3,
+        },
+      },
+    },
+  },
 };