Fixed flattenObject function in organiser/projects pages to enable export

wickathou · wickathou · commit 0c8f68d0c363 · 2024-04-03T19:52:47.000+03:00
Moved dispatch of organizer actions to their respective pages, to avoid loading data that is not necessary
Removed unused packages and commented code
Renamed outdated components to use their latest name in material
diff --git a/frontend/src/components/tables/ProjectsTable/index.js b/frontend/src/components/tables/ProjectsTable/index.js
@@ -14,13 +14,16 @@ const ProjectsTable = ({ projects }) => {
     const event = useSelector(OrganiserSelectors.event)
 
     const skipArray = ['_id', '__v', 'id', 'key', 'section']
-    function flattenObject(ob) {
+    const flattenObject = ob => {
         let toReturn = {}
         for (let i in ob) {
             if (!ob.hasOwnProperty(i) || skipArray.some(val => val === i))
                 continue
 
-            if (typeof ob[i] === 'object' && ob[i] !== null) {
+            if (i === 'description' || i === 'punchline') {
+                toReturn[i] = ob[i].replace(/"/g, '""')
+                continue
+            } else if (typeof ob[i] === 'object' && ob[i] !== null) {
                 let flatObject = flattenObject(ob[i])
                 for (let x in flatObject) {
                     if (!flatObject.hasOwnProperty(x)) continue
@@ -98,6 +101,18 @@ const ProjectsTable = ({ projects }) => {
         setSelected(selectedRows)
     }
 
+    // debugGroup(
+    //     'Projects to export',
+    //     selected.map(item => {
+    //         const returnObject = {
+    //             ...flattenObject(item.original),
+    //             projectId: item.original._id,
+    //             projectURL: projectURLgenerator(event.slug, item.original._id),
+    //         }
+    //         return returnObject
+    //     }),
+    // )
+
     return (
         <>
             <EditProjectModal
@@ -120,12 +135,12 @@ const ProjectsTable = ({ projects }) => {
                                 }}
                                 data={selected.map(item => {
                                     const returnObject = {
-                                        ...flattenObject(item.original),
                                         projectId: item.original._id,
                                         projectURL: projectURLgenerator(
                                             event.slug,
                                             item.original._id,
                                         ),
+                                        ...flattenObject(item.original),
                                     }
                                     return returnObject
                                 })}
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/index.js
@@ -21,7 +21,7 @@ import ChallengesTab from './challenges'
 import ScheduleTab from './schedule'
 import QuestionsTab from './questions'
 import SubmissionFormTab from './submission'
-import TimelineTab from './timeline'
+// import TimelineTab from './timeline'
 import MeetingRoomsTab from './meetingRooms'
 import OtherTab from './other'
 import HackerpackTab from './hackerpack'
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/index.js
@@ -59,12 +59,12 @@ export default () => {
                 OrganiserActions.updateRecruitersForEvent(event.recruiters),
             )
             dispatch(OrganiserActions.updateRegistrationsForEvent(slug))
-            dispatch(OrganiserActions.updateTeamsForEvent(slug))
+            // dispatch(OrganiserActions.updateTeamsForEvent(slug))
             dispatch(OrganiserActions.updateFilterGroups(slug))
-            dispatch(OrganiserActions.updateProjects(slug))
-            dispatch(OrganiserActions.updateGavelProjects(slug))
-            dispatch(OrganiserActions.updateRankings(slug))
-            dispatch(OrganiserActions.generateResults(slug)) // TODO do we need to get results always?
+            // dispatch(OrganiserActions.updateProjects(slug))
+            // dispatch(OrganiserActions.updateGavelProjects(slug))
+            // dispatch(OrganiserActions.updateRankings(slug))
+            // dispatch(OrganiserActions.generateResults(slug)) // TODO do we need to get results always?
         }
     }, [dispatch, slug, event])
     return (
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/participants/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/participants/index.js
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 
 import { useRouteMatch, useLocation } from 'react-router'
 import PageWrapper from 'components/layouts/PageWrapper'
@@ -10,10 +10,21 @@ import TeamsTab from './teams'
 import AssignedTab from './assigned'
 // import TravelTab from './travel'
 import AdminTab from './admin'
+import * as OrganiserSelectors from 'redux/organiser/selectors'
+import * as OrganiserActions from 'redux/organiser/actions'
+import { useDispatch, useSelector } from 'react-redux'
 
 export default () => {
+    const event = useSelector(OrganiserSelectors.event)
+    const dispatch = useDispatch()
     const match = useRouteMatch()
     const location = useLocation()
+
+    useEffect(() => {
+        if (event) {
+            dispatch(OrganiserActions.updateTeamsForEvent(event.slug))
+        }
+    }, [event, location])
     return (
         <PageWrapper>
             <PageHeader
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/by-challenge/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/by-challenge/index.js
@@ -3,9 +3,9 @@ import { useSelector } from 'react-redux'
 import { sortBy } from 'lodash-es'
 import {
     Box,
-    ExpansionPanel,
-    ExpansionPanelSummary,
-    ExpansionPanelDetails,
+    Accordion,
+    AccordionSummary,
+    AccordionDetails,
     ListItemText,
 } from '@material-ui/core'
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore'
@@ -24,7 +24,6 @@ export default () => {
         const projectsWithTeam = projects
             .map(project => {
                 const teamFound = teams.find(team => {
-                    console.log(team._id, project.team)
                     return team._id === project.team
                 })
                 if (teamFound) {
@@ -48,8 +47,8 @@ export default () => {
             {challenges.map(challenge => {
                 const projects = getProjectsForChallenge(challenge.slug)
                 return (
-                    <ExpansionPanel key={challenge.slug}>
-                        <ExpansionPanelSummary
+                    <Accordion key={challenge.slug}>
+                        <AccordionSummary
                             expandIcon={<ExpandMoreIcon />}
                             aria-controls="panel1a-content"
                             id="panel1a-header"
@@ -58,8 +57,8 @@ export default () => {
                                 primary={challenge.name}
                                 secondary={`${challenge.partner} // ${projects.length} projects`}
                             ></ListItemText>
-                        </ExpansionPanelSummary>
-                        <ExpansionPanelDetails>
+                        </AccordionSummary>
+                        <AccordionDetails>
                             <Box
                                 display="flex"
                                 flexDirection="column"
@@ -68,13 +67,10 @@ export default () => {
                                 <Box p={1}>
                                     <ChallengeLink challenge={challenge.slug} />
                                 </Box>
-                                <ProjectsTable
-                                    baseURL={`/projects/${event.slug}/view/`}
-                                    projects={projects}
-                                />
+                                <ProjectsTable projects={projects} />
                             </Box>
-                        </ExpansionPanelDetails>
-                    </ExpansionPanel>
+                        </AccordionDetails>
+                    </Accordion>
                 )
             })}
         </Box>
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/default/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/default/index.js
@@ -5,12 +5,6 @@ import ProjectsTable from 'components/tables/ProjectsTable'
 
 export default () => {
     const projects = useSelector(OrganiserSelectors.projects)
-    const event = useSelector(OrganiserSelectors.event)
 
-    return (
-        <ProjectsTable
-            baseURL={`/projects/${event.slug}/view/`}
-            projects={projects}
-        />
-    )
+    return <ProjectsTable projects={projects} />
 }
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/index.js
@@ -1,6 +1,6 @@
-import React, { useMemo } from 'react'
+import React, { useEffect, useMemo } from 'react'
 
-import { useSelector } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import { useRouteMatch, useLocation } from 'react-router'
 import { OverallReviewingMethods } from '@hackjunction/shared'
 
@@ -17,12 +17,21 @@ import WinnersTab from './winners'
 import FinalistSelectionTab from './finalist-selection'
 import VotingTokensTab from './votingTokens'
 import * as OrganiserSelectors from 'redux/organiser/selectors'
+import * as OrganiserActions from 'redux/organiser/actions'
 
 export default () => {
+    const dispatch = useDispatch()
     const event = useSelector(OrganiserSelectors.event)
-    const projectsLoading = useSelector(OrganiserSelectors.projectsLoading)
     const match = useRouteMatch()
     const location = useLocation()
+    useEffect(() => {
+        if (event.slug) {
+            dispatch(OrganiserActions.updateTeamsForEvent(event.slug))
+            dispatch(OrganiserActions.updateProjects(event.slug))
+        }
+    }, [event, location])
+
+    const projectsLoading = useSelector(OrganiserSelectors.projectsLoading)
 
     const tabs = useMemo(() => {
         const data = [
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/router.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/router.js
@@ -2,7 +2,7 @@ import React from 'react'
 import { useRouteMatch } from 'react-router'
 import { Route, Switch, Redirect } from 'react-router-dom'
 
-import DefaultPage from './default'
+// import DefaultPage from './default'
 import SlugPage from './index'
 
 export default () => {
