From 3507e0b8610c14de5fb26cfccfd099a0cf2cbeba Mon Sep 17 00:00:00 2001
From: DafneM <moretti.dafne2@gmail.com>
Date: Sun, 4 Jun 2023 11:56:50 -0300
Subject: [PATCH 1/2] #105 fix: salva marca em edicao de equipamento

---
 src/components/equipment-edit-form/index.tsx  | 7 ++++---
 src/components/equipment-edit-modal/index.tsx | 2 ++
 src/components/equipment-view-form/index.tsx  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/equipment-edit-form/index.tsx b/src/components/equipment-edit-form/index.tsx
index a3452006..e26ae9ab 100644
--- a/src/components/equipment-edit-form/index.tsx
+++ b/src/components/equipment-edit-form/index.tsx
@@ -33,7 +33,7 @@ export type EditEquipFormValues = {
   processor?: string;
   storageType?: { value: string; label: string };
   storageAmount?: string;
-  brand: { name: string };
+  brandName: string;
   acquisition: { name: string };
   unitId?: string;
   ram_size?: string;
@@ -65,6 +65,7 @@ export default function EquipmentEditForm({
     defaultValues: equip,
   });
 
+  console.log(equip);
   const watchType = watch('type');
 
   useEffect(() => {
@@ -153,8 +154,8 @@ export default function EquipmentEditForm({
 
         <Input
           label="Marca"
-          errors={errors.brand?.name}
-          {...register('brand.name', {
+          errors={errors.brandName}
+          {...register('brandName', {
             required: 'Campo Obrigatório',
             maxLength: 50,
           })}
diff --git a/src/components/equipment-edit-modal/index.tsx b/src/components/equipment-edit-modal/index.tsx
index 1a304fba..c23571de 100644
--- a/src/components/equipment-edit-modal/index.tsx
+++ b/src/components/equipment-edit-modal/index.tsx
@@ -40,6 +40,8 @@ function transformFields(data: any) {
     value: transformedData.initialUseDate.split('-')[0],
   };
 
+  transformedData.brandName = transformedData.brand.name;
+
   transformedData.acquisitionDate = new Date(transformedData.acquisitionDate);
 
   return transformedData;
diff --git a/src/components/equipment-view-form/index.tsx b/src/components/equipment-view-form/index.tsx
index 5d7502c6..b0aa16d4 100644
--- a/src/components/equipment-view-form/index.tsx
+++ b/src/components/equipment-view-form/index.tsx
@@ -29,7 +29,7 @@ export type ViewEquipFormValues = {
   processor?: string;
   storageType?: { value: string; label: string };
   storageAmount?: string;
-  brand: { name: string };
+  brandName: string;
   acquisition: { name: string };
   unitId?: string;
   ram_size?: string;

From 1c37d4761b1a5c071dbe1cc075b40ae4bb2d9900 Mon Sep 17 00:00:00 2001
From: DafneM <moretti.dafne2@gmail.com>
Date: Sun, 4 Jun 2023 16:40:22 -0300
Subject: [PATCH 2/2] #105 fix: corrige build

---
 src/components/equipment-edit-form/index.tsx  | 1 -
 src/components/equipment-view-form/index.tsx  | 4 ++--
 src/components/equipment-view-modal/index.tsx | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/equipment-edit-form/index.tsx b/src/components/equipment-edit-form/index.tsx
index e26ae9ab..5d1290d7 100644
--- a/src/components/equipment-edit-form/index.tsx
+++ b/src/components/equipment-edit-form/index.tsx
@@ -65,7 +65,6 @@ export default function EquipmentEditForm({
     defaultValues: equip,
   });
 
-  console.log(equip);
   const watchType = watch('type');
 
   useEffect(() => {
diff --git a/src/components/equipment-view-form/index.tsx b/src/components/equipment-view-form/index.tsx
index b0aa16d4..a5a23e41 100644
--- a/src/components/equipment-view-form/index.tsx
+++ b/src/components/equipment-view-form/index.tsx
@@ -109,8 +109,8 @@ export default function EquipmentViewForm({
 
         <Input
           label="Marca"
-          errors={errors.brand?.name}
-          {...register('brand.name', {
+          errors={errors.brandName}
+          {...register('brandName', {
             required: 'Campo Obrigatório',
             maxLength: 50,
           })}
diff --git a/src/components/equipment-view-modal/index.tsx b/src/components/equipment-view-modal/index.tsx
index 76200f72..e10d350c 100644
--- a/src/components/equipment-view-modal/index.tsx
+++ b/src/components/equipment-view-modal/index.tsx
@@ -42,6 +42,8 @@ function transformFields(data: any) {
     value: transformedData.initialUseDate.split('-')[0],
   };
 
+  transformedData.brandName = transformedData.brand.name;
+
   transformedData.acquisitionDate = new Date(transformedData.acquisitionDate);
 
   return transformedData;