From 4f252145ac52c05d65be7fd1ad3a31be1530270c Mon Sep 17 00:00:00 2001
From: Sven Verweij <37927107+SvenVw@users.noreply.github.com>
Date: Mon, 21 Jul 2025 17:30:41 +0200
Subject: [PATCH 1/2] fix: exception when adding a harvest in farm create
 wizard

---
 .changeset/icy-boxes-enjoy.md                 |  5 ++++
 ...ltivations.$b_lu_catalogue.crop._index.tsx | 30 +++++++------------
 2 files changed, 16 insertions(+), 19 deletions(-)
 create mode 100644 .changeset/icy-boxes-enjoy.md

diff --git a/.changeset/icy-boxes-enjoy.md b/.changeset/icy-boxes-enjoy.md
new file mode 100644
index 000000000..64dc20c9e
--- /dev/null
+++ b/.changeset/icy-boxes-enjoy.md
@@ -0,0 +1,5 @@
+---
+"@svenvw/fdm-app": patch
+---
+
+Fixes exception when adding a harvest in farm create wizard
diff --git a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.cultivations.$b_lu_catalogue.crop._index.tsx b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.cultivations.$b_lu_catalogue.crop._index.tsx
index 02bedfdf9..385c90775 100644
--- a/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.cultivations.$b_lu_catalogue.crop._index.tsx
+++ b/fdm-app/app/routes/farm.create.$b_id_farm.$calendar.cultivations.$b_lu_catalogue.crop._index.tsx
@@ -1,6 +1,7 @@
 import {
     getCultivationPlan,
     getCultivationsFromCatalogue,
+    Harvest,
     removeHarvest,
     updateCultivation,
 } from "@svenvw/fdm-core"
@@ -120,36 +121,27 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
         }
 
         // Combine similar harvests across all fields of the target cultivation.
-        interface HarvestInfo {
-            b_lu_harvest_date: Date
-            harvestables: {
-                harvestable_analyses: {
-                    b_lu_yield?: number
-                    b_lu_n_harvestable?: number
-                }[]
-            }[]
-        }
         const harvests = targetCultivation.fields.reduce(
-            (accumulator, field) => {
+            (accumulator: Harvest[], field: { harvests: Harvest[] }) => {
                 for (const harvest of field.harvests) {
                     // Create a key based on harvest properties to identify similar harvests
                     const isSimilarHarvest = (
-                        h1: HarvestInfo,
-                        h2: HarvestInfo,
+                        h1: Harvest,
+                        h2: Harvest,
                     ) =>
                         h1.b_lu_harvest_date.getTime() ===
                             h2.b_lu_harvest_date.getTime() &&
-                        h1.harvestables[0].harvestable_analyses[0]
+                        h1.harvestable.harvestable_analyses[0]
                             .b_lu_yield ===
-                            h2.harvestables[0].harvestable_analyses[0]
+                            h2.harvestable.harvestable_analyses[0]
                                 .b_lu_yield &&
-                        h1.harvestables[0].harvestable_analyses[0]
+                        h1.harvestable.harvestable_analyses[0]
                             .b_lu_n_harvestable ===
-                            h2.harvestables[0].harvestable_analyses[0]
+                            h2.harvestable.harvestable_analyses[0]
                                 .b_lu_n_harvestable
-
+            
                     const existingHarvestIndex = accumulator.findIndex(
-                        (existingHarvest: HarvestInfo) =>
+                        (existingHarvest: Harvest) =>
                             isSimilarHarvest(existingHarvest, harvest),
                     )
 
@@ -169,7 +161,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
 
                 return accumulator
             },
-            [] as HarvestInfo[],
+            [],
         )
 
         return {

From f19e2d1ea44778d4d3bd2c5560d17e56e31efd75 Mon Sep 17 00:00:00 2001
From: Sven Verweij <37927107+SvenVw@users.noreply.github.com>
Date: Tue, 22 Jul 2025 08:57:04 +0200
Subject: [PATCH 2/2] chore: bump version number and update changelog

---
 .changeset/icy-boxes-enjoy.md | 5 -----
 fdm-app/CHANGELOG.md          | 6 ++++++
 fdm-app/package.json          | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changeset/icy-boxes-enjoy.md

diff --git a/.changeset/icy-boxes-enjoy.md b/.changeset/icy-boxes-enjoy.md
deleted file mode 100644
index 64dc20c9e..000000000
--- a/.changeset/icy-boxes-enjoy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@svenvw/fdm-app": patch
----
-
-Fixes exception when adding a harvest in farm create wizard
diff --git a/fdm-app/CHANGELOG.md b/fdm-app/CHANGELOG.md
index 429651e01..853f01511 100644
--- a/fdm-app/CHANGELOG.md
+++ b/fdm-app/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog fdm-app
 
+## 0.20.3
+
+### Patch Changes
+
+- 4f25214: Fixes exception when adding a harvest in farm create wizard
+
 ## 0.20.2
 
 ### Patch Changes
diff --git a/fdm-app/package.json b/fdm-app/package.json
index f55b8322a..ee263903a 100644
--- a/fdm-app/package.json
+++ b/fdm-app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@svenvw/fdm-app",
-    "version": "0.20.2",
+    "version": "0.20.3",
     "private": true,
     "sideEffects": false,
     "type": "module",