From 8cb3c9269df166ce5427f86d80c7091a44e87a73 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 20 Aug 2025 14:58:04 +0200 Subject: [PATCH 1/3] fix: cultivation of selected field is shown when adding a new field at new fields page --- .changeset/calm-feet-jump.md | 5 +++++ fdm-app/app/components/blocks/field/form.tsx | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/calm-feet-jump.md diff --git a/.changeset/calm-feet-jump.md b/.changeset/calm-feet-jump.md new file mode 100644 index 000000000..a7d082510 --- /dev/null +++ b/.changeset/calm-feet-jump.md @@ -0,0 +1,5 @@ +--- +"@svenvw/fdm-app": patch +--- + +Fix that cultivation of selected field is shown when adding a new field at new fields page diff --git a/fdm-app/app/components/blocks/field/form.tsx b/fdm-app/app/components/blocks/field/form.tsx index 2562fbbca..27dd4df96 100644 --- a/fdm-app/app/components/blocks/field/form.tsx +++ b/fdm-app/app/components/blocks/field/form.tsx @@ -41,7 +41,7 @@ export default function FieldDetailsDialog({ cultivationOptions, fieldNameDefault, }: FieldDetailsDialogProps) { - const b_lu_catalogue = `nl_${field.properties?.b_lu_catalogue ?? ""}` + const b_lu_catalogue = field.properties?.b_lu_catalogue ?? "" const form = useRemixForm>({ mode: "onTouched", From 5d348df1ab1e4282d219c59f99c7f5c388280442 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 20 Aug 2025 15:16:10 +0200 Subject: [PATCH 2/3] nitpick --- .changeset/calm-feet-jump.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/calm-feet-jump.md b/.changeset/calm-feet-jump.md index a7d082510..923e0caf1 100644 --- a/.changeset/calm-feet-jump.md +++ b/.changeset/calm-feet-jump.md @@ -2,4 +2,4 @@ "@svenvw/fdm-app": patch --- -Fix that cultivation of selected field is shown when adding a new field at new fields page +Ensure the selected field’s cultivation is preselected when adding a new field on the New Fields page From c5f86ec35d2f322a0433e3d17189fe7a6d8dfec3 Mon Sep 17 00:00:00 2001 From: Sven Verweij <37927107+SvenVw@users.noreply.github.com> Date: Wed, 20 Aug 2025 15:37:51 +0200 Subject: [PATCH 3/3] chore: bump version number and update changelog --- .changeset/calm-feet-jump.md | 5 ----- .changeset/clever-owls-attack.md | 5 ----- .changeset/fifty-hounds-flow.md | 5 ----- .changeset/great-boats-float.md | 5 ----- fdm-app/CHANGELOG.md | 11 +++++++++++ fdm-app/package.json | 2 +- fdm-core/CHANGELOG.md | 7 +++++++ fdm-core/package.json | 2 +- 8 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 .changeset/calm-feet-jump.md delete mode 100644 .changeset/clever-owls-attack.md delete mode 100644 .changeset/fifty-hounds-flow.md delete mode 100644 .changeset/great-boats-float.md diff --git a/.changeset/calm-feet-jump.md b/.changeset/calm-feet-jump.md deleted file mode 100644 index 923e0caf1..000000000 --- a/.changeset/calm-feet-jump.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@svenvw/fdm-app": patch ---- - -Ensure the selected field’s cultivation is preselected when adding a new field on the New Fields page diff --git a/.changeset/clever-owls-attack.md b/.changeset/clever-owls-attack.md deleted file mode 100644 index 31170dee0..000000000 --- a/.changeset/clever-owls-attack.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@svenvw/fdm-core": patch ---- - -Fix to return cultivations at `getCultivationPlan` and `getCultivation` when cultivation starts before `timeFrame.start` and has no `ending date diff --git a/.changeset/fifty-hounds-flow.md b/.changeset/fifty-hounds-flow.md deleted file mode 100644 index ae6fdb207..000000000 --- a/.changeset/fifty-hounds-flow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@svenvw/fdm-core": patch ---- - -Fixes validation check that harvest or end date of cultivation cannot happen on start date of cultivation diff --git a/.changeset/great-boats-float.md b/.changeset/great-boats-float.md deleted file mode 100644 index c00333186..000000000 --- a/.changeset/great-boats-float.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@svenvw/fdm-app": patch ---- - -Increase streamTimeout from 10 seconds to 30 seconds to enable longer running calculations diff --git a/fdm-app/CHANGELOG.md b/fdm-app/CHANGELOG.md index 9695e8bcb..35ac10b3e 100644 --- a/fdm-app/CHANGELOG.md +++ b/fdm-app/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog fdm-app +## 0.22.3 + +### Patch Changes + +- 8cb3c92: Ensure the selected field’s cultivation is preselected when adding a new field on the New Fields page +- bedd5a4: Increase streamTimeout from 10 seconds to 30 seconds to enable longer running calculations +- Updated dependencies [e964a18] +- Updated dependencies [0c29661] + - @svenvw/fdm-core@0.24.1 + - @svenvw/fdm-calculator@0.6.0 + ## 0.22.2 ### Patch Changes diff --git a/fdm-app/package.json b/fdm-app/package.json index 2f0e149f9..aaae6d9ff 100644 --- a/fdm-app/package.json +++ b/fdm-app/package.json @@ -1,6 +1,6 @@ { "name": "@svenvw/fdm-app", - "version": "0.22.2", + "version": "0.22.3", "private": true, "sideEffects": false, "type": "module", diff --git a/fdm-core/CHANGELOG.md b/fdm-core/CHANGELOG.md index b5acba1f0..2445bbaa4 100644 --- a/fdm-core/CHANGELOG.md +++ b/fdm-core/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog fdm-core +## 0.24.1 + +### Patch Changes + +- e964a18: Fix to return cultivations at `getCultivationPlan` and `getCultivation` when cultivation starts before `timeFrame.start` and has no `ending date +- 0c29661: Fixes validation check that harvest or end date of cultivation cannot happen on start date of cultivation + ## 0.24.0 ### Minor Changes diff --git a/fdm-core/package.json b/fdm-core/package.json index aa3e9a3ce..b97de7665 100644 --- a/fdm-core/package.json +++ b/fdm-core/package.json @@ -1,7 +1,7 @@ { "name": "@svenvw/fdm-core", "private": false, - "version": "0.24.0", + "version": "0.24.1", "description": "Interface for the Farm Data Model", "license": "MIT", "homepage": "https://svenvw.github.io/fdm/",