Merge pull request #2855 from bluewave-labs/develop

develop -> master

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",

client/src/Pages/Infrastructure/Details/index.jsx

@@ -121,6 +121,7 @@ const InfrastructureDetails = () => {
 						<AreaChartBoxes
 							shouldRender={!isLoading}
 							monitor={monitor}
+							dateRange={dateRange}
 						/>
 					</>
 				)}

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}
 					onChange={handleChange}
 					items={[
 						{ _id: true, name: t("settingsPage.urlSettings.selectEnabled") },

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: "/",

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:

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() {

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",
+				}),
+			},
+		],
 	}),
 });