Canvas: Display commit message
Change-Id: Ifa2907c3377bd6174fa2c22a862dbae0eb8901fc
diff --git a/apps/canvas/back/src/project_monitor.ts b/apps/canvas/back/src/project_monitor.ts
index 6c178f0..c0ea56c 100644
--- a/apps/canvas/back/src/project_monitor.ts
+++ b/apps/canvas/back/src/project_monitor.ts
@@ -6,8 +6,12 @@
address: z.string().url(),
status: z.optional(
z.object({
- repoOK: z.boolean(),
- commit: z.string(),
+ commit: z.optional(
+ z.object({
+ hash: z.string(),
+ message: z.string(),
+ }),
+ ),
commands: z.optional(
z.array(
z.object({
diff --git a/apps/canvas/front/src/Monitoring.tsx b/apps/canvas/front/src/Monitoring.tsx
index b49a8d8..659d1a1 100644
--- a/apps/canvas/front/src/Monitoring.tsx
+++ b/apps/canvas/front/src/Monitoring.tsx
@@ -185,7 +185,7 @@
<LogsIcon className="w-4 h-4" />
View Logs
</Button>
- {!worker.repoOK && (
+ {!worker.commit && (
<p className="flex items-center">
<FailureIcon />
Clone Repository
@@ -193,7 +193,7 @@
)}
<p>
Commit:
- {worker.repoOK && worker.commit && (
+ {worker.commit && (
<Tooltip>
<TooltipTrigger asChild>
<span className="inline-block">
@@ -201,15 +201,19 @@
variant="outline"
className="ml-1 font-mono"
>
- {worker.commit.substring(
+ {worker.commit.hash.substring(
0,
8,
)}
</Badge>
</span>
</TooltipTrigger>
- <TooltipContent dir="right">
- <p>{worker.commit}</p>
+ <TooltipContent
+ side="right"
+ className="flex flex-col gap-1"
+ >
+ <p>{worker.commit.message}</p>
+ <p>{worker.commit.hash}</p>
</TooltipContent>
</Tooltip>
)}
diff --git a/apps/canvas/front/src/lib/state.ts b/apps/canvas/front/src/lib/state.ts
index 9f0aeb3..df658af 100644
--- a/apps/canvas/front/src/lib/state.ts
+++ b/apps/canvas/front/src/lib/state.ts
@@ -397,8 +397,12 @@
workers: z.array(
z.object({
id: z.string(),
- repoOK: z.boolean(),
- commit: z.string(),
+ commit: z.optional(
+ z.object({
+ hash: z.string(),
+ message: z.string(),
+ }),
+ ),
commands: z.optional(
z.array(
z.object({