fix(div): minor adjustments and fixes to links

Co-authored-by: Roger Bjørnstad <[email protected]>
Co-authored-by: Johnny Horvi <[email protected]>

Author: 3 people

src/hooks.server.ts

@@ -1,6 +1,5 @@
 import type { HandleFetch, Handle } from '@sveltejs/kit';
 import { env } from '$env/dynamic/private';
-const graphqlEndpoint = import.meta.env.VITE_GRAPHQL_ENDPOINT;
 
 export const handleFetch: HandleFetch = async ({ event, request, fetch }) => {
 	request.headers.set(
@@ -12,16 +11,7 @@ export const handleFetch: HandleFetch = async ({ event, request, fetch }) => {
 		'X-Goog-IAP-JWT-Assertion',
 		event.request.headers.get('X-Goog-IAP-JWT-Assertion') || ''
 	);
-
-	if (graphqlEndpoint && env.PUBLIC_GRAPHQL_ENDPOINT) {
-		if (request.url.startsWith(env.PUBLIC_GRAPHQL_ENDPOINT)) {
-			// clone the original request, but change the URL
-			request = new Request(
-				request.url.replace(env.PUBLIC_GRAPHQL_ENDPOINT, graphqlEndpoint),
-				request
-			);
-		}
-	}
+	console.log(request.url);
 
 	return fetch(request);
 };

src/routes/team/[team]/[env]/[app]/Authentications.svelte

@@ -40,16 +40,16 @@
 <div>
 	{#each authz as a}
 		{#if a.__typename === 'AzureAD'}
-			<a href="/">Azure</a>
+			Azure
 		{/if}
 		{#if a.__typename === 'IDPorten'}
-			<a href="/">IDPorten</a>
+			IDPorten
 		{/if}
 		{#if a.__typename === 'Maskinporten'}
-			<a href="/">Maskinporten</a>
+			Maskinporten
 		{/if}
 		{#if a.__typename === 'TokenX'}
-			<a href="/">TokenX</a>
+			TokenX
 		{/if}
 	{:else}
 		<p>No authz</p>

src/routes/team/[team]/[env]/[app]/AutoScaling.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { fragment, graphql } from '$houdini';
+	import { AutoScalingStore, fragment, graphql } from '$houdini';
 	import type { AutoScaling } from '$houdini';
 	import CpuIcon from '$lib/icons/CpuIcon.svelte';
 	import { Tooltip } from '@nais/ds-svelte';
@@ -33,12 +33,14 @@
 		<Tooltip content="Maximum replicas">
 			max: {autoscaling.max}
 		</Tooltip>
-		<Tooltip content="CPU threshold"
-			><div class="cpu">
-				<div style="margin-top: 4px;"><CpuIcon /></div>
-				{autoscaling.cpuThreshold}%
-			</div></Tooltip
-		>
+		{#if autoscaling.cpuThreshold > 0}
+			<Tooltip content="CPU threshold"
+				><div class="cpu">
+					<div style="margin-top: 4px;"><CpuIcon /></div>
+					{autoscaling.cpuThreshold}%
+				</div>
+			</Tooltip>
+		{/if}
 	{/if}
 </div>
 

src/routes/team/[team]/[env]/[app]/Traffic.svelte

@@ -4,6 +4,7 @@
 	import { fragment, graphql } from '$houdini';
 	import type { AccessPolicy } from '$houdini';
 	import { Tooltip } from '@nais/ds-svelte';
+	import { page } from '$app/stores';
 
 	export let app: AccessPolicy;
 
@@ -36,6 +37,8 @@
 			}
 		`)
 	);
+	$: env = $page.params.env;
+	$: team = $page.params.team;
 	$: internalIngress = $data.ingresses.filter((ingress) => !ingress.includes('.external.'));
 	$: externalIngress = $data.ingresses.filter((ingress) => ingress.includes('.external.'));
 </script>
@@ -64,7 +67,7 @@
 		<ul>
 			{#each $data.accessPolicy.inbound.rules as rule}
 				<li>
-					<a href="/"
+					<a href="/team/{rule.namespace || team}/{env}/{rule.application}"
 						>{rule.application}{#if rule.namespace}.{rule.namespace}{/if}</a
 					>
 				</li>
@@ -91,7 +94,7 @@
 		<ul>
 			{#each $data.accessPolicy.outbound.rules as rule}
 				<li>
-					<a href="/"
+					<a href="/team/{rule.namespace || team}/{env}/{rule.application}"
 						>{rule.application}{#if rule.namespace}.{rule.namespace}{/if}</a
 					>
 				</li>

src/routes/team/[team]/[env]/[app]/deploys/+page.svelte

@@ -21,6 +21,10 @@
 	{/each}
 {/if}
 
+{#if $AppDeploys.fetching}
+	<p>Loading...</p>
+{/if}
+
 {#if $AppDeploys.data}
 	<Card>
 		<Table zebraStripes={true}>