From b857137f1add45cb1514834d2f4636f246713ce8 Mon Sep 17 00:00:00 2001
From: karenvicent <karenvergara@msn.com>
Date: Wed, 20 Aug 2025 18:14:42 -0400
Subject: [PATCH 1/8] fix data format in uptime and infrastructure charts

---
 client/src/Components/Charts/Utils/chartUtilFunctions.js | 1 +
 client/src/Pages/Infrastructure/Details/index.jsx        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/client/src/Components/Charts/Utils/chartUtilFunctions.js b/client/src/Components/Charts/Utils/chartUtilFunctions.js
index d8ec6cdb6..2851af93e 100644
--- a/client/src/Components/Charts/Utils/chartUtilFunctions.js
+++ b/client/src/Components/Charts/Utils/chartUtilFunctions.js
@@ -1,5 +1,6 @@
 export const tooltipDateFormatLookup = (dateRange) => {
 	const dateFormatLookup = {
+		recent: "ddd. MMMM D, YYYY, hh:mm A",
 		day: "ddd. MMMM D, YYYY, hh:mm A",
 		week: "ddd. MMMM D, YYYY, hh:mm A",
 		month: "ddd. MMMM D, YYYY",
diff --git a/client/src/Pages/Infrastructure/Details/index.jsx b/client/src/Pages/Infrastructure/Details/index.jsx
index 72f384101..a16f3906b 100644
--- a/client/src/Pages/Infrastructure/Details/index.jsx
+++ b/client/src/Pages/Infrastructure/Details/index.jsx
@@ -121,6 +121,7 @@ const InfrastructureDetails = () => {
 						<AreaChartBoxes
 							shouldRender={!isLoading}
 							monitor={monitor}
+							dateRange={dateRange}
 						/>
 					</>
 				)}

From 1a382229748ee0efdc608f271f57693a941f3167 Mon Sep 17 00:00:00 2001
From: imjainish <jainishprajapati982@gmail.com>
Date: Thu, 21 Aug 2025 22:39:41 -0400
Subject: [PATCH 2/8] Fix Disabled Field in Settings

---
 client/src/Pages/Settings/SettingsURL.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Pages/Settings/SettingsURL.jsx b/client/src/Pages/Settings/SettingsURL.jsx
index 1ce2e8c73..c12878adc 100644
--- a/client/src/Pages/Settings/SettingsURL.jsx
+++ b/client/src/Pages/Settings/SettingsURL.jsx
@@ -29,7 +29,7 @@ const SettingsURL = ({ HEADING_SX, handleChange, showURL = false }) => {
 				<Select
 					name="showURL"
 					label={t("settingsPage.urlSettings.label")}
-					value={showURL || ""}
+					value={showURL == true ? true : false} 
 					onChange={handleChange}
 					items={[
 						{ _id: true, name: t("settingsPage.urlSettings.selectEnabled") },

From 50b9be4eca8e22bd73807cfb8412331ceea9b33f Mon Sep 17 00:00:00 2001
From: imjainish <jainishprajapati982@gmail.com>
Date: Thu, 21 Aug 2025 23:05:50 -0400
Subject: [PATCH 3/8] Address PR Comments

---
 client/src/Pages/Settings/SettingsURL.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Pages/Settings/SettingsURL.jsx b/client/src/Pages/Settings/SettingsURL.jsx
index c12878adc..dd9168cac 100644
--- a/client/src/Pages/Settings/SettingsURL.jsx
+++ b/client/src/Pages/Settings/SettingsURL.jsx
@@ -29,7 +29,7 @@ const SettingsURL = ({ HEADING_SX, handleChange, showURL = false }) => {
 				<Select
 					name="showURL"
 					label={t("settingsPage.urlSettings.label")}
-					value={showURL == true ? true : false} 
+					value={showURL === true} 
 					onChange={handleChange}
 					items={[
 						{ _id: true, name: t("settingsPage.urlSettings.selectEnabled") },

From f43210e29e8521a8c36dd3231ae5128e36cc4d2e Mon Sep 17 00:00:00 2001
From: imjainish <jainishprajapati982@gmail.com>
Date: Thu, 21 Aug 2025 23:13:50 -0400
Subject: [PATCH 4/8] Address PR Comments - Format

---
 client/src/Pages/Settings/SettingsURL.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Pages/Settings/SettingsURL.jsx b/client/src/Pages/Settings/SettingsURL.jsx
index dd9168cac..24c49cad1 100644
--- a/client/src/Pages/Settings/SettingsURL.jsx
+++ b/client/src/Pages/Settings/SettingsURL.jsx
@@ -29,7 +29,7 @@ const SettingsURL = ({ HEADING_SX, handleChange, showURL = false }) => {
 				<Select
 					name="showURL"
 					label={t("settingsPage.urlSettings.label")}
-					value={showURL === true} 
+					value={showURL === true}
 					onChange={handleChange}
 					items={[
 						{ _id: true, name: t("settingsPage.urlSettings.selectEnabled") },

From 6f307dc8221ebd46d6d23f0dc8cc70fac0d7759e Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 21 Aug 2025 22:37:59 -0700
Subject: [PATCH 5/8] update arm dist docker compose

---
 docker/dist-arm/docker-compose.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker/dist-arm/docker-compose.yaml b/docker/dist-arm/docker-compose.yaml
index 96bbf8f3f..842d4678a 100644
--- a/docker/dist-arm/docker-compose.yaml
+++ b/docker/dist-arm/docker-compose.yaml
@@ -15,9 +15,8 @@ services:
       - mongodb
   mongodb:
     image: mongo:4.4.18
-    container_name: checkmate-mongodb
     restart: always
-    command: ["mongod", "--replSet", "rs0", "--bind_ip_all"]
+    command: ["mongod", "--quiet", --bind_ip_all"]
     ports:
       - "27017:27017"
     volumes:

From dabff74946f56c4ccbd04428939d0545ad8bbb2b Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 22 Aug 2025 11:33:14 -0700
Subject: [PATCH 6/8] fix notification validation

---
 server/src/validation/joi.js | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/server/src/validation/joi.js b/server/src/validation/joi.js
index 725004afa..fa8dccde2 100755
--- a/server/src/validation/joi.js
+++ b/server/src/validation/joi.js
@@ -580,17 +580,31 @@ const createNotificationBodyValidation = joi.object({
 	}),
 
 	address: joi.when("type", {
-		is: "email",
-		then: joi.string().email().required().messages({
-			"string.empty": "E-mail address cannot be empty",
-			"any.required": "E-mail address is required",
-			"string.email": "Please enter a valid e-mail address",
-		}),
-		otherwise: joi.string().uri().required().messages({
-			"string.empty": "Webhook URL cannot be empty",
-			"any.required": "Webhook URL is required",
-			"string.uri": "Please enter a valid Webhook URL",
-		}),
+		switch: [
+			{
+				is: "email",
+				then: joi.string().email().required().messages({
+					"string.empty": "E-mail address cannot be empty",
+					"any.required": "E-mail address is required",
+					"string.email": "Please enter a valid e-mail address",
+				}),
+			},
+			{
+				is: "pager_duty",
+				then: joi.string().required().messages({
+					"string.empty": "PagerDuty integration key cannot be empty",
+					"any.required": "PagerDuty integration key is required",
+				}),
+			},
+			{
+				is: joi.string().valid("webhook", "slack", "discord"),
+				then: joi.string().uri().required().messages({
+					"string.empty": "Webhook URL cannot be empty",
+					"any.required": "Webhook URL is required",
+					"string.uri": "Please enter a valid Webhook URL",
+				}),
+			},
+		],
 	}),
 });
 

From 637bc841366e0ccdd87af632c56fb10eb2c6f96e Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 25 Aug 2025 14:30:41 -0700
Subject: [PATCH 7/8] fix string service path

---
 server/src/service/system/translationService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/service/system/translationService.js b/server/src/service/system/translationService.js
index 20b3431e0..0d3893852 100755
--- a/server/src/service/system/translationService.js
+++ b/server/src/service/system/translationService.js
@@ -7,7 +7,7 @@ class TranslationService {
 		this.logger = logger;
 		this.translations = {};
 		this._language = "en";
-		this.localesDir = path.join(process.cwd(), "locales");
+		this.localesDir = path.join(process.cwd(), "src/locales");
 	}
 
 	get serviceName() {

From 9a5ddb22b3bc48b2da59d6580c422ae5a9df8380 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 25 Aug 2025 14:37:00 -0700
Subject: [PATCH 8/8] bump version

---
 client/vite.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/vite.config.js b/client/vite.config.js
index 434cc7e96..70215550e 100644
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -5,7 +5,7 @@ import { execSync } from "child_process";
 
 export default defineConfig(({ mode }) => {
 	const env = loadEnv(mode, process.cwd(), "");
-	let version = "3.1.1";
+	let version = "3.1.2";
 
 	return {
 		base: "/",