Compare commits
7 Commits
@openstapp
...
204-pwa-of
| Author | SHA1 | Date | |
|---|---|---|---|
| d4e15aa391 | |||
|
|
6b06de4019 | ||
|
|
c5c9bcf433 | ||
|
|
b40ba7ad63 | ||
|
|
362f6adf07 | ||
|
|
bbd6b0f874 | ||
|
|
b1a9ba44d0 |
6
.changeset/new-yaks-drop.md
Normal file
@@ -0,0 +1,6 @@
|
||||
---
|
||||
"@openstapps/backend": patch
|
||||
"@openstapps/logger": patch
|
||||
---
|
||||
|
||||
Updated nodemailer dependency
|
||||
@@ -1,5 +1,12 @@
|
||||
# @openstapps/backend
|
||||
|
||||
## 4.0.1
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- b40ba7ad: Updated Elasticsearch dependency
|
||||
- @openstapps/core@4.0.0
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/backend",
|
||||
"description": "A reference implementation for a StApps backend",
|
||||
"version": "4.0.0",
|
||||
"version": "4.0.1",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"license": "AGPL-3.0-only",
|
||||
@@ -43,11 +43,11 @@
|
||||
"test:unit": "cross-env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true STAPPS_LOG_LEVEL=0 mocha --exit"
|
||||
},
|
||||
"dependencies": {
|
||||
"@elastic/elasticsearch": "8.4.0",
|
||||
"@elastic/elasticsearch": "8.14.1",
|
||||
"@openstapps/core": "workspace:*",
|
||||
"@openstapps/core-tools": "workspace:*",
|
||||
"@openstapps/logger": "workspace:*",
|
||||
"@types/body-parser": "1.19.2",
|
||||
"@types/body-parser": "1.19.6",
|
||||
"@types/cors": "2.8.13",
|
||||
"@types/express": "4.17.17",
|
||||
"@types/geojson": "1.0.6",
|
||||
@@ -56,20 +56,20 @@
|
||||
"@types/nodemailer": "6.4.7",
|
||||
"@types/promise-queue": "2.2.0",
|
||||
"@types/uuid": "8.3.4",
|
||||
"body-parser": "1.20.2",
|
||||
"body-parser": "1.20.3",
|
||||
"cors": "2.8.5",
|
||||
"cosmiconfig": "8.1.3",
|
||||
"deepmerge": "4.3.1",
|
||||
"express": "4.18.2",
|
||||
"express": "4.21.2",
|
||||
"express-prom-bundle": "6.6.0",
|
||||
"express-promise-router": "4.1.1",
|
||||
"got": "12.6.0",
|
||||
"moment": "2.30.1",
|
||||
"morgan": "1.10.0",
|
||||
"morgan": "1.10.1",
|
||||
"nock": "13.3.1",
|
||||
"node-cache": "5.1.2",
|
||||
"node-cron": "3.0.2",
|
||||
"nodemailer": "6.9.1",
|
||||
"nodemailer": "6.9.9",
|
||||
"prom-client": "14.1.1",
|
||||
"promise-queue": "2.2.5",
|
||||
"uuid": "8.3.2"
|
||||
@@ -83,7 +83,7 @@
|
||||
"@types/chai": "4.3.20",
|
||||
"@types/chai-as-promised": "7.1.8",
|
||||
"@types/mocha": "10.0.10",
|
||||
"@types/morgan": "1.9.4",
|
||||
"@types/morgan": "1.9.10",
|
||||
"@types/sinon": "10.0.14",
|
||||
"@types/sinon-express-mock": "1.3.9",
|
||||
"@types/supertest": "2.0.12",
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
# @openstapps/database
|
||||
|
||||
## 4.0.1
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- b40ba7ad: Updated Elasticsearch dependency
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM elasticsearch:8.4.2
|
||||
FROM elasticsearch:8.14.3
|
||||
|
||||
EXPOSE 9200
|
||||
EXPOSE 9300
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@openstapps/database",
|
||||
"version": "4.0.0",
|
||||
"version": "4.0.1",
|
||||
"private": true,
|
||||
"files": [
|
||||
"config",
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
# @openstapps/projectmanagement
|
||||
|
||||
## 4.0.1
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- b40ba7ad: Updated Elasticsearch dependency
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/projectmanagement",
|
||||
"description": "Main documentation and scripts for maintenance.",
|
||||
"version": "4.0.0",
|
||||
"version": "4.0.1",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"license": "GPL-3.0-only",
|
||||
@@ -41,7 +41,6 @@
|
||||
"@openstapps/collection-utils": "workspace:*",
|
||||
"@openstapps/gitlab-api": "workspace:*",
|
||||
"@openstapps/logger": "workspace:*",
|
||||
"@slack/web-api": "6.8.1",
|
||||
"commander": "10.0.0",
|
||||
"date-fns": "3.6.0",
|
||||
"glob": "10.3.10",
|
||||
|
||||
@@ -22,7 +22,6 @@ import {
|
||||
User,
|
||||
} from '@openstapps/gitlab-api';
|
||||
import {Logger} from '@openstapps/logger';
|
||||
import {WebClient} from '@slack/web-api';
|
||||
import {CONCURRENCY, GROUPS, MAX_DEPTH_FOR_REMINDER, NOTE_PREFIX, SLACK_CHANNEL} from '../configuration.js';
|
||||
import {mapAsyncLimit} from '@openstapps/collection-utils';
|
||||
|
||||
@@ -53,8 +52,7 @@ export async function remind(api: Api): Promise<void> {
|
||||
Logger.info(`Found ${mergeRequests.length} open merge requests.`);
|
||||
|
||||
// instantiate slack client
|
||||
const client =
|
||||
process.env.SLACK_API_TOKEN === undefined ? undefined : new WebClient(process.env.SLACK_API_TOKEN);
|
||||
const client = undefined;
|
||||
|
||||
// get members of the main group
|
||||
const members = await api.getMembers(MembershipScope.GROUPS, GROUPS[0]);
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
# @openstapps/minimal-connector
|
||||
|
||||
## 4.0.1
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [b40ba7ad]
|
||||
- @openstapps/api@4.0.1
|
||||
- @openstapps/core@4.0.0
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/minimal-connector",
|
||||
"description": "This is a minimal connector which serves as an example",
|
||||
"version": "4.0.0",
|
||||
"version": "4.0.1",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"license": "GPL-3.0-only",
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
# @openstapps/minimal-deployment
|
||||
|
||||
## 4.0.1
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- b40ba7ad: Updated Elasticsearch dependency
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
@@ -1,23 +1,21 @@
|
||||
version: '3.7'
|
||||
|
||||
x-development-variables: &development-variables
|
||||
NODE_ENV: "development"
|
||||
ALLOW_NO_TRANSPORT: "true"
|
||||
|
||||
services:
|
||||
database:
|
||||
image: registry.gitlab.com/openstapps/openstapps/database:3.0.0
|
||||
image: registry.gitlab.com/openstapps/openstapps/database:4.0.1
|
||||
# If you need persistence for debugging purposes uncomment the following lines
|
||||
#volumes:
|
||||
# volumes:
|
||||
# - ./database:/usr/share/elasticsearch/data
|
||||
expose:
|
||||
- 9200
|
||||
ports:
|
||||
- 127.0.0.1:9200:9200
|
||||
environment:
|
||||
- bootstrap.memory_lock=true
|
||||
- "ES_JAVA_OPTS=-Xms2g -Xmx2g"
|
||||
- discovery.type=single-node
|
||||
# - bootstrap.memory_lock=true
|
||||
# - discovery.type=single-node
|
||||
- "ES_JAVA_OPTS=-Xms4g -Xmx4g"
|
||||
ulimits:
|
||||
memlock:
|
||||
soft: -1
|
||||
@@ -25,7 +23,7 @@ services:
|
||||
restart: unless-stopped
|
||||
|
||||
backend:
|
||||
image: registry.gitlab.com/openstapps/openstapps/backend:3.1.0
|
||||
image: registry.gitlab.com/openstapps/openstapps/backend:4.0.1
|
||||
environment:
|
||||
<<: *development-variables
|
||||
ES_ADDR: "http://database:9200"
|
||||
@@ -37,10 +35,11 @@ services:
|
||||
ports:
|
||||
- 127.0.0.1:3000:3000
|
||||
labels:
|
||||
- stapps.version=4.1.0
|
||||
- stapps.version=4.0.0
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- database
|
||||
database:
|
||||
condition: service_healthy
|
||||
links:
|
||||
- database
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@openstapps/minimal-deployment",
|
||||
"version": "4.0.0",
|
||||
"version": "4.0.1",
|
||||
"private": true,
|
||||
"files": [
|
||||
"database",
|
||||
|
||||
@@ -1,5 +1,15 @@
|
||||
# @openstapps/minimal-plugin
|
||||
|
||||
## 4.0.1
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- b40ba7ad: Updated Elasticsearch dependency
|
||||
- Updated dependencies [b40ba7ad]
|
||||
- @openstapps/api-plugin@4.0.1
|
||||
- @openstapps/api@4.0.1
|
||||
- @openstapps/core@4.0.0
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/minimal-plugin",
|
||||
"description": "Minimal Plugin",
|
||||
"version": "4.0.0",
|
||||
"version": "4.0.1",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"license": "GPL-3.0-only",
|
||||
@@ -34,7 +34,7 @@
|
||||
"@openstapps/core-tools": "workspace:*",
|
||||
"@openstapps/logger": "workspace:*",
|
||||
"commander": "10.0.0",
|
||||
"express": "4.18.2",
|
||||
"express": "4.21.2",
|
||||
"ts-node": "10.9.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
# @openstapps/app
|
||||
|
||||
## 4.0.1
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- b40ba7ad: Updated Elasticsearch dependency
|
||||
- Updated dependencies [b40ba7ad]
|
||||
- @openstapps/api@4.0.1
|
||||
- @openstapps/core@4.0.0
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
@@ -40,14 +40,16 @@
|
||||
"glob": "CHANGELOG.md",
|
||||
"input": ".",
|
||||
"output": "assets"
|
||||
}
|
||||
},
|
||||
"src/manifest.webmanifest"
|
||||
],
|
||||
"styles": [
|
||||
{
|
||||
"input": "src/global.scss",
|
||||
"inject": true
|
||||
}
|
||||
]
|
||||
],
|
||||
"serviceWorker": "ngsw-config.json"
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
@@ -127,7 +129,8 @@
|
||||
"glob": "**/*",
|
||||
"input": "src/assets",
|
||||
"output": "/assets"
|
||||
}
|
||||
},
|
||||
"src/manifest.webmanifest"
|
||||
]
|
||||
}
|
||||
},
|
||||
|
||||
@@ -26,7 +26,7 @@ describe('App', () => {
|
||||
it('should have a proper title', () => {
|
||||
cy.visit('/overview');
|
||||
|
||||
cy.title().should('equal', 'StApps');
|
||||
cy.title().should('equal', 'Goethe-Uni');
|
||||
});
|
||||
|
||||
it('should have a proper working navigation', () => {
|
||||
|
||||
@@ -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');
|
||||
});
|
||||
});
|
||||
|
||||
21
frontend/app/ngsw-config.json
Normal file
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"$schema": "./node_modules/@angular/service-worker/config/schema.json",
|
||||
"index": "/index.html",
|
||||
"assetGroups": [
|
||||
{
|
||||
"name": "app",
|
||||
"installMode": "prefetch",
|
||||
"resources": {
|
||||
"files": ["/favicon.ico", "/index.html", "/manifest.webmanifest", "/*.css", "/*.js"]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "assets",
|
||||
"installMode": "lazy",
|
||||
"updateMode": "prefetch",
|
||||
"resources": {
|
||||
"files": ["/assets/**", "/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2)"]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/app",
|
||||
"description": "The generic app tailored to fulfill needs of German universities, written using Ionic Framework.",
|
||||
"version": "4.0.0",
|
||||
"version": "4.0.1",
|
||||
"private": true,
|
||||
"license": "GPL-3.0-only",
|
||||
"author": "Karl-Philipp Wulfert <krlwlfrt@gmail.com>",
|
||||
@@ -55,6 +55,7 @@
|
||||
"@angular/forms": "17.3.12",
|
||||
"@angular/platform-browser": "17.3.12",
|
||||
"@angular/router": "17.3.12",
|
||||
"@angular/service-worker": "17.3.12",
|
||||
"@awesome-cordova-plugins/calendar": "6.6.0",
|
||||
"@awesome-cordova-plugins/core": "6.6.0",
|
||||
"@capacitor-community/screen-brightness": "6.0.0",
|
||||
@@ -91,13 +92,13 @@
|
||||
"cordova-plugin-calendar": "5.1.6",
|
||||
"date-fns": "3.6.0",
|
||||
"deepmerge": "4.3.1",
|
||||
"form-data": "4.0.0",
|
||||
"form-data": "4.0.4",
|
||||
"geojson": "0.5.0",
|
||||
"ionic-appauth": "0.9.0",
|
||||
"ionicons": "7.4.0",
|
||||
"jsonpath-plus": "10.3.0",
|
||||
"maplibre-gl": "4.0.2",
|
||||
"material-symbols": "0.17.1",
|
||||
"material-symbols": "0.27.2",
|
||||
"moment": "2.30.1",
|
||||
"ngx-date-fns": "11.0.0",
|
||||
"ngx-logger": "5.0.12",
|
||||
|
||||
73
frontend/app/resources/logo_pwa.svg
Normal file
@@ -0,0 +1,73 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
version="1.1"
|
||||
id="svg2"
|
||||
width="1024"
|
||||
height="1024"
|
||||
viewBox="0 0 1024 1024"
|
||||
sodipodi:docname="logo_pwa.svg"
|
||||
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
|
||||
xml:space="preserve"
|
||||
inkscape:export-filename="../src/assets/icons/icon-512x512.png"
|
||||
inkscape:export-xdpi="48"
|
||||
inkscape:export-ydpi="48"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"><defs
|
||||
id="defs6" /><sodipodi:namedview
|
||||
id="namedview4"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#000000"
|
||||
borderopacity="0.25"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="true"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
showgrid="false"
|
||||
inkscape:zoom="0.49999772"
|
||||
inkscape:cx="454.00207"
|
||||
inkscape:cy="347.00158"
|
||||
inkscape:window-width="1504"
|
||||
inkscape:window-height="1729"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="g8" /><g
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="Image"
|
||||
id="g8"><rect
|
||||
style="fill:#00b5cc;fill-opacity:1;stroke-width:1.10978"
|
||||
id="rect2351"
|
||||
width="379.77051"
|
||||
height="379.77051"
|
||||
x="143.85109"
|
||||
y="141.62936"
|
||||
ry="50.263741"
|
||||
sodipodi:insensitive="true" /><rect
|
||||
style="fill:#3be40b;fill-opacity:1;stroke-width:1.11352"
|
||||
id="rect2353"
|
||||
width="154.14215"
|
||||
height="154.14215"
|
||||
x="580.75684"
|
||||
y="367.25772"
|
||||
ry="25.690359"
|
||||
sodipodi:insensitive="true" /><rect
|
||||
style="fill:#c90e20;fill-opacity:1;stroke-width:1.10084"
|
||||
id="rect2355"
|
||||
width="306.05032"
|
||||
height="306.05032"
|
||||
x="580.75684"
|
||||
y="578.53516"
|
||||
ry="35.743107"
|
||||
sodipodi:insensitive="true" /><rect
|
||||
style="fill:#e4a20b;fill-opacity:1;stroke-width:1.11912"
|
||||
id="rect2357"
|
||||
width="232.33018"
|
||||
height="232.33018"
|
||||
x="291.29138"
|
||||
y="578.53516"
|
||||
ry="33.509159"
|
||||
sodipodi:insensitive="true" /></g></svg>
|
||||
|
After Width: | Height: | Size: 2.3 KiB |
@@ -15,7 +15,7 @@
|
||||
import {CommonModule, LocationStrategy, PathLocationStrategy, registerLocaleData} from '@angular/common';
|
||||
import {HTTP_INTERCEPTORS, HttpClient, provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
|
||||
import localeDe from '@angular/common/locales/de';
|
||||
import {APP_INITIALIZER, NgModule} from '@angular/core';
|
||||
import {APP_INITIALIZER, NgModule, isDevMode} from '@angular/core';
|
||||
import {BrowserModule} from '@angular/platform-browser';
|
||||
import {RouteReuseStrategy} from '@angular/router';
|
||||
import {IonicRouteStrategy, Platform, provideIonicAngular, IonApp} from '@ionic/angular/standalone';
|
||||
@@ -70,6 +70,7 @@ import {Capacitor} from '@capacitor/core';
|
||||
import {SplashScreen} from '@capacitor/splash-screen';
|
||||
import maplibregl from 'maplibre-gl';
|
||||
import {Protocol} from 'pmtiles';
|
||||
import {ServiceWorkerModule} from '@angular/service-worker';
|
||||
|
||||
registerLocaleData(localeDe);
|
||||
|
||||
@@ -182,6 +183,12 @@ export function createTranslateLoader(http: HttpClient) {
|
||||
level: environment.production ? NgxLoggerLevel.FATAL : NgxLoggerLevel.TRACE,
|
||||
}),
|
||||
IonApp,
|
||||
ServiceWorkerModule.register('ngsw-worker.js', {
|
||||
enabled: !isDevMode(),
|
||||
// Register the ServiceWorker as soon as the application is stable
|
||||
// or after 30 seconds (whichever comes first).
|
||||
registrationStrategy: 'registerWhenStable:30000',
|
||||
}),
|
||||
],
|
||||
providers: [
|
||||
{
|
||||
|
||||
@@ -33,7 +33,7 @@ export const DataIcons = {
|
||||
'id card': SCIcon.badge,
|
||||
'message': SCIcon.newspaper,
|
||||
'organization': SCIcon.business_center,
|
||||
'periodical': SCIcon.feed,
|
||||
'periodical': SCIcon.news,
|
||||
'person': SCIcon.person,
|
||||
'point of interest': SCIcon.pin_drop,
|
||||
'publication event': SCIcon.campaign,
|
||||
|
||||
@@ -19,6 +19,6 @@
|
||||
[size]="24"
|
||||
[fill]="(isFavorite$ | async) || false"
|
||||
[class.selected]="isFavorite$ | async"
|
||||
name="grade"
|
||||
name="star"
|
||||
></ion-icon>
|
||||
</ion-button>
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
slot="icon-only"
|
||||
[size]="32"
|
||||
color="medium"
|
||||
name="grade"
|
||||
name="star"
|
||||
></ion-icon>
|
||||
}
|
||||
<label class="thank-you">{{ 'ratings.thank_you' | translate }}</label>
|
||||
|
||||
@@ -42,9 +42,11 @@
|
||||
}
|
||||
<!-- TODO see above -->
|
||||
@if (item.description && item.type !== 'job posting' && buttonShown) {
|
||||
<ion-button expand="full" fill="clear" (click)="toggleDescriptionAccordion()">
|
||||
<ion-icon [name]="buttonState" size="large"></ion-icon>
|
||||
</ion-button>
|
||||
<div class="read-more-container">
|
||||
<ion-button shape="round" size="small" (click)="toggleDescriptionAccordion()">
|
||||
READ_MORE...
|
||||
</ion-button>
|
||||
</div>
|
||||
}
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
|
||||
@@ -52,3 +52,21 @@ ion-card {
|
||||
--color: var(--ion-color-primary-contrast);
|
||||
}
|
||||
}
|
||||
|
||||
.read-more-container {
|
||||
position: relative;
|
||||
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
|
||||
margin-top: -24px;
|
||||
|
||||
background: linear-gradient(to bottom, transparent, var(--ion-color-primary));
|
||||
|
||||
ion-button {
|
||||
--background: var(--ion-color-primary-contrast);
|
||||
--color: var(--ion-color-primary);
|
||||
|
||||
height: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,8 +18,8 @@ import {SCThings} from '@openstapps/core';
|
||||
import {SCIcon} from '../../../util/ion-icon/icon';
|
||||
|
||||
const AccordionButtonState = {
|
||||
collapsed: SCIcon.expand_more,
|
||||
expanded: SCIcon.expand_less,
|
||||
collapsed: SCIcon.unfold_more,
|
||||
expanded: SCIcon.unfold_less,
|
||||
};
|
||||
|
||||
@Component({
|
||||
@@ -44,7 +44,7 @@ export class TitleCardComponent implements OnInit, OnChanges {
|
||||
|
||||
descriptionLinesTotal: number;
|
||||
|
||||
descriptionPreviewLines = 3;
|
||||
descriptionPreviewLines = 4;
|
||||
|
||||
descriptionLinesToDisplay = 0;
|
||||
|
||||
|
||||
@@ -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,
|
||||
@@ -36,6 +41,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
|
||||
@@ -173,7 +180,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);
|
||||
}
|
||||
@@ -368,4 +376,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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -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');
|
||||
};
|
||||
@@ -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,
|
||||
},
|
||||
];
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -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>
|
||||
@@ -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,
|
||||
},
|
||||
];
|
||||
@@ -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>
|
||||
@@ -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();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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],
|
||||
})
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
'_EVENT' | translate: {count: myCoursesDay[1].length}
|
||||
}}</ion-label
|
||||
>
|
||||
<ion-icon class="ion-accordion-toggle-icon" name="expand_more"></ion-icon>
|
||||
<ion-icon class="ion-accordion-toggle-icon" name="keyboard_arrow_down"></ion-icon>
|
||||
</ion-item>
|
||||
<ion-list class="ion-padding" slot="content">
|
||||
@if (myCoursesDay[1].length === 0) {
|
||||
|
||||
@@ -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_backward"></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_forward"></ion-icon>
|
||||
</ion-button>
|
||||
<infinite-swiper
|
||||
class="header-swiper"
|
||||
|
||||
@@ -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_backward"></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_forward"></ion-icon>
|
||||
</ion-button>
|
||||
<swiper
|
||||
class="header-swiper"
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
<ion-button expand="block" (click)="presentResetAlert()" fill="outline">
|
||||
{{ 'settings.resetSettings' | translate }}
|
||||
<ion-icon slot="start" name="device_reset"></ion-icon>
|
||||
<ion-icon slot="start" name="history"></ion-icon>
|
||||
</ion-button>
|
||||
</div>
|
||||
</ion-content>
|
||||
|
||||
@@ -14,10 +14,12 @@ export class EncryptedStorageProvider {
|
||||
* @returns The value of the resource, if found
|
||||
*/
|
||||
async get<T>(key: string): Promise<T | undefined> {
|
||||
if (!Capacitor.isNativePlatform()) return undefined;
|
||||
|
||||
try {
|
||||
const jwt = JSON.parse((await SecureStoragePlugin.get({key: `stapps:key:${key}`})).value);
|
||||
const jwt = JSON.parse(
|
||||
await (Capacitor.isNativePlatform()
|
||||
? SecureStoragePlugin.get({key: `stapps:key:${key}`}).then(it => it.value)
|
||||
: this.storageProvider.get<string>(`stapps:key:${key}`)),
|
||||
);
|
||||
const aesKey = await crypto.subtle.importKey('jwk', jwt, {name: 'AES-GCM'}, true, [
|
||||
'encrypt',
|
||||
'decrypt',
|
||||
@@ -48,8 +50,6 @@ export class EncryptedStorageProvider {
|
||||
* @returns A promise that resolves when the value is stored
|
||||
*/
|
||||
async set<T>(key: string, value: T): Promise<void> {
|
||||
if (!Capacitor.isNativePlatform()) return undefined;
|
||||
|
||||
try {
|
||||
const compressionStream = new CompressionStream('gzip');
|
||||
const writer = compressionStream.writable.getWriter();
|
||||
@@ -63,11 +63,14 @@ export class EncryptedStorageProvider {
|
||||
'decrypt',
|
||||
]);
|
||||
|
||||
const exportedKey = JSON.stringify(await crypto.subtle.exportKey('jwk', aesKey));
|
||||
await Promise.all([
|
||||
SecureStoragePlugin.set({
|
||||
key: `stapps:key:${key}`,
|
||||
value: JSON.stringify(await crypto.subtle.exportKey('jwk', aesKey)),
|
||||
}),
|
||||
Capacitor.isNativePlatform()
|
||||
? SecureStoragePlugin.set({
|
||||
key: `stapps:key:${key}`,
|
||||
value: exportedKey,
|
||||
})
|
||||
: this.storageProvider.put(`stapps:key:${key}`, exportedKey),
|
||||
this.storageProvider.put(`encrypted:${key}:iv`, iv),
|
||||
]);
|
||||
|
||||
@@ -81,10 +84,10 @@ export class EncryptedStorageProvider {
|
||||
}
|
||||
|
||||
async delete(key: string): Promise<void> {
|
||||
if (!Capacitor.isNativePlatform()) return;
|
||||
|
||||
await Promise.all([
|
||||
SecureStoragePlugin.remove({key: `stapps:key:${key}`}),
|
||||
Capacitor.isNativePlatform()
|
||||
? SecureStoragePlugin.remove({key: `stapps:key:${key}`})
|
||||
: this.storageProvider.delete(`stapps:key:${key}`),
|
||||
this.storageProvider.delete(`encrypted:${key}:iv`),
|
||||
this.storageProvider.delete(`encrypted:${key}`),
|
||||
]);
|
||||
|
||||
@@ -150,12 +150,12 @@ const iconMap = new Map<string, MaterialSymbol>([
|
||||
[menuSharp, SCIcon.menu],
|
||||
[searchOutline, SCIcon.search],
|
||||
[searchSharp, SCIcon.search],
|
||||
[chevronExpand, SCIcon.expand_more],
|
||||
[caretDownSharp, SCIcon.expand_more],
|
||||
[chevronExpand, SCIcon.keyboard_arrow_down],
|
||||
[caretDownSharp, SCIcon.keyboard_arrow_down],
|
||||
[close, SCIcon.close],
|
||||
[closeSharp, SCIcon.close],
|
||||
[closeCircle, SCIcon.cancel],
|
||||
[ellipsisHorizontal, SCIcon.more_horiz],
|
||||
['chevron-down-outline', SCIcon.expand_more],
|
||||
['chevron-down-outline', SCIcon.keyboard_arrow_down],
|
||||
['arrow_back', SCIcon.arrow_back],
|
||||
]);
|
||||
|
||||
BIN
frontend/app/src/assets/icons/apple-touch-icon.png
Normal file
|
After Width: | Height: | Size: 84 KiB |
BIN
frontend/app/src/assets/icons/icon_x128.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
frontend/app/src/assets/icons/icon_x192.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
BIN
frontend/app/src/assets/icons/icon_x384.png
Normal file
|
After Width: | Height: | Size: 70 KiB |
BIN
frontend/app/src/assets/icons/icon_x48.png
Normal file
|
After Width: | Height: | Size: 6.5 KiB |
BIN
frontend/app/src/assets/icons/icon_x512.png
Normal file
|
After Width: | Height: | Size: 101 KiB |
BIN
frontend/app/src/assets/icons/icon_x72.png
Normal file
|
After Width: | Height: | Size: 9.6 KiB |
BIN
frontend/app/src/assets/icons/icon_x96.png
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
frontend/app/src/assets/icons/local_cafe_x192.png
Normal file
|
After Width: | Height: | Size: 2.5 KiB |
BIN
frontend/app/src/assets/icons/map_x192.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
BIN
frontend/app/src/assets/icons/maskable_icon_x128.png
Normal file
|
After Width: | Height: | Size: 7.5 KiB |
BIN
frontend/app/src/assets/icons/maskable_icon_x192.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
BIN
frontend/app/src/assets/icons/maskable_icon_x384.png
Normal file
|
After Width: | Height: | Size: 49 KiB |
BIN
frontend/app/src/assets/icons/maskable_icon_x48.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
frontend/app/src/assets/icons/maskable_icon_x512.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
frontend/app/src/assets/icons/maskable_icon_x72.png
Normal file
|
After Width: | Height: | Size: 2.9 KiB |
BIN
frontend/app/src/assets/icons/maskable_icon_x96.png
Normal file
|
After Width: | Height: | Size: 4.6 KiB |
BIN
frontend/app/src/assets/icons/school_x192.png
Normal file
|
After Width: | Height: | Size: 5.4 KiB |
BIN
frontend/app/src/assets/icons/search_x192.png
Normal file
|
After Width: | Height: | Size: 5.9 KiB |
BIN
frontend/app/src/assets/screenshots/canteens-wide.png
Normal file
|
After Width: | Height: | Size: 267 KiB |
BIN
frontend/app/src/assets/screenshots/canteens.png
Normal file
|
After Width: | Height: | Size: 164 KiB |
BIN
frontend/app/src/assets/screenshots/map-wide.png
Normal file
|
After Width: | Height: | Size: 2.0 MiB |
BIN
frontend/app/src/assets/screenshots/map.png
Normal file
|
After Width: | Height: | Size: 722 KiB |
BIN
frontend/app/src/assets/screenshots/my-app-wide.png
Normal file
|
After Width: | Height: | Size: 323 KiB |
BIN
frontend/app/src/assets/screenshots/my-app.png
Normal file
|
After Width: | Height: | Size: 174 KiB |
BIN
frontend/app/src/assets/screenshots/overview-wide.png
Normal file
|
After Width: | Height: | Size: 1.5 MiB |
BIN
frontend/app/src/assets/screenshots/overview.png
Normal file
|
After Width: | Height: | Size: 546 KiB |
BIN
frontend/app/src/assets/splash_screens/10.2__iPad_landscape.png
Normal file
|
After Width: | Height: | Size: 140 KiB |
BIN
frontend/app/src/assets/splash_screens/10.2__iPad_portrait.png
Normal file
|
After Width: | Height: | Size: 142 KiB |
|
After Width: | Height: | Size: 149 KiB |
|
After Width: | Height: | Size: 147 KiB |
|
After Width: | Height: | Size: 160 KiB |
|
After Width: | Height: | Size: 158 KiB |
|
After Width: | Height: | Size: 166 KiB |
|
After Width: | Height: | Size: 164 KiB |
|
After Width: | Height: | Size: 163 KiB |
|
After Width: | Height: | Size: 162 KiB |
|
After Width: | Height: | Size: 214 KiB |
|
After Width: | Height: | Size: 214 KiB |
|
After Width: | Height: | Size: 218 KiB |
|
After Width: | Height: | Size: 217 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 41 KiB |
|
After Width: | Height: | Size: 145 KiB |
|
After Width: | Height: | Size: 145 KiB |
|
After Width: | Height: | Size: 129 KiB |
|
After Width: | Height: | Size: 128 KiB |
|
After Width: | Height: | Size: 170 KiB |
|
After Width: | Height: | Size: 166 KiB |
|
After Width: | Height: | Size: 83 KiB |