From 4408e4fb8698745303545b08fba47a184d3cb626 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 4 Jun 2024 16:55:55 +0200
Subject: [PATCH] standardize date display

---
 frontend/src/lib/components/FlowMetadata.svelte            | 2 +-
 frontend/src/lib/components/RunForm.svelte                 | 2 +-
 frontend/src/lib/components/ScriptVersionHistory.svelte    | 2 +-
 .../apps/components/helpers/RunnableComponent.svelte       | 2 +-
 .../lib/components/flows/content/FlowModuleScript.svelte   | 7 +++++++
 frontend/src/lib/scripts.ts                                | 4 +++-
 .../(root)/(logged)/flows/get/[...path]/+page.svelte       | 2 +-
 .../(root)/(logged)/scripts/get/[...hash]/+page.svelte     | 2 +-
 8 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/frontend/src/lib/components/FlowMetadata.svelte b/frontend/src/lib/components/FlowMetadata.svelte
index ee4ce3a863..defe753187 100644
--- a/frontend/src/lib/components/FlowMetadata.svelte
+++ b/frontend/src/lib/components/FlowMetadata.svelte
@@ -25,7 +25,7 @@
 			{#if job['success'] != undefined}
 				Received job: {displayDate(job.created_at ?? '')}
 			{:else}
-				Received job <TimeAgo date={job.created_at ?? ''} />
+				Received job <TimeAgo withDate date={job.created_at ?? ''} />
 			{/if}
 			<Tooltip small>{job?.created_at}</Tooltip>
 		</span>
diff --git a/frontend/src/lib/components/RunForm.svelte b/frontend/src/lib/components/RunForm.svelte
index 39ee97f0a1..4dbefbf78d 100644
--- a/frontend/src/lib/components/RunForm.svelte
+++ b/frontend/src/lib/components/RunForm.svelte
@@ -89,7 +89,7 @@
 						<div class="flex items-center gap-2">
 							<span class="text-sm text-tertiary">
 								{#if runnable}
-									Edited <TimeAgo date={runnable.created_at || ''} /> by {runnable.created_by ||
+									Edited <TimeAgo withDate date={runnable.created_at || ''} /> by {runnable.created_by ||
 										'unknown'}
 								{/if}
 							</span>
diff --git a/frontend/src/lib/components/ScriptVersionHistory.svelte b/frontend/src/lib/components/ScriptVersionHistory.svelte
index 97a60f62c0..1cdbf0889b 100644
--- a/frontend/src/lib/components/ScriptVersionHistory.svelte
+++ b/frontend/src/lib/components/ScriptVersionHistory.svelte
@@ -168,7 +168,7 @@
 								</button>
 							{/if}
 						</span>
-						<FlowModuleScript path={scriptPath} hash={selectedVersion.script_hash} />
+						<FlowModuleScript showDate path={scriptPath} hash={selectedVersion.script_hash} />
 					</div>
 				{/key}
 			{:else}
diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
index 6aa2571197..e950f6e9aa 100644
--- a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
@@ -414,7 +414,7 @@
 	type Callbacks = { done: (x: any) => void; cancel: () => void; error: (e: any) => void }
 
 	export async function runComponent(
-		noToast = false,
+		noToast = true,
 		inlineScriptOverride?: InlineScript,
 		setRunnableJobEditorPanel?: boolean,
 		dynamicArgsOverride?: Record<string, any>,
diff --git a/frontend/src/lib/components/flows/content/FlowModuleScript.svelte b/frontend/src/lib/components/flows/content/FlowModuleScript.svelte
index ea4766bd3c..9ef8344bf0 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleScript.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleScript.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import type { SupportedLanguage } from '$lib/common'
 	import HighlightCode from '$lib/components/HighlightCode.svelte'
+	import TimeAgo from '$lib/components/TimeAgo.svelte'
 	import { ScriptService } from '$lib/gen'
 	import { getScriptByPath } from '$lib/scripts'
 	import { workspaceStore } from '$lib/stores'
@@ -8,9 +9,11 @@
 	export let path: string
 	export let hash: string | undefined = undefined
 
+	export let showDate = false
 	let code: string
 	let language: SupportedLanguage
 	let lock: string | undefined = undefined
+	let date: string | undefined = undefined
 
 	let notFound = false
 	async function loadCode(path: string, hash: string | undefined) {
@@ -22,6 +25,7 @@
 			code = script.content
 			language = script.language
 			lock = script.lock
+			date = script.created_at
 		} catch (e) {
 			notFound = true
 			console.error(e)
@@ -32,6 +36,9 @@
 </script>
 
 <div class="flex flex-col flex-1 h-full overflow-auto p-2">
+	{#if showDate && date}
+		<span class="text-xs text-tertiary mb-4"><TimeAgo {date} /></span>
+	{/if}
 	{#if notFound}
 		<div class="text-red-400">script not found at {path} in workspace {$workspaceStore}</div>
 	{:else}
diff --git a/frontend/src/lib/scripts.ts b/frontend/src/lib/scripts.ts
index 85b00f4bbd..aa51f5aa91 100644
--- a/frontend/src/lib/scripts.ts
+++ b/frontend/src/lib/scripts.ts
@@ -119,6 +119,7 @@ export async function getScriptByPath(path: string): Promise<{
 	concurrent_limit: number | undefined
 	concurrency_time_window_s: number | undefined
 	lock?: string
+	created_at?: string
 }> {
 	if (path.startsWith('hub/')) {
 		const { content, language, schema, lockfile } = await ScriptService.getHubScriptByPath({ path })
@@ -146,7 +147,8 @@ export async function getScriptByPath(path: string): Promise<{
 			tag: script.tag,
 			concurrent_limit: script.concurrent_limit,
 			concurrency_time_window_s: script.concurrency_time_window_s,
-			lock: script.lock
+			lock: script.lock,
+			created_at: script.created_at
 		}
 	}
 }
diff --git a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
index 116c657a6d..c7e2f8304e 100644
--- a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
@@ -375,7 +375,7 @@
 							{/if}
 							<div class="flex flex-row gap-x-2 flex-wrap items-center">
 								<span class="text-sm text-tertiary">
-									Edited <TimeAgo date={flow.edited_at ?? ''} /> by {flow.edited_by}
+									Edited <TimeAgo withDate date={flow.edited_at ?? ''} /> by {flow.edited_by}
 								</span>
 
 								{#if flow.archived}
diff --git a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
index 11a9023da2..9eacde431e 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
@@ -607,7 +607,7 @@
 					{/if}
 					<div class="flex flex-row gap-x-2 flex-wrap items-center">
 						<span class="text-sm text-tertiary">
-							Edited <TimeAgo date={script.created_at || ''} /> by {script.created_by || 'unknown'}
+							Edited <TimeAgo withDate date={script.created_at || ''} /> by {script.created_by || 'unknown'}
 						</span>
 						<Badge small color="gray">
 							{truncateHash(script?.hash ?? '')}