From 98f56248eb94e86b5290b42b6257e4dd9614352b Mon Sep 17 00:00:00 2001
From: M M <cosmicray23@hotmail.com>
Date: Mon, 26 Aug 2024 17:16:29 -0700
Subject: [PATCH 1/2] Update all areas where it says friendly name to display
 name.

---
 .../Maintenance/CreateMaintenanceWindow/index.jsx  | 14 +++++++-------
 Client/src/Pages/Monitors/Configure/index.jsx      |  2 +-
 Client/src/Pages/Monitors/CreateMonitor/index.jsx  |  2 +-
 Client/src/Pages/PageSpeed/Configure/index.jsx     |  2 +-
 .../src/Pages/PageSpeed/CreatePageSpeed/index.jsx  |  2 +-
 Client/src/Validation/validation.js                |  6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Client/src/Pages/Maintenance/CreateMaintenanceWindow/index.jsx b/Client/src/Pages/Maintenance/CreateMaintenanceWindow/index.jsx
index 9110b7a96..f97578d5a 100644
--- a/Client/src/Pages/Maintenance/CreateMaintenanceWindow/index.jsx
+++ b/Client/src/Pages/Maintenance/CreateMaintenanceWindow/index.jsx
@@ -62,7 +62,7 @@ const CreateNewMaintenanceWindow = () => {
     startTime: dayjs(),
     duration: "60",
     unit: "minutes",
-    friendlyName: "",
+    displayName: "",
     AddMonitors: "",
   });
   const [errors, setErrors] = useState({});
@@ -82,7 +82,7 @@ const CreateNewMaintenanceWindow = () => {
       startTime: values.startTime.format("HH:mm"),
       duration: values.duration,
       unit: values.unit,
-      friendlyName: values.friendlyName,
+      displayName: values.displayName,
       addMonitors: values.AddMonitors,
     };
 
@@ -178,14 +178,14 @@ const CreateNewMaintenanceWindow = () => {
       ),
     },
     {
-      title: "Friendly name",
+      title: "Display name",
       component: (
         <Field
-          id="friendly-name"
+          id="display-name"
           placeholder="Maintanence at __ : __ for ___ minutes"
-          value={values.friendlyName}
-          onChange={(e) => handleChange(e, "friendlyName")}
-          error={errors.friendlyName}
+          value={values.displayName}
+          onChange={(e) => handleChange(e, "displayName")}
+          error={errors.displayName}
         />
       ),
     },
diff --git a/Client/src/Pages/Monitors/Configure/index.jsx b/Client/src/Pages/Monitors/Configure/index.jsx
index bd2a26df0..ebf6e3279 100644
--- a/Client/src/Pages/Monitors/Configure/index.jsx
+++ b/Client/src/Pages/Monitors/Configure/index.jsx
@@ -314,7 +314,7 @@ const Configure = () => {
                 <Field
                   type="text"
                   id="monitor-name"
-                  label="Friendly name"
+                  label="display name"
                   isOptional={true}
                   placeholder="Google"
                   value={monitor?.name || ""}
diff --git a/Client/src/Pages/Monitors/CreateMonitor/index.jsx b/Client/src/Pages/Monitors/CreateMonitor/index.jsx
index 05e343e77..72dd8b207 100644
--- a/Client/src/Pages/Monitors/CreateMonitor/index.jsx
+++ b/Client/src/Pages/Monitors/CreateMonitor/index.jsx
@@ -193,7 +193,7 @@ const CreateMonitor = () => {
             <Field
               type="text"
               id="monitor-name"
-              label="Friendly name"
+              label="Display name"
               isOptional={true}
               placeholder="Google"
               value={monitor.name}
diff --git a/Client/src/Pages/PageSpeed/Configure/index.jsx b/Client/src/Pages/PageSpeed/Configure/index.jsx
index 83484de7e..2e79275ef 100644
--- a/Client/src/Pages/PageSpeed/Configure/index.jsx
+++ b/Client/src/Pages/PageSpeed/Configure/index.jsx
@@ -223,7 +223,7 @@ const PageSpeedConfigure = () => {
             </Stack>
             <Stack gap={theme.gap.xl}>
               <Stack direction="row">
-                <Typography component="h3">Monitor friendly name</Typography>
+                <Typography component="h3">Monitor display name</Typography>
                 <Field
                   type="text"
                   id="monitor-name"
diff --git a/Client/src/Pages/PageSpeed/CreatePageSpeed/index.jsx b/Client/src/Pages/PageSpeed/CreatePageSpeed/index.jsx
index c707db319..f8735d446 100644
--- a/Client/src/Pages/PageSpeed/CreatePageSpeed/index.jsx
+++ b/Client/src/Pages/PageSpeed/CreatePageSpeed/index.jsx
@@ -116,7 +116,7 @@ const CreatePageSpeed = () => {
         <Typography component="h1">Create pagespeed monitor</Typography>
         <Stack gap={theme.gap.xl}>
           <Stack direction="row">
-            <Typography component="h3">Monitor friendly name</Typography>
+            <Typography component="h3">Monitor display name</Typography>
             <Field
               type="text"
               id="monitor-name"
diff --git a/Client/src/Validation/validation.js b/Client/src/Validation/validation.js
index 6aa7107b6..8f435c47b 100644
--- a/Client/src/Validation/validation.js
+++ b/Client/src/Validation/validation.js
@@ -135,9 +135,9 @@ const maintenanceWindowValidation = joi.object({
     "any.only": "Unit must be one of ['minutes', 'hours', 'days'].",
     "any.required": "Unit is required.",
   }),
-  friendlyName: joi.string().max(50).required().messages({
-    "string.empty": "Friendly name is required.",
-    "string.max": "Friendly name must be less than 50 characters long",
+  displayName: joi.string().max(50).required().messages({
+    "string.empty": "Display name is required.",
+    "string.max": "Display name must be less than 50 characters long",
   }),
   addMonitors: joi.string().max(50).required().messages({
     "string.empty": "Add monitors is required.",

From efe508f93614ff0f3def503fe257ea3ad70c5c91 Mon Sep 17 00:00:00 2001
From: Alexander Holliday <ajhollid@gmail.com>
Date: Tue, 27 Aug 2024 10:48:30 -0700
Subject: [PATCH 2/2] Update index.jsx

---
 Client/src/Pages/Monitors/Configure/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Client/src/Pages/Monitors/Configure/index.jsx b/Client/src/Pages/Monitors/Configure/index.jsx
index ebf6e3279..6df2f1be2 100644
--- a/Client/src/Pages/Monitors/Configure/index.jsx
+++ b/Client/src/Pages/Monitors/Configure/index.jsx
@@ -314,7 +314,7 @@ const Configure = () => {
                 <Field
                   type="text"
                   id="monitor-name"
-                  label="display name"
+                  label="Display name"
                   isOptional={true}
                   placeholder="Google"
                   value={monitor?.name || ""}