lint

ctrlplanedev · Oct 22, 2024 · b93b4e0 · b93b4e0
1 parent 4c7d63f
commit b93b4e0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 19 deletions.
diff --git a/apps/webservice/src/app/[workspaceSlug]/(job)/jobs/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(job)/jobs/page.tsx
@@ -43,8 +43,8 @@ export default async function JobsPage({
         <TableBody>
           {releaseJobTriggers.map((job) => (
             <TableRow key={job.id}>
-              <TableCell>{job.environment?.name ?? "N/A"}</TableCell>
-              <TableCell>{job.target?.name ?? "N/A"}</TableCell>
+              <TableCell>{job.environment.name}</TableCell>
+              <TableCell>{job.target.name}</TableCell>
               <TableCell>{job.release.version}</TableCell>
               <TableCell>{job.type}</TableCell>
               <TableCell>{format(new Date(job.createdAt), "PPpp")}</TableCell>

diff --git a/apps/webservice/src/app/[workspaceSlug]/(targets)/targets/[targetId]/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(targets)/targets/[targetId]/page.tsx
@@ -38,7 +38,7 @@ const DeploymentsTable: React.FC<{ targetId: string }> = ({ targetId }) => {
                 j.job.status === JobStatus.Completed ||
                 j.job.status === JobStatus.Pending,
             )
-            .find((j) => j.deployment?.id === deployment.id);
+            .find((j) => j.deployment.id === deployment.id);
 
           return (
             <TableRow key={deployment.id}>

diff --git a/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/TableCells.tsx b/apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/TableCells.tsx
@@ -149,7 +149,7 @@ export const Release: React.FC<{
   const latestJobsByTarget = _.chain(releaseJobTriggers)
     .groupBy((r) => r.target.id)
     .mapValues((triggers) =>
-      _.maxBy(triggers, (t) => new Date(t.job.createdAt ?? 0)),
+      _.maxBy(triggers, (t) => new Date(t.job.createdAt)),
     )
     .values()
     .compact()

diff --git a/.../webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/TableDeployments.tsx b/.../webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/TableDeployments.tsx
@@ -89,13 +89,7 @@ const ReleaseCell: React.FC<{
         isPresent(releaseJobTrigger.releaseId) &&
         isPresent(releaseJobTrigger.targetId),
     )
-    .map((releaseJobTrigger) => ({
-      ...releaseJobTrigger,
-      environmentId: releaseJobTrigger.environmentId,
-      target: releaseJobTrigger.target!,
-      releaseId: releaseJobTrigger.releaseId,
-      deployment: releaseJobTrigger.release.deployment!,
-    }));
+    .map((releaseJobTrigger) => ({ ...releaseJobTrigger }));
   return (
     <>
       {hasRelease && hasTargets && (

diff --git a/...lug]/systems/[systemSlug]/deployments/[deploymentSlug]/releases/DeploymentPageContent.tsx b/...lug]/systems/[systemSlug]/deployments/[deploymentSlug]/releases/DeploymentPageContent.tsx
@@ -67,12 +67,7 @@ export const DeploymentPageContent: React.FC<DeploymentPageContentProps> = ({
         isPresent(releaseJobTrigger.releaseId) &&
         isPresent(releaseJobTrigger.targetId),
     )
-    .map((releaseJobTrigger) => ({
-      ...releaseJobTrigger,
-      environmentId: releaseJobTrigger.environmentId,
-      target: releaseJobTrigger.target!,
-      releaseId: releaseJobTrigger.releaseId,
-    }));
+    .map((releaseJobTrigger) => ({ ...releaseJobTrigger }));
 
   const distribution = api.deployment.distributionById.useQuery(deployment.id, {
     refetchInterval: 2_000,

diff --git a/...lug]/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/JobsTable.tsx b/...lug]/systems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/JobsTable.tsx
@@ -23,8 +23,8 @@ export const JobsTable: React.FC<{ releaseId: string }> = ({ releaseId }) => {
       <TableBody>
         {releaseJobTriggers.data?.map((job) => (
           <TableRow key={job.id} className={cn("border-b-neutral-800/50")}>
-            <TableCell>{job.environment?.name}</TableCell>
-            <TableCell>{job.target?.name}</TableCell>
+            <TableCell>{job.environment.name}</TableCell>
+            <TableCell>{job.target.name}</TableCell>
             <TableCell>{job.job.status}</TableCell>
             <TableCell>{job.type}</TableCell>
           </TableRow>