Skip to content

feat(sprint): add sprint progress tracking with scope change visibility #14

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

Merged
fathiraz merged 3 commits into from
Mar 29, 2026
Merged

feat(sprint): add sprint progress tracking with scope change visibility #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
292ec06
feat(sprint): add sprint progress tracking with scope change visibility
fathiraz Mar 29, 2026
478bc36
fix(sprint): address code review issues from PR #14
fathiraz Mar 29, 2026
2f53a93
Merge branch 'main' into feat/sprint-progress-tracking
fathiraz Mar 29, 2026
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
94 changes: 73 additions & 21 deletions src/components/sprint/sprint-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { iterationEndDate, nextAfter, injectSprintFilter, SPRINT_FILTER } from '
import type { Iteration } from '../../lib/sprint-utils'
import type { ProjectData } from '../../lib/github-project'
import { sprintConfirmEndStore } from './sprint-store'
import { SprintProgressView } from './sprint-progress-view'

// ── Shared helpers ───────────────────────────────────────────

Expand Down Expand Up @@ -103,6 +104,8 @@ function SettingsView({ projectId, owner, isOrg, number, getFields, currentSetti
const [excludeConditions, setExcludeConditions] = useState<ExcludeCondition[]>(
currentSettings?.excludeConditions ?? []
)
const [pointsFieldId, setPointsFieldId] = useState(currentSettings?.pointsFieldId ?? '')
const [notStartedOptionId, setNotStartedOptionId] = useState(currentSettings?.notStartedOptionId ?? '')

useEffect(() => {
sendMessage('getProjectFields', { owner, number, isOrg })
Expand All @@ -116,6 +119,7 @@ function SettingsView({ projectId, owner, isOrg, number, getFields, currentSetti
const selectedSprintField = iterationFields.find((f) => f.id === sprintFieldId)
const selectedDoneField = doneFields.find((f) => f.id === doneFieldId)
const excludableFields = doneFields.filter((f) => f.id !== sprintFieldId)
const numberFields = fields.filter((f) => f.dataType === 'NUMBER')

const hasIncompleteExclude = excludeConditions.some((c) => {
if (!c.fieldId) return true
Expand Down Expand Up @@ -150,6 +154,7 @@ function SettingsView({ projectId, owner, isOrg, number, getFields, currentSetti
const doneField = doneFields.find((f) => f.id === doneFieldId)!
const isDoneText = doneField.dataType === 'TEXT'
const selectedOption = doneField.options?.find((o) => o.id === doneOptionId)
const selectedPointsField = numberFields.find((f) => f.id === pointsFieldId)
const settings: SprintSettings = {
sprintFieldId,
sprintFieldName: sprintField.name,
Expand All @@ -160,6 +165,12 @@ function SettingsView({ projectId, owner, isOrg, number, getFields, currentSetti
doneOptionName: isDoneText ? doneTextValue.trim() : (selectedOption?.name ?? ''),
acknowledgedSprintId: currentSettings?.acknowledgedSprintId,
excludeConditions: excludeConditions.filter((c) => c.fieldId && (c.optionId || c.optionName.trim())),
pointsFieldId: selectedPointsField?.id,
pointsFieldName: selectedPointsField?.name,
notStartedOptionId: notStartedOptionId || undefined,
Copy link
Copy Markdown

@cubic-dev-ai cubic-dev-ai bot Mar 29, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1: Re-validate notStartedOptionId on save; it can match doneOptionId after done-option changes and persist an invalid configuration.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At src/components/sprint/sprint-modal.tsx, line 170:

<comment>Re-validate `notStartedOptionId` on save; it can match `doneOptionId` after done-option changes and persist an invalid configuration.</comment>

<file context>
@@ -160,6 +165,12 @@ function SettingsView({ projectId, owner, isOrg, number, getFields, currentSetti
         excludeConditions: excludeConditions.filter((c) => c.fieldId && (c.optionId || c.optionName.trim())),
+        pointsFieldId: selectedPointsField?.id,
+        pointsFieldName: selectedPointsField?.name,
+        notStartedOptionId: notStartedOptionId || undefined,
+        notStartedOptionName: notStartedOptionId
+          ? (selectedDoneField?.options?.find((o) => o.id === notStartedOptionId)?.name ?? undefined)
</file context>
Suggested change
notStartedOptionId: notStartedOptionId || undefined,
notStartedOptionId: notStartedOptionId && notStartedOptionId !== doneOptionId ? notStartedOptionId : undefined,
Fix with Cubic

notStartedOptionName: notStartedOptionId
? (selectedDoneField?.options?.find((o) => o.id === notStartedOptionId)?.name ?? undefined)
: undefined,
}
await sendMessage('saveSprintSettings', { projectId, settings })
injectSprintFilter()
Expand Down Expand Up @@ -213,7 +224,7 @@ function SettingsView({ projectId, owner, isOrg, number, getFields, currentSetti
</FormControl.Label>
<Select
value={doneFieldId}
onChange={(e) => { setDoneFieldId(e.target.value); setDoneOptionId('') }}
onChange={(e) => { setDoneFieldId(e.target.value); setDoneOptionId(''); setNotStartedOptionId('') }}
block
>
<Select.Option value="">Select a field…</Select.Option>
Expand Down Expand Up @@ -251,6 +262,39 @@ function SettingsView({ projectId, owner, isOrg, number, getFields, currentSetti
</RadioGroup>
)}

{/* Not started option — items in this state are excluded from "done" count in sprint progress */}
{selectedDoneField?.dataType === 'SINGLE_SELECT' && selectedDoneField.options && (
<FormControl>
<FormControl.Label sx={{ display: 'flex', alignItems: 'center', gap: 2, fontSize: 1, fontWeight: 'semibold', color: 'fg.muted' }}>
<Box sx={labelIconBoxSx}><OptionsSelectIcon size={16} /></Box>
Not started option <Text sx={{ fontWeight: 'normal', color: 'fg.subtle' }}>(optional)</Text>
</FormControl.Label>
<Select
value={notStartedOptionId}
onChange={(e) => {
const selected = e.target.value
if (selected && selected === doneOptionId) {
setError('Not started option cannot be the same as the done option')
return
}
setError(null)
setNotStartedOptionId(selected)
}}
block
>
<Select.Option value="">None (only count exact done option)</Select.Option>
{selectedDoneField.options
.filter((opt) => opt.id !== doneOptionId)
.map((opt) => (
<Select.Option key={opt.id} value={opt.id}>{opt.name}</Select.Option>
))}
</Select>
<FormControl.Caption>
When set, all statuses except this one count toward sprint progress — not just the done option.
</FormControl.Caption>
</FormControl>
)}

{/* Text input for TEXT done field */}
{selectedDoneField?.dataType === 'TEXT' && (
<FormControl>
Expand Down Expand Up @@ -361,6 +405,23 @@ function SettingsView({ projectId, owner, isOrg, number, getFields, currentSetti
</Tippy>
</Box>

{/* Story points field (optional) */}
{numberFields.length > 0 && (
<FormControl>
<FormControl.Label sx={{ display: 'flex', alignItems: 'center', gap: 2, fontSize: 1, fontWeight: 'semibold', color: 'fg.muted' }}>
<Box sx={labelIconBoxSx}><SlidersIcon size={16} /></Box>
Story points field <Text sx={{ fontWeight: 'normal', color: 'fg.subtle' }}>(optional)</Text>
</FormControl.Label>
<Select value={pointsFieldId} onChange={(e) => setPointsFieldId(e.target.value)} block>
<Select.Option value="">None</Select.Option>
{numberFields.map((f) => (
<Select.Option key={f.id} value={f.id}>{f.name}</Select.Option>
))}
</Select>
<FormControl.Caption>Used to display point totals in the sprint progress view.</FormControl.Caption>
</FormControl>
)}

{/* Footer */}
<Box sx={{ pt: 2, borderTop: '1px solid', borderColor: 'border.default' }}>
<Flash variant="warning" sx={{ fontSize: 0, mb: 3 }}>
Expand Down Expand Up @@ -694,26 +755,17 @@ export function SprintPanel({ projectId, owner, isOrg, number, getFields, visibl
</Box>
)}

{state === 'active' && currentSprint && (
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
<Text sx={{ fontSize: 1, fontWeight: 'semibold', color: 'fg.default' }}>{currentSprint.title}</Text>
<Text sx={{ fontSize: 0, color: 'fg.muted' }}>
{fmt(currentSprint.startDate)} – {fmt(currentSprint.endDate)} · {daysLeft(currentSprint.endDate)} day{daysLeft(currentSprint.endDate) !== 1 ? 's' : ''} left
</Text>
<Box sx={{ height: '6px', borderRadius: '3px', bg: 'neutral.muted', overflow: 'hidden', mt: 1 }}>
<Box sx={{ height: '100%', borderRadius: '3px', bg: 'accent.emphasis', width: `${sprintProgress(currentSprint.startDate, currentSprint.endDate)}%` }} />
</Box>
<Text sx={{ fontSize: 0, color: 'fg.subtle' }}>
Filter{' '}
<Text as="code" sx={{ fontFamily: 'mono', fontSize: 0 }}>{SPRINT_FILTER}</Text>
{' '}is applied automatically on save.
</Text>
<Box sx={{ display: 'flex', justifyContent: 'flex-end', mt: 1 }}>
<Tippy content="End the current sprint" placement="top" delay={[400, 0]} zIndex={Z_TOOLTIP}>
<Button variant="danger" size="small" onClick={() => setConfirmingEnd(true)} sx={{ boxShadow: 'none', transition: '150ms cubic-bezier(0.4, 0, 0.2, 1)', '&:hover:not(:disabled)': { transform: 'translateY(-1px)' }, '&:active': { transform: 'translateY(0)', transition: '100ms' }, '@media (prefers-reduced-motion: reduce)': { transition: 'none', '&:hover:not(:disabled)': { transform: 'none' } } }}>End Sprint</Button>
</Tippy>
</Box>
</Box>
{state === 'active' && status?.activeSprint && status?.settings && (
<SprintProgressView
activeSprint={status.activeSprint}
settings={status.settings}
projectId={projectId}
owner={owner}
number={number}
isOrg={isOrg}
onEndSprint={() => setConfirmingEnd(true)}
onOpenSettings={() => setShowSettings(true)}
/>
)}
</>
)}
Expand Down
Loading
Loading