Skip to content
Closed
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
14 changes: 6 additions & 8 deletions src/components/miners/MinerPRsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ const MinerPRsTable: React.FC<MinerPRsTableProps> = ({ githubId }) => {
cmp = a.additions + a.deletions - (b.additions + b.deletions);
break;
case 'date': {
const da = a.mergedAt || a.prCreatedAt || '';
const db = b.mergedAt || b.prCreatedAt || '';
const da = a.mergedAt || a.closedAt || a.prCreatedAt || '';
const db = b.mergedAt || b.closedAt || b.prCreatedAt || '';
cmp = da.localeCompare(db);
break;
}
Expand Down Expand Up @@ -414,12 +414,10 @@ const MinerPRsTable: React.FC<MinerPRsTableProps> = ({ githubId }) => {
fontSize: { xs: '0.75rem', sm: '0.85rem' },
color: (theme) => alpha(theme.palette.text.primary, 0.7),
},
renderCell: (pr) =>
pr.mergedAt
? new Date(pr.mergedAt).toLocaleDateString()
: pr.prState === 'CLOSED'
? 'Closed'
: 'Open',
renderCell: (pr) => {
const dateStr = pr.mergedAt || pr.closedAt || pr.prCreatedAt;
return dateStr ? new Date(dateStr).toLocaleDateString() : null;
},
},
{
key: 'watch',
Expand Down
5 changes: 2 additions & 3 deletions src/pages/search/PullRequestsTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ const formatPrScore = (pr: CommitLog) => {
};

const formatPrDateOrStatus = (pr: CommitLog) => {
if (pr.mergedAt) return new Date(pr.mergedAt).toLocaleDateString();
if (pr.prState === 'CLOSED') return 'Closed';
return 'Open';
const dateStr = pr.mergedAt || pr.closedAt || pr.prCreatedAt;
return dateStr ? new Date(dateStr).toLocaleDateString() : '';
};

const prColumns: DataTableColumn<CommitLog>[] = [
Expand Down