Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions backend/src/github_pm/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,13 @@ class CreateMilestone(BaseModel):
due_on: datetime | None = Field(default=None, title="Milestone Due Date")


# Assisted-by: openai-code-assist
class UpdateMilestone(BaseModel):
title: str = Field(title="Milestone Title")
description: str | None = Field(default=None, title="Milestone Description")
due_on: datetime | None = Field(default=None, title="Milestone Due Date")


@api_router.post("/milestones")
async def create_milestone(
gitctx: Annotated[Connector, Depends(connection)],
Expand All @@ -687,6 +694,22 @@ async def create_milestone(
return m


@api_router.patch("/milestones/{milestone_number}")
async def update_milestone(
gitctx: Annotated[Connector, Depends(connection)],
milestone_number: Annotated[int, Path(title="Milestone")],
milestone: Annotated[UpdateMilestone, Body(title="Milestone")],
):
data = {
"title": milestone.title,
"description": milestone.description,
"due_on": milestone.due_on.isoformat() if milestone.due_on else None,
}
return gitctx.patch(
f"/repos/{context.github_repo}/milestones/{milestone_number}", data=data
)


@api_router.delete("/milestones/{milestone_number}")
async def delete_milestone(
gitctx: Annotated[Connector, Depends(connection)],
Expand Down
9 changes: 9 additions & 0 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,14 @@ const App = () => {
// but we can add a callback if needed in the future
};

const handleMilestoneUpdated = (updatedMilestone) => {
setMilestones((current) =>
current.map((item) =>
item.number === updatedMilestone.number ? updatedMilestone : item
)
);
};

const renderPlanningContent = () => (
<PlanningDnDProvider
milestones={milestones}
Expand Down Expand Up @@ -326,6 +334,7 @@ const App = () => {
hierarchyAction={hierarchyAction}
onIssueMilestoneMoved={handleIssueMilestoneMoved}
onIssueLabelsChanged={handleIssueLabelsChanged}
onMilestoneUpdated={handleMilestoneUpdated}
/>
))}
</PlanningBoard>
Expand Down
136 changes: 134 additions & 2 deletions frontend/src/components/MilestoneCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@ import {
Alert,
ExpandableSection,
Button,
Modal,
Form,
FormGroup,
TextInput,
TextArea,
} from '@patternfly/react-core';
import { fetchIssues, createIssue } from '../services/api';
import { fetchIssues, createIssue, updateMilestone } from '../services/api';
import milestonesCache from '../utils/milestonesCache';
import IssueCard from './IssueCard';
import MarkdownInputModal from './MarkdownInputModal';
import { usePlanningDnD } from './PlanningDnDContext';
Expand Down Expand Up @@ -55,6 +61,7 @@ const MilestoneCard = ({
onIssueMilestoneMoved,
onIssueLabelsChanged,
hierarchyAction,
onMilestoneUpdated,
}) => {
const [isIssuesExpanded, setIsIssuesExpanded] = useState(false);
const [isPrsExpanded, setIsPrsExpanded] = useState(false);
Expand All @@ -65,10 +72,57 @@ const MilestoneCard = ({
const [hasLoadedOnce, setHasLoadedOnce] = useState(false);
const [expandedHierarchy, setExpandedHierarchy] = useState(() => new Set());
const [isCreateIssueOpen, setIsCreateIssueOpen] = useState(false);
const [isEditOpen, setIsEditOpen] = useState(false);
const [editMilestone, setEditMilestone] = useState({
title: '',
description: '',
due_on: '',
});
const [editError, setEditError] = useState(null);
const [isSavingEdit, setIsSavingEdit] = useState(false);
const prevMilestoneNumberRef = useRef(milestone.number);
const lastAppliedHierarchyKeyRef = useRef(null);
const dnd = usePlanningDnD();

const openMilestoneEditor = () => {
setEditMilestone({
title: milestone.title || '',
description: milestone.description || '',
due_on: milestone.due_on ? milestone.due_on.slice(0, 10) : '',
});
setEditError(null);
setIsEditOpen(true);
};

const saveMilestoneEdit = async () => {
const title = editMilestone.title.trim();
if (!title) {
setEditError('Title is required');
return;
}
setIsSavingEdit(true);
setEditError(null);
try {
const updated = await updateMilestone(milestone.number, {
title,
description: editMilestone.description.trim() || null,
due_on: editMilestone.due_on
? `${editMilestone.due_on}T00:00:00Z`
: null,
});
const nextMilestone = { ...milestone, ...updated };
milestonesCache.data = milestonesCache.data.map((item) =>
item.number === milestone.number ? nextMilestone : item
);
onMilestoneUpdated?.(nextMilestone);
setIsEditOpen(false);
} catch (err) {
setEditError(err.message);
} finally {
setIsSavingEdit(false);
}
};

const applyFetchedData = useCallback((data) => {
setIssues(data.issues || []);
setPullRequests(data.pull_requests || []);
Expand Down Expand Up @@ -443,7 +497,15 @@ const MilestoneCard = ({
flexWrap: 'wrap',
}}
>
<CardTitle>{milestone.title}</CardTitle>
<CardTitle>
<span
onDoubleClick={openMilestoneEditor}
title="Double-click to edit milestone"
style={{ cursor: 'text' }}
>
{milestone.title}
</span>
</CardTitle>
<Button
variant="secondary"
onClick={() => setIsCreateIssueOpen(true)}
Expand Down Expand Up @@ -500,6 +562,76 @@ const MilestoneCard = ({
</ExpandableSection>
)}
</CardBody>
{isEditOpen && (
<Modal
title={`Edit milestone: ${milestone.title}`}
isOpen={isEditOpen}
onClose={() => setIsEditOpen(false)}
actions={[
<Button
key="save"
variant="primary"
onClick={saveMilestoneEdit}
isLoading={isSavingEdit}
>
Save
</Button>,
<Button
key="cancel"
variant="link"
onClick={() => setIsEditOpen(false)}
>
Cancel
</Button>,
]}
>
<Form>
<FormGroup
label="Title"
isRequired
fieldId={`edit-title-${milestone.number}`}
>
<TextInput
id={`edit-title-${milestone.number}`}
value={editMilestone.title}
onChange={(_event, value) =>
setEditMilestone((prev) => ({ ...prev, title: value }))
}
/>
</FormGroup>
<FormGroup
label="Description"
fieldId={`edit-description-${milestone.number}`}
>
<TextArea
id={`edit-description-${milestone.number}`}
value={editMilestone.description}
onChange={(_event, value) =>
setEditMilestone((prev) => ({ ...prev, description: value }))
}
/>
</FormGroup>
<FormGroup
label="Target date"
fieldId={`edit-date-${milestone.number}`}
>
<TextInput
id={`edit-date-${milestone.number}`}
type="date"
value={editMilestone.due_on}
onChange={(_event, value) =>
setEditMilestone((prev) => ({ ...prev, due_on: value }))
}
/>
</FormGroup>
{editError && (
<Alert variant="danger" isInline title="Unable to save milestone">
{editError}
</Alert>
)}
</Form>
</Modal>
)}
<MarkdownInputModal
isOpen={isCreateIssueOpen}
onClose={() => setIsCreateIssueOpen(false)}
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/components/ProjectStatusPanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,6 @@ const ProjectStatusPanel = () => {
const start = addDaysToLocalDateISO(today, -7);
setDraftStartDate(start);
setDraftEndDate(today);
setStartDate(start);
setEndDate(today);
}}
>
Today
Expand Down
47 changes: 47 additions & 0 deletions frontend/src/components/ProjectStatusPanel.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ import userEvent from '@testing-library/user-event';
import ProjectStatusPanel from './ProjectStatusPanel';
import * as api from '../services/api';
import * as clipboard from '../utils/clipboard';
import {
addDaysToLocalDateISO,
getLocalDateISOString,
} from '../utils/dateUtils';

vi.mock('../services/api');
vi.mock('../utils/clipboard', () => ({
Expand Down Expand Up @@ -176,4 +180,47 @@ describe('ProjectStatusPanel', () => {
expect(localStorage.getItem(STORAGE_START_KEY)).toBe('2025-04-01');
expect(localStorage.getItem(STORAGE_END_KEY)).toBe('2025-04-15');
});

it('updates Today pickers without fetching until Apply', async () => {
const user = userEvent.setup();
const today = getLocalDateISOString();
const start = addDaysToLocalDateISO(today, -7);

api.fetchProjectStatusReport.mockResolvedValue({
start_date: start,
end_date: today,
merged_pull_requests: [],
opened_pull_requests: [],
opened_issues: [],
recently_updated_pull_requests: [],
reviewer_attention_needed: [],
creator_attention_needed: [],
pr_backlog: [],
});

render(<ProjectStatusPanel />);

await waitFor(() => {
expect(api.fetchProjectStatusReport).toHaveBeenCalledTimes(1);
});

await user.click(screen.getByRole('button', { name: 'Today' }));

expect(screen.getByLabelText('Starting')).toHaveValue(start);
expect(screen.getByLabelText('Ending')).toHaveValue(today);
expect(api.fetchProjectStatusReport).toHaveBeenCalledTimes(1);
expect(localStorage.getItem(STORAGE_START_KEY)).toBe('2025-04-03');
expect(localStorage.getItem(STORAGE_END_KEY)).toBe('2025-04-10');

await user.click(screen.getByRole('button', { name: 'Apply' }));

await waitFor(() => {
expect(api.fetchProjectStatusReport).toHaveBeenLastCalledWith(
start,
today
);
});
expect(localStorage.getItem(STORAGE_START_KEY)).toBe(start);
expect(localStorage.getItem(STORAGE_END_KEY)).toBe(today);
});
});
15 changes: 15 additions & 0 deletions frontend/src/services/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,21 @@ export const createMilestone = async (milestoneData) => {
return response.json();
};

// Assisted-by: openai-code-assist
export const updateMilestone = async (milestoneNumber, milestoneData) => {
const response = await fetch(`${API_BASE}/milestones/${milestoneNumber}`, {
method: 'PATCH',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify(milestoneData),
});
if (!response.ok) {
throw new Error(`Failed to update milestone: ${response.statusText}`);
}
return response.json();
};

export const deleteMilestone = async (milestoneNumber) => {
const response = await fetch(`${API_BASE}/milestones/${milestoneNumber}`, {
method: 'DELETE',
Expand Down
Loading