From 2b7a89174ac85742d1297eed17b725fab160cc31 Mon Sep 17 00:00:00 2001 From: Pepe Ziberi Date: Sat, 21 Feb 2026 13:56:44 +0100 Subject: [PATCH] v1.0.2: Fix PDF generation (react-pdf v4), fix Next.js 15 async params in all API routes --- Dockerfile | 2 +- package-lock.json | 362 ++++++------------ package.json | 4 +- src/app/api/projects/[id]/features/route.ts | 29 +- .../journal/check-items/[itemId]/route.ts | 18 +- .../[id]/journal/check-items/route.ts | 11 +- .../[id]/journal/entries/[entryId]/route.ts | 20 +- .../projects/[id]/journal/entries/route.ts | 7 +- .../journal/pendenzen/[pendenzId]/route.ts | 18 +- .../projects/[id]/journal/pendenzen/route.ts | 7 +- src/app/api/projects/[id]/journal/route.ts | 11 +- .../[id]/journal/send-report/route.ts | 11 +- src/app/api/projects/[id]/plan-image/route.ts | 23 +- .../projects/[id]/plan-image/serve/route.ts | 5 +- src/app/api/projects/[id]/route.ts | 21 +- src/app/api/rapports/[token]/pdf/route.ts | 9 +- src/app/api/rapports/[token]/route.ts | 5 +- src/app/api/rapports/[token]/send/route.ts | 5 +- .../tenants/[tenantId]/suggestions/route.ts | 14 +- src/app/api/tenants/by-slug/[slug]/route.ts | 5 +- src/app/api/upgrade-requests/[id]/route.ts | 11 +- src/app/rapport/[token]/page.tsx | 13 +- 22 files changed, 263 insertions(+), 348 deletions(-) diff --git a/Dockerfile b/Dockerfile index 277e588..1130525 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ COPY --from=builder /app/node_modules/.bin/prisma ./node_modules/.bin/prisma COPY --from=builder /app/node_modules/bcryptjs ./node_modules/bcryptjs COPY --from=builder /app/node_modules/stripe ./node_modules/stripe COPY --from=builder /app/package.json ./package.json -RUN npm install --omit=dev --legacy-peer-deps socket.io@4.7.4 @react-pdf/renderer@3.4.4 qrcode@1.5.4 --no-save +RUN npm install --omit=dev --legacy-peer-deps socket.io@4.7.4 @react-pdf/renderer@4.3.2 qrcode@1.5.4 --no-save COPY server-custom.js ./server-custom.js COPY docker-entrypoint.sh ./docker-entrypoint.sh diff --git a/package-lock.json b/package-lock.json index b99b3af..cfa617e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "lageplan", - "version": "1.0.0", + "version": "1.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "lageplan", - "version": "1.0.0", + "version": "1.0.1", "hasInstallScript": true, "dependencies": { "@dnd-kit/core": "^6.1.0", @@ -26,7 +26,7 @@ "@radix-ui/react-tabs": "^1.1.0", "@radix-ui/react-toast": "^1.2.0", "@radix-ui/react-tooltip": "^1.1.0", - "@react-pdf/renderer": "^3.4.4", + "@react-pdf/renderer": "^4.3.2", "bcryptjs": "^2.4.3", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", @@ -2878,176 +2878,12 @@ "license": "MIT" }, "node_modules/@react-pdf/fns": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@react-pdf/fns/-/fns-2.2.1.tgz", - "integrity": "sha512-s78aDg0vDYaijU5lLOCsUD+qinQbfOvcNeaoX9AiE7+kZzzCo6B/nX+l48cmt9OosJmvZvE9DWR9cLhrhOi2pA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.13" - } - }, - "node_modules/@react-pdf/font": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/@react-pdf/font/-/font-2.5.2.tgz", - "integrity": "sha512-Ud0EfZ2FwrbvwAWx8nz+KKLmiqACCH9a/N/xNDOja0e/YgSnqTpuyHegFBgIMKjuBtO5dNvkb4dXkxAhGe/ayw==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.13", - "@react-pdf/types": "^2.6.0", - "cross-fetch": "^3.1.5", - "fontkit": "^2.0.2", - "is-url": "^1.2.4" - } - }, - "node_modules/@react-pdf/image": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/@react-pdf/image/-/image-2.3.6.tgz", - "integrity": "sha512-7iZDYZrZlJqNzS6huNl2XdMcLFUo68e6mOdzQeJ63d5eApdthhSHBnkGzHfLhH5t8DCpZNtClmklzuLL63ADfw==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.13", - "@react-pdf/png-js": "^2.3.1", - "cross-fetch": "^3.1.5", - "jay-peg": "^1.0.2" - } - }, - "node_modules/@react-pdf/layout": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@react-pdf/layout/-/layout-3.13.0.tgz", - "integrity": "sha512-lpPj/EJYHFOc0ALiJwLP09H28B4ADyvTjxOf67xTF+qkWd+dq1vg7dw3wnYESPnWk5T9NN+HlUenJqdYEY9AvA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.13", - "@react-pdf/fns": "2.2.1", - "@react-pdf/image": "^2.3.6", - "@react-pdf/pdfkit": "^3.2.0", - "@react-pdf/primitives": "^3.1.1", - "@react-pdf/stylesheet": "^4.3.0", - "@react-pdf/textkit": "^4.4.1", - "@react-pdf/types": "^2.6.0", - "cross-fetch": "^3.1.5", - "emoji-regex": "^10.3.0", - "queue": "^6.0.1", - "yoga-layout": "^2.0.1" - } - }, - "node_modules/@react-pdf/pdfkit": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@react-pdf/pdfkit/-/pdfkit-3.2.0.tgz", - "integrity": "sha512-OBfCcnTC6RpD9uv9L2woF60Zj1uQxhLFzTBXTdcYE9URzPE/zqXIyzpXEA4Vf3TFbvBCgFE2RzJ2ZUS0asq7yA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.13", - "@react-pdf/png-js": "^2.3.1", - "browserify-zlib": "^0.2.0", - "crypto-js": "^4.2.0", - "fontkit": "^2.0.2", - "jay-peg": "^1.0.2", - "vite-compatible-readable-stream": "^3.6.1" - } - }, - "node_modules/@react-pdf/png-js": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@react-pdf/png-js/-/png-js-2.3.1.tgz", - "integrity": "sha512-pEZ18I4t1vAUS4lmhvXPmXYP4PHeblpWP/pAlMMRkEyP7tdAeHUN7taQl9sf9OPq7YITMY3lWpYpJU6t4CZgZg==", - "license": "MIT", - "dependencies": { - "browserify-zlib": "^0.2.0" - } - }, - "node_modules/@react-pdf/primitives": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@react-pdf/primitives/-/primitives-3.1.1.tgz", - "integrity": "sha512-miwjxLwTnO3IjoqkTVeTI+9CdyDggwekmSLhVCw+a/7FoQc+gF3J2dSKwsHvAcVFM0gvU8mzCeTofgw0zPDq0w==", - "license": "MIT" - }, - "node_modules/@react-pdf/render": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@react-pdf/render/-/render-3.5.0.tgz", - "integrity": "sha512-gFOpnyqCgJ6l7VzfJz6rG1i2S7iVSD8bUHDjPW9Mze8TmyksHzN2zBH3y7NbsQOw1wU6hN4NhRmslrsn+BRDPA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.13", - "@react-pdf/fns": "2.2.1", - "@react-pdf/primitives": "^3.1.1", - "@react-pdf/textkit": "^4.4.1", - "@react-pdf/types": "^2.6.0", - "abs-svg-path": "^0.1.1", - "color-string": "^1.9.1", - "normalize-svg-path": "^1.1.0", - "parse-svg-path": "^0.1.2", - "svg-arc-to-cubic-bezier": "^3.2.0" - } - }, - "node_modules/@react-pdf/renderer": { - "version": "3.4.5", - "resolved": "https://registry.npmjs.org/@react-pdf/renderer/-/renderer-3.4.5.tgz", - "integrity": "sha512-O1N8q45bTs7YuC+x9afJSKQWDYQy2RjoCxlxEGdbCwP+WD5G6dWRUWXlc8F0TtzU3uFglYMmDab2YhXTmnVN9g==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.13", - "@react-pdf/font": "^2.5.2", - "@react-pdf/layout": "^3.13.0", - "@react-pdf/pdfkit": "^3.2.0", - "@react-pdf/primitives": "^3.1.1", - "@react-pdf/render": "^3.5.0", - "@react-pdf/types": "^2.6.0", - "events": "^3.3.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "queue": "^6.0.1", - "scheduler": "^0.17.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" - } - }, - "node_modules/@react-pdf/stylesheet": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@react-pdf/stylesheet/-/stylesheet-4.3.0.tgz", - "integrity": "sha512-x7IVZOqRrUum9quuDeFXBveXwBht+z/6B0M+z4a4XjfSg1vZVvzoTl07Oa1yvQ/4yIC5yIkG2TSMWeKnDB+hrw==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.13", - "@react-pdf/fns": "2.2.1", - "@react-pdf/types": "^2.6.0", - "color-string": "^1.9.1", - "hsl-to-hex": "^1.0.0", - "media-engine": "^1.0.3", - "postcss-value-parser": "^4.1.0" - } - }, - "node_modules/@react-pdf/textkit": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@react-pdf/textkit/-/textkit-4.4.1.tgz", - "integrity": "sha512-Jl9wdTqIvJ5pX+vAGz0EOhP7ut5Two9H6CzTKo/YYPeD79cM2yTXF3JzTERBC28y7LR0Waq9D2LHQjI+b/EYUQ==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.20.13", - "@react-pdf/fns": "2.2.1", - "bidi-js": "^1.0.2", - "hyphen": "^1.6.4", - "unicode-properties": "^1.4.1" - } - }, - "node_modules/@react-pdf/types": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@react-pdf/types/-/types-2.9.2.tgz", - "integrity": "sha512-dufvpKId9OajLLbgn9q7VLUmyo1Jf+iyGk2ZHmCL8nIDtL8N1Ejh9TH7+pXXrR0tdie1nmnEb5Bz9U7g4hI4/g==", - "license": "MIT", - "dependencies": { - "@react-pdf/font": "^4.0.4", - "@react-pdf/primitives": "^4.1.1", - "@react-pdf/stylesheet": "^6.1.2" - } - }, - "node_modules/@react-pdf/types/node_modules/@react-pdf/fns": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@react-pdf/fns/-/fns-3.1.2.tgz", "integrity": "sha512-qTKGUf0iAMGg2+OsUcp9ffKnKi41RukM/zYIWMDJ4hRVYSr89Q7e3wSDW/Koqx3ea3Uy/z3h2y3wPX6Bdfxk6g==", "license": "MIT" }, - "node_modules/@react-pdf/types/node_modules/@react-pdf/font": { + "node_modules/@react-pdf/font": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@react-pdf/font/-/font-4.0.4.tgz", "integrity": "sha512-8YtgGtL511txIEc9AjiilpZ7yjid8uCd8OGUl6jaL3LIHnrToUupSN4IzsMQpVTCMYiDLFnDNQzpZsOYtRS/Pg==", @@ -3059,7 +2895,34 @@ "is-url": "^1.2.4" } }, - "node_modules/@react-pdf/types/node_modules/@react-pdf/pdfkit": { + "node_modules/@react-pdf/image": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@react-pdf/image/-/image-3.0.4.tgz", + "integrity": "sha512-z0ogVQE0bKqgXQ5smgzIU857rLV7bMgVdrYsu3UfXDDLSzI7QPvzf6MFTFllX6Dx2rcsF13E01dqKPtJEM799g==", + "license": "MIT", + "dependencies": { + "@react-pdf/png-js": "^3.0.0", + "jay-peg": "^1.1.1" + } + }, + "node_modules/@react-pdf/layout": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/@react-pdf/layout/-/layout-4.4.2.tgz", + "integrity": "sha512-gNu2oh8MiGR+NJZYTJ4c4q0nWCESBI6rKFiodVhE7OeVAjtzZzd6l65wsN7HXdWJqOZD3ttD97iE+tf5SOd/Yg==", + "license": "MIT", + "dependencies": { + "@react-pdf/fns": "3.1.2", + "@react-pdf/image": "^3.0.4", + "@react-pdf/primitives": "^4.1.1", + "@react-pdf/stylesheet": "^6.1.2", + "@react-pdf/textkit": "^6.1.0", + "@react-pdf/types": "^2.9.2", + "emoji-regex-xs": "^1.0.0", + "queue": "^6.0.1", + "yoga-layout": "^3.2.1" + } + }, + "node_modules/@react-pdf/pdfkit": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/@react-pdf/pdfkit/-/pdfkit-4.1.0.tgz", "integrity": "sha512-Wm/IOAv0h/U5Ra94c/PltFJGcpTUd/fwVMVeFD6X9tTTPCttIwg0teRG1Lqq617J8K4W7jpL/B0HTH0mjp3QpQ==", @@ -3075,7 +2938,7 @@ "vite-compatible-readable-stream": "^3.6.1" } }, - "node_modules/@react-pdf/types/node_modules/@react-pdf/png-js": { + "node_modules/@react-pdf/png-js": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@react-pdf/png-js/-/png-js-3.0.0.tgz", "integrity": "sha512-eSJnEItZ37WPt6Qv5pncQDxLJRK15eaRwPT+gZoujP548CodenOVp49GST8XJvKMFt9YqIBzGBV/j9AgrOQzVA==", @@ -3084,13 +2947,68 @@ "browserify-zlib": "^0.2.0" } }, - "node_modules/@react-pdf/types/node_modules/@react-pdf/primitives": { + "node_modules/@react-pdf/primitives": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/@react-pdf/primitives/-/primitives-4.1.1.tgz", "integrity": "sha512-IuhxYls1luJb7NUWy6q5avb1XrNaVj9bTNI40U9qGRuS6n7Hje/8H8Qi99Z9UKFV74bBP3DOf3L1wV2qZVgVrQ==", "license": "MIT" }, - "node_modules/@react-pdf/types/node_modules/@react-pdf/stylesheet": { + "node_modules/@react-pdf/reconciler": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@react-pdf/reconciler/-/reconciler-2.0.0.tgz", + "integrity": "sha512-7zaPRujpbHSmCpIrZ+b9HSTJHthcVZzX0Wx7RzvQGsGBUbHP4p6s5itXrAIOuQuPvDepoHGNOvf6xUuMVvdoyw==", + "license": "MIT", + "dependencies": { + "object-assign": "^4.1.1", + "scheduler": "0.25.0-rc-603e6108-20241029" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/@react-pdf/render": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@react-pdf/render/-/render-4.3.2.tgz", + "integrity": "sha512-el5KYM1sH/PKcO4tRCIm8/AIEmhtraaONbwCrBhFdehoGv6JtgnXiMxHGAvZbI5kEg051GbyP+XIU6f6YbOu6Q==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.20.13", + "@react-pdf/fns": "3.1.2", + "@react-pdf/primitives": "^4.1.1", + "@react-pdf/textkit": "^6.1.0", + "@react-pdf/types": "^2.9.2", + "abs-svg-path": "^0.1.1", + "color-string": "^1.9.1", + "normalize-svg-path": "^1.1.0", + "parse-svg-path": "^0.1.2", + "svg-arc-to-cubic-bezier": "^3.2.0" + } + }, + "node_modules/@react-pdf/renderer": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@react-pdf/renderer/-/renderer-4.3.2.tgz", + "integrity": "sha512-EhPkj35gO9rXIyyx29W3j3axemvVY5RigMmlK4/6Ku0pXB8z9PEE/sz4ZBOShu2uot6V4xiCR3aG+t9IjJJlBQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.20.13", + "@react-pdf/fns": "3.1.2", + "@react-pdf/font": "^4.0.4", + "@react-pdf/layout": "^4.4.2", + "@react-pdf/pdfkit": "^4.1.0", + "@react-pdf/primitives": "^4.1.1", + "@react-pdf/reconciler": "^2.0.0", + "@react-pdf/render": "^4.3.2", + "@react-pdf/types": "^2.9.2", + "events": "^3.3.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "queue": "^6.0.1" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/@react-pdf/stylesheet": { "version": "6.1.2", "resolved": "https://registry.npmjs.org/@react-pdf/stylesheet/-/stylesheet-6.1.2.tgz", "integrity": "sha512-E3ftGRYUQGKiN3JOgtGsLDo0hGekA6dmkmi/MYACytmPTKxQRBSO3126MebmCq+t1rgU9uRlREIEawJ+8nzSbw==", @@ -3104,6 +3022,29 @@ "postcss-value-parser": "^4.1.0" } }, + "node_modules/@react-pdf/textkit": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@react-pdf/textkit/-/textkit-6.1.0.tgz", + "integrity": "sha512-sFlzDC9CDFrJsnL3B/+NHrk9+Advqk7iJZIStiYQDdskbow8GF/AGYrpIk+vWSnh35YxaGbHkqXq53XOxnyrjQ==", + "license": "MIT", + "dependencies": { + "@react-pdf/fns": "3.1.2", + "bidi-js": "^1.0.2", + "hyphen": "^1.6.4", + "unicode-properties": "^1.4.1" + } + }, + "node_modules/@react-pdf/types": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/@react-pdf/types/-/types-2.9.2.tgz", + "integrity": "sha512-dufvpKId9OajLLbgn9q7VLUmyo1Jf+iyGk2ZHmCL8nIDtL8N1Ejh9TH7+pXXrR0tdie1nmnEb5Bz9U7g4hI4/g==", + "license": "MIT", + "dependencies": { + "@react-pdf/font": "^4.0.4", + "@react-pdf/primitives": "^4.1.1", + "@react-pdf/stylesheet": "^6.1.2" + } + }, "node_modules/@rtsao/scc": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", @@ -4753,15 +4694,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/cross-fetch": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.2.0.tgz", - "integrity": "sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==", - "license": "MIT", - "dependencies": { - "node-fetch": "^2.7.0" - } - }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -5082,10 +5014,10 @@ "dev": true, "license": "ISC" }, - "node_modules/emoji-regex": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "node_modules/emoji-regex-xs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz", + "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==", "license": "MIT" }, "node_modules/engine.io": { @@ -7747,26 +7679,6 @@ "semver": "bin/semver.js" } }, - "node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "license": "MIT", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/node-releases": { "version": "2.0.27", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz", @@ -9043,14 +8955,10 @@ } }, "node_modules/scheduler": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.17.0.tgz", - "integrity": "sha512-7rro8Io3tnCPuY4la/NuI5F2yfESpnfZyT6TtkXnSWVkcu0BCDJ+8gk5ozUaFaxpIyNuWAPXrH0yFcSi28fnDA==", - "license": "MIT", - "dependencies": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } + "version": "0.25.0-rc-603e6108-20241029", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0-rc-603e6108-20241029.tgz", + "integrity": "sha512-pFwF6H1XrSdYYNLfOcGlM28/j8CGLu8IvdrxqhjWULe2bPcKiKW4CV+OWqR/9fT52mywx65l7ysNkjLKBda7eA==", + "license": "MIT" }, "node_modules/selecto": { "version": "1.26.3", @@ -9897,12 +9805,6 @@ "node": ">=8.0" } }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "license": "MIT" - }, "node_modules/ts-api-utils": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz", @@ -10346,22 +10248,6 @@ "@zxing/text-encoding": "0.9.0" } }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "license": "BSD-2-Clause" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "license": "MIT", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -10667,9 +10553,9 @@ } }, "node_modules/yoga-layout": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/yoga-layout/-/yoga-layout-2.0.1.tgz", - "integrity": "sha512-tT/oChyDXelLo2A+UVnlW9GU7CsvFMaEnd9kVFsaiCQonFAXd3xrHhkLYu+suwwosrAEQ746xBU+HvYtm1Zs2Q==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/yoga-layout/-/yoga-layout-3.2.1.tgz", + "integrity": "sha512-0LPOt3AxKqMdFBZA3HBAt/t/8vIKq7VaQYbuA8WxCgung+p9TVyKRYdpvCb80HcdTN2NkbIKbhNwKUfm3tQywQ==", "license": "MIT" }, "node_modules/zod": { diff --git a/package.json b/package.json index 26da5f0..04c1a14 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lageplan", - "version": "1.0.1", + "version": "1.0.2", "description": "Feuerwehr Lageplan - Krokier-App für Einsatzdokumentation", "private": true, "scripts": { @@ -34,7 +34,7 @@ "@radix-ui/react-tabs": "^1.1.0", "@radix-ui/react-toast": "^1.2.0", "@radix-ui/react-tooltip": "^1.1.0", - "@react-pdf/renderer": "^3.4.4", + "@react-pdf/renderer": "^4.3.2", "bcryptjs": "^2.4.3", "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", diff --git a/src/app/api/projects/[id]/features/route.ts b/src/app/api/projects/[id]/features/route.ts index a97b5ae..d59b3ee 100644 --- a/src/app/api/projects/[id]/features/route.ts +++ b/src/app/api/projects/[id]/features/route.ts @@ -6,21 +6,22 @@ import { getProjectWithTenantCheck } from '@/lib/tenant' export async function GET( request: NextRequest, - { params }: { params: { id: string } } + { params }: { params: Promise<{ id: string }> } ) { try { + const { id } = await params const user = await getSession() if (!user) { return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) } - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) { return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) } const features = await (prisma as any).feature.findMany({ - where: { projectId: params.id }, + where: { projectId: id }, orderBy: { createdAt: 'asc' }, }) @@ -33,9 +34,10 @@ export async function GET( export async function POST( request: NextRequest, - { params }: { params: { id: string } } + { params }: { params: Promise<{ id: string }> } ) { try { + const { id } = await params const user = await getSession() if (!user) { return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) @@ -45,7 +47,7 @@ export async function POST( return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) } - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) { return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) } @@ -66,7 +68,7 @@ export async function POST( const feature = await (prisma as any).feature.create({ data: { - projectId: params.id, + projectId: id, type: validated.data.type, geometry: validated.data.geometry, properties: validated.data.properties || {}, @@ -82,9 +84,10 @@ export async function POST( export async function PUT( request: NextRequest, - { params }: { params: { id: string } } + { params }: { params: Promise<{ id: string }> } ) { try { + const { id } = await params const user = await getSession() if (!user) { return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) @@ -94,11 +97,11 @@ export async function PUT( return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) } - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) { - const exists = await (prisma as any).project.findUnique({ where: { id: params.id }, select: { id: true, tenantId: true, ownerId: true } }) + const exists = await (prisma as any).project.findUnique({ where: { id }, select: { id: true, tenantId: true, ownerId: true } }) if (!exists) { - console.warn(`[Features PUT] Project ${params.id} not in DB`) + console.warn(`[Features PUT] Project ${id} not in DB`) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) } console.warn(`[Features PUT] Access denied: user=${user.id} tenant=${user.tenantId}, project owner=${exists.ownerId} tenant=${exists.tenantId}`) @@ -113,13 +116,13 @@ export async function PUT( const { features } = body as { features: Array<{ id?: string; type: string; geometry: object; properties?: object }> } await (prisma as any).feature.deleteMany({ - where: { projectId: params.id }, + where: { projectId: id }, }) if (features && features.length > 0) { await (prisma as any).feature.createMany({ data: features.map((f: any) => ({ - projectId: params.id, + projectId: id, type: f.type, geometry: f.geometry, properties: f.properties || {}, @@ -128,7 +131,7 @@ export async function PUT( } const updatedFeatures = await (prisma as any).feature.findMany({ - where: { projectId: params.id }, + where: { projectId: id }, }) return NextResponse.json({ features: updatedFeatures }) diff --git a/src/app/api/projects/[id]/journal/check-items/[itemId]/route.ts b/src/app/api/projects/[id]/journal/check-items/[itemId]/route.ts index a2e5636..30b53c1 100644 --- a/src/app/api/projects/[id]/journal/check-items/[itemId]/route.ts +++ b/src/app/api/projects/[id]/journal/check-items/[itemId]/route.ts @@ -4,18 +4,19 @@ import { getSession } from '@/lib/auth' import { getProjectWithTenantCheck } from '@/lib/tenant' // PUT: Toggle confirmed/ok on a check item -export async function PUT(req: NextRequest, { params }: { params: { id: string; itemId: string } }) { +export async function PUT(req: NextRequest, { params }: { params: Promise<{ id: string; itemId: string }> }) { try { + const { id, itemId } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) if (user.role === 'VIEWER') return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) // Verify item belongs to this project const existing = await (prisma as any).journalCheckItem.findFirst({ - where: { id: params.itemId, projectId: params.id }, + where: { id: itemId, projectId: id }, }) if (!existing) return NextResponse.json({ error: 'Element nicht gefunden' }, { status: 404 }) @@ -32,7 +33,7 @@ export async function PUT(req: NextRequest, { params }: { params: { id: string; } const item = await (prisma as any).journalCheckItem.update({ - where: { id: params.itemId }, + where: { id: itemId }, data, }) return NextResponse.json(item) @@ -43,22 +44,23 @@ export async function PUT(req: NextRequest, { params }: { params: { id: string; } // DELETE -export async function DELETE(req: NextRequest, { params }: { params: { id: string; itemId: string } }) { +export async function DELETE(req: NextRequest, { params }: { params: Promise<{ id: string; itemId: string }> }) { try { + const { id, itemId } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) if (user.role === 'VIEWER') return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) // Verify item belongs to this project const existing = await (prisma as any).journalCheckItem.findFirst({ - where: { id: params.itemId, projectId: params.id }, + where: { id: itemId, projectId: id }, }) if (!existing) return NextResponse.json({ error: 'Element nicht gefunden' }, { status: 404 }) - await (prisma as any).journalCheckItem.delete({ where: { id: params.itemId } }) + await (prisma as any).journalCheckItem.delete({ where: { id: itemId } }) return NextResponse.json({ ok: true }) } catch (error) { console.error('Error deleting check item:', error) diff --git a/src/app/api/projects/[id]/journal/check-items/route.ts b/src/app/api/projects/[id]/journal/check-items/route.ts index 05e0115..ad06a88 100644 --- a/src/app/api/projects/[id]/journal/check-items/route.ts +++ b/src/app/api/projects/[id]/journal/check-items/route.ts @@ -4,13 +4,14 @@ import { getSession } from '@/lib/auth' import { getProjectWithTenantCheck } from '@/lib/tenant' // POST: Add check item (or initialize from templates) -export async function POST(req: NextRequest, { params }: { params: { id: string } }) { +export async function POST(req: NextRequest, { params }: { params: Promise<{ id: string }> }) { try { + const { id } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) if (user.role === 'VIEWER') return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) const body = await req.json() @@ -18,7 +19,7 @@ export async function POST(req: NextRequest, { params }: { params: { id: string // If 'initFromTemplates' is true, create check items from templates (only if none exist) if (body.initFromTemplates) { const existing = await (prisma as any).journalCheckItem.findMany({ - where: { projectId: params.id }, + where: { projectId: id }, }) if (existing.length > 0) { return NextResponse.json(existing) @@ -31,7 +32,7 @@ export async function POST(req: NextRequest, { params }: { params: { id: string templates.map((tpl: any, i: number) => (prisma as any).journalCheckItem.create({ data: { - projectId: params.id, + projectId: id, label: tpl.label, sortOrder: i, }, @@ -44,7 +45,7 @@ export async function POST(req: NextRequest, { params }: { params: { id: string // Single item creation const item = await (prisma as any).journalCheckItem.create({ data: { - projectId: params.id, + projectId: id, label: body.label || '', sortOrder: body.sortOrder || 0, }, diff --git a/src/app/api/projects/[id]/journal/entries/[entryId]/route.ts b/src/app/api/projects/[id]/journal/entries/[entryId]/route.ts index 06e71c4..bc526d9 100644 --- a/src/app/api/projects/[id]/journal/entries/[entryId]/route.ts +++ b/src/app/api/projects/[id]/journal/entries/[entryId]/route.ts @@ -4,17 +4,18 @@ import { getSession } from '@/lib/auth' import { getProjectWithTenantCheck } from '@/lib/tenant' // PUT: Update a journal entry — only toggle done status allowed directly -export async function PUT(req: NextRequest, { params }: { params: { id: string; entryId: string } }) { +export async function PUT(req: NextRequest, { params }: { params: Promise<{ id: string; entryId: string }> }) { try { + const { id, entryId } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) if (user.role === 'VIEWER') return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) const existing = await (prisma as any).journalEntry.findFirst({ - where: { id: params.entryId, projectId: params.id }, + where: { id: entryId, projectId: id }, }) if (!existing) return NextResponse.json({ error: 'Eintrag nicht gefunden' }, { status: 404 }) @@ -23,7 +24,7 @@ export async function PUT(req: NextRequest, { params }: { params: { id: string; // Only done toggle is allowed as direct edit if (body.done !== undefined) { const entry = await (prisma as any).journalEntry.update({ - where: { id: params.entryId }, + where: { id: entryId }, data: { done: body.done, doneAt: body.done ? new Date() : null }, }) return NextResponse.json(entry) @@ -38,17 +39,18 @@ export async function PUT(req: NextRequest, { params }: { params: { id: string; // POST: Create a correction for a journal entry (replaces DELETE) // Marks the original as corrected (strikethrough) and creates a new correction entry below it -export async function POST(req: NextRequest, { params }: { params: { id: string; entryId: string } }) { +export async function POST(req: NextRequest, { params }: { params: Promise<{ id: string; entryId: string }> }) { try { + const { id, entryId } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) if (user.role === 'VIEWER') return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) const existing = await (prisma as any).journalEntry.findFirst({ - where: { id: params.entryId, projectId: params.id }, + where: { id: entryId, projectId: id }, }) if (!existing) return NextResponse.json({ error: 'Eintrag nicht gefunden' }, { status: 404 }) @@ -69,7 +71,7 @@ export async function POST(req: NextRequest, { params }: { params: { id: string; // Mark original as corrected await (prisma as any).journalEntry.update({ - where: { id: params.entryId }, + where: { id: entryId }, data: { isCorrected: true }, }) @@ -81,7 +83,7 @@ export async function POST(req: NextRequest, { params }: { params: { id: string; who: body.who || existing.who || user.name, sortOrder: existing.sortOrder + 1, correctionOfId: existing.id, - projectId: params.id, + projectId: id, }, }) diff --git a/src/app/api/projects/[id]/journal/entries/route.ts b/src/app/api/projects/[id]/journal/entries/route.ts index ed28200..f33692e 100644 --- a/src/app/api/projects/[id]/journal/entries/route.ts +++ b/src/app/api/projects/[id]/journal/entries/route.ts @@ -4,19 +4,20 @@ import { getSession } from '@/lib/auth' import { getProjectWithTenantCheck } from '@/lib/tenant' // POST: Add a new journal entry -export async function POST(req: NextRequest, { params }: { params: { id: string } }) { +export async function POST(req: NextRequest, { params }: { params: Promise<{ id: string }> }) { try { + const { id } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) if (user.role === 'VIEWER') return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) const body = await req.json() const entry = await (prisma as any).journalEntry.create({ data: { - projectId: params.id, + projectId: id, time: body.time ? new Date(body.time) : new Date(), what: body.what || '', who: body.who || null, diff --git a/src/app/api/projects/[id]/journal/pendenzen/[pendenzId]/route.ts b/src/app/api/projects/[id]/journal/pendenzen/[pendenzId]/route.ts index c75b183..a74f14c 100644 --- a/src/app/api/projects/[id]/journal/pendenzen/[pendenzId]/route.ts +++ b/src/app/api/projects/[id]/journal/pendenzen/[pendenzId]/route.ts @@ -4,18 +4,19 @@ import { getSession } from '@/lib/auth' import { getProjectWithTenantCheck } from '@/lib/tenant' // PUT: Update a pendenz -export async function PUT(req: NextRequest, { params }: { params: { id: string; pendenzId: string } }) { +export async function PUT(req: NextRequest, { params }: { params: Promise<{ id: string; pendenzId: string }> }) { try { + const { id, pendenzId } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) if (user.role === 'VIEWER') return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) // Verify pendenz belongs to this project const existing = await (prisma as any).journalPendenz.findFirst({ - where: { id: params.pendenzId, projectId: params.id }, + where: { id: pendenzId, projectId: id }, }) if (!existing) return NextResponse.json({ error: 'Pendenz nicht gefunden' }, { status: 404 }) @@ -30,7 +31,7 @@ export async function PUT(req: NextRequest, { params }: { params: { id: string; } const item = await (prisma as any).journalPendenz.update({ - where: { id: params.pendenzId }, + where: { id: pendenzId }, data, }) return NextResponse.json(item) @@ -41,22 +42,23 @@ export async function PUT(req: NextRequest, { params }: { params: { id: string; } // DELETE -export async function DELETE(req: NextRequest, { params }: { params: { id: string; pendenzId: string } }) { +export async function DELETE(req: NextRequest, { params }: { params: Promise<{ id: string; pendenzId: string }> }) { try { + const { id, pendenzId } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) if (user.role === 'VIEWER') return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) // Verify pendenz belongs to this project const existing = await (prisma as any).journalPendenz.findFirst({ - where: { id: params.pendenzId, projectId: params.id }, + where: { id: pendenzId, projectId: id }, }) if (!existing) return NextResponse.json({ error: 'Pendenz nicht gefunden' }, { status: 404 }) - await (prisma as any).journalPendenz.delete({ where: { id: params.pendenzId } }) + await (prisma as any).journalPendenz.delete({ where: { id: pendenzId } }) return NextResponse.json({ ok: true }) } catch (error) { console.error('Error deleting pendenz:', error) diff --git a/src/app/api/projects/[id]/journal/pendenzen/route.ts b/src/app/api/projects/[id]/journal/pendenzen/route.ts index 482b6c5..250f0c2 100644 --- a/src/app/api/projects/[id]/journal/pendenzen/route.ts +++ b/src/app/api/projects/[id]/journal/pendenzen/route.ts @@ -4,19 +4,20 @@ import { getSession } from '@/lib/auth' import { getProjectWithTenantCheck } from '@/lib/tenant' // POST: Add a new pendenz -export async function POST(req: NextRequest, { params }: { params: { id: string } }) { +export async function POST(req: NextRequest, { params }: { params: Promise<{ id: string }> }) { try { + const { id } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) if (user.role === 'VIEWER') return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) const body = await req.json() const item = await (prisma as any).journalPendenz.create({ data: { - projectId: params.id, + projectId: id, what: body.what || '', who: body.who || null, whenHow: body.whenHow || null, diff --git a/src/app/api/projects/[id]/journal/route.ts b/src/app/api/projects/[id]/journal/route.ts index a158267..5a05890 100644 --- a/src/app/api/projects/[id]/journal/route.ts +++ b/src/app/api/projects/[id]/journal/route.ts @@ -4,25 +4,26 @@ import { getSession } from '@/lib/auth' import { getProjectWithTenantCheck } from '@/lib/tenant' // GET all journal data for a project (entries, check items, pendenzen) -export async function GET(req: NextRequest, { params }: { params: { id: string } }) { +export async function GET(req: NextRequest, { params }: { params: Promise<{ id: string }> }) { try { + const { id } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) const [entries, checkItems, pendenzen] = await Promise.all([ (prisma as any).journalEntry.findMany({ - where: { projectId: params.id }, + where: { projectId: id }, orderBy: [{ time: 'asc' }, { sortOrder: 'asc' }, { createdAt: 'asc' }], }), (prisma as any).journalCheckItem.findMany({ - where: { projectId: params.id }, + where: { projectId: id }, orderBy: { sortOrder: 'asc' }, }), (prisma as any).journalPendenz.findMany({ - where: { projectId: params.id }, + where: { projectId: id }, orderBy: { sortOrder: 'asc' }, }), ]) diff --git a/src/app/api/projects/[id]/journal/send-report/route.ts b/src/app/api/projects/[id]/journal/send-report/route.ts index ffff7ce..f1290de 100644 --- a/src/app/api/projects/[id]/journal/send-report/route.ts +++ b/src/app/api/projects/[id]/journal/send-report/route.ts @@ -4,12 +4,13 @@ import { getSession } from '@/lib/auth' import { getProjectWithTenantCheck } from '@/lib/tenant' import { sendEmail } from '@/lib/email' -export async function POST(req: NextRequest, { params }: { params: { id: string } }) { +export async function POST(req: NextRequest, { params }: { params: Promise<{ id: string }> }) { try { + const { id } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) // Load tenant logo @@ -32,17 +33,17 @@ export async function POST(req: NextRequest, { params }: { params: { id: string // Load journal data const entries = await (prisma as any).journalEntry.findMany({ - where: { projectId: params.id }, + where: { projectId: id }, orderBy: [{ time: 'asc' }, { sortOrder: 'asc' }], }) const checkItems = await (prisma as any).journalCheckItem.findMany({ - where: { projectId: params.id }, + where: { projectId: id }, orderBy: { sortOrder: 'asc' }, }) const pendenzen = await (prisma as any).journalPendenz.findMany({ - where: { projectId: params.id }, + where: { projectId: id }, orderBy: { sortOrder: 'asc' }, }) diff --git a/src/app/api/projects/[id]/plan-image/route.ts b/src/app/api/projects/[id]/plan-image/route.ts index b9532ac..2d25dca 100644 --- a/src/app/api/projects/[id]/plan-image/route.ts +++ b/src/app/api/projects/[id]/plan-image/route.ts @@ -5,13 +5,14 @@ import { getProjectWithTenantCheck } from '@/lib/tenant' import { uploadFile, deleteFile, getFileUrl } from '@/lib/minio' // POST: Upload a plan image for a project -export async function POST(req: NextRequest, { params }: { params: { id: string } }) { +export async function POST(req: NextRequest, { params }: { params: Promise<{ id: string }> }) { try { + const { id } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) if (user.role === 'VIEWER') return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) const formData = await req.formData() @@ -37,7 +38,7 @@ export async function POST(req: NextRequest, { params }: { params: { id: string // Upload to MinIO const buffer = Buffer.from(await file.arrayBuffer()) const ext = file.name.split('.').pop() || 'png' - const fileKey = `plans/${params.id}/${Date.now()}.${ext}` + const fileKey = `plans/${id}/${Date.now()}.${ext}` await uploadFile(fileKey, buffer, file.type) // Parse bounds or use default (current map view) @@ -48,7 +49,7 @@ export async function POST(req: NextRequest, { params }: { params: { id: string // Update project await (prisma as any).project.update({ - where: { id: params.id }, + where: { id }, data: { planImageKey: fileKey, planBounds: bounds, @@ -70,13 +71,14 @@ export async function POST(req: NextRequest, { params }: { params: { id: string } // DELETE: Remove the plan image -export async function DELETE(req: NextRequest, { params }: { params: { id: string } }) { +export async function DELETE(req: NextRequest, { params }: { params: Promise<{ id: string }> }) { try { + const { id } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) if (user.role === 'VIEWER') return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) const p = project as any @@ -85,7 +87,7 @@ export async function DELETE(req: NextRequest, { params }: { params: { id: strin } await (prisma as any).project.update({ - where: { id: params.id }, + where: { id }, data: { planImageKey: null, planBounds: null }, }) @@ -97,19 +99,20 @@ export async function DELETE(req: NextRequest, { params }: { params: { id: strin } // PATCH: Update plan bounds (repositioning) -export async function PATCH(req: NextRequest, { params }: { params: { id: string } }) { +export async function PATCH(req: NextRequest, { params }: { params: Promise<{ id: string }> }) { try { + const { id } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) - const project = await getProjectWithTenantCheck(params.id, user) + const project = await getProjectWithTenantCheck(id, user) if (!project) return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) const body = await req.json() if (!body.bounds) return NextResponse.json({ error: 'Bounds erforderlich' }, { status: 400 }) await (prisma as any).project.update({ - where: { id: params.id }, + where: { id }, data: { planBounds: body.bounds }, }) diff --git a/src/app/api/projects/[id]/plan-image/serve/route.ts b/src/app/api/projects/[id]/plan-image/serve/route.ts index 7641cfc..b178342 100644 --- a/src/app/api/projects/[id]/plan-image/serve/route.ts +++ b/src/app/api/projects/[id]/plan-image/serve/route.ts @@ -4,13 +4,14 @@ import { getSession } from '@/lib/auth' import { getFileStream } from '@/lib/minio' // Serve plan image (authenticated users only) -export async function GET(req: NextRequest, { params }: { params: { id: string } }) { +export async function GET(req: NextRequest, { params }: { params: Promise<{ id: string }> }) { try { + const { id } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) const project = await (prisma as any).project.findUnique({ - where: { id: params.id }, + where: { id }, select: { planImageKey: true }, }) diff --git a/src/app/api/projects/[id]/route.ts b/src/app/api/projects/[id]/route.ts index de735a8..eb6890c 100644 --- a/src/app/api/projects/[id]/route.ts +++ b/src/app/api/projects/[id]/route.ts @@ -6,22 +6,23 @@ import { getProjectWithTenantCheck } from '@/lib/tenant' export async function GET( request: NextRequest, - { params }: { params: { id: string } } + { params }: { params: Promise<{ id: string }> } ) { try { + const { id } = await params const user = await getSession() if (!user) { return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) } - const projectBase = await getProjectWithTenantCheck(params.id, user) + const projectBase = await getProjectWithTenantCheck(id, user) if (!projectBase) { return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) } // Re-fetch with includes const project = await (prisma as any).project.findUnique({ - where: { id: params.id }, + where: { id }, include: { owner: { select: { id: true, name: true, email: true }, @@ -39,9 +40,10 @@ export async function GET( export async function PATCH( request: NextRequest, - { params }: { params: { id: string } } + { params }: { params: Promise<{ id: string }> } ) { try { + const { id } = await params const user = await getSession() if (!user) { return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) @@ -51,7 +53,7 @@ export async function PATCH( return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) } - const existingProject = await getProjectWithTenantCheck(params.id, user) + const existingProject = await getProjectWithTenantCheck(id, user) if (!existingProject) { return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) } @@ -67,7 +69,7 @@ export async function PATCH( } const project = await (prisma as any).project.update({ - where: { id: params.id }, + where: { id }, data: validated.data, }) @@ -80,15 +82,16 @@ export async function PATCH( export async function DELETE( request: NextRequest, - { params }: { params: { id: string } } + { params }: { params: Promise<{ id: string }> } ) { try { + const { id } = await params const user = await getSession() if (!user) { return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) } - const existingProject = await getProjectWithTenantCheck(params.id, user) + const existingProject = await getProjectWithTenantCheck(id, user) if (!existingProject) { return NextResponse.json({ error: 'Projekt nicht gefunden' }, { status: 404 }) } @@ -99,7 +102,7 @@ export async function DELETE( } await (prisma as any).project.delete({ - where: { id: params.id }, + where: { id }, }) return NextResponse.json({ success: true }) diff --git a/src/app/api/rapports/[token]/pdf/route.ts b/src/app/api/rapports/[token]/pdf/route.ts index 3d3e756..7f916e1 100644 --- a/src/app/api/rapports/[token]/pdf/route.ts +++ b/src/app/api/rapports/[token]/pdf/route.ts @@ -40,10 +40,11 @@ async function resolveLogoDataUri(rapport: any): Promise { } // GET: Generate and serve PDF for a rapport (public, token-based) -export async function GET(req: NextRequest, { params }: { params: { token: string } }) { +export async function GET(req: NextRequest, { params }: { params: Promise<{ token: string }> }) { try { + const { token } = await params const rapport = await (prisma as any).rapport.findUnique({ - where: { token: params.token }, + where: { token }, include: { tenant: { select: { name: true } }, }, @@ -68,10 +69,10 @@ export async function GET(req: NextRequest, { params }: { params: { token: strin const { RapportDocument } = await import('@/lib/rapport-pdf') const buffer = await renderToBuffer( - React.createElement(RapportDocument, { data: pdfData }) + React.createElement(RapportDocument, { data: pdfData }) as any ) - return new NextResponse(buffer, { + return new NextResponse(Buffer.from(buffer) as any, { headers: { 'Content-Type': 'application/pdf', 'Content-Disposition': `inline; filename="Rapport-${rapport.reportNumber}.pdf"`, diff --git a/src/app/api/rapports/[token]/route.ts b/src/app/api/rapports/[token]/route.ts index caa053c..634c6b2 100644 --- a/src/app/api/rapports/[token]/route.ts +++ b/src/app/api/rapports/[token]/route.ts @@ -37,10 +37,11 @@ async function resolveLogoForClient(rapport: any): Promise { } // GET: Public access to rapport by token (no auth required) -export async function GET(req: NextRequest, { params }: { params: { token: string } }) { +export async function GET(req: NextRequest, { params }: { params: Promise<{ token: string }> }) { try { + const { token } = await params const rapport = await (prisma as any).rapport.findUnique({ - where: { token: params.token }, + where: { token }, include: { project: { select: { title: true, location: true } }, tenant: { select: { name: true } }, diff --git a/src/app/api/rapports/[token]/send/route.ts b/src/app/api/rapports/[token]/send/route.ts index cdff64e..ecea50b 100644 --- a/src/app/api/rapports/[token]/send/route.ts +++ b/src/app/api/rapports/[token]/send/route.ts @@ -4,8 +4,9 @@ import { getSession } from '@/lib/auth' import { sendEmail } from '@/lib/email' // POST: Send rapport link via email -export async function POST(req: NextRequest, { params }: { params: { token: string } }) { +export async function POST(req: NextRequest, { params }: { params: Promise<{ token: string }> }) { try { + const { token } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) @@ -13,7 +14,7 @@ export async function POST(req: NextRequest, { params }: { params: { token: stri if (!email) return NextResponse.json({ error: 'E-Mail-Adresse erforderlich' }, { status: 400 }) const rapport = await (prisma as any).rapport.findUnique({ - where: { token: params.token }, + where: { token }, include: { tenant: { select: { name: true } }, project: { select: { title: true, location: true } }, diff --git a/src/app/api/tenants/[tenantId]/suggestions/route.ts b/src/app/api/tenants/[tenantId]/suggestions/route.ts index 7f0ef12..d91cd1b 100644 --- a/src/app/api/tenants/[tenantId]/suggestions/route.ts +++ b/src/app/api/tenants/[tenantId]/suggestions/route.ts @@ -5,9 +5,10 @@ import { getSession, isAdmin } from '@/lib/auth' // GET: Fetch journal suggestions for a tenant (global + tenant dictionary merged) export async function GET( req: NextRequest, - { params }: { params: { tenantId: string } } + { params }: { params: Promise<{ tenantId: string }> } ) { try { + const { tenantId } = await params const user = await getSession() if (!user) return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 401 }) @@ -18,11 +19,11 @@ export async function GET( select: { word: true }, }).catch(() => []), (prisma as any).dictionaryEntry.findMany({ - where: { scope: 'TENANT', tenantId: params.tenantId }, + where: { scope: 'TENANT', tenantId }, select: { word: true }, }).catch(() => []), (prisma as any).tenant.findUnique({ - where: { id: params.tenantId }, + where: { id: tenantId }, select: { journalSuggestions: true }, }), ]) @@ -46,16 +47,17 @@ export async function GET( // PUT: Replace all journal suggestions for a tenant (admin only) export async function PUT( req: NextRequest, - { params }: { params: { tenantId: string } } + { params }: { params: Promise<{ tenantId: string }> } ) { try { + const { tenantId } = await params const user = await getSession() if (!user || !isAdmin(user.role)) { return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 403 }) } // TENANT_ADMIN can only edit their own tenant - if (user.role !== 'SERVER_ADMIN' && user.tenantId !== params.tenantId) { + if (user.role !== 'SERVER_ADMIN' && user.tenantId !== tenantId) { return NextResponse.json({ error: 'Keine Berechtigung' }, { status: 403 }) } @@ -65,7 +67,7 @@ export async function PUT( : [] await (prisma as any).tenant.update({ - where: { id: params.tenantId }, + where: { id: tenantId }, data: { journalSuggestions: suggestions }, }) diff --git a/src/app/api/tenants/by-slug/[slug]/route.ts b/src/app/api/tenants/by-slug/[slug]/route.ts index f2a3fe3..baf7538 100644 --- a/src/app/api/tenants/by-slug/[slug]/route.ts +++ b/src/app/api/tenants/by-slug/[slug]/route.ts @@ -4,11 +4,12 @@ import { prisma } from '@/lib/db' // Public endpoint: get tenant info by slug (logo, name) export async function GET( req: NextRequest, - { params }: { params: { slug: string } } + { params }: { params: Promise<{ slug: string }> } ) { try { + const { slug } = await params const tenant = await (prisma as any).tenant.findUnique({ - where: { slug: params.slug }, + where: { slug }, select: { id: true, name: true, diff --git a/src/app/api/upgrade-requests/[id]/route.ts b/src/app/api/upgrade-requests/[id]/route.ts index 5e9be83..06af7ce 100644 --- a/src/app/api/upgrade-requests/[id]/route.ts +++ b/src/app/api/upgrade-requests/[id]/route.ts @@ -15,9 +15,10 @@ const processSchema = z.object({ // PATCH: Approve or reject an upgrade request (SERVER_ADMIN only) export async function PATCH( req: NextRequest, - { params }: { params: { id: string } } + { params }: { params: Promise<{ id: string }> } ) { try { + const { id } = await params const user = await getSession() if (!user || !isServerAdmin(user.role)) { return NextResponse.json({ error: 'Nicht autorisiert' }, { status: 403 }) @@ -31,7 +32,7 @@ export async function PATCH( // Get the request const upgradeReq = await (prisma as any).upgradeRequest.findUnique({ - where: { id: params.id }, + where: { id }, include: { tenant: { select: { id: true, name: true, plan: true, contactEmail: true } }, requestedBy: { select: { name: true, email: true } }, @@ -71,7 +72,7 @@ export async function PATCH( // Update request status await (prisma as any).upgradeRequest.update({ - where: { id: params.id }, + where: { id }, data: { status: 'APPROVED', adminNote: validated.data.adminNote || null, @@ -127,7 +128,7 @@ export async function PATCH( } else { // Reject await (prisma as any).upgradeRequest.update({ - where: { id: params.id }, + where: { id }, data: { status: 'REJECTED', adminNote: validated.data.adminNote || null, @@ -170,7 +171,7 @@ export async function PATCH( // Return updated request const updated = await (prisma as any).upgradeRequest.findUnique({ - where: { id: params.id }, + where: { id }, include: { tenant: { select: { name: true, slug: true, plan: true, subscriptionStatus: true } }, requestedBy: { select: { name: true, email: true } }, diff --git a/src/app/rapport/[token]/page.tsx b/src/app/rapport/[token]/page.tsx index 285f90d..2ddeea6 100644 --- a/src/app/rapport/[token]/page.tsx +++ b/src/app/rapport/[token]/page.tsx @@ -1,6 +1,6 @@ 'use client' -import { useState, useEffect } from 'react' +import { useState, useEffect, use } from 'react' import { Loader2, FileText, Download, Printer, MapPin, Send, CheckCircle, XCircle } from 'lucide-react' interface RapportViewData { @@ -13,7 +13,8 @@ interface RapportViewData { createdBy: { name: string } | null } -export default function RapportViewerPage({ params }: { params: { token: string } }) { +export default function RapportViewerPage({ params }: { params: Promise<{ token: string }> }) { + const { token } = use(params) const [rapport, setRapport] = useState(null) const [isLoading, setIsLoading] = useState(true) const [error, setError] = useState('') @@ -25,7 +26,7 @@ export default function RapportViewerPage({ params }: { params: { token: string useEffect(() => { async function load() { try { - const res = await fetch(`/api/rapports/${params.token}`) + const res = await fetch(`/api/rapports/${token}`) if (res.ok) { setRapport(await res.json()) } else { @@ -38,7 +39,7 @@ export default function RapportViewerPage({ params }: { params: { token: string } } load() - }, [params.token]) + }, [token]) if (isLoading) { return ( @@ -64,7 +65,7 @@ export default function RapportViewerPage({ params }: { params: { token: string } const d = rapport.data - const pdfUrl = `/api/rapports/${params.token}/pdf` + const pdfUrl = `/api/rapports/${token}/pdf` return (
@@ -119,7 +120,7 @@ export default function RapportViewerPage({ params }: { params: { token: string setEmailSending(true) setEmailStatus(null) try { - const res = await fetch(`/api/rapports/${params.token}/send`, { + const res = await fetch(`/api/rapports/${token}/send`, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ email: emailTo }),