NAIS -> Nais. Remove please, please. Job run failed warning on job page

Author: andnorda

charts/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: console-frontend
-description: Frontend for NAIS console
+description: Frontend for Nais console
 type: application
 version: 2024-02-13-104003-46227aa
 sources:

package-lock.json

@@ -121,7 +121,7 @@
 			<Alert variant={variant($data.level)}>
 				<h4>Missing SBOM</h4>
 				The workload does not have a registered Software Bill of Materials (SBOM). Refer to the
-				<a href={docURL('/services/vulnerabilities/how-to/sbom/')}>NAIS documentation</a>
+				<a href={docURL('/services/vulnerabilities/how-to/sbom/')}>Nais documentation</a>
 				for instructions on how to resolve this.
 			</Alert>
 		{:else if type === 'WorkloadStatusVulnerable'}

src/lib/AppErrorTypeToMessage.svelte

@@ -94,7 +94,7 @@
 			<Alert variant={variant($data.level)}>
 				<h4>Missing SBOM</h4>
 				The workload does not have a registered Software Bill of Materials (SBOM). Refer to the
-				<a href={docURL('/services/vulnerabilities/how-to/sbom/')}>NAIS documentation</a>
+				<a href={docURL('/services/vulnerabilities/how-to/sbom/')}>Nais documentation</a>
 				for instructions on how to resolve this.
 			</Alert>
 		{:else if type === 'WorkloadStatusVulnerable'}

src/lib/JobErrorTypeToMessage.svelte

@@ -63,9 +63,8 @@
 		{#if !image.hasSBOM && image.vulnerabilitySummary !== null}
 			<BodyShort>
 				<WarningIcon class="text-aligned-icon" /> Data was discovered, but the SBOM was not rendered.
-				Please refer to the <Link href={docURL('/services/vulnerabilities/')}
-					>NAIS documentation</Link
-				> for further assistance.
+				Refer to the <Link href={docURL('/services/vulnerabilities/')}>Nais documentation</Link> for
+				further assistance.
 			</BodyShort>
 		{:else if image.vulnerabilitySummary === null}
 			<BodyShort>

src/lib/components/Image.svelte

@@ -97,12 +97,12 @@
 		errormessage = '';
 
 		if (selectedReason === '') {
-			errormessage += 'Please select a suppress reason from the Analysis dropdown.';
+			errormessage += 'Select a suppress reason from the Analysis dropdown.';
 			return;
 		}
 
 		if (inputText === '') {
-			errormessage += 'Please provide a comment before suppressing the finding. ';
+			errormessage += 'Provide a comment before suppressing the finding. ';
 			return;
 		}
 
@@ -232,8 +232,8 @@
 				</Alert>
 			{/if}
 			<p>
-				Please provide a reason for suppressing this finding. This will be recorded in the analysis
-				audit log. Suppression will be in effect for all workloads using this image.
+				Provide a reason for suppressing this finding. This will be recorded in the analysis audit
+				log. Suppression will be in effect for all workloads using this image.
 			</p>
 			<Select size="small" label="Analysis" bind:value={selectedReason}>
 				{#each SUPPRESS_OPTIONS as option (option)}

src/lib/components/image/SuppressFinding.svelte

@@ -84,7 +84,7 @@
 	{:else}
 		<p>
 			Help us improve Console! We value your input. Feedback will be associated with your logged-in
-			email address. To provide feedback anonymously, please check the box below.
+			email address. To provide feedback anonymously, check the box below.
 		</p>
 		<div class="wrapper">
 			<Select size="small" label="Type" bind:value={type}>
@@ -93,9 +93,7 @@
 				{/each}
 			</Select>
 			{#if errorType}
-				<p class="navds-error-message navds-label navds-label--small">
-					Please provide type of feedback
-				</p>
+				<p class="navds-error-message navds-label navds-label--small">Feedback type required</p>
 			{/if}
 
 			<label class="navds-form-field__label navds-label navds-label--small" for="details">
@@ -125,7 +123,7 @@
 			>
 				{#if errorDetails}
 					<p class="navds-error-message navds-label navds-label--small">
-						Please provide feedback details
+						Feedback details required
 					</p>
 				{/if}
 			</div>

src/lib/feedback/Feedback.svelte

@@ -29,7 +29,7 @@
 			{@const error = $page.url.searchParams.get('error')}
 			<Alert variant="error">
 				{#if error == 'unknown-user'}
-					Error during login. The user is not known in the system.<br />
+					Error during login: Unknown user.<br />
 					Please contact the system administrator.
 				{:else}
 					<!-- "unable-to-create-session", "invalid-state", and "unauthenticated" are known. -->

src/routes/Login.svelte

@@ -132,7 +132,7 @@
 	{#if $r.errors.pageInfo.totalCount}
 		<span class="reconciler-error">
 			Reconciler has {$r.errors.pageInfo.totalCount} errors. Please consult the
-			<a href="/admin/reconcilerLogs/{$r.id}">logs</a>.
+			<a href="/admin/reconcilerLogs/{$r.id}">logs</a> 🙏
 		</span>
 	{/if}
 	<p>{$r.description}</p>

src/routes/admin/reconcilers/Reconciler.svelte

@@ -2,7 +2,7 @@ query AllIngresses {
 	teams(first: 500) {
 		nodes {
 			slug
-			workloads(first: 1000) {
+			workloads(first: 500) {
 				nodes {
 					__typename
 					id
@@ -29,6 +29,19 @@ query AllIngresses {
 						}
 					}
 
+					... on Job {
+						runs {
+							nodes {
+								id
+								name
+								status {
+									state
+									message
+								}
+							}
+						}
+					}
+
 					status {
 						errors {
 							level

src/routes/dataproduct/errors/+page.gql

@@ -38,6 +38,12 @@
 							{JSON.stringify(instance.status, null, 2)}
 						{/if}
 					{/each}
+				{:else if workload.__typename === 'Job'}
+					{#each workload.runs.nodes as run (run.id)}
+						{#if run.status.state !== 'SUCCEEDED'}
+							{JSON.stringify(run.status, null, 2)}
+						{/if}
+					{/each}
 				{/if}
 			</div>
 		{/each}