mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2025-12-14 02:06:20 +00:00
Compare commits
117 Commits
@openstapp
...
@openstapp
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bee38d4a59 | ||
|
|
a5c5c31d09 | ||
|
|
c8e290200f | ||
|
|
ef4e1f8ded | ||
|
|
5759a1cbb1 | ||
| b8ac30b9d0 | |||
|
|
436e1471a7 | ||
|
|
4c9d330c88 | ||
|
|
580ebee362 | ||
|
|
07e5c80223 | ||
|
|
2ac840d845 | ||
|
|
8b581ef9ca | ||
|
|
e2d5d4f187 | ||
|
|
496b50d892 | ||
|
e6c17c860b
|
|||
|
|
bb1f596bfc | ||
|
0c49fd8c34
|
|||
|
|
ce5016a992 | ||
|
3ac8c04765
|
|||
|
|
5c260dd26b | ||
|
|
f2e1a6ddd5 | ||
|
|
ccacfbf710 | ||
|
|
b249b329f7 | ||
|
|
7afc24f1bc | ||
|
|
7276525dfa | ||
|
|
c9e881582f | ||
|
|
df681de083 | ||
| 802a7a3fa7 | |||
|
|
343d03e647 | ||
| 727b92911e | |||
| 11bc987807 | |||
|
|
b8faae5988 | ||
| 67ab1fd613 | |||
|
|
142079bf0e | ||
|
|
5050ac90eb | ||
|
|
688bc5f2e7 | ||
|
|
ad174dd7d7 | ||
|
|
26e654f5b8 | ||
|
|
5439484a90 | ||
|
|
68f3366a27 | ||
|
|
dea9a82105 | ||
|
39d2801114
|
|||
|
|
341b209092 | ||
|
|
a6b88d3534 | ||
|
|
be863daaef | ||
| 2f64d69693 | |||
| 964516d3cf | |||
| 71ff9fd960 | |||
| abf9999461 | |||
| 53c3d0ba0c | |||
|
|
622481a3c9 | ||
|
|
1ab5c0c355 | ||
|
|
b0f6ffb21c | ||
|
|
e658cff9d2 | ||
|
|
e71355a2fb | ||
| 100607740b | |||
|
|
10c4466b37 | ||
|
|
09faa66e98 | ||
|
|
7c5687111f | ||
|
|
c066028e49 | ||
| 0858a26dc1 | |||
| 8667603bd6 | |||
| 65bc9a76b6 | |||
| 912ae42270 | |||
| c4a5d6e73b | |||
| deed376c24 | |||
| a4cc23e9a8 | |||
| e8d72683ef | |||
|
|
e3d068f8d4 | ||
|
|
b346d216a3 | ||
| dbb558508f | |||
|
|
754d99c1b4 | ||
|
|
689ac68be3 | ||
|
|
d36d9596fc | ||
|
|
8d50f669e7 | ||
|
|
dce08d9c03 | ||
|
|
296054c8e0 | ||
|
859763367e
|
|||
|
|
848fde4660 | ||
|
|
bd1046a19a | ||
|
|
3b9068197c | ||
|
|
d2c8120255 | ||
|
d44204cf8d
|
|||
|
9d5dd05bb6
|
|||
|
288a49113f
|
|||
| 791b5c895d | |||
| d7a85b7fae | |||
|
|
bff2d985aa | ||
|
|
655efc9d29 | ||
|
|
66712bdd24 | ||
| 8b5b4c765b | |||
|
|
31a6ebfd3f | ||
|
|
991ed1cb1f | ||
|
|
1efe5c1449 | ||
|
|
4dbeb9936c | ||
|
|
29e6128141 | ||
|
|
753dc7cd11 | ||
|
|
4f3834c20e | ||
|
|
cfb4aa364f | ||
|
|
37945f7d19 | ||
|
5d47a17629
|
|||
| 61587c7ba1 | |||
| 066e374462 | |||
|
a02190fe5a
|
|||
|
04e275e967
|
|||
|
f618725598
|
|||
|
|
06b8ca109e
|
||
|
f3ba8af051
|
|||
|
2e0020b5c8
|
|||
|
d17e8abea3
|
|||
|
ef092a8bff
|
|||
|
656f2266e3
|
|||
|
|
5c8c151917 | ||
|
|
c020f075be | ||
| 98f21ac23b | |||
| c460a3dbc0 | |||
|
|
5db3b7948a |
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Update to Angular 16.1
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Detail views now won't load data again if it is being navigated to from a list item
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Refactored Opening Hours
|
|
||||||
|
|
||||||
- Migrated Opening Hours to use OnPush change detection
|
|
||||||
- Fixed a bug where opening hours would not update correctly
|
|
||||||
- Lazy-load opening hours module to keep it out of the main bundle
|
|
||||||
- Added e2e tests to verify functionality
|
|
||||||
- Changed live update status to show exact minutes starting one hour before the next change
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/core-tools': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Removed pack tool
|
|
||||||
|
|
||||||
Use a bundler like `tsup` in conjunction with an
|
|
||||||
`index.ts` that aggregates all exports instead.
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/api-plugin': major
|
|
||||||
'@openstapps/api-cli': major
|
|
||||||
'@openstapps/api': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Split API into API, API-CLI and API-Plugin
|
|
||||||
|
|
||||||
Plugins are now required to use `api-plugin`.
|
|
||||||
Consumers of `api` can benefit from a slimmer package with
|
|
||||||
no NodeJS dependencies.
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/backend': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate config system to cosmiconfig
|
|
||||||
|
|
||||||
Configs are now written using type-checked JavaScript
|
|
||||||
|
|
||||||
```js
|
|
||||||
// @ts-check
|
|
||||||
|
|
||||||
// This file is now type-safe just like TypeScript, but
|
|
||||||
// without the compilation step
|
|
||||||
|
|
||||||
/** @type {import('@openstapps/package').Type} */
|
|
||||||
const foo = {};
|
|
||||||
```
|
|
||||||
|
|
||||||
You can write config files in JavaScript, JSON, or other
|
|
||||||
cosmiconfig-supported formats.
|
|
||||||
|
|
||||||
The config files now are
|
|
||||||
|
|
||||||
- `backendrc.{js,json,...}`
|
|
||||||
- `elasticsearchrc.{js,json,...}`
|
|
||||||
- `prometheusrc.{js,json,...}`
|
|
||||||
|
|
||||||
You can also split them into multiple files,
|
|
||||||
as well as using the `markdown.js` helper in
|
|
||||||
`config/default/tools` to include markdown files
|
|
||||||
as text (see `config/f-u/about-pages`)
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Use observable chains instead of change detection in the rating component
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': major
|
|
||||||
'@openstapps/prettier-config': major
|
|
||||||
'@openstapps/es-mapping-generator': major
|
|
||||||
'@openstapps/backend-config': major
|
|
||||||
'@openstapps/eslint-config': major
|
|
||||||
'@openstapps/minimal-connector': major
|
|
||||||
'@openstapps/collection-utils': major
|
|
||||||
'@openstapps/minimal-plugin': major
|
|
||||||
'@openstapps/tsconfig': major
|
|
||||||
'@openstapps/api-plugin': major
|
|
||||||
'@openstapps/core-tools': major
|
|
||||||
'@openstapps/gitlab-api': major
|
|
||||||
'@openstapps/easy-ast': major
|
|
||||||
'@openstapps/api-cli': major
|
|
||||||
'@openstapps/backend': major
|
|
||||||
'@openstapps/logger': major
|
|
||||||
'@openstapps/proxy': major
|
|
||||||
'@openstapps/core': major
|
|
||||||
'@openstapps/app': major
|
|
||||||
'@openstapps/api': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Move project to a turbo monorepo & pnpm
|
|
||||||
|
|
||||||
Internal dependencies are now defined using `"@openstapps/package": "workspace:*"`
|
|
||||||
|
|
||||||
- Removed extraneous files from packages
|
|
||||||
- `.npmrc`
|
|
||||||
- `.npmignore`
|
|
||||||
- `.mailmap`
|
|
||||||
- `.gitignore`
|
|
||||||
- `CONTRIBUTING.md`
|
|
||||||
- `LICENSE` (Project license file is added upon publishing, see [pnpm.io](https://pnpm.io/cli/publish))
|
|
||||||
- `package-lock.json`
|
|
||||||
- `.editorconfig`
|
|
||||||
- `.eslintrc.json` (moved eslint config to `package.json`)
|
|
||||||
- `.eslintignore`
|
|
||||||
- `.gitlab-ci.yml` (Most workflows are workspace-level)
|
|
||||||
- `.gitlab/**` (issue templates etc. are now workspace-level)
|
|
||||||
- `.dockerignore` (Docker files are determined by which files are deployed with `pnpm deploy`, as per `package.json/files`)
|
|
||||||
- TSConfig has been moved to its own package (You can now use `"extends": "@openstapps/tsconfig"`)
|
|
||||||
- Removed ESLint and Prettier peer dependency hell by injecting them through the `.pnpmfile.cjs`
|
|
||||||
- Added syncpack for keeping dependency versions in sync (and consistent key ordering in `package.json`)
|
|
||||||
- Replaced conventional changelog with changesets
|
|
||||||
- Apps with binaries now use a top level `app.js`
|
|
||||||
|
|
||||||
```js
|
|
||||||
#!/usr/bin/env node
|
|
||||||
import './lib/app.js';
|
|
||||||
```
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Added the ability to remove and add date series from their detail page
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Add a way to hide action chips on list items
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/core': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate away from [ts-optchain](https://www.npmjs.com/package/ts-optchain)
|
|
||||||
|
|
||||||
The package has been deprecated with the last releast being 4 years ago.
|
|
||||||
|
|
||||||
TypeScript as well as ECMAScript have native support for optional
|
|
||||||
chaining with the `?.` operator now.
|
|
||||||
|
|
||||||
You will need to update any packages that rely on the translator
|
|
||||||
module.
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': patch
|
|
||||||
'@openstapps/prettier-config': patch
|
|
||||||
'@openstapps/es-mapping-generator': patch
|
|
||||||
'@openstapps/eslint-config': patch
|
|
||||||
'@openstapps/minimal-connector': patch
|
|
||||||
'@openstapps/minimal-plugin': patch
|
|
||||||
'@openstapps/core-tools': patch
|
|
||||||
'@openstapps/gitlab-api': patch
|
|
||||||
'@openstapps/backend': patch
|
|
||||||
'@openstapps/logger': patch
|
|
||||||
'@openstapps/proxy': patch
|
|
||||||
'@openstapps/core': patch
|
|
||||||
'@openstapps/api': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrated changelogs to changeset format
|
|
||||||
|
|
||||||
```js
|
|
||||||
import fs from 'fs';
|
|
||||||
|
|
||||||
const path = 'packages/logger/CHANGELOG.md';
|
|
||||||
|
|
||||||
fs.writeFileSync(path, fs.readFileSync(path, 'utf8').replace(/^#+\s+\[/gm, '## ['));
|
|
||||||
```
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/backend': minor
|
|
||||||
'@openstapps/api-cli': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate integration tests from docker-compose solution to a shell script
|
|
||||||
|
|
||||||
`api-cli` no longer builds as a Docker container as a result.
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': major
|
|
||||||
'@openstapps/prettier-config': major
|
|
||||||
'@openstapps/es-mapping-generator': major
|
|
||||||
'@openstapps/backend-config': major
|
|
||||||
'@openstapps/eslint-config': major
|
|
||||||
'@openstapps/minimal-connector': major
|
|
||||||
'@openstapps/collection-utils': major
|
|
||||||
'@openstapps/minimal-plugin': major
|
|
||||||
'@openstapps/tsconfig': major
|
|
||||||
'@openstapps/api-plugin': major
|
|
||||||
'@openstapps/core-tools': major
|
|
||||||
'@openstapps/gitlab-api': major
|
|
||||||
'@openstapps/easy-ast': major
|
|
||||||
'@openstapps/api-cli': major
|
|
||||||
'@openstapps/backend': major
|
|
||||||
'@openstapps/logger': major
|
|
||||||
'@openstapps/proxy': major
|
|
||||||
'@openstapps/core': major
|
|
||||||
'@openstapps/app': major
|
|
||||||
'@openstapps/api': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate to ESM
|
|
||||||
|
|
||||||
CommonJS is no longer supported in any capacity. To use the new
|
|
||||||
version, you will need to migrate your package to ESM.
|
|
||||||
We recommend using `tsup` and `Node 18`.
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"type": "module"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': major
|
|
||||||
'@openstapps/prettier-config': major
|
|
||||||
'@openstapps/es-mapping-generator': major
|
|
||||||
'@openstapps/backend-config': major
|
|
||||||
'@openstapps/eslint-config': major
|
|
||||||
'@openstapps/minimal-connector': major
|
|
||||||
'@openstapps/collection-utils': major
|
|
||||||
'@openstapps/minimal-plugin': major
|
|
||||||
'@openstapps/tsconfig': major
|
|
||||||
'@openstapps/api-plugin': major
|
|
||||||
'@openstapps/core-tools': major
|
|
||||||
'@openstapps/gitlab-api': major
|
|
||||||
'@openstapps/easy-ast': major
|
|
||||||
'@openstapps/api-cli': major
|
|
||||||
'@openstapps/backend': major
|
|
||||||
'@openstapps/logger': major
|
|
||||||
'@openstapps/proxy': major
|
|
||||||
'@openstapps/core': major
|
|
||||||
'@openstapps/app': major
|
|
||||||
'@openstapps/api': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate package to Node 18
|
|
||||||
|
|
||||||
- Consumers of this package will need to migrate to Node 18 or
|
|
||||||
higher.
|
|
||||||
- Packages have been migrated from promisified `readFile` or
|
|
||||||
`readFileSync` towards `fs/promises`
|
|
||||||
- Packages use native `flatMap` now
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/gitlab-api': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate from request-promise-native to got
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Fixed distance not updating in list items
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Moved project-docs to the [GitLab Wiki](https://gitlab.com/openstapps/openstapps/-/wikis/home) repo.
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Change leaflet tiles to be inverted as a whole
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': minor
|
|
||||||
'@openstapps/prettier-config': minor
|
|
||||||
'@openstapps/es-mapping-generator': minor
|
|
||||||
'@openstapps/backend-config': minor
|
|
||||||
'@openstapps/eslint-config': minor
|
|
||||||
'@openstapps/minimal-connector': minor
|
|
||||||
'@openstapps/collection-utils': minor
|
|
||||||
'@openstapps/minimal-plugin': minor
|
|
||||||
'@openstapps/tsconfig': minor
|
|
||||||
'@openstapps/api-plugin': minor
|
|
||||||
'@openstapps/core-tools': minor
|
|
||||||
'@openstapps/gitlab-api': minor
|
|
||||||
'@openstapps/easy-ast': minor
|
|
||||||
'@openstapps/api-cli': minor
|
|
||||||
'@openstapps/backend': minor
|
|
||||||
'@openstapps/logger': minor
|
|
||||||
'@openstapps/proxy': minor
|
|
||||||
'@openstapps/core': minor
|
|
||||||
'@openstapps/app': minor
|
|
||||||
'@openstapps/api': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate tests to C8/Chai/Mocha
|
|
||||||
|
|
||||||
- `@testdeck` OOP testing has been removed.
|
|
||||||
- Tests have been unified
|
|
||||||
- CommonJS module mocking has been replaced through
|
|
||||||
refactoring of tests, as ES Modules cannot be mocked
|
|
||||||
(do yourself a favor and don't try to mock them)
|
|
||||||
- C8 now replaces NYC as a native coverage tool
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/es-mapping-generator': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Remove @openstapps/logger dependency
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/core': minor
|
|
||||||
'@openstapps/app': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Add support for web-service-provided id cards on the profile page
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Add directions to inPlace and place list items
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Improved calendar descriptions
|
|
||||||
|
|
||||||
- The dashboard quick link now has a more intuitive icon
|
|
||||||
- "Recurring" has been renamed to "Week Overview"
|
|
||||||
- Long words in calendar tabs will now break instead of overflowing
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
{
|
|
||||||
"mode": "pre",
|
|
||||||
"tag": "next",
|
|
||||||
"initialVersions": {
|
|
||||||
"@openstapps/backend": "2.0.0",
|
|
||||||
"@openstapps/database": "2.0.0",
|
|
||||||
"@openstapps/proxy": "2.0.0",
|
|
||||||
"@openstapps/backend-config": "2.0.0",
|
|
||||||
"@openstapps/eslint-config": "2.0.0",
|
|
||||||
"@openstapps/prettier-config": "2.0.0",
|
|
||||||
"@openstapps/projectmanagement": "2.0.0",
|
|
||||||
"@openstapps/tsconfig": "2.0.0",
|
|
||||||
"@openstapps/minimal-connector": "2.0.0",
|
|
||||||
"@openstapps/minimal-deployment": "2.0.0",
|
|
||||||
"@openstapps/minimal-plugin": "2.0.0",
|
|
||||||
"@openstapps/app": "2.0.0",
|
|
||||||
"@openstapps/api": "2.0.0",
|
|
||||||
"@openstapps/api-cli": "2.0.0",
|
|
||||||
"@openstapps/api-plugin": "2.0.0",
|
|
||||||
"@openstapps/collection-utils": "2.0.0",
|
|
||||||
"@openstapps/core": "2.0.0",
|
|
||||||
"@openstapps/core-tools": "2.0.0",
|
|
||||||
"@openstapps/easy-ast": "2.0.0",
|
|
||||||
"@openstapps/es-mapping-generator": "2.0.0",
|
|
||||||
"@openstapps/gitlab-api": "2.0.0",
|
|
||||||
"@openstapps/logger": "2.0.0",
|
|
||||||
"@openstapps/app-builder-image": "3.0.0-next.3",
|
|
||||||
"@openstapps/node-base": "3.0.0-next.3",
|
|
||||||
"@openstapps/node-builder": "3.0.0-next.3"
|
|
||||||
},
|
|
||||||
"changesets": [
|
|
||||||
"bright-dryers-act",
|
|
||||||
"cool-jars-kiss",
|
|
||||||
"cuddly-bobcats-roll",
|
|
||||||
"dull-news-appear",
|
|
||||||
"five-ears-wash",
|
|
||||||
"fuzzy-walls-greet",
|
|
||||||
"giant-crabs-cheer",
|
|
||||||
"gorgeous-flowers-reflect",
|
|
||||||
"healthy-steaks-shop",
|
|
||||||
"honest-sheep-train",
|
|
||||||
"late-zoos-breathe",
|
|
||||||
"moody-parrots-develop",
|
|
||||||
"neat-hats-trade",
|
|
||||||
"new-pianos-joke",
|
|
||||||
"pretty-timers-complain",
|
|
||||||
"proud-wolves-end",
|
|
||||||
"quick-houses-count",
|
|
||||||
"rare-squids-bake",
|
|
||||||
"serious-meals-sin",
|
|
||||||
"silent-maps-float",
|
|
||||||
"silly-news-punch",
|
|
||||||
"smart-ghosts-shout",
|
|
||||||
"soft-donuts-fail",
|
|
||||||
"sour-coins-visit",
|
|
||||||
"spicy-snails-sort",
|
|
||||||
"stale-garlics-share",
|
|
||||||
"strange-hounds-repair",
|
|
||||||
"tall-ducks-dream",
|
|
||||||
"tame-mayflies-hug",
|
|
||||||
"tame-rings-dream",
|
|
||||||
"tasty-islands-smell",
|
|
||||||
"thick-weeks-compete",
|
|
||||||
"thin-camels-give",
|
|
||||||
"tidy-buses-reflect",
|
|
||||||
"tough-hairs-provide"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': major
|
|
||||||
'@openstapps/node-base': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Move images to separate packages
|
|
||||||
|
|
||||||
Removed builder image due to migration to Kaniko
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Revamp "My Courses" section on profile page
|
|
||||||
|
|
||||||
The "My Courses" section on the profile page has been improved
|
|
||||||
|
|
||||||
- It will now show the upcoming courses for the next five days
|
|
||||||
- The section header is now consistent with the other sections
|
|
||||||
- The section now uses standard list items instead of the custom solution
|
|
||||||
|
|
||||||
Additionally, the profile page component has been cleaned up.
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Adjust map button and item behavior on different screen sizes
|
|
||||||
|
|
||||||
- Small screens will show the item without margins below the map actions
|
|
||||||
- Large screens will show the list item on the left side
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/eslint-config': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Update rules
|
|
||||||
|
|
||||||
- `unicorn/no-array-reduce` is now off
|
|
||||||
- `unicorn/no-non-null-assertion` is now off
|
|
||||||
- Removed prettier rules (use prettier formatting instead)
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/es-mapping-generator': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Remove put-es-templates
|
|
||||||
|
|
||||||
The `put-es-templates` functionality has been removed.
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': patch
|
|
||||||
'@openstapps/prettier-config': patch
|
|
||||||
'@openstapps/es-mapping-generator': patch
|
|
||||||
'@openstapps/backend-config': patch
|
|
||||||
'@openstapps/eslint-config': patch
|
|
||||||
'@openstapps/minimal-connector': patch
|
|
||||||
'@openstapps/collection-utils': patch
|
|
||||||
'@openstapps/minimal-plugin': patch
|
|
||||||
'@openstapps/tsconfig': patch
|
|
||||||
'@openstapps/api-plugin': patch
|
|
||||||
'@openstapps/core-tools': patch
|
|
||||||
'@openstapps/gitlab-api': patch
|
|
||||||
'@openstapps/easy-ast': patch
|
|
||||||
'@openstapps/api-cli': patch
|
|
||||||
'@openstapps/backend': patch
|
|
||||||
'@openstapps/logger': patch
|
|
||||||
'@openstapps/proxy': patch
|
|
||||||
'@openstapps/core': patch
|
|
||||||
'@openstapps/app': patch
|
|
||||||
'@openstapps/api': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate away from @openstapps/configuration
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Update release configs
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': patch
|
|
||||||
'@openstapps/prettier-config': patch
|
|
||||||
'@openstapps/es-mapping-generator': patch
|
|
||||||
'@openstapps/backend-config': patch
|
|
||||||
'@openstapps/eslint-config': patch
|
|
||||||
'@openstapps/minimal-deployment': patch
|
|
||||||
'@openstapps/minimal-connector': patch
|
|
||||||
'@openstapps/collection-utils': patch
|
|
||||||
'@openstapps/minimal-plugin': patch
|
|
||||||
'@openstapps/tsconfig': patch
|
|
||||||
'@openstapps/node-builder': patch
|
|
||||||
'@openstapps/api-plugin': patch
|
|
||||||
'@openstapps/core-tools': patch
|
|
||||||
'@openstapps/gitlab-api': patch
|
|
||||||
'@openstapps/app-builder-image': patch
|
|
||||||
'@openstapps/easy-ast': patch
|
|
||||||
'@openstapps/database': patch
|
|
||||||
'@openstapps/node-base': patch
|
|
||||||
'@openstapps/api-cli': patch
|
|
||||||
'@openstapps/backend': patch
|
|
||||||
'@openstapps/logger': patch
|
|
||||||
'@openstapps/proxy': patch
|
|
||||||
'@openstapps/core': patch
|
|
||||||
'@openstapps/app': patch
|
|
||||||
'@openstapps/api': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Update to TypeScript 5.1.6
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate collection helpers to use @openstapps/collection-utils
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate to Ionic 7
|
|
||||||
|
|
||||||
- Migrate uses of `<ion-label>` with inputs to new syntax
|
|
||||||
- Fix infinite loop in schedule date picker (`datetime.confirm()` to `datetime.cancel()`)
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/api': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate HttpClient to Node 18's native `fetch` API
|
|
||||||
|
|
||||||
HttpClient can now be used both in NodeJS and browsers.
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Fixed an issue that caused double and triple loading of data detail items through the route stack service
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/es-mapping-generator': major
|
|
||||||
'@openstapps/backend': major
|
|
||||||
'@openstapps/core': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate es mapping types from es-mapping-generator to .d.ts next to generated mappings
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/eslint-config': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Add license header enforcement rule (unfinished)
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/core': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Include openapi.json in built package
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': minor
|
|
||||||
'@openstapps/minimal-connector': minor
|
|
||||||
'@openstapps/minimal-plugin': minor
|
|
||||||
'@openstapps/collection-utils': minor
|
|
||||||
'@openstapps/core-tools': minor
|
|
||||||
'@openstapps/gitlab-api': minor
|
|
||||||
'@openstapps/backend': minor
|
|
||||||
'@openstapps/logger': minor
|
|
||||||
'@openstapps/core': minor
|
|
||||||
'@openstapps/api': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate away from `@krlwlfrt/async-pool`
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import {mapAsyncLimit} from '@openstapps/collection-utils';
|
|
||||||
|
|
||||||
await mapAsyncLimit(
|
|
||||||
[1, 2, 3],
|
|
||||||
async it => {
|
|
||||||
await someNetworkRequest(it);
|
|
||||||
},
|
|
||||||
5,
|
|
||||||
);
|
|
||||||
```
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate away from JIT compilation
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/logger': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Fix an issue with chalk terminal colors in tests
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/core-tools': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate openapi generation to output single file
|
|
||||||
|
|
||||||
The OpenAPI generator now outputs a single file instead
|
|
||||||
of a directory with the `openapi.json` and copied schema
|
|
||||||
files.
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate unit tests to karma-coverage and junit reports.
|
|
||||||
Fixes an issue where coverage reports would not be generated.
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Map items are now native list items
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate moment.js to date-fns
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/projectmanagement': major
|
|
||||||
'@openstapps/es-mapping-generator': major
|
|
||||||
'@openstapps/minimal-connector': major
|
|
||||||
'@openstapps/collection-utils': major
|
|
||||||
'@openstapps/minimal-plugin': major
|
|
||||||
'@openstapps/api-plugin': major
|
|
||||||
'@openstapps/core-tools': major
|
|
||||||
'@openstapps/gitlab-api': major
|
|
||||||
'@openstapps/easy-ast': major
|
|
||||||
'@openstapps/api-cli': major
|
|
||||||
'@openstapps/backend': major
|
|
||||||
'@openstapps/logger': major
|
|
||||||
'@openstapps/proxy': major
|
|
||||||
'@openstapps/core': major
|
|
||||||
'@openstapps/api': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate build system to `tsup`
|
|
||||||
|
|
||||||
All packages now use an `index.ts` file to expose contents.
|
|
||||||
|
|
||||||
You will need to migrate paths from `import foo from '@scope/package/lib/foo` to `import foo from '@scope/package'`
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/core-tools': major
|
|
||||||
'@openstapps/easy-ast': major
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate easy-ast to separate package
|
|
||||||
|
|
||||||
The `easy-ast` part of `core-tools` has been moved to its own package.
|
|
||||||
For migration, simply use the new package.
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/core-tools': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Migrate from away from lodash
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Replaced simple links with list items in date-series detail
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': patch
|
|
||||||
---
|
|
||||||
|
|
||||||
Make section swiper buttons reactive
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
'@openstapps/app': minor
|
|
||||||
---
|
|
||||||
|
|
||||||
Use event title for date series instead of the generic date series title
|
|
||||||
4
.gitignore
vendored
4
.gitignore
vendored
@@ -24,6 +24,7 @@ report-junit.xml
|
|||||||
# NixOS flake
|
# NixOS flake
|
||||||
result
|
result
|
||||||
hsperfdata_root
|
hsperfdata_root
|
||||||
|
.direnv/
|
||||||
|
|
||||||
# Directory for instrumented libs generated by jscoverage/JSCover
|
# Directory for instrumented libs generated by jscoverage/JSCover
|
||||||
lib-cov
|
lib-cov
|
||||||
@@ -97,7 +98,8 @@ typings/
|
|||||||
|
|
||||||
# ignore ide files
|
# ignore ide files
|
||||||
.idea
|
.idea
|
||||||
.vscode
|
.vscode?*
|
||||||
|
!.vscode/launch.json
|
||||||
|
|
||||||
# ignore lib
|
# ignore lib
|
||||||
lib
|
lib
|
||||||
|
|||||||
@@ -21,13 +21,7 @@ include:
|
|||||||
- local: /.gitlab/publishing.gitlab-ci.yml
|
- local: /.gitlab/publishing.gitlab-ci.yml
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
TURBO_CACHE_BYPASS:
|
TURBO_CACHE_BYPASS: "--force --no-cache"
|
||||||
value: ''
|
|
||||||
options:
|
|
||||||
- '--force'
|
|
||||||
- '--no-cache'
|
|
||||||
- ''
|
|
||||||
description: Bypass turbo cache
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
image: registry.gitlab.com/openstapps/openstapps/node-builder
|
image: registry.gitlab.com/openstapps/openstapps/node-builder
|
||||||
@@ -36,10 +30,7 @@ default:
|
|||||||
interruptible: true
|
interruptible: true
|
||||||
before_script:
|
before_script:
|
||||||
- corepack enable
|
- corepack enable
|
||||||
- corepack prepare pnpm@latest-8 --activate
|
- corepack prepare pnpm@latest-10 --activate
|
||||||
- echo TURBO_API=$TURBO_API >> .env.local
|
|
||||||
- echo TURBO_TOKEN=$TURBO_TOKEN >> .env.local
|
|
||||||
- echo TURBO_TEAM=$TURBO_TEAM >> .env.local
|
|
||||||
- pnpm config set store-dir .pnpm-store
|
- pnpm config set store-dir .pnpm-store
|
||||||
cache: &pnpm_cache
|
cache: &pnpm_cache
|
||||||
key:
|
key:
|
||||||
@@ -63,13 +54,13 @@ build:
|
|||||||
# - pnpm i --prefer-offline
|
# - pnpm i --prefer-offline
|
||||||
# - pnpm build:full:skip || pnpm i -r --prefer-offline
|
# - pnpm build:full:skip || pnpm i -r --prefer-offline
|
||||||
- pnpm install
|
- pnpm install
|
||||||
# TODO: whats the benifit for CI? something doesn't work with git here...
|
# TODO: whats the benefit for CI? something doesn't work with git here...
|
||||||
# "🦋 error Error: Failed to find where HEAD diverged from master. Does master exist?"
|
# "🦋 error Error: Failed to find where HEAD diverged from master. Does master exist?"
|
||||||
# - pnpm changeset:status
|
# - pnpm changeset:status
|
||||||
- pnpm build:full $TURBO_CACHE_BYPASS
|
- pnpm build:full $TURBO_CACHE_BYPASS
|
||||||
- .gitlab/ci/enableGitlabReviewToolbar.sh frontend/app/www/index.html "$CI_PROJECT_ID" "$CI_OPEN_MERGE_REQUESTS"
|
- .gitlab/ci/enableGitlabReviewToolbar.sh frontend/app/www/browser/index.html "$CI_PROJECT_ID" "$CI_OPEN_MERGE_REQUESTS"
|
||||||
- cp frontend/app/www/index.html frontend/app/www/200.html
|
- cp frontend/app/www/browser/index.html frontend/app/www/browser/200.html
|
||||||
- pnpm dlx surge -p frontend/app/www -d https://$CI_PROJECT_NAME-$DEPLOY_ID.surge.sh/
|
- pnpm dlx surge -p frontend/app/www/browser -d https://$CI_PROJECT_NAME-$DEPLOY_ID.surge.sh/
|
||||||
cache:
|
cache:
|
||||||
<<: *pnpm_cache
|
<<: *pnpm_cache
|
||||||
policy: pull-push
|
policy: pull-push
|
||||||
@@ -105,13 +96,7 @@ unit:
|
|||||||
stage: test
|
stage: test
|
||||||
needs: ['build']
|
needs: ['build']
|
||||||
script:
|
script:
|
||||||
# - pnpm config set recursive-install false
|
|
||||||
# - pnpm i --prefer-offline
|
|
||||||
# - pnpm test:skip || pnpm i -r --prefer-offline
|
|
||||||
- pnpm install
|
- pnpm install
|
||||||
- cd node_modules/.pnpm/re2*/node_modules/re2
|
|
||||||
- npm run install
|
|
||||||
- cd $CI_PROJECT_DIR
|
|
||||||
- pnpm test $TURBO_CACHE_BYPASS
|
- pnpm test $TURBO_CACHE_BYPASS
|
||||||
coverage: '/Statements[^:]*\:[^:]*\s+([\d\.]+)%/'
|
coverage: '/Statements[^:]*\:[^:]*\s+([\d\.]+)%/'
|
||||||
artifacts:
|
artifacts:
|
||||||
@@ -133,7 +118,7 @@ audit:
|
|||||||
allow_failure: true
|
allow_failure: true
|
||||||
needs: []
|
needs: []
|
||||||
script:
|
script:
|
||||||
- pnpm audit --prod
|
- pnpm audit --prod --audit-level critical
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == 'main'
|
- if: $CI_COMMIT_BRANCH == 'main'
|
||||||
allow_failure: false
|
allow_failure: false
|
||||||
|
|||||||
@@ -1,6 +1,11 @@
|
|||||||
.limit_publish_pipelines:
|
.limit_publish_pipelines:
|
||||||
rules:
|
rules:
|
||||||
- if: '($CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "develop") && $CI_COMMIT_MESSAGE =~ /ci: publish release/ && $CI_PIPELINE_SOURCE != "schedule"'
|
- if: '$CI_COMMIT_BRANCH == "develop" && $CI_COMMIT_MESSAGE =~ /ci: publish prerelease/ && $CI_PIPELINE_SOURCE != "schedule"'
|
||||||
|
variables:
|
||||||
|
PUBLISH_TAG: next
|
||||||
|
- if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_MESSAGE =~ /ci: publish release/ && $CI_PIPELINE_SOURCE != "schedule"'
|
||||||
|
variables:
|
||||||
|
PUBLISH_TAG: latest
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
stage: publish
|
stage: publish
|
||||||
@@ -22,10 +27,8 @@ publish image:
|
|||||||
- tags
|
- tags
|
||||||
needs: ['deploy']
|
needs: ['deploy']
|
||||||
image:
|
image:
|
||||||
name: gcr.io/kaniko-project/executor:v1.12.1-debug
|
name: gcr.io/kaniko-project/executor:v1.24.0-debug
|
||||||
entrypoint: [""]
|
entrypoint: [""]
|
||||||
variables:
|
|
||||||
PUBLISH_TAG: next
|
|
||||||
script:
|
script:
|
||||||
- >
|
- >
|
||||||
/kaniko/executor
|
/kaniko/executor
|
||||||
@@ -50,9 +53,6 @@ publish image:
|
|||||||
- IMAGE_NAME: app
|
- IMAGE_NAME: app
|
||||||
DEPLOY_DIR: frontend/app
|
DEPLOY_DIR: frontend/app
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == 'main'
|
|
||||||
variables:
|
|
||||||
PUBLISH_TAG: latest
|
|
||||||
- !reference [.limit_publish_pipelines, rules]
|
- !reference [.limit_publish_pipelines, rules]
|
||||||
|
|
||||||
publish packages:
|
publish packages:
|
||||||
@@ -61,16 +61,12 @@ publish packages:
|
|||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: clone
|
GIT_STRATEGY: clone
|
||||||
GIT_DEPTH: 0
|
GIT_DEPTH: 0
|
||||||
PUBLISH_TAG: next
|
|
||||||
script:
|
script:
|
||||||
- pnpm install
|
- pnpm install
|
||||||
- pnpm build
|
- pnpm build
|
||||||
- pnpm config set '//registry.npmjs.org/:_authToken' "${NPM_AUTH_TOKEN}"
|
- pnpm config set '//registry.npmjs.org/:_authToken' "${NPM_AUTH_TOKEN}"
|
||||||
- pnpm publish -r --publish-branch ${CI_COMMIT_BRANCH} --tag ${PUBLISH_TAG} --no-git-checks # TODO: Git checks...
|
- pnpm publish -r --publish-branch ${CI_COMMIT_BRANCH} --tag ${PUBLISH_TAG} --no-git-checks # TODO: Git checks...
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == 'main'
|
|
||||||
variables:
|
|
||||||
PUBLISH_TAG: latest
|
|
||||||
- !reference [.limit_publish_pipelines, rules]
|
- !reference [.limit_publish_pipelines, rules]
|
||||||
|
|
||||||
publish docs:
|
publish docs:
|
||||||
@@ -84,5 +80,4 @@ publish docs:
|
|||||||
paths:
|
paths:
|
||||||
- public
|
- public
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == 'main'
|
|
||||||
- !reference [.limit_publish_pipelines, rules]
|
- !reference [.limit_publish_pipelines, rules]
|
||||||
|
|||||||
1
.prettierignore
Normal file
1
.prettierignore
Normal file
@@ -0,0 +1 @@
|
|||||||
|
pnpm-lock.yaml
|
||||||
@@ -2,7 +2,13 @@
|
|||||||
|
|
||||||
/** @type {import('syncpack').RcFile} */
|
/** @type {import('syncpack').RcFile} */
|
||||||
const config = {
|
const config = {
|
||||||
semverRange: '',
|
semverGroups: [
|
||||||
|
{
|
||||||
|
range: '',
|
||||||
|
dependencies: ['**'],
|
||||||
|
packages: ['**'],
|
||||||
|
}
|
||||||
|
],
|
||||||
source: ['package.json', '**/package.json'],
|
source: ['package.json', '**/package.json'],
|
||||||
indent: ' ',
|
indent: ' ',
|
||||||
sortFirst: [
|
sortFirst: [
|
||||||
@@ -21,6 +27,7 @@ const config = {
|
|||||||
'bin',
|
'bin',
|
||||||
'files',
|
'files',
|
||||||
'engines',
|
'engines',
|
||||||
|
'packageManager',
|
||||||
'scripts',
|
'scripts',
|
||||||
'dependencies',
|
'dependencies',
|
||||||
'devDependencies',
|
'devDependencies',
|
||||||
@@ -49,7 +56,7 @@ const config = {
|
|||||||
{
|
{
|
||||||
label: 'Packages should use workspace version',
|
label: 'Packages should use workspace version',
|
||||||
dependencies: ['@openstapps/**'],
|
dependencies: ['@openstapps/**'],
|
||||||
dependencyTypes: ['prod', 'dev'],
|
dependencyTypes: ['prod', 'dev', 'peer'],
|
||||||
packages: ['**'],
|
packages: ['**'],
|
||||||
pinVersion: 'workspace:*',
|
pinVersion: 'workspace:*',
|
||||||
},
|
},
|
||||||
|
|||||||
3
.tool-versions
Normal file
3
.tool-versions
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
nodejs 22.16.0
|
||||||
|
pnpm 10.12.3
|
||||||
|
python 3.11.5
|
||||||
16
.vscode/launch.json
vendored
Normal file
16
.vscode/launch.json
vendored
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
// Use IntelliSense to learn about possible attributes.
|
||||||
|
// Hover to view descriptions of existing attributes.
|
||||||
|
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
|
"version": "0.2.0",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"type":"node",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "Run mocha for nodejs workspace",
|
||||||
|
"runtimeExecutable": "${fileDirname}/../node_modules/.bin/c8",
|
||||||
|
"cwd": "${fileDirname}/../",
|
||||||
|
"runtimeArgs": ["--config", "${workspaceFolder}/.c8rc.json", "${fileDirname}/../node_modules/.bin/mocha", "--exit", "--reporter", "spec"]
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -37,13 +37,13 @@ Adding new types requires changes at multiple locations for it to work correctly
|
|||||||
- Add your SCThing and SCThingWithoutReferences to `src/things/your-thing-name.ts` and make them extend `SCThingWithoutReferences` and `SCThing` respectively
|
- Add your SCThing and SCThingWithoutReferences to `src/things/your-thing-name.ts` and make them extend `SCThingWithoutReferences` and `SCThing` respectively
|
||||||
- Add your SCThingMeta to `src/things/your-thing-name.ts` and make it extend `SCThingMeta`
|
- Add your SCThingMeta to `src/things/your-thing-name.ts` and make it extend `SCThingMeta`
|
||||||
- Add your SCThingMeta to `SCClasses` in `src/meta.ts`
|
- Add your SCThingMeta to `SCClasses` in `src/meta.ts`
|
||||||
- Add your SCThing to `SCThingsWithoutDiff` in `src/meta.ts`
|
- Add your SCThing to `SCIndexableThings ` in `src/meta.ts`
|
||||||
- Add your SCThingWithoutReferences to `SCAssociatedThingWithoutReferences` in `src/meta.ts`
|
- Add your SCThingWithoutReferences to `SCAssociatedThingWithoutReferences` in `src/meta.ts`
|
||||||
- Add your SCThing to `SCAssociatedThing` in `src/meta.ts`
|
- Add your SCThing to `SCAssociatedThing` in `src/meta.ts`
|
||||||
- Add your SCThing to the `SCThingType` enum in `src/things/abstract/thing.ts`
|
- Add your SCThing to the `SCThingType` enum in `src/things/abstract/thing.ts`
|
||||||
- Add an example file for your SCThing in `test/resources/YourThingName.json`
|
- Add an example file for your SCThing in `test/resources/YourThingName.json`
|
||||||
- Add the following lines for your SCThing in `test/type.spec.ts`:
|
- Add the following lines for your SCThing in `test/type.spec.ts`:
|
||||||
|
- Make sure your SCThing (but not SCThingWithoutReferences!) includes the `@indexable` and `@validatable` JSDoc annotations, otherwise neither JSON Schemas nor Elasticsearch mappings will be generated
|
||||||
```typescript
|
```typescript
|
||||||
/**
|
/**
|
||||||
* Types of properties of SCYourThingName
|
* Types of properties of SCYourThingName
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ integration:
|
|||||||
- name: registry.gitlab.com/openstapps/openstapps/database:latest
|
- name: registry.gitlab.com/openstapps/openstapps/database:latest
|
||||||
alias: elasticsearch
|
alias: elasticsearch
|
||||||
script:
|
script:
|
||||||
- pnpm --filter=@openstapps/backend install
|
- pnpm install
|
||||||
- pnpm test:integration:backend
|
- pnpm test:integration:backend --force --no-cache
|
||||||
artifacts:
|
artifacts:
|
||||||
when: on_failure
|
when: on_failure
|
||||||
paths:
|
paths:
|
||||||
|
|||||||
@@ -1,5 +1,244 @@
|
|||||||
# @openstapps/backend
|
# @openstapps/backend
|
||||||
|
|
||||||
|
## 4.0.0
|
||||||
|
|
||||||
|
### Major Changes
|
||||||
|
|
||||||
|
- c8e29020: Update to Node 22
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [c8e29020]
|
||||||
|
- @openstapps/core@4.0.0
|
||||||
|
- @openstapps/core-tools@4.0.0
|
||||||
|
- @openstapps/logger@4.0.0
|
||||||
|
|
||||||
|
## 3.3.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- @openstapps/core@3.3.2
|
||||||
|
- @openstapps/core-tools@3.3.2
|
||||||
|
|
||||||
|
## 3.3.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 67ab1fd6: fix for geo.point mapping
|
||||||
|
|
||||||
|
## 3.3.0
|
||||||
|
|
||||||
|
### Minor Changes
|
||||||
|
|
||||||
|
- 688bc5f2: v3.3.0 changes
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [688bc5f2]
|
||||||
|
- @openstapps/core@3.3.0
|
||||||
|
- @openstapps/core-tools@3.3.0
|
||||||
|
- @openstapps/logger@3.0.0
|
||||||
|
|
||||||
|
## 3.2.0
|
||||||
|
|
||||||
|
### Minor Changes
|
||||||
|
|
||||||
|
- 912ae422: Add the ability to filter by existence of a field
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 689ac68b: pin alpine version to 3.18 and add healthchecks
|
||||||
|
- e8d72683: Backend unit tests break every year
|
||||||
|
- Updated dependencies [912ae422]
|
||||||
|
- @openstapps/core@4.0.0
|
||||||
|
- @openstapps/core-tools@3.0.0
|
||||||
|
- @openstapps/logger@3.0.0
|
||||||
|
|
||||||
|
## 3.1.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Fix backend rejecting plugins
|
||||||
|
- Fix backend sliently falling back to default configs
|
||||||
|
|
||||||
|
## 3.1.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Fix version history offered by backend
|
||||||
|
- Updated dependencies
|
||||||
|
- @openstapps/core@3.1.1
|
||||||
|
|
||||||
|
## 3.1.0
|
||||||
|
|
||||||
|
### Minor Changes
|
||||||
|
|
||||||
|
- 06b8ca10: Add job portal feature
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [06b8ca10]
|
||||||
|
- @openstapps/core@3.1.0
|
||||||
|
|
||||||
|
## 3.0.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Fix missing dependency
|
||||||
|
|
||||||
|
## 3.0.0
|
||||||
|
|
||||||
|
### Major Changes
|
||||||
|
|
||||||
|
- 64caebaf: Migrate config system to cosmiconfig
|
||||||
|
|
||||||
|
Configs are now written using type-checked JavaScript
|
||||||
|
|
||||||
|
```js
|
||||||
|
// @ts-check
|
||||||
|
|
||||||
|
// This file is now type-safe just like TypeScript, but
|
||||||
|
// without the compilation step
|
||||||
|
|
||||||
|
/** @type {import('@openstapps/package').Type} */
|
||||||
|
const foo = {};
|
||||||
|
```
|
||||||
|
|
||||||
|
You can write config files in JavaScript, JSON, or other
|
||||||
|
cosmiconfig-supported formats.
|
||||||
|
|
||||||
|
The config files now are
|
||||||
|
|
||||||
|
- `backendrc.{js,json,...}`
|
||||||
|
- `elasticsearchrc.{js,json,...}`
|
||||||
|
- `prometheusrc.{js,json,...}`
|
||||||
|
|
||||||
|
You can also split them into multiple files,
|
||||||
|
as well as using the `markdown.js` helper in
|
||||||
|
`config/default/tools` to include markdown files
|
||||||
|
as text (see `config/f-u/about-pages`)
|
||||||
|
|
||||||
|
- 64caebaf: Move project to a turbo monorepo & pnpm
|
||||||
|
|
||||||
|
Internal dependencies are now defined using `"@openstapps/package": "workspace:*"`
|
||||||
|
|
||||||
|
- Removed extraneous files from packages
|
||||||
|
- `.npmrc`
|
||||||
|
- `.npmignore`
|
||||||
|
- `.mailmap`
|
||||||
|
- `.gitignore`
|
||||||
|
- `CONTRIBUTING.md`
|
||||||
|
- `LICENSE` (Project license file is added upon publishing, see [pnpm.io](https://pnpm.io/cli/publish))
|
||||||
|
- `package-lock.json`
|
||||||
|
- `.editorconfig`
|
||||||
|
- `.eslintrc.json` (moved eslint config to `package.json`)
|
||||||
|
- `.eslintignore`
|
||||||
|
- `.gitlab-ci.yml` (Most workflows are workspace-level)
|
||||||
|
- `.gitlab/**` (issue templates etc. are now workspace-level)
|
||||||
|
- `.dockerignore` (Docker files are determined by which files are deployed with `pnpm deploy`, as per `package.json/files`)
|
||||||
|
- TSConfig has been moved to its own package (You can now use `"extends": "@openstapps/tsconfig"`)
|
||||||
|
- Removed ESLint and Prettier peer dependency hell by injecting them through the `.pnpmfile.cjs`
|
||||||
|
- Added syncpack for keeping dependency versions in sync (and consistent key ordering in `package.json`)
|
||||||
|
- Replaced conventional changelog with changesets
|
||||||
|
- Apps with binaries now use a top level `app.js`
|
||||||
|
|
||||||
|
```js
|
||||||
|
#!/usr/bin/env node
|
||||||
|
import './lib/app.js';
|
||||||
|
```
|
||||||
|
|
||||||
|
- 64caebaf: Migrate to ESM
|
||||||
|
|
||||||
|
CommonJS is no longer supported in any capacity. To use the new
|
||||||
|
version, you will need to migrate your package to ESM.
|
||||||
|
We recommend using `tsup` and `Node 18`.
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"type": "module"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- 64caebaf: Migrate package to Node 18
|
||||||
|
|
||||||
|
- Consumers of this package will need to migrate to Node 18 or
|
||||||
|
higher.
|
||||||
|
- Packages have been migrated from promisified `readFile` or
|
||||||
|
`readFileSync` towards `fs/promises`
|
||||||
|
- Packages use native `flatMap` now
|
||||||
|
|
||||||
|
- 0a7e6af1: Migrate es mapping types from es-mapping-generator to .d.ts next to generated mappings
|
||||||
|
- 64caebaf: Migrate build system to `tsup`
|
||||||
|
|
||||||
|
All packages now use an `index.ts` file to expose contents.
|
||||||
|
|
||||||
|
You will need to migrate paths from `import foo from '@scope/package/lib/foo` to `import foo from '@scope/package'`
|
||||||
|
|
||||||
|
### Minor Changes
|
||||||
|
|
||||||
|
- 64caebaf: Migrate integration tests from docker-compose solution to a shell script
|
||||||
|
|
||||||
|
`api-cli` no longer builds as a Docker container as a result.
|
||||||
|
|
||||||
|
- 64caebaf: Migrate tests to C8/Chai/Mocha
|
||||||
|
|
||||||
|
- `@testdeck` OOP testing has been removed.
|
||||||
|
- Tests have been unified
|
||||||
|
- CommonJS module mocking has been replaced through
|
||||||
|
refactoring of tests, as ES Modules cannot be mocked
|
||||||
|
(do yourself a favor and don't try to mock them)
|
||||||
|
- C8 now replaces NYC as a native coverage tool
|
||||||
|
|
||||||
|
- 64caebaf: Migrate away from `@krlwlfrt/async-pool`
|
||||||
|
|
||||||
|
```ts
|
||||||
|
import {mapAsyncLimit} from '@openstapps/collection-utils';
|
||||||
|
|
||||||
|
await mapAsyncLimit(
|
||||||
|
[1, 2, 3],
|
||||||
|
async it => {
|
||||||
|
await someNetworkRequest(it);
|
||||||
|
},
|
||||||
|
5,
|
||||||
|
);
|
||||||
|
```
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 64caebaf: Migrated changelogs to changeset format
|
||||||
|
|
||||||
|
```js
|
||||||
|
import fs from 'fs';
|
||||||
|
|
||||||
|
const path = 'packages/logger/CHANGELOG.md';
|
||||||
|
|
||||||
|
fs.writeFileSync(path, fs.readFileSync(path, 'utf8').replace(/^#+\s+\[/gm, '## ['));
|
||||||
|
```
|
||||||
|
|
||||||
|
- 98546a97: Migrate away from @openstapps/configuration
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
|
- Updated dependencies [98546a97]
|
||||||
|
- Updated dependencies [64caebaf]
|
||||||
|
- Updated dependencies [98546a97]
|
||||||
|
- Updated dependencies [64caebaf]
|
||||||
|
- Updated dependencies [64caebaf]
|
||||||
|
- Updated dependencies [64caebaf]
|
||||||
|
- Updated dependencies [64caebaf]
|
||||||
|
- Updated dependencies [1f62b5c5]
|
||||||
|
- Updated dependencies [98546a97]
|
||||||
|
- Updated dependencies [23481d0d]
|
||||||
|
- Updated dependencies [0a7e6af1]
|
||||||
|
- Updated dependencies [64caebaf]
|
||||||
|
- Updated dependencies [64caebaf]
|
||||||
|
- Updated dependencies [98546a97]
|
||||||
|
- Updated dependencies [64caebaf]
|
||||||
|
- Updated dependencies [64caebaf]
|
||||||
|
- Updated dependencies [64caebaf]
|
||||||
|
- Updated dependencies [98546a97]
|
||||||
|
- @openstapps/core-tools@3.0.0
|
||||||
|
- @openstapps/logger@3.0.0
|
||||||
|
- @openstapps/core@3.0.0
|
||||||
|
|
||||||
## 3.0.0-next.4
|
## 3.0.0-next.4
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
|||||||
@@ -9,4 +9,6 @@ ENV NODE_ENV=production
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
|
HEALTHCHECK --interval=10s --timeout=10s --start-period=10s --retries=12 CMD curl -s --fail --request POST --data '{}' --header 'Content-Type: application/json' http://localhost:3000/ >/dev/null || exit 1
|
||||||
|
|
||||||
ENTRYPOINT ["node", "app.js"]
|
ENTRYPOINT ["node", "app.js"]
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is the database configuration for the technical university of berlin
|
* This is the database configuration for the technical university of berlin
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ const app = {
|
|||||||
name: 'Goethe-Uni',
|
name: 'Goethe-Uni',
|
||||||
privacyPolicyUrl: 'https://mobile.server.uni-frankfurt.de/_static/privacy.md',
|
privacyPolicyUrl: 'https://mobile.server.uni-frankfurt.de/_static/privacy.md',
|
||||||
settings: [userGroupSetting, languageSetting],
|
settings: [userGroupSetting, languageSetting],
|
||||||
|
versionHistory: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
export default app;
|
export default app;
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
import {SCSettingInputType, SCThingOriginType, SCThingType} from '@openstapps/core';
|
import {SCSettingInputType, SCThingOriginType, SCThingType} from '@openstapps/core';
|
||||||
|
|
||||||
/** @type {import('@openstapps/core').SCLanguageSetting} */
|
/** @type {import('@openstapps/core').SCLanguageSetting} */
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
/** @type {import('@openstapps/core').SCAppConfigurationMenuCategory[]} */
|
/** @type {import('@openstapps/core').SCAppConfigurationMenuCategory[]} */
|
||||||
const menus = [
|
const menus = [
|
||||||
{
|
{
|
||||||
@@ -56,6 +55,19 @@ const menus = [
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
icon: 'work',
|
||||||
|
route: '/jobs',
|
||||||
|
title: 'job postings',
|
||||||
|
translations: {
|
||||||
|
de: {
|
||||||
|
title: 'Jobangebote',
|
||||||
|
},
|
||||||
|
en: {
|
||||||
|
title: 'job postings',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
],
|
],
|
||||||
title: 'overview',
|
title: 'overview',
|
||||||
route: '/overview',
|
route: '/overview',
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
import {SCSettingInputType, SCThingOriginType, SCThingType} from '@openstapps/core';
|
import {SCSettingInputType, SCThingOriginType, SCThingType} from '@openstapps/core';
|
||||||
|
|
||||||
/** @type {import('@openstapps/core').SCUserGroupSetting} */
|
/** @type {import('@openstapps/core').SCUserGroupSetting} */
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
import {SCThingType} from '@openstapps/core';
|
import {SCThingType} from '@openstapps/core';
|
||||||
|
|
||||||
/** @type {import('@openstapps/core').SCBackendAggregationConfiguration[]} */
|
/** @type {import('@openstapps/core').SCBackendAggregationConfiguration[]} */
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
import {
|
import {
|
||||||
month,
|
month,
|
||||||
sommerRange,
|
sommerRange,
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
import {SCThingType} from '@openstapps/core';
|
import {SCThingType} from '@openstapps/core';
|
||||||
import aggregations from './aggregations.js';
|
import aggregations from './aggregations.js';
|
||||||
import boostings from './boostings.js';
|
import boostings from './boostings.js';
|
||||||
@@ -17,7 +16,7 @@ export const backend = {
|
|||||||
hiddenTypes: [SCThingType.DateSeries, SCThingType.Diff, SCThingType.Floor],
|
hiddenTypes: [SCThingType.DateSeries, SCThingType.Diff, SCThingType.Floor],
|
||||||
mappingIgnoredTags: ['minlength', 'pattern', 'see', 'tjs-format'],
|
mappingIgnoredTags: ['minlength', 'pattern', 'see', 'tjs-format'],
|
||||||
maxMultiSearchRouteQueries: 5,
|
maxMultiSearchRouteQueries: 5,
|
||||||
maxRequestBodySize: 512 * 1024,
|
maxRequestBodySize: 2e6,
|
||||||
name: 'Goethe-Universität Frankfurt am Main',
|
name: 'Goethe-Universität Frankfurt am Main',
|
||||||
namespace: '909a8cbc-8520-456c-b474-ef1525f14209',
|
namespace: '909a8cbc-8520-456c-b474-ef1525f14209',
|
||||||
sortableFields: [
|
sortableFields: [
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
import app from './app/index.js';
|
import app from './app/index.js';
|
||||||
import {backend, internal} from './backend/index.js';
|
import {backend, internal} from './backend/index.js';
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is the default configuration for elasticsearch (a database)
|
* This is the default configuration for elasticsearch (a database)
|
||||||
*
|
*
|
||||||
@@ -11,13 +9,13 @@
|
|||||||
*
|
*
|
||||||
* To get more information about the meaning of specific fields, please use your IDE to read the TSDoc documentation.
|
* To get more information about the meaning of specific fields, please use your IDE to read the TSDoc documentation.
|
||||||
*
|
*
|
||||||
* @type {import('../../src/storage/elasticsearch/types/elasticsearch-config.js')}
|
* @type {import('../../src/storage/elasticsearch/types/elasticsearch-config.js').ElasticsearchConfigFile}
|
||||||
*/
|
*/
|
||||||
const config = {
|
const config = {
|
||||||
internal: {
|
internal: {
|
||||||
database: {
|
database: {
|
||||||
name: 'elasticsearch',
|
name: 'elasticsearch',
|
||||||
version: '5.6',
|
version: '8.4.2',
|
||||||
query: {
|
query: {
|
||||||
minMatch: '75%',
|
minMatch: '75%',
|
||||||
queryType: 'dis_max',
|
queryType: 'dis_max',
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
import {readFile} from 'fs/promises';
|
import {readFile} from 'fs/promises';
|
||||||
import {SCAboutPageContentType} from '@openstapps/core';
|
import {SCAboutPageContentType} from '@openstapps/core';
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
/**
|
/**
|
||||||
* Generates a range of numbers that represent consecutive calendar months
|
* Generates a range of numbers that represent consecutive calendar months
|
||||||
*
|
*
|
||||||
|
|||||||
37
backend/backend/config/default/tools/version.js
Normal file
37
backend/backend/config/default/tools/version.js
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
import {readFile, readdir} from 'fs/promises';
|
||||||
|
import url from 'url';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @example version(1, import.meta.url)
|
||||||
|
* @param options {Omit<import('@openstapps/core').SCAppVersionInfo, 'releaseNotes' | 'translations'>}
|
||||||
|
* @param base {string}
|
||||||
|
* @returns {Promise<import('@openstapps/core').SCAppVersionInfo>}
|
||||||
|
*/
|
||||||
|
export async function version(options, base) {
|
||||||
|
const de = await readFile(new URL(`${options.version}.de.md`, base), 'utf8');
|
||||||
|
const en = await readFile(new URL(`${options.version}.en.md`, base), 'utf8');
|
||||||
|
|
||||||
|
return {
|
||||||
|
...options,
|
||||||
|
releaseNotes: de,
|
||||||
|
translations: {
|
||||||
|
en: {
|
||||||
|
releaseNotes: en,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param base {string} Base path of the file as `import.meta.url`
|
||||||
|
* @returns {Promise<import('@openstapps/core').SCAppVersionInfo[]>}
|
||||||
|
*/
|
||||||
|
export async function versions(base) {
|
||||||
|
const directory = await readdir(path.dirname(url.fileURLToPath(base)));
|
||||||
|
const versions = [
|
||||||
|
...new Set(directory.filter(it => it.endsWith('.md')).map(it => it.replace(/\.\w+\.md$/, ''))),
|
||||||
|
].sort((a, b) => -a.localeCompare(b, undefined, {numeric: true}));
|
||||||
|
|
||||||
|
return Promise.all(versions.map(versionName => version({version: versionName}, base)));
|
||||||
|
}
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
import {SCAboutPageContentType} from '@openstapps/core';
|
import {SCAboutPageContentType} from '@openstapps/core';
|
||||||
import {markdown} from '../../default/tools/markdown.js';
|
import {markdown} from '../../default/tools/markdown.js';
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
import {SCAboutPageContentType} from '@openstapps/core';
|
import {SCAboutPageContentType} from '@openstapps/core';
|
||||||
|
|
||||||
/** @type {import('@openstapps/core').SCAboutPage} */
|
/** @type {import('@openstapps/core').SCAboutPage} */
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
import about from './about.js';
|
import about from './about.js';
|
||||||
import imprint from './imprint.js';
|
import imprint from './imprint.js';
|
||||||
import privacy from './privacy.js';
|
import privacy from './privacy.js';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// @ts-check
|
|
||||||
import {markdown} from '../../default/tools/markdown.js';
|
import {markdown} from '../../default/tools/markdown.js';
|
||||||
|
|
||||||
/** @type {import('@openstapps/core').SCAboutPage} */
|
/** @type {import('@openstapps/core').SCAboutPage} */
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// @ts-check
|
|
||||||
import aboutPages from './about-pages/index.js';
|
import aboutPages from './about-pages/index.js';
|
||||||
import defaultApp from '../default/app/index.js';
|
import defaultApp from '../default/app/index.js';
|
||||||
import {backend as defaultBackend, internal as defaultInternal} from '../default/backend/index.js';
|
import {backend as defaultBackend, internal as defaultInternal} from '../default/backend/index.js';
|
||||||
|
import versionHistory from './version-history/index.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is the default configuration for the Goethe university of Frankfurt
|
* This is the default configuration for the Goethe university of Frankfurt
|
||||||
@@ -76,6 +76,7 @@ const config = {
|
|||||||
} */
|
} */
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
versionHistory,
|
||||||
aboutPages,
|
aboutPages,
|
||||||
},
|
},
|
||||||
backend: defaultBackend,
|
backend: defaultBackend,
|
||||||
|
|||||||
52
backend/backend/config/f-u/version-history/2.4.0.de.md
Normal file
52
backend/backend/config/f-u/version-history/2.4.0.de.md
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
# Goethe-Uni App 2.4
|
||||||
|
|
||||||
|
Wir freuen uns euch mehr in der Goethe-Uni App
|
||||||
|
bieten zu können.
|
||||||
|
|
||||||
|
## Navigation zu Gebäuden und Orten
|
||||||
|
|
||||||
|
Als eines der Ergebnisse des Ideenwettbewerbs wurde jetzt
|
||||||
|
ein Navigationsfeature in die App integriert.
|
||||||
|
|
||||||
|
Orte auf der Karte, Mensen, sowie sogar Termine (wenn hinterlegt)
|
||||||
|
bieten jetzt direkt die Option eine Verbindung zu finden, gestützt
|
||||||
|
durch die Karten App auf deinem Gerät.
|
||||||
|
|
||||||
|
## Integration der Jobbörse
|
||||||
|
|
||||||
|
Jobs findest du ab sofort auch in der Goethe-Uni App.
|
||||||
|
|
||||||
|
Auch das ist ein Ergebnis des Ideenwettbewerbs,
|
||||||
|
und wir freuen uns es euch hier präsentieren zu können!
|
||||||
|
|
||||||
|
## Der Umweltscore
|
||||||
|
|
||||||
|
Der Umweltscore für Gerichte wird nun auch in der App angezeigt.
|
||||||
|
|
||||||
|
> Nachhaltigkeit, Umweltschutz, Gesundheit und Klimawandel sind
|
||||||
|
> zentrale Begriffe im gesellschaftlichen Miteinander.
|
||||||
|
> Unsere Ernährung spielt hierbei eine wichtige Rolle.
|
||||||
|
> Das Studierendenwerk Frankfurt am Main zeichnet seine Speisenpläne
|
||||||
|
> ab sofort mit einem Umweltscore aus.
|
||||||
|
> Anhand dieser Bewertung können Sie direkt ersehen,
|
||||||
|
> welchen Einfluss Ihre Essenauswahl auf das Klima hat.
|
||||||
|
|
||||||
|
## Weitere Verbesserungen
|
||||||
|
|
||||||
|
### Performance
|
||||||
|
|
||||||
|
Die Performance der App beim Navigieren wurde stark verbessert und ist datensparender.
|
||||||
|
|
||||||
|
### Kalender
|
||||||
|
|
||||||
|
Die Kalenderabschnitte haben jetzt neue Namen bekommen:
|
||||||
|
|
||||||
|
- Der _Kalender_ zeigt Termine für spezifische Tage
|
||||||
|
- Die _Wochenübersicht_ ist ein Stundenplan mit allen Termine, die sich wiederholen (z. B. Vorlesungen)
|
||||||
|
- Die _Einzeltermine_ zeigen alle Termine, die sich nicht wiederholen
|
||||||
|
(z. B. Klausuren)
|
||||||
|
|
||||||
|
### Meine App
|
||||||
|
|
||||||
|
Der "Meine Kurse" Abschnitt wurde überarbeitet, und zeigt jetzt Termine
|
||||||
|
für die nächsten Tage und mit mehr Details an.
|
||||||
49
backend/backend/config/f-u/version-history/2.4.0.en.md
Normal file
49
backend/backend/config/f-u/version-history/2.4.0.en.md
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
# Goethe-Uni App 2.4
|
||||||
|
|
||||||
|
The Goethe-Uni App got even better!
|
||||||
|
|
||||||
|
## Navigation to buildings and places
|
||||||
|
|
||||||
|
As part of the "Ideenwettbewerb," the idea competition,
|
||||||
|
we have now integrated a navigation feature into the app.
|
||||||
|
|
||||||
|
Orte auf der Karte, Mensen, sowie sogar Termine (wenn hinterlegt)
|
||||||
|
bieten jetzt direkt die Option eine Verbindung zu finden, gestützt
|
||||||
|
durch die Karten App auf deinem Gerät.
|
||||||
|
|
||||||
|
## Integration of the job market
|
||||||
|
|
||||||
|
Jobs are now also available in the Goethe-Uni App.
|
||||||
|
|
||||||
|
This feature is also a result of the idea competition,
|
||||||
|
and we're happy to be able to present it to you here!
|
||||||
|
|
||||||
|
## The environment score
|
||||||
|
|
||||||
|
The environment score for dishes is now displayed inside the app.
|
||||||
|
|
||||||
|
> Sustainability, environment protection, health, and climate change are
|
||||||
|
> central topics in how we live today in our society.
|
||||||
|
> Our eating habits play an important role in it.
|
||||||
|
> The "Studierendenwerk Frankfurt am Main" is marking up its menus
|
||||||
|
> from now on with the so-called "Umweltscore," the environment score.
|
||||||
|
> Based on this rating, you can see the impact your meal choice would have on our climate.
|
||||||
|
|
||||||
|
## Further improvements
|
||||||
|
|
||||||
|
### Performance
|
||||||
|
|
||||||
|
The performance while navigating around the app has been heavily improved and requires less data to work.
|
||||||
|
|
||||||
|
### Calendar
|
||||||
|
|
||||||
|
The calendar sections have new names:
|
||||||
|
|
||||||
|
- The _calendar_ shows appointments on specific days
|
||||||
|
- The _week overview_ is a schedule with all events that repeat (e.g. lectures)
|
||||||
|
- The _single events_ show all appointments that don't repeat (e.g. exams)
|
||||||
|
|
||||||
|
### My App
|
||||||
|
|
||||||
|
The "my courses" section has been revamped,
|
||||||
|
and now shows events for the next days and with more detail.
|
||||||
15
backend/backend/config/f-u/version-history/2.5.0.de.md
Normal file
15
backend/backend/config/f-u/version-history/2.5.0.de.md
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
# Goethe-Uni App 2.5
|
||||||
|
|
||||||
|
Die Goethe-Uni App ist noch besser geworden!
|
||||||
|
|
||||||
|
## Komplett neue Kartenansicht
|
||||||
|
|
||||||
|
Wir haben die Karte überarbeitet, um eine klarere und schnellere Übersicht zu bieten.
|
||||||
|
|
||||||
|
## Deutschlandticket mit an Bord
|
||||||
|
|
||||||
|
Wenn du das Upgrade des Semesterticket zum Deutschlandticket gemacht hast und eingeloggt bist, findet es sich jetzt auch in der App.
|
||||||
|
|
||||||
|
## Bibliotheksdienste sind wieder voll funktionsfähig
|
||||||
|
|
||||||
|
Aufgrund einiger Adhoc-Änderungen im Bibliothekssystem haben wir die App so angepasst, dass sie damit umgehen kann.
|
||||||
15
backend/backend/config/f-u/version-history/2.5.0.en.md
Normal file
15
backend/backend/config/f-u/version-history/2.5.0.en.md
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
# Goethe-Uni App 2.5
|
||||||
|
|
||||||
|
The Goethe-Uni App got even better!
|
||||||
|
|
||||||
|
## Completely new map view
|
||||||
|
|
||||||
|
We overhauled the map to offer you a clearer and faster and overview.
|
||||||
|
|
||||||
|
## Deutschlandticket included
|
||||||
|
|
||||||
|
If you upgraded your Semesterticket to a Deutschlandticket it will now reside in the App if you are logged in.
|
||||||
|
|
||||||
|
## Library services are fully functional again
|
||||||
|
|
||||||
|
Due to some adhoc changes in the library system we adjusted the app to handle them properly.
|
||||||
6
backend/backend/config/f-u/version-history/index.js
Normal file
6
backend/backend/config/f-u/version-history/index.js
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
import {versions} from '../../default/tools/version.js';
|
||||||
|
|
||||||
|
/** @type {import('@openstapps/core').SCAppVersionInfo[]} */
|
||||||
|
const versionHistory = await versions(import.meta.url);
|
||||||
|
|
||||||
|
export default versionHistory;
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/backend",
|
"name": "@openstapps/backend",
|
||||||
"description": "A reference implementation for a StApps backend",
|
"description": "A reference implementation for a StApps backend",
|
||||||
"version": "3.0.0-next.4",
|
"version": "4.0.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
"@types/cors": "2.8.13",
|
"@types/cors": "2.8.13",
|
||||||
"@types/express": "4.17.17",
|
"@types/express": "4.17.17",
|
||||||
"@types/geojson": "1.0.6",
|
"@types/geojson": "1.0.6",
|
||||||
"@types/node": "18.15.3",
|
"@types/node": "22.15.31",
|
||||||
"@types/node-cron": "3.0.7",
|
"@types/node-cron": "3.0.7",
|
||||||
"@types/nodemailer": "6.4.7",
|
"@types/nodemailer": "6.4.7",
|
||||||
"@types/promise-queue": "2.2.0",
|
"@types/promise-queue": "2.2.0",
|
||||||
@@ -59,11 +59,12 @@
|
|||||||
"body-parser": "1.20.2",
|
"body-parser": "1.20.2",
|
||||||
"cors": "2.8.5",
|
"cors": "2.8.5",
|
||||||
"cosmiconfig": "8.1.3",
|
"cosmiconfig": "8.1.3",
|
||||||
|
"deepmerge": "4.3.1",
|
||||||
"express": "4.18.2",
|
"express": "4.18.2",
|
||||||
"express-prom-bundle": "6.6.0",
|
"express-prom-bundle": "6.6.0",
|
||||||
"express-promise-router": "4.1.1",
|
"express-promise-router": "4.1.1",
|
||||||
"got": "12.6.0",
|
"got": "12.6.0",
|
||||||
"moment": "2.29.4",
|
"moment": "2.30.1",
|
||||||
"morgan": "1.10.0",
|
"morgan": "1.10.0",
|
||||||
"nock": "13.3.1",
|
"nock": "13.3.1",
|
||||||
"node-cache": "5.1.2",
|
"node-cache": "5.1.2",
|
||||||
@@ -79,27 +80,27 @@
|
|||||||
"@openstapps/prettier-config": "workspace:*",
|
"@openstapps/prettier-config": "workspace:*",
|
||||||
"@openstapps/tsconfig": "workspace:*",
|
"@openstapps/tsconfig": "workspace:*",
|
||||||
"@testdeck/mocha": "0.3.3",
|
"@testdeck/mocha": "0.3.3",
|
||||||
"@types/chai": "4.3.5",
|
"@types/chai": "4.3.20",
|
||||||
"@types/chai-as-promised": "7.1.5",
|
"@types/chai-as-promised": "7.1.8",
|
||||||
"@types/mocha": "10.0.1",
|
"@types/mocha": "10.0.10",
|
||||||
"@types/morgan": "1.9.4",
|
"@types/morgan": "1.9.4",
|
||||||
"@types/sinon": "10.0.14",
|
"@types/sinon": "10.0.14",
|
||||||
"@types/sinon-express-mock": "1.3.9",
|
"@types/sinon-express-mock": "1.3.9",
|
||||||
"@types/supertest": "2.0.12",
|
"@types/supertest": "2.0.12",
|
||||||
"c8": "7.14.0",
|
"c8": "10.1.3",
|
||||||
"chai": "4.3.7",
|
"chai": "4.5.0",
|
||||||
"chai-as-promised": "7.1.1",
|
"chai-as-promised": "7.1.2",
|
||||||
"cross-env": "7.0.3",
|
"cross-env": "7.0.3",
|
||||||
"get-port": "5.1.1",
|
"get-port": "5.1.1",
|
||||||
"mocha": "10.2.0",
|
"mocha": "10.8.2",
|
||||||
"mocha-junit-reporter": "2.2.0",
|
"mocha-junit-reporter": "2.2.0",
|
||||||
"mocked-env": "1.3.5",
|
"mocked-env": "1.3.5",
|
||||||
"sinon": "15.0.4",
|
"sinon": "15.0.4",
|
||||||
"sinon-express-mock": "2.2.1",
|
"sinon-express-mock": "2.2.1",
|
||||||
"supertest": "6.3.3",
|
"supertest": "6.3.3",
|
||||||
"ts-node": "10.9.1",
|
"ts-node": "10.9.2",
|
||||||
"tsup": "6.7.0",
|
"tsup": "8.5.0",
|
||||||
"typescript": "5.1.6"
|
"typescript": "5.4.2"
|
||||||
},
|
},
|
||||||
"tsup": {
|
"tsup": {
|
||||||
"entry": [
|
"entry": [
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import {cosmiconfig, PublicExplorer} from 'cosmiconfig';
|
|||||||
import {SCConfigFile} from '@openstapps/core';
|
import {SCConfigFile} from '@openstapps/core';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import deepmerge from 'deepmerge';
|
import deepmerge from 'deepmerge';
|
||||||
|
import {Logger} from '@openstapps/logger';
|
||||||
|
|
||||||
const fallbackNamespace = 'default';
|
const fallbackNamespace = 'default';
|
||||||
const configPath = 'config';
|
const configPath = 'config';
|
||||||
@@ -23,31 +24,25 @@ function configLoader(moduleName: string): PublicExplorer {
|
|||||||
* Find and load a config file
|
* Find and load a config file
|
||||||
*/
|
*/
|
||||||
async function findConfig<T>(moduleName: string, namespace = fallbackNamespace): Promise<T> {
|
async function findConfig<T>(moduleName: string, namespace = fallbackNamespace): Promise<T> {
|
||||||
return configLoader(moduleName)
|
const config = await configLoader(moduleName).search(path.posix.join('.', configPath, namespace));
|
||||||
.search(path.posix.join('.', configPath, namespace))
|
|
||||||
.then(it => it!.config as T)
|
|
||||||
.catch(() =>
|
|
||||||
configLoader(moduleName)
|
|
||||||
.search(path.posix.join('.', configPath, fallbackNamespace))
|
|
||||||
.then(it => it!.config),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
if (config) {
|
||||||
* Loads a config file
|
Logger.info(`Using ${namespace} config for ${moduleName}`);
|
||||||
*/
|
return config.config;
|
||||||
async function loadConfig<T>(moduleName: string): Promise<T> {
|
} else {
|
||||||
const namespace = process.env.NODE_APP_INSTANCE;
|
Logger.info(`Using ${fallbackNamespace} config for ${moduleName}`);
|
||||||
const database = process.env.NODE_CONFIG_ENV;
|
return configLoader(moduleName)
|
||||||
|
.search(path.posix.join('.', configPath, fallbackNamespace))
|
||||||
const config = await findConfig<T>(moduleName, namespace);
|
.then(it => it!.config);
|
||||||
if (database) {
|
|
||||||
const databaseConfig = await findConfig<T>(database, namespace);
|
|
||||||
return deepmerge(config, databaseConfig);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return config;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const backendConfig = await loadConfig<SCConfigFile>('backend');
|
const namespace = process.env.NODE_APP_INSTANCE;
|
||||||
export const prometheusConfig = await loadConfig<unknown>('prometheus');
|
const database = process.env.NODE_CONFIG_ENV;
|
||||||
|
|
||||||
|
export const prometheusConfig = await findConfig<unknown>('prometheus', namespace);
|
||||||
|
|
||||||
|
const backendConfigWithoutDatabase = await findConfig<SCConfigFile>('backend', namespace);
|
||||||
|
export const backendConfig = database
|
||||||
|
? deepmerge(backendConfigWithoutDatabase, await findConfig<never>(database, namespace))
|
||||||
|
: backendConfigWithoutDatabase;
|
||||||
|
|||||||
@@ -13,15 +13,34 @@
|
|||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {SCConfigFile, SCSearchQuery, SCSearchResponse, SCThings, SCUuid} from '@openstapps/core';
|
import {
|
||||||
|
SCConfigFile,
|
||||||
|
SCPlace,
|
||||||
|
SCPlaceWithoutReferences,
|
||||||
|
SCSearchQuery,
|
||||||
|
SCSearchResponse,
|
||||||
|
SCThingWithCategoriesWithoutReferences,
|
||||||
|
SCThings,
|
||||||
|
SCUuid,
|
||||||
|
} from '@openstapps/core';
|
||||||
import {MailQueue} from '../notification/mail-queue.js';
|
import {MailQueue} from '../notification/mail-queue.js';
|
||||||
import {Bulk} from './bulk-storage.js';
|
import {Bulk} from './bulk-storage.js';
|
||||||
|
import {FeatureCollection, Point, Polygon} from 'geojson';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an instance of a database
|
* Creates an instance of a database
|
||||||
*/
|
*/
|
||||||
export type DatabaseConstructor = new (config: SCConfigFile, mailQueue?: MailQueue) => Database;
|
export type DatabaseConstructor = new (config: SCConfigFile, mailQueue?: MailQueue) => Database;
|
||||||
|
|
||||||
|
export type SupplementaryGeoJSON = FeatureCollection<Point | Polygon, SupplementaryGeoJSONThing>;
|
||||||
|
export type SupplementaryGeoJSONThing = Pick<
|
||||||
|
Extract<SCThings, SCPlace>,
|
||||||
|
Exclude<
|
||||||
|
keyof SCPlaceWithoutReferences | keyof SCThingWithCategoriesWithoutReferences<never, never>,
|
||||||
|
'geo' | 'origin' | 'translations'
|
||||||
|
>
|
||||||
|
>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines what one database class needs to have defined
|
* Defines what one database class needs to have defined
|
||||||
*/
|
*/
|
||||||
@@ -82,4 +101,9 @@ export interface Database {
|
|||||||
* @param params Parameters which form a search query to search the backend data
|
* @param params Parameters which form a search query to search the backend data
|
||||||
*/
|
*/
|
||||||
search(parameters: SCSearchQuery): Promise<SCSearchResponse>;
|
search(parameters: SCSearchQuery): Promise<SCSearchResponse>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get geo info for display on a map
|
||||||
|
*/
|
||||||
|
geo(): Promise<SupplementaryGeoJSON>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import {Logger} from '@openstapps/logger';
|
|||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import {MailQueue} from '../../notification/mail-queue.js';
|
import {MailQueue} from '../../notification/mail-queue.js';
|
||||||
import {Bulk} from '../bulk-storage.js';
|
import {Bulk} from '../bulk-storage.js';
|
||||||
import {Database} from '../database.js';
|
import {Database, SupplementaryGeoJSON, SupplementaryGeoJSONThing} from '../database.js';
|
||||||
import {parseAggregations} from './aggregations.js';
|
import {parseAggregations} from './aggregations.js';
|
||||||
import * as Monitoring from './monitoring.js';
|
import * as Monitoring from './monitoring.js';
|
||||||
import {buildQuery} from './query/query.js';
|
import {buildQuery} from './query/query.js';
|
||||||
@@ -46,6 +46,7 @@ import {
|
|||||||
} from './util/index.js';
|
} from './util/index.js';
|
||||||
import {noUndefined} from './util/no-undefined.js';
|
import {noUndefined} from './util/no-undefined.js';
|
||||||
import {retryCatch, RetryOptions} from './util/retry.js';
|
import {retryCatch, RetryOptions} from './util/retry.js';
|
||||||
|
import {Feature, Point, Polygon} from 'geojson';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A database interface for elasticsearch
|
* A database interface for elasticsearch
|
||||||
@@ -84,7 +85,10 @@ export class Elasticsearch implements Database {
|
|||||||
* @param config an assembled config file
|
* @param config an assembled config file
|
||||||
* @param mailQueue a mail queue for monitoring
|
* @param mailQueue a mail queue for monitoring
|
||||||
*/
|
*/
|
||||||
constructor(private readonly config: SCConfigFile, mailQueue?: MailQueue) {
|
constructor(
|
||||||
|
private readonly config: SCConfigFile,
|
||||||
|
mailQueue?: MailQueue,
|
||||||
|
) {
|
||||||
if (config.internal.database === undefined || typeof config.internal.database.version !== 'string') {
|
if (config.internal.database === undefined || typeof config.internal.database.version !== 'string') {
|
||||||
throw new TypeError('Database version is undefined. Check your config file');
|
throw new TypeError('Database version is undefined. Check your config file');
|
||||||
}
|
}
|
||||||
@@ -402,4 +406,49 @@ export class Elasticsearch implements Database {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async geo(): Promise<SupplementaryGeoJSON> {
|
||||||
|
const searchResponse = await this.client.search<Extract<SCThings, {geo: unknown}>>({
|
||||||
|
body: {
|
||||||
|
query: {
|
||||||
|
exists: {
|
||||||
|
field: 'geo',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
from: 0,
|
||||||
|
allow_no_indices: true,
|
||||||
|
index: ACTIVE_INDICES_ALIAS,
|
||||||
|
size: 1,
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
type: 'FeatureCollection',
|
||||||
|
features: searchResponse.hits.hits
|
||||||
|
.map(thing => {
|
||||||
|
return thing._source?.geo
|
||||||
|
? ({
|
||||||
|
id: Number(thing._source.identifiers?.['OSM']) || undefined,
|
||||||
|
type: 'Feature',
|
||||||
|
geometry: thing._source.geo.polygon ?? thing._source.geo.point,
|
||||||
|
properties: {
|
||||||
|
name: thing._source.name,
|
||||||
|
sameAs: thing._source.sameAs,
|
||||||
|
image: thing._source.image,
|
||||||
|
alternateNames: thing._source.alternateNames,
|
||||||
|
description: thing._source.description,
|
||||||
|
identifiers: thing._source.identifiers,
|
||||||
|
categories: thing._source.categories,
|
||||||
|
categorySpecificValues: thing._source.categorySpecificValues,
|
||||||
|
openingHours: thing._source.openingHours,
|
||||||
|
address: thing._source.address,
|
||||||
|
uid: thing._source.uid,
|
||||||
|
type: thing._source.type,
|
||||||
|
},
|
||||||
|
} satisfies Feature<Polygon | Point, SupplementaryGeoJSONThing>)
|
||||||
|
: undefined;
|
||||||
|
})
|
||||||
|
.filter(noUndefined),
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export function buildDistanceFilter(
|
|||||||
): QueryDslSpecificQueryContainer<'geo_distance'> {
|
): QueryDslSpecificQueryContainer<'geo_distance'> {
|
||||||
const geoObject: QueryDslGeoDistanceQuery = {
|
const geoObject: QueryDslGeoDistanceQuery = {
|
||||||
distance: `${filter.arguments.distance}m`,
|
distance: `${filter.arguments.distance}m`,
|
||||||
[`${filter.arguments.field}.point.coordinates`]: {
|
[`${filter.arguments.field}.point`]: {
|
||||||
lat: filter.arguments.position[1],
|
lat: filter.arguments.position[1],
|
||||||
lon: filter.arguments.position[0],
|
lon: filter.arguments.position[0],
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -19,14 +19,29 @@ import {QueryDslSpecificQueryContainer} from '../../types/util.js';
|
|||||||
* Converts a geo filter to elasticsearch syntax
|
* Converts a geo filter to elasticsearch syntax
|
||||||
* @param filter A search filter for the retrieval of the data
|
* @param filter A search filter for the retrieval of the data
|
||||||
*/
|
*/
|
||||||
export function buildGeoFilter(filter: SCGeoFilter): QueryDslSpecificQueryContainer<'geo_shape'> {
|
export function buildGeoFilter(filter: SCGeoFilter): QueryDslSpecificQueryContainer<'bool'> {
|
||||||
return {
|
return {
|
||||||
geo_shape: {
|
bool: {
|
||||||
ignore_unmapped: true,
|
should: [
|
||||||
[`${filter.arguments.field}.polygon`]: {
|
{
|
||||||
shape: filter.arguments.shape,
|
geo_shape: {
|
||||||
relation: filter.arguments.spatialRelation,
|
ignore_unmapped: true,
|
||||||
},
|
[`${filter.arguments.field}.polygon`]: {
|
||||||
|
shape: filter.arguments.shape,
|
||||||
|
relation: filter.arguments.spatialRelation,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
} satisfies QueryDslSpecificQueryContainer<'geo_shape'>,
|
||||||
|
{
|
||||||
|
geo_shape: {
|
||||||
|
ignore_unmapped: true,
|
||||||
|
[`${filter.arguments.field}.point`]: {
|
||||||
|
shape: filter.arguments.shape,
|
||||||
|
relation: filter.arguments.spatialRelation,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
} satisfies QueryDslSpecificQueryContainer<'geo_shape'>,
|
||||||
|
],
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,16 +21,31 @@ import {QueryDslSpecificQueryContainer} from '../../types/util.js';
|
|||||||
*/
|
*/
|
||||||
export function buildValueFilter(
|
export function buildValueFilter(
|
||||||
filter: SCSearchValueFilter,
|
filter: SCSearchValueFilter,
|
||||||
): QueryDslSpecificQueryContainer<'term'> | QueryDslSpecificQueryContainer<'terms'> {
|
):
|
||||||
return Array.isArray(filter.arguments.value)
|
| QueryDslSpecificQueryContainer<'exists'>
|
||||||
? {
|
| QueryDslSpecificQueryContainer<'term'>
|
||||||
terms: {
|
| QueryDslSpecificQueryContainer<'terms'> {
|
||||||
[`${filter.arguments.field}.raw`]: filter.arguments.value,
|
switch (typeof filter.arguments.value) {
|
||||||
|
case 'undefined': {
|
||||||
|
return {
|
||||||
|
exists: {
|
||||||
|
field: filter.arguments.field,
|
||||||
},
|
},
|
||||||
}
|
};
|
||||||
: {
|
}
|
||||||
|
case 'string': {
|
||||||
|
return {
|
||||||
term: {
|
term: {
|
||||||
[`${filter.arguments.field}.raw`]: filter.arguments.value,
|
[`${filter.arguments.field}.raw`]: filter.arguments.value,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
case 'object': {
|
||||||
|
return {
|
||||||
|
terms: {
|
||||||
|
[`${filter.arguments.field}.raw`]: filter.arguments.value,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export function buildDistanceSort(sort: SCDistanceSort): SortOptions {
|
|||||||
mode: 'avg',
|
mode: 'avg',
|
||||||
order: sort.order,
|
order: sort.order,
|
||||||
unit: 'm',
|
unit: 'm',
|
||||||
[`${sort.arguments.field}.point.coordinates`]: {
|
[`${sort.arguments.field}.point`]: {
|
||||||
lat: sort.arguments.position[1],
|
lat: sort.arguments.position[1],
|
||||||
lon: sort.arguments.position[0],
|
lon: sort.arguments.position[0],
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import http from 'http';
|
|||||||
import {MailQueue} from '../src/notification/mail-queue.js';
|
import {MailQueue} from '../src/notification/mail-queue.js';
|
||||||
import {Bulk, BulkStorage} from '../src/storage/bulk-storage.js';
|
import {Bulk, BulkStorage} from '../src/storage/bulk-storage.js';
|
||||||
import getPort from 'get-port';
|
import getPort from 'get-port';
|
||||||
import {Database} from '../src/storage/database.js';
|
import {Database, SupplementaryGeoJSON} from '../src/storage/database.js';
|
||||||
import {v4} from 'uuid';
|
import {v4} from 'uuid';
|
||||||
import {backendConfig} from '../src/config.js';
|
import {backendConfig} from '../src/config.js';
|
||||||
import {getIndexUID} from '../src/storage/elasticsearch/util/index.js';
|
import {getIndexUID} from '../src/storage/elasticsearch/util/index.js';
|
||||||
@@ -58,7 +58,6 @@ export async function startApp(): Promise<Express> {
|
|||||||
* An elasticsearch mock
|
* An elasticsearch mock
|
||||||
*/
|
*/
|
||||||
export class ElasticsearchMock implements Database {
|
export class ElasticsearchMock implements Database {
|
||||||
// @ts-expect-error never read
|
|
||||||
private bulk: Bulk | undefined;
|
private bulk: Bulk | undefined;
|
||||||
|
|
||||||
private storageMock = new Map<string, SCThings>();
|
private storageMock = new Map<string, SCThings>();
|
||||||
@@ -67,6 +66,10 @@ export class ElasticsearchMock implements Database {
|
|||||||
// Nothing to do here
|
// Nothing to do here
|
||||||
}
|
}
|
||||||
|
|
||||||
|
geo(): Promise<SupplementaryGeoJSON> {
|
||||||
|
throw new Error('Method not implemented.');
|
||||||
|
}
|
||||||
|
|
||||||
bulkCreated(bulk: Bulk): Promise<void> {
|
bulkCreated(bulk: Bulk): Promise<void> {
|
||||||
this.bulk = bulk;
|
this.bulk = bulk;
|
||||||
return Promise.resolve(undefined);
|
return Promise.resolve(undefined);
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {
|
import {
|
||||||
|
SCBook,
|
||||||
SCBulkAddRoute,
|
SCBulkAddRoute,
|
||||||
SCBulkDoneRoute,
|
SCBulkDoneRoute,
|
||||||
SCBulkRequest,
|
SCBulkRequest,
|
||||||
@@ -23,29 +24,30 @@ import {
|
|||||||
import {expect} from 'chai';
|
import {expect} from 'chai';
|
||||||
import {bulk, DEFAULT_TEST_TIMEOUT} from '../common.js';
|
import {bulk, DEFAULT_TEST_TIMEOUT} from '../common.js';
|
||||||
import {testApp} from '../tests-setup.js';
|
import {testApp} from '../tests-setup.js';
|
||||||
import {readFile} from 'fs/promises';
|
|
||||||
import {v4} from 'uuid';
|
import {v4} from 'uuid';
|
||||||
|
import bookFile from '@openstapps/core/test/resources/indexable/Book.2.json' with {type: 'json'};
|
||||||
|
|
||||||
const book = JSON.parse(
|
const book = bookFile.instance as SCBook;
|
||||||
await readFile('node_modules/@openstapps/core/test/resources/indexable/Book.2.json', 'utf8'),
|
|
||||||
).instance;
|
|
||||||
|
|
||||||
describe('Bulk routes', async function () {
|
describe('Bulk routes', async function () {
|
||||||
// increase timeout for the suite
|
// increase timeout for the suite
|
||||||
this.timeout(DEFAULT_TEST_TIMEOUT);
|
this.timeout(DEFAULT_TEST_TIMEOUT);
|
||||||
|
|
||||||
const request: SCBulkRequest = {
|
let request: SCBulkRequest;
|
||||||
expiration: bulk.expiration,
|
let bulkRoute: SCBulkRoute;
|
||||||
source: bulk.source,
|
let bulkAddRoute: SCBulkAddRoute;
|
||||||
type: bulk.type,
|
let bulkDoneRoute: SCBulkDoneRoute;
|
||||||
};
|
|
||||||
const bulkRoute = new SCBulkRoute();
|
|
||||||
const bulkAddRoute = new SCBulkAddRoute();
|
|
||||||
const bulkDoneRoute = new SCBulkDoneRoute();
|
|
||||||
|
|
||||||
// afterEach(async function() {
|
before(function () {
|
||||||
// TODO: Delete saved bulks
|
request = {
|
||||||
// });
|
expiration: bulk.expiration,
|
||||||
|
source: bulk.source,
|
||||||
|
type: bulk.type,
|
||||||
|
};
|
||||||
|
bulkRoute = new SCBulkRoute();
|
||||||
|
bulkAddRoute = new SCBulkAddRoute();
|
||||||
|
bulkDoneRoute = new SCBulkDoneRoute();
|
||||||
|
});
|
||||||
|
|
||||||
it('should create bulk', async function () {
|
it('should create bulk', async function () {
|
||||||
const {status, body, error} = await testApp
|
const {status, body, error} = await testApp
|
||||||
|
|||||||
@@ -21,7 +21,12 @@ import {expect} from 'chai';
|
|||||||
describe('Index route', async function () {
|
describe('Index route', async function () {
|
||||||
// increase timeout for the suite
|
// increase timeout for the suite
|
||||||
this.timeout(DEFAULT_TEST_TIMEOUT);
|
this.timeout(DEFAULT_TEST_TIMEOUT);
|
||||||
const indexRoute = new SCIndexRoute();
|
|
||||||
|
let indexRoute: SCIndexRoute;
|
||||||
|
|
||||||
|
before(function () {
|
||||||
|
indexRoute = new SCIndexRoute();
|
||||||
|
});
|
||||||
|
|
||||||
it('should respond with both app and backend configuration', async function () {
|
it('should respond with both app and backend configuration', async function () {
|
||||||
const request: SCIndexRequest = {};
|
const request: SCIndexRequest = {};
|
||||||
|
|||||||
@@ -30,15 +30,11 @@ import chaiAsPromised from 'chai-as-promised';
|
|||||||
import {DEFAULT_TEST_TIMEOUT} from '../common.js';
|
import {DEFAULT_TEST_TIMEOUT} from '../common.js';
|
||||||
import {testApp} from '../tests-setup.js';
|
import {testApp} from '../tests-setup.js';
|
||||||
import {backendConfig} from '../../src/config.js';
|
import {backendConfig} from '../../src/config.js';
|
||||||
import {readFile} from 'fs/promises';
|
import registerRequest from '@openstapps/core/test/resources/PluginRegisterRequest.1.json' with {type: 'json'};
|
||||||
|
|
||||||
// for using promises in expectations (to.eventually.be...)
|
// for using promises in expectations (to.eventually.be...)
|
||||||
use(chaiAsPromised);
|
use(chaiAsPromised);
|
||||||
|
|
||||||
const registerRequest = JSON.parse(
|
|
||||||
await readFile('node_modules/@openstapps/core/test/resources/PluginRegisterRequest.1.json', 'utf8'),
|
|
||||||
);
|
|
||||||
|
|
||||||
// cast it because of "TS2322: Type 'string' is not assignable to type '"add"'"
|
// cast it because of "TS2322: Type 'string' is not assignable to type '"add"'"
|
||||||
export const registerAddRequest: SCPluginAdd = registerRequest.instance as SCPluginAdd;
|
export const registerAddRequest: SCPluginAdd = registerRequest.instance as SCPluginAdd;
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user