From 00e35584f4da3852e46243e78ba6f999ee76a658 Mon Sep 17 00:00:00 2001
From: Donkie <daniel.cf.hultgren@gmail.com>
Date: Mon, 5 Aug 2024 19:56:42 +0200
Subject: [PATCH] Fixed item cloning not handling extra fields properly

Resolves #424
---
 client/src/pages/filaments/create.tsx | 5 ++++-
 client/src/pages/spools/create.tsx    | 5 ++++-
 client/src/pages/vendors/create.tsx   | 7 ++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/client/src/pages/filaments/create.tsx b/client/src/pages/filaments/create.tsx
index 964139c..d3e4e8a 100644
--- a/client/src/pages/filaments/create.tsx
+++ b/client/src/pages/filaments/create.tsx
@@ -7,7 +7,7 @@ import { numberFormatter, numberParser } from "../../utils/parsing";
 import { IVendor } from "../vendors/model";
 import { IFilament, IFilamentParsedExtras } from "./model";
 import { EntityType, useGetFields } from "../../utils/queryFields";
-import { ExtraFieldFormItem, StringifiedExtras } from "../../components/extraFields";
+import { ExtraFieldFormItem, ParsedExtras, StringifiedExtras } from "../../components/extraFields";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc";
 import { getCurrencySymbol, useCurrency } from "../../utils/settings";
@@ -52,6 +52,9 @@ export const FilamentCreate: React.FC<IResourceComponentsProps & CreateOrClonePr
     if (formProps.initialValues.vendor) {
       formProps.initialValues.vendor_id = formProps.initialValues.vendor.id;
     }
+
+    // Parse the extra fields from string values into real types
+    formProps.initialValues = ParsedExtras(formProps.initialValues);
   }
 
   const handleSubmit = async (redirectTo: "list" | "create") => {
diff --git a/client/src/pages/spools/create.tsx b/client/src/pages/spools/create.tsx
index 786646b..d2853ec 100644
--- a/client/src/pages/spools/create.tsx
+++ b/client/src/pages/spools/create.tsx
@@ -24,7 +24,7 @@ import { useSpoolmanLocations } from "../../components/otherModels";
 import { MinusOutlined, PlusOutlined } from "@ant-design/icons";
 import "../../utils/overrides.css";
 import { EntityType, useGetFields } from "../../utils/queryFields";
-import { ExtraFieldFormItem, StringifiedExtras } from "../../components/extraFields";
+import { ExtraFieldFormItem, ParsedExtras, StringifiedExtras } from "../../components/extraFields";
 import utc from "dayjs/plugin/utc";
 import { getCurrencySymbol, useCurrency } from "../../utils/settings";
 import { ExternalFilament, useGetExternalDBFilaments } from "../../utils/queryExternalDB";
@@ -73,6 +73,9 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
     if (formProps.initialValues.filament) {
       formProps.initialValues.filament_id = formProps.initialValues.filament.id;
     }
+
+    // Parse the extra fields from string values into real types
+    formProps.initialValues = ParsedExtras(formProps.initialValues);
   }
 
   // If the query variable filament_id is set, set the filament_id field to that value
diff --git a/client/src/pages/vendors/create.tsx b/client/src/pages/vendors/create.tsx
index 3a04eef..e896893 100644
--- a/client/src/pages/vendors/create.tsx
+++ b/client/src/pages/vendors/create.tsx
@@ -5,7 +5,7 @@ import { Button, Form, Input, Typography, InputNumber } from "antd";
 import TextArea from "antd/es/input/TextArea";
 import { IVendor, IVendorParsedExtras } from "./model";
 import { EntityType, useGetFields } from "../../utils/queryFields";
-import { ExtraFieldFormItem, StringifiedExtras } from "../../components/extraFields";
+import { ExtraFieldFormItem, ParsedExtras, StringifiedExtras } from "../../components/extraFields";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc";
 
@@ -30,6 +30,11 @@ export const VendorCreate: React.FC<IResourceComponentsProps & CreateOrCloneProp
     formProps.initialValues = {};
   }
 
+  if (props.mode === "clone") {
+    // Parse the extra fields from string values into real types
+    formProps.initialValues = ParsedExtras(formProps.initialValues);
+  }
+
   const handleSubmit = async (redirectTo: "list" | "edit" | "create") => {
     const values = StringifiedExtras(await form.validateFields());
     await onFinish(values);