From 84979527eb29f87895162aae350767bb66950902 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sun, 2 Oct 2022 21:32:39 +0200
Subject: [PATCH] minor UI fixes

---
 backend/src/worker_flow.rs                    | 22 ++++++++++---------
 .../src/lib/components/FlowBuilder.svelte     | 12 +++++-----
 frontend/src/lib/components/flows/types.ts    |  3 ++-
 .../propertyPicker/PropPicker.svelte          | 22 +++++++++----------
 4 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/backend/src/worker_flow.rs b/backend/src/worker_flow.rs
index aa737cc126..c0ea4b77ab 100644
--- a/backend/src/worker_flow.rs
+++ b/backend/src/worker_flow.rs
@@ -432,18 +432,20 @@ async fn transform_input(
             InputTransform::Javascript { expr } => {
                 let previous_result = last_result.clone();
                 let flow_input = flow_args.clone().unwrap_or_else(|| json!({}));
+                let context = vec![
+                    ("params".to_string(), serde_json::json!(mapped)),
+                    ("previous_result".to_string(), previous_result),
+                    ("flow_input".to_string(), flow_input),
+                    (
+                        "resume".to_string(),
+                        resumes.last().map(|v| json!(v)).unwrap_or_default(),
+                    ),
+                    ("resumes".to_string(), resumes.clone().into()),
+                ];
+
                 let v = eval_timeout(
                     expr.to_string(),
-                    vec![
-                        ("params".to_string(), serde_json::json!(mapped)),
-                        ("previous_result".to_string(), previous_result),
-                        ("flow_input".to_string(), flow_input),
-                        (
-                            "resume".to_string(),
-                            resumes.last().map(|v| json!(v)).unwrap_or_default(),
-                        ),
-                        ("resumes".to_string(), resumes.clone().into()),
-                    ],
+                    context,
                     Some(EvalCreds { workspace: workspace.to_string(), token: token.to_string() }),
                     steps.clone(),
                 )
diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index df51313408..99236d4124 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -133,6 +133,7 @@
 	const selectedIdStore = writable<string>('settings')
 	const scheduleStore = writable<Schedule>({ args: {}, cron: '', enabled: false })
 	const previewArgsStore = writable<Record<string, any>>({})
+	const reservedVariablesStore = writable<Record<string, string>>({})
 
 	function select(selectedId: string) {
 		selectedIdStore.set(selectedId)
@@ -142,10 +143,11 @@
 		selectedId: selectedIdStore,
 		schedule: scheduleStore,
 		select,
-		previewArgs: previewArgsStore
+		previewArgs: previewArgsStore,
+		reservedVariables: reservedVariablesStore
 	})
 
-	$: {
+	async function loadSchedule() {
 		loadFlowSchedule(initialPath, $workspaceStore)
 			.then((schedule: Schedule) => {
 				scheduleStore.set(schedule)
@@ -159,9 +161,9 @@
 			})
 	}
 
-	onMount(() => {
-		loadHubScripts()
-	})
+	$: initialPath && $workspaceStore && loadSchedule()
+
+	loadHubScripts()
 </script>
 
 <div class="flex flex-col flex-1 h-full">
diff --git a/frontend/src/lib/components/flows/types.ts b/frontend/src/lib/components/flows/types.ts
index 8065954440..397cee7385 100644
--- a/frontend/src/lib/components/flows/types.ts
+++ b/frontend/src/lib/components/flows/types.ts
@@ -5,5 +5,6 @@ export type FlowEditorContext = {
 	selectedId: Writable<string>
 	select: (id: string) => void
 	schedule: Writable<Schedule>
-	previewArgs: Writable<Record<string, any>>
+	previewArgs: Writable<Record<string, any>>,
+	reservedVariables: Writable<Record<string, string>>
 }
diff --git a/frontend/src/lib/components/propertyPicker/PropPicker.svelte b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
index bfdd13afa7..a5d3522473 100644
--- a/frontend/src/lib/components/propertyPicker/PropPicker.svelte
+++ b/frontend/src/lib/components/propertyPicker/PropPicker.svelte
@@ -18,9 +18,15 @@
 		search === EMPTY_STRING ? pickableProperties : keepByKey(pickableProperties, search)
 </script>
 
-<div class="px-4 pt-4">
+<div class="px-2 pt-2">
+	<input
+		type="text"
+		bind:value={search}
+		class="bg-gray-50 mt-1 border border-gray-300 text-gray-900 text-sm rounded-lg block px-2 mb-2 w-full"
+		placeholder="Search prop..."
+	/>
 	<div class="flex justify-between items-center space-x-1">
-		<span class="font-bold text-sm">Context</span>
+		<span class="font-bold text-sm">Step Context</span>
 		<div class="flex space-x-2 items-center">
 			{#if $propPickerConfig}
 				<span
@@ -43,13 +49,7 @@
 			{/if}
 		</div>
 	</div>
-	<input
-		type="text"
-		bind:value={search}
-		class="bg-gray-50 mt-1 border border-gray-300 text-gray-900 text-sm rounded-lg block p-2 mb-2"
-		placeholder="Search prop..."
-	/>
-</div>
-<div class="overflow-y-auto mb-8">
-	<ObjectViewer json={propsFiltered} on:select />
+	<div class="overflow-y-auto mb-2">
+		<ObjectViewer json={propsFiltered} on:select />
+	</div>
 </div>