Fix deployment status dot on deploying devices status

cph-cachet · Nov 6, 2024 · 546d03c · 546d03c
1 parent 10dc1c3
commit 546d03c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/src/pages/Deployment/BasicInfo/index.tsx b/src/pages/Deployment/BasicInfo/index.tsx
@@ -100,7 +100,7 @@ const BasicInfo = () => {
           }
         >
           <FileDownloadOutlinedIcon fontSize="small" />
-          <Typography variant="h5">Export Data</Typography>
+          <Typography variant="h5">{t("common:export_data")}</Typography>
         </ExportButton>
       </Box>
       <StyledCard elevation={2}>
@@ -113,7 +113,13 @@ const BasicInfo = () => {
               variant="h6"
               status={deployment.deploymentStatus.__type.split(".").pop()}
             >
-              {deployment.deploymentStatus.__type.split(".").pop()}
+              {
+                deployment.deploymentStatus.__type
+                  .split(".")
+                  .pop()
+                  .replace(/([a-z])([A-Z])/g, "$1 $2")
+                  .split(" ")[0]
+              }
             </StyledStatusText>
           </Stack>
           {!deployment.deploymentStatus.__type.includes("Stopped") && (

diff --git a/src/pages/Deployments/DeploymentCard/index.tsx b/src/pages/Deployments/DeploymentCard/index.tsx
@@ -88,7 +88,13 @@ const DeploymentCard = ({
             status={deployment.deploymentStatus.__type.split(".").pop()}
           />
           <Typography variant="h6">
-            {deployment.deploymentStatus.__type.split(".").pop()}
+            {
+              deployment.deploymentStatus.__type
+                .split(".")
+                .pop()
+                .replace(/([a-z])([A-Z])/g, "$1 $2")
+                .split(" ")[0]
+            }
           </Typography>
           <DateTooltip
             invitedAt={deployment.deploymentStatus.createdOn}

diff --git a/src/pages/Participant/Deployment/index.tsx b/src/pages/Participant/Deployment/index.tsx
@@ -152,7 +152,11 @@ const Deployment = () => {
               status={deploymentInformation.groupStatus}
             />
             <SecondaryText variant="h6">
-              {deploymentInformation.groupStatus}
+              {
+                deploymentInformation.groupStatus
+                  .replace(/([a-z])([A-Z])/g, "$1 $2")
+                  .split(" ")[0]
+              }
             </SecondaryText>
             <DateTooltip
               invitedAt={deploymentInformation.deploymentStatus.invitedOn}

diff --git a/src/pages/StudyOverview/Overview/DeploymentStatus/index.tsx b/src/pages/StudyOverview/Overview/DeploymentStatus/index.tsx
@@ -67,7 +67,7 @@ const DeploymentStatus = () => {
           id: 1,
           value: 0,
           label: "Deploying",
-          color: getDeploymentStatusColor("Deploying"),
+          color: getDeploymentStatusColor("DeployingDevices"),
         },
         running: {
           id: 2,

diff --git a/src/utils/utility.tsx b/src/utils/utility.tsx
@@ -231,7 +231,7 @@ export const getDeploymentStatusColor = (deploymentStatus: string) => {
       return palette.status.green;
     case "Stopped":
       return palette.status.grey;
-    case "Deploying":
+    case "DeployingDevices":
       return palette.status.blue;
     default:
       return "#000000";