From 4c20fa07de983c154b5f3bd790c7f6e86f055c33 Mon Sep 17 00:00:00 2001
From: Daniel Jakab <jakdan99@gmail.com>
Date: Wed, 6 Nov 2024 14:48:59 +0100
Subject: [PATCH] Change Deploying to Deploying devices

---
 src/pages/Deployment/BasicInfo/index.tsx             | 12 +++++-------
 src/pages/Deployments/DeploymentCard/index.tsx       | 11 ++++-------
 src/pages/Deployments/DeploymentCard/styles.ts       |  2 +-
 src/pages/Participant/Deployment/index.tsx           |  9 ++++-----
 src/pages/StudyAnnouncementNew/index.tsx             |  2 ++
 .../DeploymentStatusLegend/styles.ts                 |  2 +-
 .../DeploymentStatus/TooltipContent/index.tsx        |  4 ++--
 .../Overview/DeploymentStatus/index.tsx              |  2 +-
 8 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/pages/Deployment/BasicInfo/index.tsx b/src/pages/Deployment/BasicInfo/index.tsx
index f477868..2c8a266 100644
--- a/src/pages/Deployment/BasicInfo/index.tsx
+++ b/src/pages/Deployment/BasicInfo/index.tsx
@@ -112,14 +112,12 @@ const BasicInfo = () => {
             <StyledStatusText
               variant="h6"
               status={deployment.deploymentStatus.__type.split(".").pop()}
+              align="center"
             >
-              {
-                deployment.deploymentStatus.__type
-                  .split(".")
-                  .pop()
-                  .replace(/([a-z])([A-Z])/g, "$1 $2")
-                  .split(" ")[0]
-              }
+              {deployment.deploymentStatus.__type
+                .split(".")
+                .pop()
+                .replace(/([a-z])([A-Z])/g, "$1 $2")}
             </StyledStatusText>
           </Stack>
           {!deployment.deploymentStatus.__type.includes("Stopped") && (
diff --git a/src/pages/Deployments/DeploymentCard/index.tsx b/src/pages/Deployments/DeploymentCard/index.tsx
index 5a46bcc..8ccb454 100644
--- a/src/pages/Deployments/DeploymentCard/index.tsx
+++ b/src/pages/Deployments/DeploymentCard/index.tsx
@@ -88,13 +88,10 @@ const DeploymentCard = ({
             status={deployment.deploymentStatus.__type.split(".").pop()}
           />
           <Typography variant="h6">
-            {
-              deployment.deploymentStatus.__type
-                .split(".")
-                .pop()
-                .replace(/([a-z])([A-Z])/g, "$1 $2")
-                .split(" ")[0]
-            }
+            {deployment.deploymentStatus.__type
+              .split(".")
+              .pop()
+              .replace(/([a-z])([A-Z])/g, "$1 $2")}
           </Typography>
           <DateTooltip
             invitedAt={deployment.deploymentStatus.createdOn}
diff --git a/src/pages/Deployments/DeploymentCard/styles.ts b/src/pages/Deployments/DeploymentCard/styles.ts
index 65b532b..3294c0e 100644
--- a/src/pages/Deployments/DeploymentCard/styles.ts
+++ b/src/pages/Deployments/DeploymentCard/styles.ts
@@ -9,7 +9,7 @@ export const GreyText = styled(Typography)(({ theme }) => ({
 export const TopContainer = styled("div")({
   borderRadius: "16px",
   display: "grid",
-  gridTemplateColumns: "1fr 40px 220px 400px 60px",
+  gridTemplateColumns: "1fr 40px 275px 400px 60px",
   alignItems: "center",
   marginBottom: 16,
   width: "100%",
diff --git a/src/pages/Participant/Deployment/index.tsx b/src/pages/Participant/Deployment/index.tsx
index c7d7a46..88bf251 100644
--- a/src/pages/Participant/Deployment/index.tsx
+++ b/src/pages/Participant/Deployment/index.tsx
@@ -152,11 +152,10 @@ const Deployment = () => {
               status={deploymentInformation.groupStatus}
             />
             <SecondaryText variant="h6">
-              {
-                deploymentInformation.groupStatus
-                  .replace(/([a-z])([A-Z])/g, "$1 $2")
-                  .split(" ")[0]
-              }
+              {deploymentInformation.groupStatus.replace(
+                /([a-z])([A-Z])/g,
+                "$1 $2",
+              )}
             </SecondaryText>
             <DateTooltip
               invitedAt={deploymentInformation.deploymentStatus.invitedOn}
diff --git a/src/pages/StudyAnnouncementNew/index.tsx b/src/pages/StudyAnnouncementNew/index.tsx
index b1b1910..3661e93 100644
--- a/src/pages/StudyAnnouncementNew/index.tsx
+++ b/src/pages/StudyAnnouncementNew/index.tsx
@@ -39,6 +39,8 @@ const validationSchema = yup.object().shape({
   type: yup.string().required("Type is required"),
   url: yup.string().test("is-url-valid", "URL is not valid", (value) => {
     try {
+      if (!value) return true;
+
       // eslint-disable-next-line no-new
       new URL(value);
       return true;
diff --git a/src/pages/StudyOverview/Overview/DeploymentStatus/DeploymentStatusLegend/styles.ts b/src/pages/StudyOverview/Overview/DeploymentStatus/DeploymentStatusLegend/styles.ts
index a4f6677..74fed0e 100644
--- a/src/pages/StudyOverview/Overview/DeploymentStatus/DeploymentStatusLegend/styles.ts
+++ b/src/pages/StudyOverview/Overview/DeploymentStatus/DeploymentStatusLegend/styles.ts
@@ -6,7 +6,7 @@ const ParticipantsRow = styled("div")({
   display: "grid",
   gridTemplateColumns: "80px 1fr",
   gap: 8,
-  alignItems: "end",
+  alignItems: "center",
 });
 
 export default ParticipantsRow;
diff --git a/src/pages/StudyOverview/Overview/DeploymentStatus/TooltipContent/index.tsx b/src/pages/StudyOverview/Overview/DeploymentStatus/TooltipContent/index.tsx
index a322cb7..4c7b0c4 100644
--- a/src/pages/StudyOverview/Overview/DeploymentStatus/TooltipContent/index.tsx
+++ b/src/pages/StudyOverview/Overview/DeploymentStatus/TooltipContent/index.tsx
@@ -13,8 +13,8 @@ const TooltipContent = () => {
         invitation.
       </Typography>
       <Typography variant="h5">
-        <span style={{ color: getDeploymentStatusColor("Deploying") }}>
-          Deploying
+        <span style={{ color: getDeploymentStatusColor("DeployingDevices") }}>
+          Deploying Devices
         </span>
         : Participants have started registering devices, but are remaining
         devices.
diff --git a/src/pages/StudyOverview/Overview/DeploymentStatus/index.tsx b/src/pages/StudyOverview/Overview/DeploymentStatus/index.tsx
index 781f5f7..fe39ac4 100644
--- a/src/pages/StudyOverview/Overview/DeploymentStatus/index.tsx
+++ b/src/pages/StudyOverview/Overview/DeploymentStatus/index.tsx
@@ -66,7 +66,7 @@ const DeploymentStatus = () => {
         deploying: {
           id: 1,
           value: 0,
-          label: "Deploying",
+          label: "Deploying Devices",
           color: getDeploymentStatusColor("DeployingDevices"),
         },
         running: {