Skip to content

Commit 51b90bc

Browse files
authored
Issues - milestone picker feedback (#6873)
Fixes #6845
1 parent c441268 commit 51b90bc

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

src/github/quickPicks.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,18 @@ export async function getMilestoneFromQuickPick(folderRepositoryManager: FolderR
284284
};
285285
let selectedItem: vscode.QuickPickItem | undefined;
286286
async function getMilestoneOptions(): Promise<(MilestoneQuickPickItem | vscode.QuickPickItem)[]> {
287-
const milestones = await githubRepository.getMilestones();
287+
const milestones = (await githubRepository.getMilestones())?.sort((a, b) => {
288+
// Milestones with a date should be first, and sorted by due date
289+
if (a.dueOn && b.dueOn) {
290+
return new Date(a.dueOn).getTime() - new Date(b.dueOn).getTime();
291+
} else if (a.dueOn) {
292+
return -1;
293+
} else if (b.dueOn) {
294+
return 1;
295+
} else {
296+
return a.title.localeCompare(b.title);
297+
}
298+
});
288299
if (!milestones || !milestones.length) {
289300
return [
290301
{

0 commit comments

Comments
 (0)