Merge branch 'upstream/develop' into feat/bulk-edit-notifications and resolve conflicts

server/src/controllers/monitorController.ts

@@ -63,7 +63,6 @@ class MonitorController {
 
 			const monitorId = validatedParams.monitorId;
 			const dateRange = validatedQuery.dateRange;
-			const normalize = validatedQuery.normalize;
 
 			const teamId = requireTeamId(req.user?.teamId);
 
@@ -71,7 +70,6 @@ class MonitorController {
 				teamId,
 				monitorId,
 				dateRange,
-				normalize,
 			});
 			return res.status(200).json({
 				success: true,
@@ -327,7 +325,6 @@ class MonitorController {
 		try {
 			const validatedQuery = getMonitorsWithChecksQueryValidation.parse(req.query);
 
-			const explain = validatedQuery.explain;
 			const limit = validatedQuery.limit;
 			const page = validatedQuery.page;
 			const rowsPerPage = validatedQuery.rowsPerPage;
@@ -346,7 +343,6 @@ class MonitorController {
 				filter,
 				field,
 				order,
-				explain,
 			});
 
 			return res.status(200).json({