Merge branch 'main' into v5

Author: cdauth

.github/workflows/docker-latest.yml

@@ -74,7 +74,7 @@ jobs:
       -
         name: Run integration tests
         run: >-
-          docker run --rm -u root --add-host host.docker.internal:host-gateway facilmap-ci sh -c "
+          docker run --rm -e RUN_AS_ROOT=1 --add-host host.docker.internal:host-gateway facilmap-ci sh -c "
           yarn workspaces focus facilmap-integration-tests &&
           FACILMAP_URL=http://host.docker.internal:8080 yarn workspace facilmap-integration-tests run integration-tests &&
           FACILMAP_URL=http://host.docker.internal:8081 yarn workspace facilmap-integration-tests run integration-tests

Dockerfile

@@ -1,9 +1,11 @@
 FROM node:22-alpine
 MAINTAINER Candid Dauth <cdauth@cdauth.eu>
 
+ENTRYPOINT ["/opt/facilmap/entrypoint.sh"]
 CMD yarn run prod-server
 EXPOSE 8080
 ENV CACHE_DIR=/opt/facilmap/cache
+VOLUME /opt/facilmap/cache
 HEALTHCHECK --start-period=60s --start-interval=3s --timeout=5s --retries=1 \
 	CMD wget -O/dev/null 'http://127.0.0.1:8080/socket.io/?EIO=4&transport=polling' || exit 1
 
@@ -23,6 +25,4 @@ RUN yarn install && \
 	yarn run build:server && \
 	yarn workspaces focus -A --production
 
-RUN mkdir -p "$CACHE_DIR" && chown -R facilmap:facilmap "$CACHE_DIR"
-
-USER facilmap
+RUN mkdir -p "$CACHE_DIR" && chown -R facilmap:facilmap "$CACHE_DIR"

docs/src/developers/server/docker.md

@@ -36,7 +36,9 @@ services:
             MAXMIND_USER_ID: # Sign up here https://www.maxmind.com/en/geolite2/signup (needed for geoip lookup to show initial map state)
             MAXMIND_LICENSE_KEY:
             LIMA_LABS_TOKEN: # Get an API key on https://maps.lima-labs.com/ (optional, needed for double-resolution tiles)
-        restart: unless-stopped
+        volumes:
+            - ./cache:/opt/facilmap/cache
+        restart: always
     mariadb:
         image: mariadb
         environment:
@@ -49,7 +51,7 @@ services:
             test: healthcheck.sh --su-mysql --connect --innodb_initialized
         volumes:
             - ./mysql:/var/lib/mysql
-        restart: unless-stopped
+        restart: always
 ```
 
 Here is an example with Postgres:
@@ -78,7 +80,9 @@ services:
             MAXMIND_USER_ID: # Sign up here https://www.maxmind.com/en/geolite2/signup (needed for geoip lookup to show initial map state)
             MAXMIND_LICENSE_KEY:
             LIMA_LABS_TOKEN: # Get an API key on https://maps.lima-labs.com/ (optional, needed for double-resolution tiles)
-        restart: unless-stopped
+        volumes:
+            - ./cache:/opt/facilmap/cache
+        restart: always
     postgres:
         image: postgis/postgis
         environment:
@@ -89,7 +93,7 @@ services:
             test: pg_isready -d $$POSTGRES_DB
         volumes:
             - ./postgis:/var/lib/postgresql/data
-        restart: unless-stopped
+        restart: always
 ```
 
 To start FacilMap, run `docker-compose up -d` in the directory of the `docker-compose.yml` file. To upgrade FacilMap, run `docker-compose pull` and then restart it by running `docker-compose up -d`.

entrypoint.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+chown facilmap:facilmap "$CACHE_DIR"
+
+if [[ "$RUN_AS_ROOT" = 1 ]]; then
+	exec "$@"
+else
+	exec su facilmap -c "$@"
+fi

frontend/public/static/sw.js

@@ -784,6 +784,11 @@
         "attributes-description": "The permissions for changing the marker/line name, location/waypoints, style attributes and any field values that do not have custom permissions, for markers/lines of this type.",
         "field": "Field"
     },
+    "number-input": {
+        "integer-error": "Please enter a valid integer.",
+        "min-error": "Please enter a number not smaller than {{min}}.",
+        "max-error": "Please enter a number not greater than {{max}}."
+    },
     "pagination": {
         "first-label": "First",
         "previous-label": "Previous",

frontend/src/i18n/en.json

@@ -142,7 +142,6 @@
 						<WidthPicker
 							:id="`${id}-width-input`"
 							v-model="line.width"
-							class="fm-custom-range-with-label"
 						></WidthPicker>
 					</div>
 				</div>

frontend/src/lib/components/edit-line-dialog.vue

@@ -134,7 +134,6 @@
 						<SizePicker
 							:id="`${id}-size-input`"
 							v-model="marker.size"
-							class="fm-custom-range-with-label"
 						></SizePicker>
 					</div>
 				</div>

frontend/src/lib/components/edit-marker-dialog.vue

@@ -230,7 +230,6 @@
 								<SizePicker
 									:id="`${id}-default-size-input`"
 									v-model="type.defaultSize"
-									class="fm-custom-range-with-label"
 								></SizePicker>
 							</div>
 							<div class="col-sm-3">
@@ -312,7 +311,6 @@
 								<WidthPicker
 									:id="`${id}-default-width-input`"
 									v-model="type.defaultWidth"
-									class="fm-custom-range-with-label"
 								></WidthPicker>
 							</div>
 							<div class="col-sm-3">

frontend/src/lib/components/edit-type-dialog/edit-type-dialog.vue

@@ -345,7 +345,6 @@
 							<SizePicker
 								:modelValue="option.size ?? type.defaultSize"
 								@update:modelValue="option.size = $event"
-								class="fm-custom-range-with-label"
 							></SizePicker>
 						</td>
 						<td v-if="fieldValue.controlIcon" class="field">
@@ -364,7 +363,6 @@
 							<WidthPicker
 								:modelValue="option.width ?? type.defaultWidth"
 								@update:modelValue="option.width = $event"
-								class="fm-custom-range-with-label"
 							></WidthPicker>
 						</td>
 						<td v-if="fieldValue.controlStroke" class="field">