Merge pull request #74 from fga-eps-mds/fix/movements-blank-page

fix: movements blank page after register
fga-eps-mds · Jul 10, 2023 · cf6e175 · cf6e175
2 parents 6a9d4e5 + 43902b9
commit cf6e175
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/src/components/movement-form/index.tsx b/src/components/movement-form/index.tsx
@@ -203,11 +203,11 @@ export default function MovementForm({
           materiais.includes(equipment.id) ? 'rgba(244, 147, 32, 0.2)' : 'white'
         }
       >
-        <Td>{equipment.type.name}</Td>
-        <Td>{equipment.brand.name}</Td>
-        <Td>{equipment.model}</Td>
-        <Td>{equipment.tippingNumber}</Td>
-        <Td>{equipment.serialNumber}</Td>
+        <Td>{equipment?.type?.name}</Td>
+        <Td>{equipment?.brand?.name}</Td>
+        <Td>{equipment?.model}</Td>
+        <Td>{equipment?.tippingNumber}</Td>
+        <Td>{equipment?.serialNumber}</Td>
         <Td>
           <Checkbox
             onChange={toggleMaterial(equipment.id)}

diff --git a/src/components/movements-modal/index.tsx b/src/components/movements-modal/index.tsx
@@ -198,7 +198,7 @@ export function MovementsModal({
                           }
                         >
                           <Td textAlign="center">{equipment?.tippingNumber}</Td>
-                          <Td textAlign="center">{equipment?.type.name}</Td>
+                          <Td textAlign="center">{equipment?.type?.name}</Td>
                           <Td textAlign="center">{equipment?.brand?.name}</Td>
                           <Td textAlign="center">{equipment?.model}</Td>
                           <Td textAlign="center">{equipment?.serialNumber}</Td>
@@ -247,7 +247,7 @@ export function MovementsModal({
                     }
                     equipments={selectedMoviment.equipments}
                     date={selectedMoviment.date}
-                    destination={selectedMoviment.destination.name}
+                    destination={selectedMoviment?.destination?.name}
                   />
                 }
                 fileName={`termo_de_${

diff --git a/src/components/movements-pdf/MovementsPdfDocument.tsx b/src/components/movements-pdf/MovementsPdfDocument.tsx
@@ -192,7 +192,7 @@ export function MovementsPDF({
               {equipment?.tippingNumber}
             </Text>
             <Text style={{ ...styles.rowData, minWidth: 60, maxWidth: 80 }}>
-              {equipment?.type.name}
+              {equipment?.type?.name}
             </Text>
             <Text style={{ ...styles.rowData, maxWidth: 40 }}>
               {equipment?.brand?.name}

diff --git a/src/components/side-bar/index.tsx b/src/components/side-bar/index.tsx
@@ -11,7 +11,6 @@ export const SideBar = memo(() => {
     { name: 'Controle de Equipamento', link: '/equipments' },
     { name: 'Controle Ordem Serviço', link: '/order-services' },
     { name: 'Movimentações', link: '/movements' },
-    { name: 'Relatórios', link: '/reports' },
   ];
   const optionUser = [
     { name: 'Controle de Cadastro', link: '/equipments-fields' },

diff --git a/src/pages/reports/Reports.tsx b/src/pages/reports/Reports.tsx
@@ -120,7 +120,7 @@ function ReportsTable() {
 
   const formattedWorkstations = (data: Workstation[]): ISelectOption[] => {
     return data?.map((item: Workstation) => {
-      return { label: item.name, value: item.name };
+      return { label: item?.name, value: item?.name };
     });
   };