mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-01-23 18:12:43 +00:00
Compare commits
2 Commits
@openstapp
...
be98df0bad
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
be98df0bad | ||
|
|
533c3cbcb3 |
@@ -15,7 +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 {AlertController, AnimationBuilder, AnimationController} from '@ionic/angular/standalone';
|
import {AlertController, AnimationBuilder, AnimationController, ModalController} from '@ionic/angular/standalone';
|
||||||
import {Capacitor} from '@capacitor/core';
|
import {Capacitor} from '@capacitor/core';
|
||||||
import {
|
import {
|
||||||
SCFacet,
|
SCFacet,
|
||||||
@@ -36,6 +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 {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
|
||||||
@@ -173,7 +175,8 @@ export class SearchPageComponent implements OnInit {
|
|||||||
private readonly route: ActivatedRoute,
|
private readonly route: ActivatedRoute,
|
||||||
protected positionService: PositionService,
|
protected positionService: PositionService,
|
||||||
private readonly configProvider: ConfigProvider,
|
private readonly configProvider: ConfigProvider,
|
||||||
animationController: AnimationController,
|
protected animationController: AnimationController,
|
||||||
|
protected modalController: ModalController,
|
||||||
) {
|
) {
|
||||||
this.routeAnimation = searchPageSwitchAnimation(animationController);
|
this.routeAnimation = searchPageSwitchAnimation(animationController);
|
||||||
}
|
}
|
||||||
@@ -368,4 +371,20 @@ export class SearchPageComponent implements OnInit {
|
|||||||
this.searchStringChanged(term);
|
this.searchStringChanged(term);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async openContextMenu(): Promise<void> {
|
||||||
|
const modal = await this.modalController.create({
|
||||||
|
component: ContextMenuModalComponent,
|
||||||
|
cssClass: 'context-menu-modal',
|
||||||
|
showBackdrop: true,
|
||||||
|
backdropDismiss: true,
|
||||||
|
enterAnimation: (baseEl: HTMLElement) => enterAnimation(baseEl, this.animationController),
|
||||||
|
leaveAnimation: (baseEl: HTMLElement) => leaveAnimation(baseEl, this.animationController),
|
||||||
|
componentProps: {
|
||||||
|
contextMenuService: this.contextMenuService,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await modal.present();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,10 +12,6 @@
|
|||||||
~ 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/>.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
@if (showContextMenu) {
|
|
||||||
<stapps-context contentId="data-list"></stapps-context>
|
|
||||||
}
|
|
||||||
<ion-header>
|
<ion-header>
|
||||||
@if (showDrawer && showTopToolbar) {
|
@if (showDrawer && showTopToolbar) {
|
||||||
<ion-toolbar color="primary" mode="ios">
|
<ion-toolbar color="primary" mode="ios">
|
||||||
@@ -41,7 +37,7 @@
|
|||||||
>
|
>
|
||||||
</ion-searchbar>
|
</ion-searchbar>
|
||||||
@if (showContextMenu) {
|
@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-icon name="tune"></ion-icon>
|
||||||
</ion-menu-button>
|
</ion-menu-button>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Component, OnInit} from '@angular/core';
|
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 {ActivatedRoute, Router} from '@angular/router';
|
||||||
import {NGXLogger} from 'ngx-logger';
|
import {NGXLogger} from 'ngx-logger';
|
||||||
import {debounceTime, distinctUntilChanged, startWith, take} from 'rxjs/operators';
|
import {debounceTime, distinctUntilChanged, startWith, take} from 'rxjs/operators';
|
||||||
@@ -55,6 +55,7 @@ export class FavoritesPageComponent extends SearchPageComponent implements OnIni
|
|||||||
private favoritesService: FavoritesService,
|
private favoritesService: FavoritesService,
|
||||||
configProvider: ConfigProvider,
|
configProvider: ConfigProvider,
|
||||||
animationController: AnimationController,
|
animationController: AnimationController,
|
||||||
|
modalController: ModalController,
|
||||||
) {
|
) {
|
||||||
super(
|
super(
|
||||||
alertController,
|
alertController,
|
||||||
@@ -68,6 +69,7 @@ export class FavoritesPageComponent extends SearchPageComponent implements OnIni
|
|||||||
positionService,
|
positionService,
|
||||||
configProvider,
|
configProvider,
|
||||||
animationController,
|
animationController,
|
||||||
|
modalController,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,57 @@
|
|||||||
|
import {Animation, AnimationController} from '@ionic/angular';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Defines the animation for showing a modal as a right-hand sidebar.
|
||||||
|
*
|
||||||
|
* @param baseEl The root element of the modal (including Shadow DOM).
|
||||||
|
* @param animationCtrl The Ionic AnimationController.
|
||||||
|
* @returns The configured Ionic animation.
|
||||||
|
*/
|
||||||
|
export const enterAnimation = (baseEl: HTMLElement, animationCtrl: AnimationController): Animation => {
|
||||||
|
const root = baseEl.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%',
|
||||||
|
margin: '0',
|
||||||
|
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(baseEl)
|
||||||
|
.duration(400)
|
||||||
|
.easing('ease-out')
|
||||||
|
.addAnimation([backdropAnimation, wrapperAnimation]);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Defines the animation for hiding a modal by sliding it out to the right.
|
||||||
|
*
|
||||||
|
* @param baseEl The root element of the modal.
|
||||||
|
* @param animationCtrl The Ionic AnimationController.
|
||||||
|
* @returns The configured Ionic animation (reverse of enterAnimation).
|
||||||
|
*/
|
||||||
|
export const leaveAnimation = (baseEl: HTMLElement, animationCtrl: AnimationController): Animation => {
|
||||||
|
return enterAnimation(baseEl, animationCtrl).direction('reverse');
|
||||||
|
};
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
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} from '@angular/core';
|
||||||
|
import {Subject,takeUntil} from 'rxjs';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'stapps-context-menu-modal',
|
||||||
|
templateUrl: './context-menu-modal.html',
|
||||||
|
})
|
||||||
|
export class ContextMenuModalComponent {
|
||||||
|
@Input() contextMenuService: ContextMenuService;
|
||||||
|
|
||||||
|
compactFilterOptionCount = 5;
|
||||||
|
|
||||||
|
filterOption: FilterContext;
|
||||||
|
sortOption: SortContext;
|
||||||
|
|
||||||
|
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 modalCtrl: ModalController
|
||||||
|
) {
|
||||||
|
this.language = this.translateService.currentLang as keyof SCTranslations<SCLanguage>;
|
||||||
|
this.translator = new SCThingTranslator(this.language);
|
||||||
|
|
||||||
|
this.translateService.onLangChange
|
||||||
|
.pipe(takeUntilDestroyed())
|
||||||
|
.subscribe((event: LangChangeEvent) => {
|
||||||
|
this.language = event.lang as keyof SCTranslations<SCLanguage>;
|
||||||
|
this.translator = new SCThingTranslator(this.language);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
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.sortContextChanged$
|
||||||
|
.pipe(takeUntil(this.destroy$))
|
||||||
|
.subscribe(sc => {
|
||||||
|
if (sc) {
|
||||||
|
this.sortOption = sc;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
};
|
||||||
|
|
||||||
|
sortChanged(option: SortContext, value: SortContextOption) {
|
||||||
|
if (option.value === value.value) {
|
||||||
|
if (value.reversible) {
|
||||||
|
option.reversed = !option.reversed;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
option.value = value.value;
|
||||||
|
if (value.reversible) {
|
||||||
|
option.reversed = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.contextMenuService.contextSortChanged(option);
|
||||||
|
}
|
||||||
|
|
||||||
|
getTranslatedPropertyValue(onlyForType: SCThingType, field: string, key?: string): string | undefined {
|
||||||
|
return this.translator.translatedPropertyValue(onlyForType, field, key);
|
||||||
|
}
|
||||||
|
|
||||||
|
dismiss() {
|
||||||
|
this.modalCtrl.dismiss();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
<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>
|
||||||
@@ -1,142 +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/>.
|
|
||||||
*/
|
|
||||||
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';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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',
|
|
||||||
})
|
|
||||||
export class ContextMenuComponent {
|
|
||||||
/**
|
|
||||||
* Id of the content the menu is used for
|
|
||||||
*/
|
|
||||||
@Input()
|
|
||||||
contentId: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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
|
|
||||||
*/
|
|
||||||
translator: SCThingTranslator;
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
private translateService: TranslateService,
|
|
||||||
private readonly contextMenuService: ContextMenuService,
|
|
||||||
) {
|
|
||||||
this.language = this.translateService.currentLang as keyof SCTranslations<SCLanguage>;
|
|
||||||
this.translator = new SCThingTranslator(this.language);
|
|
||||||
|
|
||||||
this.translateService.onLangChange.pipe(takeUntilDestroyed()).subscribe((event: LangChangeEvent) => {
|
|
||||||
this.language = event.lang as keyof SCTranslations<SCLanguage>;
|
|
||||||
this.translator = new SCThingTranslator(this.language);
|
|
||||||
});
|
|
||||||
this.contextMenuService.filterContextChanged$.pipe(takeUntilDestroyed()).subscribe(filterContext => {
|
|
||||||
this.filterOption = filterContext;
|
|
||||||
});
|
|
||||||
this.contextMenuService.sortOptions.pipe(takeUntilDestroyed()).subscribe(sortContext => {
|
|
||||||
this.sortOption = sortContext;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets selected filter options and updates listener
|
|
||||||
*/
|
|
||||||
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) => {
|
|
||||||
if (option.value === value.value) {
|
|
||||||
if (value.reversible) {
|
|
||||||
option.reversed = !option.reversed;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
option.value = value.value;
|
|
||||||
if (value.reversible) {
|
|
||||||
option.reversed = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.contextMenuService.contextSortChanged(option);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -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>
|
|
||||||
@@ -21,7 +21,7 @@ import {
|
|||||||
SCThingType,
|
SCThingType,
|
||||||
SCTranslations,
|
SCTranslations,
|
||||||
} from '@openstapps/core';
|
} from '@openstapps/core';
|
||||||
import {Subject} from 'rxjs';
|
import {BehaviorSubject} from 'rxjs';
|
||||||
import {FilterBucket, FilterContext, FilterFacet, SortContext, TransformedFacet} from './context-type';
|
import {FilterBucket, FilterContext, FilterFacet, SortContext, TransformedFacet} from './context-type';
|
||||||
import {TranslateService} from '@ngx-translate/core';
|
import {TranslateService} from '@ngx-translate/core';
|
||||||
import {ThingTranslateService} from '../../../translation/thing-translate.service';
|
import {ThingTranslateService} from '../../../translation/thing-translate.service';
|
||||||
@@ -40,7 +40,7 @@ export class ContextMenuService {
|
|||||||
/**
|
/**
|
||||||
* Container for the filter context
|
* Container for the filter context
|
||||||
*/
|
*/
|
||||||
filterOptions = new Subject<FilterContext>();
|
filterOptions = new BehaviorSubject<FilterContext | undefined>(undefined);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Observable filterContext streams
|
* Observable filterContext streams
|
||||||
@@ -50,7 +50,7 @@ export class ContextMenuService {
|
|||||||
/**
|
/**
|
||||||
* Container for the filter query (SCSearchFilter)
|
* Container for the filter query (SCSearchFilter)
|
||||||
*/
|
*/
|
||||||
filterQuery = new Subject<SCSearchFilter | undefined>();
|
filterQuery = new BehaviorSubject<SCSearchFilter | undefined>(undefined);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Observable filterContext streams
|
* Observable filterContext streams
|
||||||
@@ -65,7 +65,7 @@ export class ContextMenuService {
|
|||||||
/**
|
/**
|
||||||
* Container for the sort context
|
* Container for the sort context
|
||||||
*/
|
*/
|
||||||
sortOptions = new Subject<SortContext>();
|
sortOptions = new BehaviorSubject<SortContext | undefined>(undefined);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Observable SortContext streams
|
* Observable SortContext streams
|
||||||
@@ -75,7 +75,7 @@ export class ContextMenuService {
|
|||||||
/**
|
/**
|
||||||
* Container for the sort query
|
* Container for the sort query
|
||||||
*/
|
*/
|
||||||
sortQuery = new Subject<SCSearchSort[] | undefined>();
|
sortQuery = new BehaviorSubject<SCSearchSort[] | undefined>(undefined);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Observable SortContext streams
|
* Observable SortContext streams
|
||||||
|
|||||||
@@ -19,12 +19,13 @@ import {RouterModule} from '@angular/router';
|
|||||||
import {LayoutModule} from '@angular/cdk/layout';
|
import {LayoutModule} from '@angular/cdk/layout';
|
||||||
import {TranslateModule} from '@ngx-translate/core';
|
import {TranslateModule} from '@ngx-translate/core';
|
||||||
import {SettingsModule} from '../settings/settings.module';
|
import {SettingsModule} from '../settings/settings.module';
|
||||||
import {ContextMenuComponent} from './context/context-menu.component';
|
|
||||||
import {ContextMenuService} from './context/context-menu.service';
|
import {ContextMenuService} from './context/context-menu.service';
|
||||||
import {
|
import {
|
||||||
IonButton,
|
IonButton,
|
||||||
|
IonButtons,
|
||||||
IonCheckbox,
|
IonCheckbox,
|
||||||
IonContent,
|
IonContent,
|
||||||
|
IonHeader,
|
||||||
IonItem,
|
IonItem,
|
||||||
IonLabel,
|
IonLabel,
|
||||||
IonList,
|
IonList,
|
||||||
@@ -39,13 +40,14 @@ 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";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Menu module
|
* Menu module
|
||||||
*/
|
*/
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [ContextMenuComponent],
|
declarations: [ContextMenuModalComponent],
|
||||||
exports: [ContextMenuComponent],
|
exports: [ContextMenuModalComponent],
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
IonIconDirective,
|
IonIconDirective,
|
||||||
@@ -69,6 +71,8 @@ import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
|||||||
IonRadioGroup,
|
IonRadioGroup,
|
||||||
IonContent,
|
IonContent,
|
||||||
IonToolbar,
|
IonToolbar,
|
||||||
|
IonButtons,
|
||||||
|
IonHeader,
|
||||||
],
|
],
|
||||||
providers: [ContextMenuService],
|
providers: [ContextMenuService],
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user