From e298ab3078bb17fbd82a645cfe5e22856246893e Mon Sep 17 00:00:00 2001 From: James Ritchie Date: Fri, 30 Aug 2024 14:53:47 +0100 Subject: [PATCH] Deployment table now scrolls --- .../route.tsx | 192 +++++++++--------- 1 file changed, 98 insertions(+), 94 deletions(-) diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.deployments/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.deployments/route.tsx index deed5f50a..e73abd970 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.deployments/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.deployments/route.tsx @@ -105,103 +105,107 @@ export default function Page() { - + {hasDeployments ? ( -
- - - - Deploy - Env - Version - Status - Tasks - Deployed at - Deployed by - Go to page - - - - {deployments.length > 0 ? ( - deployments.map((deployment) => { - const usernameForEnv = - user.id !== deployment.environment.userId - ? deployment.environment.userName - : undefined; - const path = v3DeploymentPath( - organization, - project, - deployment, - currentPage - ); - return ( - - -
- {deployment.shortCode} - {deployment.label && ( - {deployment.label} - )} -
-
- - - - {deployment.version} - - - - - {deployment.tasksCount !== null ? deployment.tasksCount : "–"} - - - {deployment.deployedAt ? ( - - ) : ( - "–" - )} - - - {deployment.deployedBy ? ( -
- +
+
+
+ + + Deploy + Env + Version + Status + Tasks + Deployed at + Deployed by + Go to page + + + + {deployments.length > 0 ? ( + deployments.map((deployment) => { + const usernameForEnv = + user.id !== deployment.environment.userId + ? deployment.environment.userName + : undefined; + const path = v3DeploymentPath( + organization, + project, + deployment, + currentPage + ); + return ( + + +
- {deployment.deployedBy.name ?? - deployment.deployedBy.displayName} + {deployment.shortCode} + {deployment.label && ( + {deployment.label} + )}
- ) : ( - "–" - )} -
- -
- ); - }) - ) : ( - - - No deploys match your filters - - - )} -
-
-
- + + + + + {deployment.version} + + + + + {deployment.tasksCount !== null ? deployment.tasksCount : "–"} + + + {deployment.deployedAt ? ( + + ) : ( + "–" + )} + + + {deployment.deployedBy ? ( +
+ + + {deployment.deployedBy.name ?? + deployment.deployedBy.displayName} + +
+ ) : ( + "–" + )} +
+ + + ); + }) + ) : ( + + + No deploys match your filters + + + )} + + +
+ +
) : ( @@ -212,7 +216,7 @@ export default function Page() { {deploymentParam && ( <> - +