Chore/20260428

.changeset/goofy-nails-shop.md

@@ -0,0 +1,6 @@
+---
+"@nmi-agro/fdm-core": patch
+"@nmi-agro/fdm-app": patch
+---
+
+In case Microsoft does not provide an email address at sign-in, ask users to use the magic link instead

.github/workflows/deploy-docs-test.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 10.33.0
+          version: 10.33.2
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:

.github/workflows/deploy-docs.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 10.33.0
+          version: 10.33.2
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 10.33.0
+          version: 10.33.2
 
       - name: Setup Node.js
         uses: actions/setup-node@v4

.github/workflows/tests.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Setup pnpm 10
         uses: pnpm/action-setup@v4
         with:
-          version: 10.33.0
+          version: 10.33.2
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
@@ -145,7 +145,7 @@ jobs:
       - name: Setup pnpm 10
         uses: pnpm/action-setup@v4
         with:
-          version: 10.33.0
+          version: 10.33.2
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
@@ -224,7 +224,7 @@ jobs:
       - name: Setup pnpm 10
         uses: pnpm/action-setup@v4
         with:
-          version: 10.33.0
+          version: 10.33.2
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
@@ -301,7 +301,7 @@ jobs:
       - name: Setup pnpm 10
         uses: pnpm/action-setup@v4
         with:
-          version: 10.33.0
+          version: 10.33.2
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
@@ -376,7 +376,7 @@ jobs:
       - name: Setup pnpm 10
         uses: pnpm/action-setup@v4
         with:
-          version: 10.33.0
+          version: 10.33.2
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4

.github/workflows/typecheck.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup pnpm 10
         uses: pnpm/action-setup@v4
         with:
-          version: 10.33.0
+          version: 10.33.2
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4

.npmrc

@@ -1,2 +1,3 @@
 sync-injected-deps-after-scripts[]=build
 link-workspace-packages=true
+public-hoist-pattern[]=*typedoc*

fdm-agents/package.json

@@ -25,11 +25,11 @@
     },
     "dependencies": {
         "@google/adk": "^0.6.1",
-        "@google/genai": "^1.48.0",
+        "@google/genai": "^1.50.1",
         "@nmi-agro/fdm-calculator": "workspace:^",
         "@nmi-agro/fdm-core": "workspace:^",
         "@nmi-agro/fdm-data": "workspace:^",
-        "posthog-node": "^5.29.0",
+        "posthog-node": "^5.30.6",
         "zod": "^3.25.76"
     },
     "engines": {

fdm-app/app/components/blocks/email/farm-invitation-cancelled.tsx

@@ -1,4 +1,4 @@
-import { Heading, Text } from "@react-email/components"
+import { Heading, Text } from "react-email"
 import BaseEmailLayout from "./layout"
 
 interface FarmInvitationCancelledEmailProps {
@@ -18,7 +18,7 @@ export const FarmInvitationCancelledEmail = ({
     appName,
     appBaseUrl,
     senderName,
-    logoFileName = "/fdm-high-resolution-logo-transparent.png",
+    logoFileName = "/fdm-high-resolution-logo-transparent-no-text.png",
 }: FarmInvitationCancelledEmailProps) => {
     const previewText = `Je uitnodiging voor ${farmName} is ingetrokken.`
 

fdm-app/app/components/blocks/email/farm-invitation-role-updated.tsx

@@ -1,4 +1,4 @@
-import { Button, Heading, Section, Text } from "@react-email/components"
+import { Button, Heading, Section, Text } from "react-email"
 import BaseEmailLayout from "./layout"
 
 interface FarmInvitationRoleUpdatedEmailProps {
@@ -26,7 +26,7 @@ export const FarmInvitationRoleUpdatedEmail = ({
     appName,
     appBaseUrl,
     senderName,
-    logoFileName = "/fdm-high-resolution-logo-transparent.png",
+    logoFileName = "/fdm-high-resolution-logo-transparent-no-text.png",
 }: FarmInvitationRoleUpdatedEmailProps) => {
     const roleLabel = roleLabels[newRole] ?? newRole
     const previewText = `Je uitnodiging voor ${farmName} is bijgewerkt. Je nieuwe rol is ${roleLabel}.`

fdm-app/app/components/blocks/email/farm-invitation.tsx

@@ -1,4 +1,4 @@
-import { Button, Heading, Link, Section, Text } from "@react-email/components"
+import { Button, Heading, Link, Section, Text } from "react-email"
 import BaseEmailLayout from "./layout"
 
 interface FarmInvitationEmailProps {
@@ -28,7 +28,7 @@ export const FarmInvitationEmail = ({
     appName,
     appBaseUrl,
     senderName,
-    logoFileName = "/fdm-high-resolution-logo-transparent.png",
+    logoFileName = "/fdm-high-resolution-logo-transparent-no-text.png",
     isUnregistered = false,
 }: FarmInvitationEmailProps) => {
     const roleLabel = roleLabels[role] ?? role

fdm-app/app/components/blocks/email/invitation.tsx

@@ -1,4 +1,4 @@
-import { Button, Heading, Link, Section, Text } from "@react-email/components"
+import { Button, Heading, Link, Section, Text } from "react-email"
 import BaseEmailLayout from "./layout"
 
 interface InvitationEmailProps {
@@ -20,7 +20,7 @@ export const InvitationEmail = ({
     appName,
     appBaseUrl,
     senderName,
-    logoFileName = "/fdm-high-resolution-logo-transparent.png",
+    logoFileName = "/fdm-high-resolution-logo-transparent-no-text.png",
 }: InvitationEmailProps) => {
     const previewText = `Accepteer de uitnodiging om samen te werken in ${organizationName}.`
     const baseUrl = appBaseUrl.startsWith("http")

fdm-app/app/components/blocks/email/layout.tsx

@@ -8,9 +8,9 @@ import {
     Link,
     Preview,
     Section,
+    Tailwind,
     Text,
-} from "@react-email/components"
-import { Tailwind } from "@react-email/tailwind"
+} from "react-email"
 import type * as React from "react"
 
 interface BaseEmailLayoutProps {
@@ -50,7 +50,7 @@ export const BaseEmailLayout = ({
     appName,
     appBaseUrl = "",
     senderName,
-    logoFileName = "/fdm-high-resolution-logo-transparent.png",
+    logoFileName = "/fdm-high-resolution-logo-transparent-no-text.png",
     preview,
     children,
     showLogo = true,

fdm-app/app/components/blocks/email/magic-link.tsx

@@ -1,4 +1,4 @@
-import { Button, Heading, Section, Text } from "@react-email/components"
+import { Button, Heading, Section, Text } from "react-email"
 import BaseEmailLayout from "./layout"
 
 interface MagicLinkEmailProps {

fdm-app/app/components/blocks/email/welcome.tsx

@@ -1,4 +1,4 @@
-import { Button, Heading, Hr, Section, Text } from "@react-email/components"
+import { Button, Heading, Hr, Section, Text } from "react-email"
 import BaseEmailLayout from "./layout"
 
 interface WelcomeEmailProps {
@@ -16,7 +16,7 @@ export function WelcomeEmail({
     appName,
     appBaseUrl = "",
     senderName,
-    logoFileName = "/fdm-high-resolution-logo-transparent.png",
+    logoFileName = "/fdm-high-resolution-logo-transparent-no-text.png",
 }: WelcomeEmailProps) {
     const previewText = "Ga aan de slag en krijg beter agronomisch inzicht."
     const absoluteUrl = url.startsWith("http") ? url : `https://${url}`

fdm-app/app/lib/email.server.ts

@@ -1,5 +1,5 @@
 import { TZDate } from "@date-fns/tz"
-import { render } from "@react-email/components"
+import { render } from "react-email"
 import type { User } from "better-auth"
 import { format } from "date-fns"
 import { nl } from "date-fns/locale"

fdm-app/app/routes/signin._index.tsx

@@ -277,6 +277,15 @@ export default function SignIn() {
         }
     }, [rawRedirectTo, redirectTo, setSearchParams])
 
+    useEffect(() => {
+        const error = searchParams.get("error")
+        if (error === "microsoft_no_email") {
+            setSocialSignInError(
+                "Uw Microsoft-account deelt geen e-mailadres met ons. Vul alstublieft uw e-mailadres hieronder in om een aanmeldlink te ontvangen.",
+            )
+        }
+    }, [searchParams])
+
     const socialProviderNewUserCallbackUrl = modifySearchParams(
         "/welcome",
         (searchParams) => searchParams.set("redirectTo", redirectTo),

fdm-app/package.json

@@ -26,55 +26,55 @@
         "@nmi-agro/fdm-core": "workspace:^",
         "@nmi-agro/fdm-data": "workspace:*",
         "@nmi-agro/fdm-rvo": "workspace:^",
-        "@react-email/components": "^1.0.11",
-        "@react-email/tailwind": "^2.0.7",
-        "@react-pdf/renderer": "^4.4.0",
-        "@react-router/node": "^7.14.0",
-        "@react-router/serve": "^7.14.0",
+        "@react-email/ui": "^6.0.1",
+        "@react-pdf/renderer": "^4.5.1",
+        "@react-router/node": "^7.14.2",
+        "@react-router/serve": "^7.14.2",
         "@remix-run/file-storage": "^0.13.3",
-        "@remix-run/form-data-parser": "^0.15.0",
-        "@sentry/profiling-node": "^10.47.0",
-        "@sentry/react-router": "^10.47.0",
-        "@tailwindcss/vite": "^4.2.2",
+        "@remix-run/form-data-parser": "^0.16.0",
+        "@sentry/profiling-node": "^10.50.0",
+        "@sentry/react-router": "^10.50.0",
+        "@tailwindcss/vite": "^4.2.4",
         "@tanstack/react-table": "^8.21.3",
-        "@turf/area": "^7.3.4",
-        "@turf/boolean-point-in-polygon": "^7.3.4",
-        "@turf/centroid": "^7.3.4",
-        "@turf/helpers": "^7.3.4",
-        "@turf/simplify": "^7.3.4",
+        "@turf/area": "^7.3.5",
+        "@turf/boolean-point-in-polygon": "^7.3.5",
+        "@turf/centroid": "^7.3.5",
+        "@turf/helpers": "^7.3.5",
+        "@turf/simplify": "^7.3.5",
         "better-auth": "catalog:",
         "chrono-node": "^2.9.0",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "cmdk": "1.1.1",
         "date-fns": "^4.1.0",
-        "dompurify": "^3.4.0",
+        "dompurify": "^3.4.1",
         "drizzle-orm": "catalog:",
-        "file-type": "^22.0.0",
+        "file-type": "^22.0.1",
         "flatgeobuf": "^4.4.0",
         "framer-motion": "^12.38.0",
         "fuzzysort": "^3.1.0",
         "input-otp": "^1.4.2",
-        "isbot": "^5.1.37",
+        "isbot": "^5.1.39",
         "lodash.throttle": "^4.1.1",
-        "lucide-react": "^1.7.0",
-        "maplibre-gl": "^5.22.0",
-        "nanoid": "^5.1.7",
+        "lucide-react": "^1.11.0",
+        "maplibre-gl": "^5.24.0",
+        "nanoid": "^5.1.9",
         "next-themes": "^0.4.6",
         "postgres": "^3.4.9",
-        "posthog-js": "^1.365.0",
-        "posthog-node": "^5.29.0",
+        "posthog-js": "^1.372.3",
+        "posthog-node": "^5.30.6",
         "postmark": "^4.0.7",
         "proj4": "^2.20.8",
         "radix-ui": "^1.4.3",
-        "react": "^19.2.4",
+        "react": "^19.2.5",
         "react-day-picker": "9.14.0",
-        "react-dom": "^19.2.4",
-        "react-hook-form": "^7.72.1",
-        "react-map-gl": "^8.1.0",
+        "react-dom": "^19.2.5",
+        "react-email": "^6.0.1",
+        "react-hook-form": "^7.74.0",
+        "react-map-gl": "^8.1.1",
         "react-markdown": "^10.1.0",
-        "react-router": "^7.14.0",
-        "react-router-dom": "^7.14.0",
+        "react-router": "^7.14.2",
+        "react-router-dom": "^7.14.2",
         "recharts": "^3.8.1",
         "remark-gfm": "^4.0.1",
         "remix-hook-form": "7.1.1",
@@ -94,24 +94,24 @@
         "@nmi-agro/fdm-core": "workspace:*",
         "@nmi-agro/fdm-data": "workspace:*",
         "@nmi-agro/fdm-rvo": "workspace:*",
-        "@react-router/dev": "^7.14.0",
-        "@react-router/fs-routes": "^7.14.0",
-        "@tailwindcss/postcss": "^4.2.2",
+        "@react-router/dev": "^7.14.2",
+        "@react-router/fs-routes": "^7.14.2",
+        "@tailwindcss/postcss": "^4.2.4",
         "@types/geojson": "^7946.0.16",
         "@types/lodash.throttle": "^4.1.9",
         "@types/mapbox__geojson-extent": "^1.0.3",
         "@types/react": "^19.2.14",
         "@types/react-dom": "^19.2.3",
         "@types/react-map-gl": "^6.1.8",
         "@types/validator": "^13.15.10",
-        "postcss": "^8.5.8",
-        "tailwindcss": "^4.2.2",
+        "postcss": "^8.5.12",
+        "tailwindcss": "^4.2.4",
         "typescript": "catalog:",
-        "vite": "^8.0.5",
+        "vite": "^8.0.10",
         "vite-node": "^6.0.0"
     },
     "engines": {
         "node": ">=24.0.0"
     },
-    "packageManager": "pnpm@10.33.0"
+    "packageManager": "pnpm@10.33.2"
 }

fdm-calculator/package.json

@@ -64,5 +64,5 @@
     "publishConfig": {
         "registry": "https://npm.pkg.github.com"
     },
-    "packageManager": "pnpm@10.33.0"
+    "packageManager": "pnpm@10.33.2"
 }

fdm-calculator/src/balance/nitrogen/index.ts

@@ -54,7 +54,7 @@ export async function calculateNitrogenBalance(
  * using `calculateNitrogenBalancesFieldToFarm`.
  *
  * @param fdm - The FDM instance for database access (caching).
- * @param nitrogenBalanceInput - The input data for the nitrogen balance calculation, including all fields.
+ * @param inputs - The input data for the nitrogen balance calculation for multiple farms.
  * @returns A promise that resolves an array where each item is the aggregated nitrogen balance of a farm,
  * including the b_id_farm.
  */
@@ -328,7 +328,6 @@ export function calculateNitrogenBalanceField(
  * same input. The cache is managed by `withCalculationCache` and uses the
  * `pkg.calculatorVersion` as part of its cache key.
  *
- * @param nitrogenBalanceInput - The input data for the nitrogen balance calculation.
  * @returns A promise that resolves with the calculated nitrogen balance, with numeric values as numbers.
  */
 export const getNitrogenBalanceField = withCalculationCache(

fdm-calculator/src/balance/organic-matter/index.ts

@@ -57,7 +57,7 @@ export async function calculateOrganicMatterBalance(
  * The final output is a numeric representation of the balance, suitable for display or further analysis.
  *
  * @param fdm - The FDM instance for database access (caching).
- * @param organicMatterBalanceInput - The complete dataset required for the calculation, including all fields,
+ * @param inputs - The complete dataset required for the calculation, including all fields,
  *   fertilizer catalogues, and cultivation catalogues for the farm.
  * @returns A promise that resolves to the aggregated `OrganicMatterBalanceNumeric` object for the farm.
  * @throws {Error} Throws an error if the calculation process fails for any reason.
@@ -244,7 +244,6 @@ export function calculateOrganicMatterBalanceField(
  * same input. The cache is managed by `withCalculationCache` and uses the
  * `pkg.calculatorVersion` as part of its cache key.
  *
- * @param organicMatterBalanceFieldInput - The input data for the organic matter balance calculation for a single field.
  * @returns A promise that resolves with the calculated organic matter balance, with numeric values as numbers.
  */
 export const getOrganicMatterBalanceField = withCalculationCache(

fdm-calculator/src/doses/calculate-dose.ts

@@ -6,8 +6,9 @@ import type { Dose, NumericDoseKeys } from "./d"
  *
  * This function processes an array of fertilizer applications, matching each with its corresponding fertilizer definition to calculate the dose of each nutrient. The nutrient rates are converted from grams or milligrams per kilogram to kilograms per kilogram and then multiplied by the application amount to determine the dose in kg/ha.
  *
- * @param applications An array of fertilizer application objects, each specifying the fertilizer `p_id` and the applied amount `p_app_amount` in kg/ha.
- * @param fertilizers An array of fertilizer objects, providing the nutrient rates for each fertilizer. Nutrient rates are expected to be non-negative.
+ * @param input - An object containing:
+ *   - `applications`: An array of fertilizer application objects, each specifying the fertilizer `p_id` and the applied amount `p_app_amount` in kg/ha.
+ *   - `fertilizers`: An array of fertilizer objects, providing the nutrient rates for each fertilizer. Nutrient rates are expected to be non-negative.
  * @returns An object containing:
  *   - `dose`: An object with the total cumulative doses for all nutrients in kg/ha.
  *   - `applications`: An array of objects, each detailing the individual nutrient doses for each fertilizer application.