Skip to content

#3661 gantt chart items duplicating #3823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rbessin wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

#3661 gantt chart items duplicating #3823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daffec2
#3661 added seed data for blocked items
rbessin Dec 9, 2025
f2a8a58
#3661 fixed duplication issues
rbessin Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/backend/src/prisma/seed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,7 @@ const performSeed: () => Promise<void> = async () => {
await ChangeRequestsService.reviewChangeRequest(joeShmoe, project3WP1ActivationCrId, 'Approved!', true, ner, null);

/** Work Package 2 */
await seedWorkPackage(
const { workPackage: project3WP2 } = await seedWorkPackage(
lexLuther,
'Laser Canon Research',
changeRequestProject7Id,
Expand All @@ -1404,7 +1404,7 @@ const performSeed: () => Promise<void> = async () => {
WorkPackageStage.Testing,
weeksFromNow(3).toISOString().split('T')[0],
4,
[],
[project3WP1.wbsNum, project3WP2.wbsNum],
[],
zatanna,
WbsElementStatus.Active,
Expand Down
70 changes: 0 additions & 70 deletions ...d/src/pages/GanttPage/GanttChart/GanttChartComponents/GanttTaskBar/BlockedTaskBarView.tsx
View file
Open in desktop

This file was deleted.

71 changes: 27 additions & 44 deletions ...rontend/src/pages/GanttPage/GanttChart/GanttChartComponents/GanttTaskBar/GanttTaskBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@

import GanttTaskBarEdit from './GanttTaskBarEdit';
import GanttTaskBarView from './GanttTaskBarView';
import { ArcherContainer } from 'react-archer';
import { useRef } from 'react';
import { ArcherContainerHandle } from 'react-archer/lib/ArcherContainer/ArcherContainer.types';
import {
GanttChange,
GanttTask,
Expand Down Expand Up @@ -46,14 +43,11 @@ const GanttTaskBar = <T,>({
highlightSubtaskComparator,
highlightTaskComparator
}: GanttTaskBarProps<T>) => {
const archerRef = useRef<ArcherContainerHandle>(null);

const getStartCol = (start: Date) => {
const startCol = days.findIndex((day) => dateToString(day) === dateToString(getMonday(start))) + 1;
return startCol;
};

// if the end date doesn't exist within the timeframe, have it span to the end
const getEndCol = (end: Date) => {
const endCol =
days.findIndex((day) => dateToString(day) === dateToString(getMonday(end))) === -1
Expand All @@ -62,45 +56,34 @@ const GanttTaskBar = <T,>({
return endCol;
};

const handleChange = (change: GanttChange<T>) => {
createChange(change);
setTimeout(() => {
if (archerRef.current) {
archerRef.current.refreshScreen();
}
}, 100); // wait for the change to be added to the state and the DOM to update
};

return (
<ArcherContainer ref={archerRef} strokeColor="#ef4545">
<div id={`gantt-task-${task.id}`}>
{isEditMode ? (
<GanttTaskBarEdit
days={days}
task={task}
createChange={handleChange}
getStartCol={getStartCol}
getEndCol={getEndCol}
onAddTaskPressed={onAddTaskPressed}
/>
) : (
<GanttTaskBarView
days={days}
task={task}
getStartCol={getStartCol}
getEndCol={getEndCol}
handleOnMouseOver={handleOnMouseOver}
handleOnMouseLeave={handleOnMouseLeave}
showChildren={showChildren}
onShowChildrenToggle={onShowChildrenToggle}
highlightedChange={highlightedChange}
onAddTaskPressed={onAddTaskPressed}
highlightSubtaskComparator={highlightSubtaskComparator}
highlightTaskComparator={highlightTaskComparator}
/>
)}
</div>
</ArcherContainer>
<div id={`gantt-task-${task.id}`}>
{isEditMode ? (
<GanttTaskBarEdit
days={days}
task={task}
createChange={createChange}
getStartCol={getStartCol}
getEndCol={getEndCol}
onAddTaskPressed={onAddTaskPressed}
/>
) : (
<GanttTaskBarView
days={days}
task={task}
getStartCol={getStartCol}
getEndCol={getEndCol}
handleOnMouseOver={handleOnMouseOver}
handleOnMouseLeave={handleOnMouseLeave}
showChildren={showChildren}
onShowChildrenToggle={onShowChildrenToggle}
highlightedChange={highlightedChange}
onAddTaskPressed={onAddTaskPressed}
highlightSubtaskComparator={highlightSubtaskComparator}
highlightTaskComparator={highlightTaskComparator}
/>
)}
</div>
);
};

Expand Down
18 changes: 0 additions & 18 deletions ...end/src/pages/GanttPage/GanttChart/GanttChartComponents/GanttTaskBar/GanttTaskBarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
} from '../../../../../utils/gantt.utils';
import { Collapse } from '@mui/material';
import GanttTaskBar from './GanttTaskBar';
import BlockedGanttTaskView from './BlockedTaskBarView';
import GanttTaskBarDisplay from './GanttTaskBarDisplay';

interface GanttTaskBarViewProps<T> {
Expand Down Expand Up @@ -74,23 +73,6 @@ const GanttTaskBarView = <T,>({
);
})}
</Collapse>
{task.blocking.map((blocking) => {
return (
<BlockedGanttTaskView
key={blocking.id}
task={blocking}
days={days}
getStartCol={getStartCol}
getEndCol={getEndCol}
handleOnMouseOver={handleOnMouseOver}
onShowChildrenToggle={onShowChildrenToggle}
highlightSubtaskComparator={highlightSubtaskComparator}
highlightTaskComparator={highlightTaskComparator}
handleOnMouseLeave={handleOnMouseLeave}
highlightedChange={highlightedChange}
/>
);
})}
</>
);
};
Expand Down
72 changes: 37 additions & 35 deletions src/frontend/src/pages/GanttPage/GanttChart/GanttChartSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { Box, Typography } from '@mui/material';
import { useState } from 'react';
import GanttTaskBar from './GanttChartComponents/GanttTaskBar/GanttTaskBar';
import GanttToolTip from './GanttChartComponents/GanttToolTip';
import { ArcherContainer } from 'react-archer';

interface GanttChartSectionProps<T> {
start: Date;
Expand Down Expand Up @@ -64,42 +65,43 @@ const GanttChartSection = <T,>({
};

return tasks.length > 0 ? (
<Box sx={{ width: 'fit-content' }}>
<Box sx={{ mt: '1rem', width: 'fit-content' }}>
{tasks.map((task) => {
return (
<Box display="flex" alignItems="center">
<GanttTaskBar
key={task.id}
days={days}
task={task}
isEditMode={isEditMode}
createChange={handleCreateProjectChange}
handleOnMouseOver={handleOnMouseOver}
handleOnMouseLeave={handleOnMouseLeave}
onShowChildrenToggle={() => onShowChildrenToggle(task)}
onAddTaskPressed={onAddTaskPressed}
showChildren={shouldShowChildren(task)}
highlightedChange={highlightedChange}
highlightSubtaskComparator={highlightSubtaskComparator}
highlightTaskComparator={highlightTaskComparator}
/>
</Box>
);
})}
<ArcherContainer strokeColor="#ef4545">
<Box sx={{ width: 'fit-content' }}>
<Box sx={{ mt: '1rem', width: 'fit-content' }}>
{tasks.map((task) => {
return (
<Box key={task.id} display="flex" alignItems="center">
<GanttTaskBar
days={days}
task={task}
isEditMode={isEditMode}
createChange={handleCreateProjectChange}
handleOnMouseOver={handleOnMouseOver}
handleOnMouseLeave={handleOnMouseLeave}
onShowChildrenToggle={() => onShowChildrenToggle(task)}
onAddTaskPressed={onAddTaskPressed}
showChildren={shouldShowChildren(task)}
highlightedChange={highlightedChange}
highlightSubtaskComparator={highlightSubtaskComparator}
highlightTaskComparator={highlightTaskComparator}
/>
</Box>
);
})}
</Box>
{currentTooltipOptions && (
<GanttToolTip
yCoordinate={cursorY}
title={currentTooltipOptions.name}
startDate={currentTooltipOptions.start}
endDate={currentTooltipOptions.end}
color={currentTooltipOptions.styles?.backgroundColor}
upperRightDisplay={currentTooltipOptions.tooltip?.upperRightDisplay}
lowerRightDisplay={currentTooltipOptions.tooltip?.lowerRightDisplay}
/>
)}
</Box>
{currentTooltipOptions && (
<GanttToolTip
yCoordinate={cursorY}
title={currentTooltipOptions.name}
startDate={currentTooltipOptions.start}
endDate={currentTooltipOptions.end}
color={currentTooltipOptions.styles?.backgroundColor}
upperRightDisplay={currentTooltipOptions.tooltip?.upperRightDisplay}
lowerRightDisplay={currentTooltipOptions.tooltip?.lowerRightDisplay}
/>
)}
</Box>
</ArcherContainer>
) : (
<Typography sx={{ marginTop: 5 }}>No Projects to Display</Typography>
);
Expand Down
10 changes: 4 additions & 6 deletions src/frontend/src/utils/gantt.utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ const getBlockingGanttTasks = <T extends WorkPackage>(

export const transformTaskToGanttTask = <T extends Task>(task: T, end: Date): GanttTask<T> => {
return {
id: uuidv4(),
id: task.taskId,
element: task,

name: task.title,
Expand Down Expand Up @@ -441,7 +441,7 @@ export const transformWorkPackageToGanttTask = <T extends WorkPackage>(
allWorkPackages: T[]
): GanttTask<T> => {
return {
id: uuidv4(),
id: workPackage.id,
element: workPackage,

name: workPackage.name,
Expand Down Expand Up @@ -477,17 +477,15 @@ export const transformProjectToGanttTask = (
const taskList = hideTasks ? [] : project.tasks;

return {
id: uuidv4(),
id: project.id,
element: project,

name: project.name,
start: startDate,
end: endDate,
blocking: [],
children: [
...project.workPackages
.filter((workPackage) => workPackage.blockedBy.length === 0)
.map((workPackage) => transformWorkPackageToGanttTask(workPackage, project.workPackages)),
...project.workPackages.map((workPackage) => transformWorkPackageToGanttTask(workPackage, project.workPackages)),
...taskList.map((task) => transformTaskToGanttTask(task, endDate))
],
overlays: [
Expand Down