Merge pull request #114 from medizininformatik-initiative/release/v5.1.1

Release/v5.1.1

Author: EmteZogaf

CHANGELOG.md

@@ -17,6 +17,25 @@ Please refer to the respective repositories for a more in depth changelog of sin
 |TORCH|<https://github.com/medizininformatik-initiative/torch|
 |Blaze FHIR server|<https://github.com/samply/blaze>|
 
+## [5.1.1] - 2025-03-03
+
+**minor fixes in v5.1.1**
+
+- Backend Bugfixes: Improve elastic search query for better results, fix initial counter value of remaining result details views
+
+### known bugs
+
+- Encounter Module faulty at sq2cql translation and therefore non functioning (CQL)
+
+### Ontology
+
+This Release is based on ontology Version [v3.1.0](https://github.com/medizininformatik-initiative/fhir-ontology-generator/releases/tag/v3.1.0)
+
+### Updates to
+
+- backend
+
+
 ## [5.1.0] - 2025-02-18
 
 **minor fixes in v5.1.0**

feasibility-portal/backend/docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   dataportal-backend:
     restart: unless-stopped
-    image: ghcr.io/medizininformatik-initiative/feasibility-backend:6.1.0
+    image: ghcr.io/medizininformatik-initiative/feasibility-backend:6.1.1
     ports:
     - ${DATAPORTAL_BACKEND_PORT:-127.0.0.1:8091}:8090
     depends_on:
@@ -144,4 +144,4 @@ volumes:
   dataportal-deploy-postgres-data:
     name: "dataportal-deploy-postgres-data"
   dataportal-deploy-elastic-data:
-    name: "dataportal-deploy-elastic-data"
+    name: "dataportal-deploy-elastic-data"

feasibility-portal/down-feasibility-portal.sh

@@ -4,7 +4,7 @@ COMPOSE_PROJECT=${FEASIBILITY_COMPOSE_PROJECT:-feasibility-deploy}
 
 BASE_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 || exit 1 ; pwd -P )"
 
- docker compose -p "$COMPOSE_PROJECT" -f "$BASE_DIR"/keycloak/docker-compose.yml down
+docker compose -p "$COMPOSE_PROJECT" -f "$BASE_DIR"/keycloak/docker-compose.yml down
 
 
 docker compose -p "$COMPOSE_PROJECT" -f "$BASE_DIR"/backend/docker-compose.yml down

feasibility-portal/gui/deploy-config.json.default

@@ -9,7 +9,7 @@
     "baseUrl": "https://api.datenportal.localhost/api/v4"
   },
   "auth": {
-    "baseUrl": "https://example.org/auth",
+    "baseUrl": "https://auth.datenportal.localhost",
     "realm": "feasibility",
     "clientId": "feasibility-webapp",
     "roles": ["FeasibilityUser"]
@@ -52,4 +52,4 @@
   "dataset": "codex",
   "queryVersion": "v2",
   "proposalPortalLink": "https://antrag.dev.forschen-fuer-gesundheit.de"
-}
+}

feasibility-portal/initialise-portal-env-files.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-envfiles=( "gui/deploy-config.json" "backend/.env" "keycloak/.env" "proxy/.env")
+BASE_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 || exit 1 ; pwd -P )"
+envfiles=( "$BASE_DIR/gui/deploy-config.json" "$BASE_DIR/backend/.env" "$BASE_DIR/keycloak/.env" "$BASE_DIR/proxy/.env")
 
 for file in "${envfiles[@]}"
 do

feasibility-portal/keycloak/.env.default

@@ -4,8 +4,9 @@ FEASIBILITY_KC_DB_PW=keycloakdbpw
 FEASIBILITY_KC_ADMIN_USER=admin
 FEASIBILITY_KC_ADMIN_PW=admin
 FEASIBILITY_KC_HTTP_RELATIVE_PATH=/auth
-FEASIBILITY_KC_HOSTNAME_URL=https://example.org/auth
-FEASIBILITY_KC_HOSTNAME_ADMIN_URL=https://example.org/auth
+FEASIBILITY_KC_HOSTNAME_URL=https://auth.datenportal.localhost
+FEASIBILITY_KC_HOSTNAME_ADMIN_URL=https://auth.datenportal.localhost
 FEASIBILITY_KC_LOG_LEVEL=info
 FEASIBILITY_KC_PROXY=edge
+FEASIBILITY_BACKEND_BASE_URL=https:/api.datenportal.localhost
 

feasibility-portal/proxy/context-paths.nginx.conf

@@ -78,6 +78,8 @@ http {
         add_header                    X-Content-Type-Options nosniff;
         add_header                    X-Frame-Options SAMEORIGIN;
 
+        port_in_redirect off;
+
         # redirect server error pages to the static page /50x.html
         #
         error_page   500 502 503 504  /50x.html;
@@ -91,15 +93,17 @@ http {
         proxy_set_header     X-Forwarded-Port  $x_forwarded_port;
 
         location /api {
-            set                     $backend_upstream http://feasibility-gui-backend:8090;
+            set                     $backend_upstream http://dataportal-backend:8090;
             proxy_pass              $backend_upstream;
 
             proxy_buffer_size       8k;
             proxy_request_buffering off;
             client_max_body_size    100M;
         }
 
-        location /auth {
+        rewrite ^/auth$ /auth/ permanent;
+
+        location /auth/ {
             set              $auth_upstream http://auth:8080;
             proxy_pass       $auth_upstream;
         }

feasibility-portal/proxy/subdomains.nginx.conf

@@ -73,7 +73,7 @@ http {
     # Header Options
     add_header                    Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
     add_header                    X-Content-Type-Options nosniff;
-     add_header                    X-Frame-Options SAMEORIGIN;
-     
+    add_header                    X-Frame-Options SAMEORIGIN;
+
     include /etc/nginx/conf.d/*.conf;
 }