From 8c02b24806246d2be444701ebf299dbbd096b207 Mon Sep 17 00:00:00 2001
From: Javier <javidx@gmail.com>
Date: Sat, 11 Nov 2023 15:47:45 +0200
Subject: [PATCH 1/2] Added conditional allow redirect logic after submission
 is completed Removed unnesary code

---
 .../participant/project/SubmissionForm.js                | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/project/SubmissionForm.js b/frontend/src/pages/_dashboard/renderDashboard/participant/project/SubmissionForm.js
index 3873a6677..f20c020e2 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/project/SubmissionForm.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/project/SubmissionForm.js
@@ -2,7 +2,7 @@ import React, { useMemo, useState, useEffect } from 'react'
 
 import * as yup from 'yup'
 import { useSelector, useDispatch } from 'react-redux'
-import { FastField, Formik } from 'formik'
+import { Formik } from 'formik'
 import { ProjectSchema, EventTypes } from '@hackjunction/shared'
 import { Grid, Box, Typography } from '@material-ui/core'
 import GradientBox from 'components/generic/GradientBox'
@@ -25,8 +25,6 @@ import NameField from 'components/projects/ProjectSubmissionFields/NameField'
 import _ from 'lodash'
 import StatusField from 'components/projects/ProjectSubmissionFields/StatusField'
 import ProjectFieldsComponents from 'constants/projectFields'
-import ImageUpload from 'components/inputs/ImageUpload'
-import FormControl from 'components/inputs/FormControl'
 // import FileInput from 'pages/_organise/slug/edit/submission/components/inputs/FileInput'
 
 const useStyles = makeStyles(theme => ({
@@ -41,7 +39,6 @@ const SubmissionForm = props => {
     const dispatch = useDispatch()
     const event = useSelector(DashboardSelectors.event)
     const idTokenData = useSelector(AuthSelectors.idTokenData)
-    const idToken = useSelector(AuthSelectors.getIdToken)
     const { t } = useTranslation()
     const projects = useSelector(DashboardSelectors.projects)
     const projectLoading = useSelector(DashboardSelectors.projectsLoading)
@@ -255,7 +252,9 @@ const SubmissionForm = props => {
                 <BottomBar
                     onSubmit={async () => {
                         formikProps.submitForm().then(() => {
-                            handleProjectSelected(undefined)
+                            if (event.allowProjectSubmissionsPerChallenge) {
+                                handleProjectSelected(undefined)
+                            }
                         })
                     }}
                     errors={formikProps.errors}

From 6f08a2cd485e21f4edaf3ceaccf5ecb596c216d1 Mon Sep 17 00:00:00 2001
From: Javier <javidx@gmail.com>
Date: Sat, 11 Nov 2023 20:54:27 +0200
Subject: [PATCH 2/2] Added status to project tables Added sorting to all
 project table columns

---
 .../src/components/tables/ProjectsTable/index.js    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/tables/ProjectsTable/index.js b/frontend/src/components/tables/ProjectsTable/index.js
index 1f1ec4ca5..149fe2406 100644
--- a/frontend/src/components/tables/ProjectsTable/index.js
+++ b/frontend/src/components/tables/ProjectsTable/index.js
@@ -37,31 +37,42 @@ const ProjectsTable = ({ projects, baseURL }) => {
                     return index + 1
                 },
                 id: 'index',
-                sortType: Sorters.Numeric,
+                ...Sorters.Numeric,
+            },
+            {
+                Header: 'Status',
+                accessor: 'status',
+                ...Sorters.Alphabetic,
+                ...Filters.ContainsSearch,
             },
             {
                 Header: 'Team',
                 accessor: 'teamCode',
+                ...Sorters.Alphanumeric,
                 ...Filters.ContainsSearch,
             },
             {
                 Header: 'Name',
                 accessor: 'name',
+                ...Sorters.Alphabetic,
                 ...Filters.ContainsSearch,
             },
             {
                 Header: 'Punchline',
                 accessor: 'punchline',
+                ...Sorters.Alphabetic,
                 ...Filters.ContainsSearch,
             },
             {
                 Header: 'Demo',
                 accessor: 'demo',
+                ...Sorters.Alphabetic,
                 ...Filters.ContainsSearch,
             },
             {
                 Header: 'Source',
                 accessor: 'source',
+                ...Sorters.Alphabetic,
                 ...Filters.ContainsSearch,
             },
             /*