Skip to content

fix: pr timeline #88

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
waltergalvao merged 3 commits into from
Feb 22, 2026
Merged

fix: pr timeline #88

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
053a855
fix: pr timeline
waltergalvao Feb 22, 2026
9ebec04
fix: personal metrics date range
waltergalvao Feb 22, 2026
59341b6
fix: remove log
waltergalvao Feb 22, 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
12 changes: 6 additions & 6 deletions apps/api/src/app/metrics/services/personal-metrics.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ const getCodeReviewMetrics = async (workspaceId: number, personId: number) => {
>(Prisma.sql`
SELECT
COUNT(*) FILTER (
WHERE "CodeReview"."createdAt" BETWEEN CURRENT_DATE - INTERVAL '29 days' AND CURRENT_DATE
WHERE "CodeReview"."createdAt" BETWEEN NOW() - INTERVAL '30 days' AND NOW()
AND "CodeReview"."workspaceId" = ${workspaceId}
) AS current,
COUNT(*) FILTER (
WHERE "CodeReview"."createdAt" BETWEEN CURRENT_DATE - INTERVAL '60 days' AND CURRENT_DATE - INTERVAL '30 days'
WHERE "CodeReview"."createdAt" BETWEEN NOW() - INTERVAL '60 days' AND NOW() - INTERVAL '30 days'
AND "CodeReview"."workspaceId" = ${workspaceId}
) AS previous
FROM
Expand Down Expand Up @@ -78,19 +78,19 @@ const getPullRequestSizeMetrics = async (
>(Prisma.sql`
SELECT
COUNT(*) FILTER (
WHERE "PullRequest"."createdAt" BETWEEN CURRENT_DATE - INTERVAL '29 days' AND CURRENT_DATE
WHERE "PullRequest"."mergedAt" BETWEEN NOW() - INTERVAL '30 days' AND NOW()
AND "PullRequest"."workspaceId" = ${workspaceId}
) AS current,
COUNT(*) FILTER (
WHERE "PullRequest"."createdAt" BETWEEN CURRENT_DATE - INTERVAL '60 days' AND CURRENT_DATE - INTERVAL '30 days'
WHERE "PullRequest"."mergedAt" BETWEEN NOW() - INTERVAL '60 days' AND NOW() - INTERVAL '30 days'
AND "PullRequest"."workspaceId" = ${workspaceId}
) AS previous,
COUNT(*) FILTER (
WHERE "PullRequestTracking"."size" IN ('TINY', 'SMALL') AND "PullRequest"."createdAt" BETWEEN CURRENT_DATE - INTERVAL '29 days' AND CURRENT_DATE
WHERE "PullRequestTracking"."size" IN ('TINY', 'SMALL') AND "PullRequest"."mergedAt" BETWEEN NOW() - INTERVAL '30 days' AND NOW()
AND "PullRequest"."workspaceId" = ${workspaceId}
) AS current_small,
COUNT(*) FILTER (
WHERE "PullRequestTracking"."size" IN ('TINY', 'SMALL') AND "PullRequest"."createdAt" BETWEEN CURRENT_DATE - INTERVAL '60 days' AND CURRENT_DATE - INTERVAL '30 days'
WHERE "PullRequestTracking"."size" IN ('TINY', 'SMALL') AND "PullRequest"."mergedAt" BETWEEN NOW() - INTERVAL '60 days' AND NOW() - INTERVAL '30 days'
AND "PullRequest"."workspaceId" = ${workspaceId}
) AS previous_small
FROM
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/card-pull-request/timeline-pull-request.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ export const TimelinePullRequest = ({
)}
</Timeline>
</Box>
{cycleTime && isMerged && (
{!!cycleTime && isMerged && (
<>
<Divider />
<Box p="md">
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/card-pull-request/use-badges.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const getApprovalBadge = (
const getVariant = (): Variant => {
const timeToFirstApproval = pullRequest.tracking.timeToFirstApproval;

if (!timeToFirstApproval) return "warning";
if (!timeToFirstApproval) return "default";

const hoursToFirstApproval = timeToFirstApproval / msToHour;

Expand Down
Loading