Jenkinsfile

@@ -39,12 +39,6 @@ pipeline {
                                 echo "Retry ${retryCount}/${MAX_RETRIES} failed"
                             }
                         }
-                        try {
-                            sh 'npm install --legacy-peer-deps --force'
-                            success = true
-                        } catch (Exception e4) {
-                            echo "npm install --legacy-peer-deps --force failed"
-                        }
                     }
 
                     if (!success) {
@@ -62,10 +56,8 @@ pipeline {
         }
         stage('discord') {
             when {
-                anyOf {
+               branch 'main'
-                    branch 'main'
+               branch 'master'
-                    branch 'master'
-                }
             }
             steps {
                 discordSend description: "Build: ${BUILD_NUMBER}", showChangeset: true, result: currentBuild.currentResult, title: currentBuild.fullProjectName, webhookURL: env.discordwebhook

src/App.tsx

@@ -9,7 +9,6 @@ import DEBUG from "./components/DEBUG/DEBUG";
 import GenericForm from "./components/form/genericForm";
 import {getFormProperties} from "./components/form/formData";
 import {FormProperties} from "./components/form/formInterfaces";
-import FormActiveRedirect from "./components/form/formActiveRedirect";
 
 function App() {
     return (
@@ -22,7 +21,7 @@ function App() {
                         <Route
                             key={property.path}
                             path={property.path}
-                            element={<FormActiveRedirect {...property.formData} />}
+                            element={<GenericForm {...property.formData} />}
                         />
                     ))}
                     <Route path="/verify-email" element={<VerifyMail/>}/>

src/components/form/data/apply.tsx

@@ -213,6 +213,5 @@ export const apply: FormData = {
         other: Yup.string()
                     .max(2000, 'Please provide at most 2000 characters')
     }),
-    title: "Staff Application",
+    title: "Staff Application"
-    backendFormName: "StaffApplication",
 };

src/components/form/data/contact.tsx

@@ -48,6 +48,5 @@ export const contact: FormData = {
             .max(2000, 'Question should not exceed 2000 characters')
             .required('Question is required')
     }),
-    title: "Contact Form",
+    title: "Contact Form"
-    backendFormName: "ContactForm",
 };

src/components/form/formActiveRedirect.tsx

@@ -1,35 +0,0 @@
-import {FormData} from "./formInterfaces";
-import {useEffect, useState} from "react";
-import GenericForm from "./genericForm";
-
-const FormActiveRedirect = (formData: FormData) => {
-    const [isLoading, setLoading] = useState(true);
-    const [isFormActive, setFormActive] = useState(false);
-    const handleCheckForm = async () => {
-        const result = await fetch(`${process.env.REACT_APP_BACKEND_BASE_URL}/api/checks/formActive`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ formName: formData.backendFormName })
-        });
-        const response = await result.json();
-        setFormActive(response.isActive);
-        setLoading(false);
-    };
-
-    useEffect(() => {
-        handleCheckForm();
-    }, []);
-
-    if (isLoading) {
-        return <div className={"container"}><h2>Checking if form is active</h2></div>;
-    }
-
-    if (!isFormActive) {
-        return <div className={"container"}><h2>The {formData.title} is not currently active</h2></div>;
-    }
-
-    return (
-        <GenericForm {...formData} />
-    );
-}
-export default FormActiveRedirect;

src/components/form/formInterfaces.tsx

@@ -22,7 +22,6 @@ export interface UserInput {
 }
 
 export type FormData = {
-    backendFormName: string;
     steps: Step[];
     backend: string;
     userInput: UserInput;

src/components/form/genericForm.tsx

@@ -1,9 +1,10 @@
 import React, {useState} from "react";
 import './GenericForm.css';
 import {useNavigate} from 'react-router-dom'
-import {ErrorMessage, Form, FormikProvider, FormikValues, useFormik} from "formik";
+import {ErrorMessage, Field, Form, FormikProvider, FormikValues, useFormik} from "formik";
 import {Step, UserInput, FormData} from './formInterfaces';
 import * as Yup from "yup";
+import formHTML from "./formHTML";
 import FormHTML from "./formHTML";
 
 const GenericForm = (formData: FormData) => {