From f43bcec080e74cf42a2c7d3fa016e5c92e751cd9 Mon Sep 17 00:00:00 2001
From: Jesus Vasquez <jesus.wmr@gmail.com>
Date: Sun, 3 Mar 2024 22:17:36 -0500
Subject: [PATCH] cleanup

---
 components/Form/data.tsx       |  7 +++++
 components/Form/formSchemas.ts | 30 ++++++++++++++++++++
 components/Form/index.tsx      | 50 +++-------------------------------
 components/Form/types.ts       |  8 ++++++
 4 files changed, 49 insertions(+), 46 deletions(-)
 create mode 100644 components/Form/formSchemas.ts

diff --git a/components/Form/data.tsx b/components/Form/data.tsx
index e69de29..2a1ab07 100644
--- a/components/Form/data.tsx
+++ b/components/Form/data.tsx
@@ -0,0 +1,7 @@
+export const data = {
+    importNames: ["Import ABC", "Import DEF", "Import GHI"],
+    splitScheduleOptions: ["Yes", "No"],
+    clientOptions: ["Single", "Multiple"],
+    testingCenterOptions: ["testing center 1", "testing center 2", "testing center 3", "testing center 4"],
+    clientsOptions: ["client 1", "client 2", "client 3"],
+};
\ No newline at end of file
diff --git a/components/Form/formSchemas.ts b/components/Form/formSchemas.ts
new file mode 100644
index 0000000..e2070e6
--- /dev/null
+++ b/components/Form/formSchemas.ts
@@ -0,0 +1,30 @@
+import { FormValues } from "./types";
+import * as Yup from "yup";
+
+export const initialValues: FormValues = {
+    importName: '',
+    manifestFile: null,
+    splitSchedule: '',
+    client: '',
+    testingCenter: '',
+    toleranceWindow: false, 
+};
+
+export const validationSchema = Yup.object({
+    importName: Yup.string()
+        .required('Import name is required')
+        .oneOf(["Import ABC", "Import DEF", "Import GHI"], "Invalid Import Name"),
+    manifestFile: Yup.mixed()
+        .required('A file is required')
+        .nullable(), // Allows for null values
+    splitSchedule: Yup.string()
+        .required('This field is required')
+        .oneOf(["Yes", "No"], "Invalid Option"),
+    client: Yup.string()
+        .required('Client selection is required')
+        .oneOf(["Single", "Multiple"], "Invalid Client Type"),
+    testingCenter: Yup.string()
+        .required('Testing center selection is required'), // Assuming a selection is required
+    toleranceWindow: Yup.boolean()
+        .required('Tolerance window selection is required'), // Assuming this is a boolean represented by a toggle
+});
\ No newline at end of file
diff --git a/components/Form/index.tsx b/components/Form/index.tsx
index 366b8db..f789491 100644
--- a/components/Form/index.tsx
+++ b/components/Form/index.tsx
@@ -4,7 +4,7 @@ import React, { useState } from "react";
 
 //Dependencies
 import { Formik, Form } from "formik";
-import * as Yup from "yup";
+
 import axios from "axios";
 
 //Input fields
@@ -15,51 +15,9 @@ import ToggleField from "./ToggleField";
 import StatusField from "./StatusField";
 import ClientField from "./ClientField";
 
-interface FormValues {
-    importName: string;
-    manifestFile: File | null;
-    splitSchedule: string;
-    client: string; 
-    testingCenter: string; 
-    toleranceWindow: boolean;
-}
-
-const initialValues: FormValues = {
-    importName: '',
-    manifestFile: null,
-    splitSchedule: '',
-    client: '',
-    testingCenter: '',
-    toleranceWindow: false, 
-};
-
-const validationSchema = Yup.object({
-    importName: Yup.string()
-        .required('Import name is required')
-        .oneOf(["Import ABC", "Import DEF", "Import GHI"], "Invalid Import Name"),
-    manifestFile: Yup.mixed()
-        .required('A file is required')
-        .nullable(), // Allows for null values, adjust based on your logic for file handling
-    splitSchedule: Yup.string()
-        .required('This field is required')
-        .oneOf(["Yes", "No"], "Invalid Option"),
-    client: Yup.string()
-        .required('Client selection is required')
-        .oneOf(["Single", "Multiple"], "Invalid Client Type"),
-    testingCenter: Yup.string()
-        .required('Testing center selection is required'), // Assuming a selection is required
-    toleranceWindow: Yup.boolean()
-        .required('Tolerance window selection is required'), // Assuming this is a boolean represented by a toggle
-});
-
-
-const data = {
-    importNames: ["Import ABC", "Import DEF", "Import GHI"],
-    splitScheduleOptions: ["Yes", "No"],
-    clientOptions: ["Single", "Multiple"],
-    testingCenterOptions: ["testing center 1", "testing center 2", "testing center 3", "testing center 4"],
-    clientsOptions: ["client 1", "client 2", "client 3"],
-};
+import { FormValues } from "./types";
+import { data } from "./data";
+import { initialValues, validationSchema } from "./formSchemas";
 
 const FormComponent: React.FC = () => {
     const [formSubmitted, setFormSubmitted] = useState(false);
diff --git a/components/Form/types.ts b/components/Form/types.ts
index e69de29..3793f42 100644
--- a/components/Form/types.ts
+++ b/components/Form/types.ts
@@ -0,0 +1,8 @@
+export interface FormValues {
+    importName: string;
+    manifestFile: File | null;
+    splitSchedule: string;
+    client: string; 
+    testingCenter: string; 
+    toleranceWindow: boolean;
+}
\ No newline at end of file