Skip to content

Commit c9d7a08

Browse files
authored
Merge branch 'main' into feat/incident-detection-implementation
2 parents 8e50659 + 5c785fc commit c9d7a08

16 files changed

Lines changed: 65 additions & 37 deletions

File tree

apps/api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"got": "^11.8.3",
5858
"graphql": "^16.8.1",
5959
"graphql-scalars": "^1.22.4",
60-
"graphql-yoga": "^5.0.0",
60+
"graphql-yoga": "^5.18.0",
6161
"hashids": "^2.3.0",
6262
"ioredis": "^5.9.3",
6363
"jsonwebtoken": "^9.0.2",

apps/api/src/app/pull-requests/resolvers/transformers/pull-request-tracking.transformer.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ export const transformPullRequestTracking = ({
5353
firstReviewAt: tracking.firstReviewAt?.toISOString(),
5454
timeToCode: tracking.timeToCode,
5555
firstDeployedAt: tracking.firstDeployedAt?.toISOString(),
56+
timeToFirstReview: calculateTimeForEvent({
57+
from: tracking.firstReadyAt || pullRequest.createdAt,
58+
duration: tracking.timeToFirstReview,
59+
pullRequest,
60+
uselessAfterMerge: true,
61+
}),
5662
timeToFirstApproval: calculateTimeForEvent({
5763
from:
5864
tracking.firstReviewAt ||
@@ -62,14 +68,12 @@ export const transformPullRequestTracking = ({
6268
pullRequest,
6369
uselessAfterMerge: true,
6470
}),
65-
timeToFirstReview: calculateTimeForEvent({
66-
from: tracking.firstReadyAt || pullRequest.createdAt,
67-
duration: tracking.timeToFirstReview,
68-
pullRequest,
69-
uselessAfterMerge: true,
70-
}),
7171
timeToMerge: calculateTimeForEvent({
72-
from: tracking.firstReadyAt || pullRequest.createdAt,
72+
from:
73+
tracking.firstApprovalAt ||
74+
tracking.firstReviewAt ||
75+
tracking.firstReadyAt ||
76+
pullRequest.createdAt,
7377
duration: tracking.timeToMerge,
7478
pullRequest,
7579
uselessAfterMerge: true,

apps/api/src/fastify.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,21 @@ export async function buildApp(opts: FastifyServerOptions = {}) {
5151
app.route({
5252
url: yoga.graphqlEndpoint,
5353
method: ["GET", "POST", "OPTIONS"],
54-
handler: (req, reply) =>
55-
yoga.handleNodeRequestAndResponse(req, reply, {
54+
handler: async (req, reply) => {
55+
const response = await yoga.handleNodeRequestAndResponse(req, reply, {
5656
req,
5757
reply,
58-
} as never),
58+
} as never);
59+
60+
response.headers.forEach((value, key) => {
61+
reply.header(key, value);
62+
});
63+
64+
reply.status(response.status);
65+
reply.send(response.body);
66+
67+
return reply;
68+
},
5969
});
6070

6171
setupFastifyErrorHandler(app);

apps/web/src/app/humans/teams/[id]/health-and-performance/activity/code-review-distribution/page.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ export const TeamCodeReviewDistributionPage = () => {
8383

8484
filters.setFieldValue("from", from);
8585
filters.setFieldValue("to", to);
86-
searchParams.set("from", from);
87-
searchParams.set("to", to);
86+
searchParams.setMany({ from, to });
8887
}}
8988
value={[
9089
parseNullableISO(filters.values.from) || null,

apps/web/src/app/humans/teams/[id]/health-and-performance/code-reviews/time-to-approve/page.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ export const TeamCodeReviewsTimeToApprovePage = () => {
7979

8080
filters.setFieldValue("from", from);
8181
filters.setFieldValue("to", to);
82-
searchParams.set("from", from);
83-
searchParams.set("to", to);
82+
searchParams.setMany({ from, to });
8483
}}
8584
value={[
8685
parseNullableISO(filters.values.from) || null,

apps/web/src/app/humans/teams/[id]/health-and-performance/code-reviews/time-to-first-review/page.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ export const TeamCodeReviewsTimeToFirstReviewPage = () => {
7878

7979
filters.setFieldValue("from", from);
8080
filters.setFieldValue("to", to);
81-
searchParams.set("from", from);
82-
searchParams.set("to", to);
81+
searchParams.setMany({ from, to });
8382
}}
8483
value={[
8584
parseNullableISO(filters.values.from) || null,

apps/web/src/app/humans/teams/[id]/health-and-performance/pull-requests/cycle-time/page.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ export const TeamPullRequestsCycleTimePage = () => {
8080

8181
filters.setFieldValue("from", from);
8282
filters.setFieldValue("to", to);
83-
searchParams.set("from", from);
84-
searchParams.set("to", to);
83+
searchParams.setMany({ from, to });
8584
}}
8685
value={[
8786
parseNullableISO(filters.values.from) || null,

apps/web/src/app/humans/teams/[id]/health-and-performance/pull-requests/size-distribution/page.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ export const TeamPullRequestsSizeDistribution = () => {
8484

8585
filters.setFieldValue("from", from);
8686
filters.setFieldValue("to", to);
87-
searchParams.set("from", from);
88-
searchParams.set("to", to);
87+
searchParams.setMany({ from, to });
8988
}}
9089
value={[
9190
parseNullableISO(filters.values.from) || null,

apps/web/src/app/humans/teams/[id]/health-and-performance/pull-requests/time-to-merge/page.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ export const TeamPullRequestsTimeToMergePage = () => {
8484

8585
filters.setFieldValue("from", from);
8686
filters.setFieldValue("to", to);
87-
searchParams.set("from", from);
88-
searchParams.set("to", to);
87+
searchParams.setMany({ from, to });
8988
}}
9089
value={[
9190
parseNullableISO(filters.values.from) || null,

apps/web/src/app/humans/teams/[id]/work-log/page.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ export const TeamWorkLogPage = () => {
3535

3636
filters.setFieldValue("from", from);
3737
filters.setFieldValue("to", to);
38-
searchParams.set("from", from);
39-
searchParams.set("to", to);
38+
searchParams.setMany({ from, to });
4039
}}
4140
value={[
4241
parseNullableISO(filters.values.from) || null,

0 commit comments

Comments
 (0)