Update ui dependencies

^ Conflicts:
^	.gitattributes
^	ui/index.html
^	ui/package-lock.json
^	ui/package.json
^	ui/src/AmazonS3Resource.js
^	ui/src/elements/dashboard/ngm-project-edit.ts
^	ui/src/elements/dashboard/ngm-project-topic-overview.ts
^	ui/src/elements/ngm-side-bar.ts
^	ui/src/index.ts
^	ui/src/layers/helpers.ts
^	ui/src/ngm-app.ts
^	ui/tsconfig.json

Author: daniel-va

.gitattributes

@@ -1,2 +1 @@
-package-lock.json -diff
 * -text

.github/scripts/find-version.js

@@ -10,6 +10,7 @@ const findNextVersion = (tags, branch) => {
     if (version.preRelease == null || version.patch !== 0) {
       version.minor += 1;
       version.patch = 0;
+      version.preRelease = null
     }
   } else {
     // It's a patch.

.gitignore

@@ -9,7 +9,7 @@
 /secrets.txt
 
 # JetBrains IDE files
-/.idea/
+.idea/
 
 # Local Docker volumes
 /volumes/

api/start.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
 
 SQLX_VERSION=0.8.2
 if [[ ! -f ~/.cargo/bin/sqlx ]] || [[ $(sqlx --version) != "sqlx-cli $SQLX_VERSION" ]]; then

docker-compose.yaml

@@ -19,20 +19,21 @@ services:
       - .env
 
   ui:
-    image: node:22
+    image: swissgeol-viewer-app/ui:local
+    build:
+      context: ./ui
+      dockerfile: DockerfileDev
     init: true
     ports:
       - "8000:8000"
-    environment:
-      NODE_ENV: development
-    working_dir: /app
-    command: ["sh", "-c", "npm ci && npm run start"]
     depends_on:
       - api
       - abbreviator
     volumes:
-      - ./ui:/app
-      - ui.node_modules:/app/node_modules
+      - ./:/app
+      - ui.node_modules:/app/ui/node_modules
+    tmpfs:
+      - /app/ui/dist
 
   minio:
     image: minio/minio:latest
@@ -84,4 +85,4 @@ volumes:
   db:
   api.cargo:
   api.target:
-  ui.node_modules:
+  ui.node_modules:

ui/.dockerignore

@@ -0,0 +1,2 @@
+/node_modules/
+/dist/

ui/.eslintrc.yml

@@ -1,5 +1,9 @@
 {
-  "spec": "src/test/**/*.ts",
+  "spec": "src/test/**/*.test.ts",
   "extension": ["ts", "js"],
-  "loader": "ts-node/esm"
+  "require": [
+    "ts-node/register/transpile-only",
+    "jsdom-global/register.js",
+    "./src/test/jquery.register.js"
+  ]
 }

ui/.mocharc.json

@@ -0,0 +1,13 @@
+FROM node:22-alpine as build
+
+ENV NODE_ENV=development
+
+RUN apk add --no-cache git bash
+
+WORKDIR /app/ui
+COPY . .
+
+EXPOSE 8000
+
+ENTRYPOINT ["/bin/bash"]
+CMD ["start.sh"]

ui/DockerfileDev

@@ -1,8 +1,9 @@
-import { defineConfig } from 'cypress'
+import {defineConfig} from 'cypress';
 
 export default defineConfig({
-  e2e: {
-    setupNodeEvents(on, config) {},
-    baseUrl: 'http://localhost:8000',
-  },
-})
+    e2e: {
+        setupNodeEvents(_on, _config) {
+        },
+        baseUrl: 'http://localhost:8000',
+    },
+});