From 9cdcf530bd2d07c4e9e6de01218f9143eaff06e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roger=20Bj=C3=B8rnstad?= <roger.bjornstad@nav.no>
Date: Tue, 28 Nov 2023 10:50:13 +0100
Subject: [PATCH] minor fixes: do not show link when github-url annotation is
 missing. fix job page

---
 src/routes/team/[team]/[env]/app/[app]/Image.svelte  |  8 ++++++--
 .../team/[team]/[env]/job/[job]/+layout.svelte       |  5 -----
 src/routes/team/[team]/[env]/job/[job]/+page.gql     |  2 +-
 src/routes/team/[team]/[env]/job/[job]/+page.svelte  | 12 +++++++-----
 src/routes/team/[team]/[env]/job/[job]/Image.svelte  | 10 +++++++---
 src/routes/team/[team]/[env]/job/[job]/Status.svelte |  5 ++++-
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/routes/team/[team]/[env]/app/[app]/Image.svelte b/src/routes/team/[team]/[env]/app/[app]/Image.svelte
index f1220f42..faad445c 100644
--- a/src/routes/team/[team]/[env]/app/[app]/Image.svelte
+++ b/src/routes/team/[team]/[env]/app/[app]/Image.svelte
@@ -89,9 +89,13 @@
 	{#if deployInfo?.timestamp === PendingValue}
 		<Skeleton variant="text" width="40%" />
 	{:else if deployInfo.timestamp !== null}
-		<a href={deployInfo.url}>Deployed</a>
+		{#if deployInfo.url === ''}
+			Deployed
+		{:else}
+			<a href={deployInfo.url}>Deployed</a>
+		{/if}
 		<Time time={deployInfo.timestamp} distance={true} />
-		{#if deployInfo.deployer && deployInfo.url}
+		{#if deployInfo.deployer !== ''}
 			by
 			<a href="https://github.com/{deployInfo.deployer}">{deployInfo.deployer}</a>.
 		{/if}
diff --git a/src/routes/team/[team]/[env]/job/[job]/+layout.svelte b/src/routes/team/[team]/[env]/job/[job]/+layout.svelte
index e0bc5f10..779002c9 100644
--- a/src/routes/team/[team]/[env]/job/[job]/+layout.svelte
+++ b/src/routes/team/[team]/[env]/job/[job]/+layout.svelte
@@ -76,11 +76,6 @@
 				</div>
 			{/if}
 		{/if}
-		{#if tab === 'Status' && (state === State.NOTNAIS || state === State.FAILING)}
-			<div class="notification">
-				<NotificationBadge color={'var(--a-border-action)'} size={'8px'} />
-			</div>
-		{/if}
 	{/each}
 </Tabs>
 <slot />
diff --git a/src/routes/team/[team]/[env]/job/[job]/+page.gql b/src/routes/team/[team]/[env]/job/[job]/+page.gql
index 04c9f9cb..3c131425 100644
--- a/src/routes/team/[team]/[env]/job/[job]/+page.gql
+++ b/src/routes/team/[team]/[env]/job/[job]/+page.gql
@@ -1,4 +1,4 @@
-query Job($job: String!, $team: String!, $env: String!) {
+query Job($job: String!, $team: String!, $env: String!) @cache(policy: NetworkOnly) {
 	naisjob(name: $job, team: $team, env: $env) @loading(cascade: true) {
 		name
 		schedule
diff --git a/src/routes/team/[team]/[env]/job/[job]/+page.svelte b/src/routes/team/[team]/[env]/job/[job]/+page.svelte
index efceb14a..c6afa0f1 100644
--- a/src/routes/team/[team]/[env]/job/[job]/+page.svelte
+++ b/src/routes/team/[team]/[env]/job/[job]/+page.svelte
@@ -32,13 +32,15 @@
 	<div class="grid">
 		<Status job={$Job.data.naisjob} />
 
-		<Card columns={4}>
-			<Cost app={jobName} {env} {team} />
-		</Card>
-		<Card columns={6}>
+		<Card columns={9} rows={1}>
 			<Image {job} />
 		</Card>
-		<Card columns={6}>
+
+		<Card columns={3} rows={1}>
+			<Cost app={jobName} {env} {team} />
+		</Card>
+
+		<Card columns={3}>
 			<h4>Schedule</h4>
 			{#if job.schedule === PendingValue}
 				<Skeleton variant="text" />
diff --git a/src/routes/team/[team]/[env]/job/[job]/Image.svelte b/src/routes/team/[team]/[env]/job/[job]/Image.svelte
index fb0815f1..4e5bf5be 100644
--- a/src/routes/team/[team]/[env]/job/[job]/Image.svelte
+++ b/src/routes/team/[team]/[env]/job/[job]/Image.svelte
@@ -47,11 +47,15 @@
 </h4>
 <p class="lastActivity">
 	{#if deployInfo?.timestamp === PendingValue}
-		<Skeleton variant="text" />
+		<Skeleton variant="text" width="40%" />
 	{:else if deployInfo.timestamp !== null}
-		<a href={deployInfo.url}>Deployed</a>
+		{#if deployInfo.url === ''}
+			Deployed
+		{:else}
+			<a href={deployInfo.url}>Deployed</a>
+		{/if}
 		<Time time={deployInfo.timestamp} distance={true} />
-		{#if deployInfo.deployer && deployInfo.url}
+		{#if deployInfo.deployer !== ''}
 			by
 			<a href="https://github.com/{deployInfo.deployer}">{deployInfo.deployer}</a>.
 		{/if}
diff --git a/src/routes/team/[team]/[env]/job/[job]/Status.svelte b/src/routes/team/[team]/[env]/job/[job]/Status.svelte
index 7e44fe8e..7e0e416b 100644
--- a/src/routes/team/[team]/[env]/job/[job]/Status.svelte
+++ b/src/routes/team/[team]/[env]/job/[job]/Status.svelte
@@ -87,7 +87,10 @@
 	.card {
 		border-radius: 0.5rem;
 		padding: 1rem;
-		grid-column: span 2;
+		grid-column: span 3;
+		grid-row: span 1;
+		border: 1px solid var(--a-gray-200);
+		background-color: var(--a-bg-default);
 	}
 
 	.NAIS {