Add RVO field synchronization package and import workflows

.changeset/chatty-bananas-sink.md

@@ -0,0 +1,5 @@
+---
+"@nmi-agro/fdm-app": minor
+---
+
+Add the option to import fields from RVO in farm create wizard and also at the fields page of the farm

.changeset/public-llamas-clap.md

@@ -0,0 +1,5 @@
+---
+"@nmi-agro/fdm-docs": minor
+---
+
+Add the reference for fdm-rvo

.changeset/tangy-ways-win.md

@@ -0,0 +1,5 @@
+---
+"@nmi-agro/fdm-rvo": minor
+---
+
+Initial version of `fdm-rvo` that provides the logic for fdm-app to connect to RVO and sync fields with fdm-core

.github/workflows/release.yml

@@ -44,6 +44,7 @@ jobs:
       - name: Publish Snapshot
         if: github.ref == 'refs/heads/development'
         run: |
+          echo "//npm.pkg.github.com/:_authToken=\${NODE_AUTH_TOKEN}" >> .npmrc
           pnpm changeset version --snapshot
           pnpm changeset publish --tag development
         env:
@@ -68,6 +69,7 @@ jobs:
         if: github.ref == 'refs/heads/main'
         shell: bash
         run: |
+          echo "//npm.pkg.github.com/:_authToken=\${NODE_AUTH_TOKEN}" >> .npmrc
           # Build packages
           pnpm build --filter="!@nmi-agro/fdm-app"
 

.github/workflows/tests.yml

@@ -59,7 +59,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-          registry-url: 'https://npm.pkg.github.com'
           cache: 'pnpm'
 
       - name: Install Dependencies
@@ -152,7 +151,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-          registry-url: 'https://npm.pkg.github.com'
           cache: 'pnpm'
 
       - name: Install Dependencies
@@ -232,7 +230,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-          registry-url: 'https://npm.pkg.github.com'
           cache: 'pnpm'
 
       - name: Install Dependencies
@@ -252,3 +249,95 @@ jobs:
           files: ./fdm-data/coverage/coverage-final.json
           flags: fdm-data
           token: ${{ secrets.CODECOV_TOKEN }}
+
+  # Label of the container job for fdm-rvo
+  test-rvo:
+    name: rvo
+    # Containers must run in Linux based operating systems
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [24]
+    permissions:
+      contents: read
+      packages: write
+    # Docker Hub image that `container-job` executes in
+    container: node:${{ matrix.node-version }}-bookworm-slim
+
+    # Service containers to run with `container-job`
+    services:
+      # Label used to access the service container
+      postgres:
+        # Docker Hub image with postgis extension
+        image: postgis/postgis:17-3.5
+        # Provide the password for postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      # Include dependencies for codecov
+      - name: Install system dependencies
+        run: apt-get update && apt-get install -y git curl gpg
+
+      # Downloads a copy of the code in your repository before running CI tests
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Cache turbo build setup
+        uses: actions/cache@v4
+        with:
+          path: .turbo
+          key: ${{ runner.os }}-turbo-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-turbo-
+
+      - name: Setup pnpm 10
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.32.1
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'pnpm'
+
+      - name: Install Dependencies
+        run: pnpm i
+
+      - name: Build fdm-data
+        run: pnpm build
+        working-directory: ./fdm-data
+
+      - name: Build fdm-core
+        run: pnpm build
+        working-directory: ./fdm-core
+
+      - name: Run tests with coverage
+        run: pnpm test-coverage
+        working-directory: ./fdm-rvo
+        env:
+          # The hostname used to communicate with the PostgreSQL service container
+          POSTGRES_HOST: postgres
+          # The default PostgreSQL port
+          POSTGRES_PORT: 5432
+          # the default usernam
+          POSTGRES_USER: postgres
+          # the default password
+          POSTGRES_PASSWORD: postgres
+          # the default database
+          POSTGRES_DB: postgres
+
+      - name: fdm-rvo - Upload results to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          files: ./fdm-rvo/coverage/coverage-final.json
+          flags: fdm-rvo
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/typecheck.yml

@@ -33,7 +33,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-          registry-url: 'https://npm.pkg.github.com'
           cache: 'pnpm'
 
       - name: Install Dependencies

.npmrc

@@ -1,4 +1,2 @@
 sync-injected-deps-after-scripts[]=build
 link-workspace-packages=true
-@nmi-agro:registry=https://npm.pkg.github.com
-//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}

fdm-app/.env.example

@@ -68,6 +68,13 @@ GOOGLE_CLIENT_SECRET=
 MS_CLIENT_ID=
 MS_CLIENT_SECRET=
 
+# RVO OAuth Credentials (Optional: Leave empty to disable RVO Integration)
+# Required: No
+RVO_CLIENT_ID=
+RVO_CLIENT_NAME=
+RVO_PKIO_PRIVATE_KEY=
+RVO_REDIRECT_URI=
+
 # -------------------------------------
 # Map & Data Configuration
 # -------------------------------------

fdm-app/app/components/blocks/fertilizer/utils.server.ts

@@ -0,0 +1,31 @@
+import { getFertilizerParametersDescription, type Fertilizer } from "@nmi-agro/fdm-core"
+
+/**
+ * Retrieves RVO label and type mappings used across fertilizer forms and summaries.
+ * Centralizes the assembly of RVO metadata from the parameter descriptions and available fertilizers.
+ *
+ * @param fertilizers - Optional array of fertilizers to build the RVO-to-Type mapping for dynamic badge colors.
+ * @returns An object containing:
+ *   - `rvoLabels`: A record mapping RVO codes to their descriptive labels (in Dutch).
+ *   - `rvoToType`: A record mapping RVO codes to fertilizer types (manure, compost, etc.).
+ */
+export async function getRvoMappings(fertilizers: Partial<Fertilizer>[] = []) {
+    const fertilizerParameterDescription =
+        await getFertilizerParametersDescription("NL-nl")
+    const p_type_rvo_options =
+        fertilizerParameterDescription.find((x) => x.parameter === "p_type_rvo")
+            ?.options ?? []
+
+    const rvoLabels = Object.fromEntries(
+        p_type_rvo_options.map((opt) => [String(opt.value), opt.label]),
+    )
+
+    const rvoToType: Record<string, string> = {}
+    for (const f of fertilizers) {
+        if (f.p_type_rvo && f.p_type) {
+            rvoToType[f.p_type_rvo] = f.p_type
+        }
+    }
+
+    return { rvoLabels, rvoToType }
+}

fdm-app/app/components/blocks/fertilizer/utils.ts

@@ -64,44 +64,6 @@ export function buildFertilizerDefaults(
     }
 }
 
-/**
- * Retrieves RVO label and type mappings used across fertilizer forms and summaries.
- * Centralizes the assembly of RVO metadata from the parameter descriptions and available fertilizers.
- *
- * @param fertilizers - Optional array of fertilizers to build the RVO-to-Type mapping for dynamic badge colors.
- * @returns An object containing:
- *   - `rvoLabels`: A record mapping RVO codes to their descriptive labels (in Dutch).
- *   - `rvoToType`: A record mapping RVO codes to fertilizer types (manure, compost, etc.).
- */
-export async function getRvoMappings(fertilizers: Partial<Fertilizer>[] = []) {
-    if (typeof window !== "undefined") {
-        return { rvoLabels: {}, rvoToType: {} }
-    }
-
-    const { getFertilizerParametersDescription } = await import(
-        "@nmi-agro/fdm-core"
-    )
-
-    const fertilizerParameterDescription =
-        await getFertilizerParametersDescription("NL-nl")
-    const p_type_rvo_options =
-        fertilizerParameterDescription.find((x) => x.parameter === "p_type_rvo")
-            ?.options ?? []
-
-    const rvoLabels = Object.fromEntries(
-        p_type_rvo_options.map((opt) => [String(opt.value), opt.label]),
-    )
-
-    const rvoToType: Record<string, string> = {}
-    for (const f of fertilizers) {
-        if (f.p_type_rvo && f.p_type) {
-            rvoToType[f.p_type_rvo] = f.p_type
-        }
-    }
-
-    return { rvoLabels, rvoToType }
-}
-
 /**
  * Builds the payload for adding a fertilizer to the catalogue.
  *

fdm-app/app/components/blocks/fields/columns.tsx

@@ -183,7 +183,9 @@ export const columns: ColumnDef<FieldExtended>[] = [
             const field = row.original
             return (
                 <p className="text-muted-foreground">
-                    {`${field.a_som_loi.toFixed(2)} %`}
+                    {field.a_som_loi !== null && field.a_som_loi !== undefined
+                        ? `${field.a_som_loi.toFixed(2)} %`
+                        : "-"}
                 </p>
             )
         },