mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-01-24 18:42:45 +00:00
Compare commits
2 Commits
ec8c9c639e
...
be98df0bad
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
be98df0bad | ||
|
|
533c3cbcb3 |
@@ -15,12 +15,7 @@
|
|||||||
import {Component, DestroyRef, inject, Input, OnInit} from '@angular/core';
|
import {Component, DestroyRef, inject, Input, OnInit} from '@angular/core';
|
||||||
import {ActivatedRoute, Router} from '@angular/router';
|
import {ActivatedRoute, Router} from '@angular/router';
|
||||||
import {Keyboard} from '@capacitor/keyboard';
|
import {Keyboard} from '@capacitor/keyboard';
|
||||||
import {
|
import {AlertController, AnimationBuilder, AnimationController, ModalController} from '@ionic/angular/standalone';
|
||||||
AlertController,
|
|
||||||
AnimationBuilder,
|
|
||||||
AnimationController,
|
|
||||||
ModalController,
|
|
||||||
} from '@ionic/angular/standalone';
|
|
||||||
import {Capacitor} from '@capacitor/core';
|
import {Capacitor} from '@capacitor/core';
|
||||||
import {
|
import {
|
||||||
SCFacet,
|
SCFacet,
|
||||||
@@ -41,8 +36,8 @@ import {PositionService} from '../../map/position.service';
|
|||||||
import {ConfigProvider} from '../../config/config.provider';
|
import {ConfigProvider} from '../../config/config.provider';
|
||||||
import {searchPageSwitchAnimation} from './search-page-switch-animation';
|
import {searchPageSwitchAnimation} from './search-page-switch-animation';
|
||||||
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
||||||
import {ContextMenuModalComponent} from '../../menu/context/context-menu-modal.component';
|
import {ContextMenuModalComponent} from "../../menu/context/context-menu-modal.component";
|
||||||
import {enterAnimation, leaveAnimation} from '../../menu/context/context-menu-modal.animations';
|
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
|
* SearchPageComponent queries things and shows list of things as search results and filter as context menu
|
||||||
@@ -383,8 +378,8 @@ export class SearchPageComponent implements OnInit {
|
|||||||
cssClass: 'context-menu-modal',
|
cssClass: 'context-menu-modal',
|
||||||
showBackdrop: true,
|
showBackdrop: true,
|
||||||
backdropDismiss: true,
|
backdropDismiss: true,
|
||||||
enterAnimation: (baseElement: HTMLElement) => enterAnimation(baseElement, this.animationController),
|
enterAnimation: (baseEl: HTMLElement) => enterAnimation(baseEl, this.animationController),
|
||||||
leaveAnimation: (baseElement: HTMLElement) => leaveAnimation(baseElement, this.animationController),
|
leaveAnimation: (baseEl: HTMLElement) => leaveAnimation(baseEl, this.animationController),
|
||||||
componentProps: {
|
componentProps: {
|
||||||
contextMenuService: this.contextMenuService,
|
contextMenuService: this.contextMenuService,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,27 +1,14 @@
|
|||||||
/*
|
|
||||||
* 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';
|
import {Animation, AnimationController} from '@ionic/angular';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines the animation for showing a modal as a right-hand sidebar.
|
* Defines the animation for showing a modal as a right-hand sidebar.
|
||||||
* @param baseElement The root element of the modal (including Shadow DOM).
|
*
|
||||||
|
* @param baseEl The root element of the modal (including Shadow DOM).
|
||||||
* @param animationCtrl The Ionic AnimationController.
|
* @param animationCtrl The Ionic AnimationController.
|
||||||
* @returns The configured Ionic animation.
|
* @returns The configured Ionic animation.
|
||||||
*/
|
*/
|
||||||
export const enterAnimation = (baseElement: HTMLElement, animationCtrl: AnimationController): Animation => {
|
export const enterAnimation = (baseEl: HTMLElement, animationCtrl: AnimationController): Animation => {
|
||||||
const root = baseElement.shadowRoot;
|
const root = baseEl.shadowRoot;
|
||||||
|
|
||||||
const backdrop = root?.querySelector('ion-backdrop');
|
const backdrop = root?.querySelector('ion-backdrop');
|
||||||
const wrapper = root?.querySelector('.modal-wrapper');
|
const wrapper = root?.querySelector('.modal-wrapper');
|
||||||
@@ -35,6 +22,7 @@ export const enterAnimation = (baseElement: HTMLElement, animationCtrl: Animatio
|
|||||||
height: '100%',
|
height: '100%',
|
||||||
width: '304px',
|
width: '304px',
|
||||||
maxWidth: '75%',
|
maxWidth: '75%',
|
||||||
|
margin: '0',
|
||||||
opacity: '1',
|
opacity: '1',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -51,7 +39,7 @@ export const enterAnimation = (baseElement: HTMLElement, animationCtrl: Animatio
|
|||||||
|
|
||||||
return animationCtrl
|
return animationCtrl
|
||||||
.create()
|
.create()
|
||||||
.addElement(baseElement)
|
.addElement(baseEl)
|
||||||
.duration(400)
|
.duration(400)
|
||||||
.easing('ease-out')
|
.easing('ease-out')
|
||||||
.addAnimation([backdropAnimation, wrapperAnimation]);
|
.addAnimation([backdropAnimation, wrapperAnimation]);
|
||||||
@@ -59,10 +47,11 @@ export const enterAnimation = (baseElement: HTMLElement, animationCtrl: Animatio
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines the animation for hiding a modal by sliding it out to the right.
|
* Defines the animation for hiding a modal by sliding it out to the right.
|
||||||
* @param baseElement The root element of the modal.
|
*
|
||||||
|
* @param baseEl The root element of the modal.
|
||||||
* @param animationCtrl The Ionic AnimationController.
|
* @param animationCtrl The Ionic AnimationController.
|
||||||
* @returns The configured Ionic animation (reverse of enterAnimation).
|
* @returns The configured Ionic animation (reverse of enterAnimation).
|
||||||
*/
|
*/
|
||||||
export const leaveAnimation = (baseElement: HTMLElement, animationCtrl: AnimationController): Animation => {
|
export const leaveAnimation = (baseEl: HTMLElement, animationCtrl: AnimationController): Animation => {
|
||||||
return enterAnimation(baseElement, animationCtrl).direction('reverse');
|
return enterAnimation(baseEl, animationCtrl).direction('reverse');
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,179 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
@@ -1,43 +1,26 @@
|
|||||||
/*
|
|
||||||
* 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 {LangChangeEvent,TranslateService} from '@ngx-translate/core';
|
||||||
import {SCLanguage,SCThingTranslator,SCThingType,SCTranslations} from '@openstapps/core';
|
import {SCLanguage,SCThingTranslator,SCThingType,SCTranslations} from '@openstapps/core';
|
||||||
import {ContextMenuService} from './context-menu.service';
|
import {ContextMenuService} from './context-menu.service';
|
||||||
import {FilterContext,FilterFacet,SortContext,SortContextOption} from './context-type.js';
|
import {FilterContext,FilterFacet,SortContext,SortContextOption} from './context-type.js';
|
||||||
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
||||||
import {ModalController} from '@ionic/angular/standalone';
|
import {ModalController} from '@ionic/angular/standalone';
|
||||||
import {Component, Input, OnInit, OnDestroy} from '@angular/core';
|
import {Component,Input} from '@angular/core';
|
||||||
import {Subject,takeUntil} from 'rxjs';
|
import {Subject,takeUntil} from 'rxjs';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'stapps-context-menu-modal',
|
selector: 'stapps-context-menu-modal',
|
||||||
templateUrl: './context-menu-modal.html',
|
templateUrl: './context-menu-modal.html',
|
||||||
})
|
})
|
||||||
export class ContextMenuModalComponent implements OnInit, OnDestroy {
|
export class ContextMenuModalComponent {
|
||||||
@Input() contextMenuService: ContextMenuService;
|
@Input() contextMenuService: ContextMenuService;
|
||||||
|
|
||||||
compactFilterOptionCount = 5;
|
compactFilterOptionCount = 5;
|
||||||
|
|
||||||
filterOption: FilterContext;
|
filterOption: FilterContext;
|
||||||
|
|
||||||
sortOption: SortContext;
|
sortOption: SortContext;
|
||||||
|
|
||||||
language: keyof SCTranslations<SCLanguage>;
|
language: keyof SCTranslations<SCLanguage>;
|
||||||
|
|
||||||
translator: SCThingTranslator;
|
translator: SCThingTranslator;
|
||||||
|
|
||||||
scThingType = SCThingType;
|
scThingType = SCThingType;
|
||||||
|
|
||||||
// Using a subject to manage subscriptions for clean-up
|
// Using a subject to manage subscriptions for clean-up
|
||||||
@@ -45,12 +28,14 @@ export class ContextMenuModalComponent implements OnInit, OnDestroy {
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private translateService: TranslateService,
|
private translateService: TranslateService,
|
||||||
private readonly modalController: ModalController,
|
private readonly modalCtrl: ModalController
|
||||||
) {
|
) {
|
||||||
this.language = this.translateService.currentLang as keyof SCTranslations<SCLanguage>;
|
this.language = this.translateService.currentLang as keyof SCTranslations<SCLanguage>;
|
||||||
this.translator = new SCThingTranslator(this.language);
|
this.translator = new SCThingTranslator(this.language);
|
||||||
|
|
||||||
this.translateService.onLangChange.pipe(takeUntilDestroyed()).subscribe((event: LangChangeEvent) => {
|
this.translateService.onLangChange
|
||||||
|
.pipe(takeUntilDestroyed())
|
||||||
|
.subscribe((event: LangChangeEvent) => {
|
||||||
this.language = event.lang as keyof SCTranslations<SCLanguage>;
|
this.language = event.lang as keyof SCTranslations<SCLanguage>;
|
||||||
this.translator = new SCThingTranslator(this.language);
|
this.translator = new SCThingTranslator(this.language);
|
||||||
});
|
});
|
||||||
@@ -68,13 +53,17 @@ export class ContextMenuModalComponent implements OnInit, OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Move the subscription logic here. It's now safe to access this.contextMenuService.
|
// Move the subscription logic here. It's now safe to access this.contextMenuService.
|
||||||
this.contextMenuService.filterContextChanged$.pipe(takeUntil(this.destroy$)).subscribe(fc => {
|
this.contextMenuService.filterContextChanged$
|
||||||
|
.pipe(takeUntil(this.destroy$))
|
||||||
|
.subscribe(fc => {
|
||||||
if (fc) {
|
if (fc) {
|
||||||
this.filterOption = fc;
|
this.filterOption = fc;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
this.contextMenuService.sortContextChanged$.pipe(takeUntil(this.destroy$)).subscribe(sc => {
|
this.contextMenuService.sortContextChanged$
|
||||||
|
.pipe(takeUntil(this.destroy$))
|
||||||
|
.subscribe(sc => {
|
||||||
if (sc) {
|
if (sc) {
|
||||||
this.sortOption = sc;
|
this.sortOption = sc;
|
||||||
}
|
}
|
||||||
@@ -122,6 +111,6 @@ export class ContextMenuModalComponent implements OnInit, OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dismiss() {
|
dismiss() {
|
||||||
this.modalController.dismiss();
|
this.modalCtrl.dismiss();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,3 @@
|
|||||||
<!--
|
|
||||||
~ 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-header>
|
||||||
<ion-toolbar color="primary" mode="ios">
|
<ion-toolbar color="primary" mode="ios">
|
||||||
<ion-label class="ion-padding-horizontal">
|
<ion-label class="ion-padding-horizontal">
|
||||||
@@ -34,7 +20,7 @@
|
|||||||
(click)="sortChanged(sortOption, value)"
|
(click)="sortChanged(sortOption, value)"
|
||||||
>
|
>
|
||||||
<ion-radio [value]="i">
|
<ion-radio [value]="i">
|
||||||
{{ 'menu.context.sort.' + value.value | translate | titlecase }}
|
{{ ('menu.context.sort.' + value.value) | translate | titlecase }}
|
||||||
<span *ngIf="sortOption.value === value.value && value.reversible">
|
<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_downward"></ion-icon>
|
||||||
<ion-icon *ngIf="!sortOption.reversed" name="arrow_upward"></ion-icon>
|
<ion-icon *ngIf="!sortOption.reversed" name="arrow_upward"></ion-icon>
|
||||||
@@ -57,18 +43,12 @@
|
|||||||
<ion-list class="filter-group" *ngFor="let facet of facets">
|
<ion-list class="filter-group" *ngFor="let facet of facets">
|
||||||
<ion-list-header class="h3">
|
<ion-list-header class="h3">
|
||||||
<ion-label>
|
<ion-label>
|
||||||
<span *ngIf="facet.info.onlyOnType"
|
<span *ngIf="facet.info.onlyOnType"><b>{{ facet.info.onlyOnType | titlecase }}</b> / </span>
|
||||||
><b>{{ facet.info.onlyOnType | titlecase }}</b> /
|
|
||||||
</span>
|
|
||||||
{{ facet.info.field | titlecase }}
|
{{ facet.info.field | titlecase }}
|
||||||
</ion-label>
|
</ion-label>
|
||||||
</ion-list-header>
|
</ion-list-header>
|
||||||
|
|
||||||
<ng-container
|
<ng-container *ngFor="let bucket of !facet.compact ? facet.buckets.slice(0, compactFilterOptionCount) : facet.buckets">
|
||||||
*ngFor="
|
|
||||||
let bucket of !facet.compact ? facet.buckets.slice(0, compactFilterOptionCount) : facet.buckets
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<ion-item>
|
<ion-item>
|
||||||
<ion-checkbox
|
<ion-checkbox
|
||||||
[(ngModel)]="bucket.checked"
|
[(ngModel)]="bucket.checked"
|
||||||
@@ -85,18 +65,15 @@
|
|||||||
{{
|
{{
|
||||||
facet.field === 'type'
|
facet.field === 'type'
|
||||||
? (getTranslatedPropertyValue($any(bucket.key), 'type') | titlecase)
|
? (getTranslatedPropertyValue($any(bucket.key), 'type') | titlecase)
|
||||||
: (facet.onlyOnType && getTranslatedPropertyValue(facet.onlyOnType, facet.field, bucket.key)
|
: (facet.onlyOnType &&
|
||||||
|
getTranslatedPropertyValue(facet.onlyOnType, facet.field, bucket.key)
|
||||||
| titlecase)
|
| titlecase)
|
||||||
}}
|
}}
|
||||||
</ion-checkbox>
|
</ion-checkbox>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<ion-button
|
<ion-button *ngIf="!facet.compact && facet.buckets.length > compactFilterOptionCount" fill="clear" (click)="facet.compact = true">
|
||||||
*ngIf="!facet.compact && facet.buckets.length > compactFilterOptionCount"
|
|
||||||
fill="clear"
|
|
||||||
(click)="facet.compact = true"
|
|
||||||
>
|
|
||||||
{{ 'menu.context.filter.showAll' | translate }}
|
{{ 'menu.context.filter.showAll' | translate }}
|
||||||
</ion-button>
|
</ion-button>
|
||||||
</ion-list>
|
</ion-list>
|
||||||
|
|||||||
@@ -0,0 +1,303 @@
|
|||||||
|
/*
|
||||||
|
* 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,
|
||||||
|
},
|
||||||
|
];
|
||||||
@@ -12,13 +12,14 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {TestBed} from '@angular/core/testing';
|
import {TestBed} from '@angular/core/testing';
|
||||||
|
|
||||||
import {ContextMenuService} from './context-menu.service';
|
import {ContextMenuService} from './context-menu.service';
|
||||||
import {SCFacet} from '@openstapps/core';
|
import {SCFacet} from '@openstapps/core';
|
||||||
import {FilterContext, SortContext} from './context-type';
|
import {FilterContext, SortContext} from './context-type';
|
||||||
import {ThingTranslateModule} from '../../../translation/thing-translate.module';
|
import {ThingTranslateModule} from '../../../translation/thing-translate.module';
|
||||||
import {TranslateModule} from '@ngx-translate/core';
|
import {TranslateModule} from '@ngx-translate/core';
|
||||||
import {firstValueFrom, filter} from 'rxjs';
|
|
||||||
|
|
||||||
describe('ContextMenuService', () => {
|
describe('ContextMenuService', () => {
|
||||||
let service: ContextMenuService;
|
let service: ContextMenuService;
|
||||||
@@ -35,39 +36,39 @@ describe('ContextMenuService', () => {
|
|||||||
expect(service).toBeTruthy();
|
expect(service).toBeTruthy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should update filterOptions', async () => {
|
it('should update filterOptions', done => {
|
||||||
|
service.filterContextChanged$.subscribe(result => {
|
||||||
|
expect(result).toBeDefined();
|
||||||
|
done();
|
||||||
|
});
|
||||||
service.updateContextFilter(facetsMock);
|
service.updateContextFilter(facetsMock);
|
||||||
|
|
||||||
const result = await firstValueFrom(service.filterContextChanged$.pipe(filter(Boolean)));
|
|
||||||
|
|
||||||
expect(result).toBeDefined();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should update filterQuery', async () => {
|
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();
|
||||||
|
});
|
||||||
service.updateContextFilter(facetsMock);
|
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', async () => {
|
it('should update sortOptions', done => {
|
||||||
service.setContextSort(sortContext);
|
service.sortContextChanged$.subscribe(result => {
|
||||||
|
|
||||||
const result = await firstValueFrom(service.sortContextChanged$.pipe(filter(Boolean)));
|
|
||||||
|
|
||||||
expect(result).toBeDefined();
|
expect(result).toBeDefined();
|
||||||
|
done();
|
||||||
|
});
|
||||||
|
service.setContextSort(sortContext);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should update sortQuery', async () => {
|
it('should update sortQuery', done => {
|
||||||
service.setContextSort(sortContext);
|
service.sortContextChanged$.subscribe(result => {
|
||||||
|
|
||||||
const result = await firstValueFrom(service.sortContextChanged$.pipe(filter(Boolean)));
|
|
||||||
|
|
||||||
expect(result).toBeDefined();
|
expect(result).toBeDefined();
|
||||||
|
done();
|
||||||
|
});
|
||||||
|
service.setContextSort(sortContext);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ import {
|
|||||||
IonToolbar,
|
IonToolbar,
|
||||||
} from '@ionic/angular/standalone';
|
} from '@ionic/angular/standalone';
|
||||||
import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
||||||
import {ContextMenuModalComponent} from './context/context-menu-modal.component';
|
import {ContextMenuModalComponent} from "./context/context-menu-modal.component";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Menu module
|
* Menu module
|
||||||
|
|||||||
Reference in New Issue
Block a user