merge main

.devcontainer/docker-compose.yml

@@ -31,7 +31,6 @@ services:
       - EMAIL_RATE_LIMIT=100
       - MATCHER_MAX_CAPACITY=80
       - MATCHER_RUN=false
-      - ECON_PACKAGE_REGISTRY_READ_TOKEN
     depends_on:
       - database-root
       - database-tenant

.env.sample

@@ -3,8 +3,6 @@ SIHL_ENV=development
 VERSION=dev
 PUBLIC_URL=http://localhost:3000
 
-ECON_PACKAGE_REGISTRY_READ_TOKEN=<token>
-
 DATABASE_URL=mariadb://[email protected]:3316/development
 DATABASE_URL_TENANT_ONE=mariadb://[email protected]:3317/test_econ
 DATABASE_URL_TENANT_TWO=mariadb://[email protected]:3317/test_zhaw

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: add commit SHA for non-production builds
         if: github.ref_type != 'tag'
@@ -62,12 +62,12 @@ jobs:
             # Restore directory permissions to avoid conflicts
             sudo chown -R 1001:123 .
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: run.exe
           path: _build/default/pool/run/run.exe
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: tests
@@ -85,12 +85,10 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: node:lts
-      env:
-        ECON_PACKAGE_REGISTRY_READ_TOKEN: ${{ secrets.ECON_PACKAGE_REGISTRY_READ_TOKEN }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: install yarn packages
         run: yarn install
@@ -101,7 +99,7 @@ jobs:
       - name: move all assets to one folder
         run: '[ "$(ls pool/public)" ] && cp -r pool/public/* public || exit 0'
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: assets
           path: public
@@ -119,7 +117,7 @@ jobs:
     if: github.ref_name == 'main'
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Trigger deploy
         uses: ./.github/actions/trigger-deploy
@@ -134,10 +132,10 @@ jobs:
     if: github.ref_type == 'tag'
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Extract version changelog
         run: sed -nr "/^## .?v?${GITHUB_REF_NAME}/,/^## /p" CHANGELOG.md | sed '1d;2d;$d' > changes.md
@@ -148,7 +146,7 @@ jobs:
           tar -zcf executable.tar.gz run.exe/run.exe
 
       - name: Create release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           body_path: changes.md
@@ -168,7 +166,7 @@ jobs:
     needs: release
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Trigger deploy
         uses: ./.github/actions/trigger-deploy

.yarnrc

@@ -1 +1,2 @@
 version-tag-prefix ""
+"@econ:registry" "https://gitlab.uzh.ch/api/v4/projects/662/packages/npm/"

CHANGELOG.md

@@ -4,6 +4,88 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [unreleased](https://github.com/uzh/z-pool-tool/tree/HEAD)
 
+## [0.8.3](https://github.com/uzh/z-pool-tool/tree/0.8.3) - 2024-10-24
+
+### Fixed
+
+- handling of lost database connection in schedule
+- filtering of locations on location index page
+
+## [0.8.2](https://github.com/uzh/z-pool-tool/tree/0.8.2) - 2024-10-24
+
+### Added
+
+- creation of announcement banners on tenants for admins and/or contacts
+- keep track of sign up codes of newly registered contacts
+- enable verification of contacts
+- creation of release note pages
+
+### Changed
+
+- sort participation history on contact profile by session start
+
+### Fixed
+
+- fix tenant middleware to retry database connection after a connection issue occurred
+
+## [0.8.1](https://github.com/uzh/z-pool-tool/tree/0.8.1) - 2024-10-09
+
+### Added
+
+- validation of uuids in guardian middleware
+- warnings to mailings form if no invitations will be sent
+
+### Changed
+
+- standradized page width for all pages
+- matcher sends invitations to online experiment with upcoming time windows
+
+### Fixed
+
+- `experimentSurveyRedirectUrl` text template typo
+- resending of queue jobs
+- experiment detail view middleware
+
+## [0.8.0](https://github.com/uzh/z-pool-tool/tree/0.8.0) - 2024-09-11
+
+### Added
+
+- mark a contact as deleted
+- marked as deleted column to waiting list, incl. handling of it
+- register DLR for text messages
+- persistent multitenant job queue, incl. history as mapping
+- additional hints (e.g. custom fields)
+- survey url for text templates
+
+### Changed
+
+- allow customization of dashboard subtitles
+- change migration handling, only preset to "dirty" for open migrations
+- some error messages
+- naming for registration, login and sign up
+- start worker for active tenants only
+- explicit mark jobs when they should run on root database as well
+- separate job counts per tenant in status route
+- database connection handling: increase stability for connection issues
+- link backend of guardian to pool database
+- split upcoming and history of jobs
+- rework startup process of root an tenant, decrease downtime on startup
+
+### Fixed
+
+- list cancelled sessions separately
+- schedule table layout
+- experiment statistics using temporary table
+- statistict without previous data
+- duplicate url parameter encoding
+- t&c routes
+- optimize regex for finding tenant
+- fix email logo on gmail web client
+
+### Removed
+
+- package read token (as publicly accessible now)
+
 ## [0.7.6](https://github.com/uzh/z-pool-tool/tree/0.7.6) - 2024-06-10
 
 ### Added

README.md

@@ -12,7 +12,6 @@ locally](#running-locally-with-Esy), you can do that with [esy][esy].
 
 The project executable can be run via command line `make sihl` and shows the information of the executable.
 
-1. Create a `.env` file and set the environment variable `ECON_PACKAGE_REGISTRY_READ_TOKEN`to the value stored in 1Password or in the GitLab CI/CD variables.
 1. Migrate root database with `make sihl migrate.root`
 1. Seed root database `make sihl seed.root`
 1. Migrate tenant database with `make sihl migrate.tenant`

dune-project

@@ -4,7 +4,7 @@
 
 (name pool)
 
-(version 0.7.6)
+(version 0.8.3)
 
 (authors "Department of Economics, University of Zurich")
 
@@ -48,9 +48,9 @@
   (logs
    (>= 0.7.0))
   (containers
-   (>= 3.6))
+   (>= 3.14))
   (containers-data
-   (>= 3.6))
+   (>= 3.14))
   (mariadb
    (and
     (>= 1.1.6)
@@ -77,5 +77,4 @@
   (guardian
    (= 0.3.2))
   ;; Test/Dev dependencies
-  (alcotest-lwt :with-test)
-  ))
+  (alcotest-lwt :with-test)))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pool",
-  "version": "0.7.6",
+  "version": "0.8.3",
   "license": "GPL-2.0-or-later",
   "scripts": {
     "build": "export NODE_OPTIONS=--trace-warnings PUBLIC_URL=$PREFIX_PATH/assets/; parcel build resources/index.js resources/images/** --dist-dir public --public-url $PUBLIC_URL && parcel build resources/admin.js --dist-dir public --public-url $PUBLIC_URL",

pool.opam

@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.7.6"
+version: "0.8.3"
 synopsis: "The Z-Pool tool"
 description: """
 
@@ -21,8 +21,8 @@ depends: [
   "sihl-storage" {>= "4.0.0" & < "5.0.0"}
   "lwt" {>= "5.6.1"}
   "logs" {>= "0.7.0"}
-  "containers" {>= "3.6"}
-  "containers-data" {>= "3.6"}
+  "containers" {>= "3.14"}
+  "containers-data" {>= "3.14"}
   "mariadb" {>= "1.1.6" & < "2.0.0"}
   "caqti-driver-mariadb" {>= "2.0.1"}
   "caqti-lwt" {>= "2.0.1"}

pool.opam.locked

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "0.7.6"
+version: "0.8.3"
 synopsis: "The Z-Pool tool"
 description: """
 
@@ -12,7 +12,7 @@ homepage: "https://github.com/uzh/z-pool-tool"
 doc: "https://uzh.github.io/z-pool-tool-documentation/"
 bug-reports: "https://github.com/uzh/z-pool-tool"
 depends: [
-  "angstrom" {= "0.16.0"}
+  "angstrom" {= "0.16.1"}
   "asn1-combinators" {= "0.2.6"}
   "astring" {= "0.8.5"}
   "base" {= "v0.16.3"}
@@ -28,7 +28,7 @@ depends: [
   "ca-certs" {= "0.2.3"}
   "camlp-streams" {= "5.0.1"}
   "canary" {= "0.0.3"}
-  "caqti" {= "2.1.1"}
+  "caqti" {= "2.1.2"}
   "caqti-driver-mariadb" {= "2.1.1"}
   "caqti-lwt" {= "2.1.1"}
   "cmdliner" {= "1.3.0"}
@@ -49,9 +49,9 @@ depends: [
   "conf-mariadb" {= "2"}
   "conf-pkg-config" {= "3"}
   "conformist" {= "0.8.1"}
-  "containers" {= "3.13.1"}
-  "containers-data" {= "3.13.1"}
-  "cppo" {= "1.6.9"}
+  "containers" {= "3.14"}
+  "containers-data" {= "3.14"}
+  "cppo" {= "1.7.0"}
   "csexp" {= "1.5.2"}
   "cstruct" {= "6.2.0"}
   "ctypes" {= "0.20.2"}
@@ -90,9 +90,9 @@ depends: [
   "ke" {= "0.6"}
   "letters" {= "0.3.3"}
   "logs" {= "0.7.0"}
-  "lwt" {= "5.7.0"}
+  "lwt" {= "5.8.0"}
   "lwt-dllist" {= "1.0.1"}
-  "lwt_ppx" {= "2.1.0"}
+  "lwt_ppx" {= "5.8.0"}
   "lwt_ssl" {= "1.2.0"}
   "macaddr" {= "5.6.0"}
   "magic-mime" {= "1.3.1"}
@@ -108,14 +108,14 @@ depends: [
   "mirage-crypto-rng" {= "0.11.3"}
   "mirage-crypto-rng-lwt" {= "0.11.3"}
   "mrmime" {= "0.6.1"}
-  "mtime" {= "2.0.0"}
+  "mtime" {= "2.1.0"}
   "multipart-form-data" {= "0.3.0"}
   "num" {= "1.5-1"}
   "ocaml" {= "4.14.2"}
   "ocaml-base-compiler" {= "4.14.2"}
   "ocaml-compiler-libs" {= "v0.12.4"}
   "ocaml-syntax-shims" {= "1.0.0"}
-  "ocaml-version" {= "3.6.7"}
+  "ocaml-version" {= "3.6.9"}
   "ocamlbuild" {= "0.15.0"}
   "ocamlfind" {= "1.9.6"}
   "ocamlformat" {= "0.26.2"}
@@ -133,8 +133,8 @@ depends: [
   "ppx_cold" {= "v0.16.0"}
   "ppx_compare" {= "v0.16.0"}
   "ppx_derivers" {= "1.2.1"}
-  "ppx_deriving" {= "6.0.2"}
-  "ppx_deriving_yojson" {= "3.8.0"}
+  "ppx_deriving" {= "6.0.3"}
+  "ppx_deriving_yojson" {= "3.9.0"}
   "ppx_enumerate" {= "v0.16.0"}
   "ppx_fields_conv" {= "v0.16.0"}
   "ppx_globalize" {= "v0.16.0"}
@@ -145,10 +145,10 @@ depends: [
   "ppx_variants_conv" {= "v0.16.0"}
   "ppx_yojson_conv" {= "v0.16.0"}
   "ppx_yojson_conv_lib" {= "v0.16.0"}
-  "ppxlib" {= "0.32.1"}
+  "ppxlib" {= "0.33.0"}
   "prettym" {= "0.0.3"}
-  "ptime" {= "1.1.0"}
-  "re" {= "1.11.0"}
+  "ptime" {= "1.2.0"}
+  "re" {= "1.12.0"}
   "result" {= "1.5"}
   "rock" {= "0.20.0"}
   "rosetta" {= "0.3.0"}
@@ -177,9 +177,9 @@ depends: [
   "unstrctrd" {= "0.4"}
   "uri" {= "4.4.0"}
   "uri-sexp" {= "4.4.0"}
-  "uucp" {= "15.1.0"}
-  "uuidm" {= "0.9.8"}
-  "uuseg" {= "15.1.0"}
+  "uucp" {= "16.0.0"}
+  "uuidm" {= "0.9.9"}
+  "uuseg" {= "16.0.0"}
   "uutf" {= "1.0.3"}
   "uuuu" {= "0.3.0"}
   "variantslib" {= "v0.16.0"}
@@ -215,7 +215,7 @@ pin-depends: [
   ]
   [
     "guardian.0.3.2"
-    "git+https://github.com/uzh/guardian.git#87214e65f5e50f2ad9209ef9d407ec28a7004498"
+    "git+https://github.com/uzh/guardian.git#287bab9baf9b346efe47999e8b7f456bfefe8c13"
   ]
   ["canary.0.0.3" "git+https://github.com/uzh/canary.git#0.0.3"]
   [

pool/app/announcement/announcement.ml

@@ -0,0 +1,4 @@
+include Entity
+include Event
+include Entity_guard
+include Repo