reversion

Author: JoshuaGoldberg

src/frontend/src/pages/GanttPage/GanttChart/GanttChartComponents/GanttTaskBar/GanttTaskBarDisplay.tsx

@@ -194,7 +194,7 @@ const GanttTaskBarDisplay = <T,>({
                 </Typography>
               </div>
               {hasOverlays &&
-                task.overlays.map((childTask) => {
+                task.children.map((childTask) => {
                   return (
                     <div
                       style={ganttTaskBarChildOverlayStyles(childTask)}

src/frontend/src/pages/GanttPage/GanttChart/GanttChartComponents/GanttTaskBar/GanttTaskBarEdit.tsx

@@ -26,7 +26,7 @@ const GanttTaskBarEdit = <T,>({
         getEndCol={getEndCol}
         onAddTaskPressed={onAddTaskPressed}
       />
-      {(task.children.length > 0 ? task.children : (task.loadChildren?.() ?? [])).map((child) => {
+      {task.children.map((child) => {
         return (
           <GanttTaskBarEdit
             key={child.id}

src/frontend/src/pages/GanttPage/GanttChart/GanttChartComponents/GanttTaskBar/GanttTaskBarView.tsx

@@ -37,19 +37,11 @@ const GanttTaskBarView = <T,>({
   onToggle
 }: GanttTaskBarViewProps<T>) => {
   const [showChildren, setShowChildren] = useState(false);
-  const [loadedChildren, setLoadedChildren] = useState<GanttTask<T>[]>(task.children);
-  const [hasLoaded, setHasLoaded] = useState(task.children.length > 0);
 
   const handleToggle = () => {
-    if (!hasLoaded && task.loadChildren) {
-      setLoadedChildren(task.loadChildren());
-      setHasLoaded(true);
-    }
     setShowChildren((prev) => !prev);
   };
 
-  console.log('I Rerender!');
-
   return (
     <>
       <GanttTaskBarDisplay
@@ -67,7 +59,7 @@ const GanttTaskBarView = <T,>({
       />
 
       <Collapse in={showChildren} unmountOnExit onEntered={onToggle} onExited={onToggle}>
-        {loadedChildren.map((child) => (
+        {task.children.map((child) => (
           <GanttTaskBar
             key={child.id}
             days={days}

src/frontend/src/utils/gantt.utils.tsx

@@ -112,7 +112,6 @@ interface GanttTaskData<T> {
   retro?: GanttRetroProps;
   onClick?: () => void;
   root?: boolean;
-  loadChildren?: () => GanttTaskData<T>[];
 }
 
 export type Date_Event = { id: string; start: Date; end: Date; title: string };
@@ -485,12 +484,10 @@ export const transformProjectToGanttTask = (
     start: startDate,
     end: endDate,
     blocking: [],
-    children: [],
-    loadChildren: () =>
-      [
-        ...project.workPackages.map((workPackage) => transformWorkPackageToGanttTask(workPackage, project.workPackages)),
-        ...taskList.map((task) => transformTaskToGanttTask(task, endDate))
-      ].sort((a, b) => new Date(a.start).getTime() - new Date(b.start).getTime()),
+    children: [
+      ...project.workPackages.map((workPackage) => transformWorkPackageToGanttTask(workPackage, project.workPackages)),
+      ...taskList.map((task) => transformTaskToGanttTask(task, endDate))
+    ],
     overlays: [
       ...project.workPackages.map((wp) => transformWorkPackageToGanttTask(wp, project.workPackages)),
       ...taskList.map((task) => transformTaskToGanttTask(task, endDate))