From e0903477300e030353cf06509f5dcf36f44c0233 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 9 Mar 2023 01:16:57 +0100
Subject: [PATCH] fix app json import

---
 .../helpers/RunnableComponent.svelte          |  2 --
 .../components/apps/editor/AppEditor.svelte   |  1 +
 .../apps/editor/AppEditorHeader.svelte        |  2 +-
 frontend/src/lib/components/apps/store.ts     |  3 ++-
 .../(root)/(logged)/apps/add/+page.svelte     | 21 ++++++++-----------
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
index d8510a88ae..c054290381 100644
--- a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
@@ -60,7 +60,6 @@
 	let executeTimeout: NodeJS.Timeout | undefined = undefined
 
 	function setDebouncedExecute() {
-		console.log('EXECUTE')
 		executeTimeout && clearTimeout(executeTimeout)
 		executeTimeout = setTimeout(() => {
 			executeComponent(true)
@@ -88,7 +87,6 @@
 	}
 
 	$: fields && (lazyStaticValues = computeStaticValues())
-	$: console.log(runnableInputValues, extraQueryParams, args, autoRefresh, testJobLoader)
 	$: (runnableInputValues || extraQueryParams || args) &&
 		autoRefresh &&
 		testJobLoader &&
diff --git a/frontend/src/lib/components/apps/editor/AppEditor.svelte b/frontend/src/lib/components/apps/editor/AppEditor.svelte
index 9ad96d6716..cca593c0b9 100644
--- a/frontend/src/lib/components/apps/editor/AppEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditor.svelte
@@ -45,6 +45,7 @@
 	export let summary: string
 	export let fromHub: boolean = false
 
+	console.log('app', app)
 	const appStore = writable<App>(app)
 	const worldStore = writable<World | undefined>(undefined)
 	const staticOutputs = writable<Record<string, string[]>>({})
diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
index 2617d25c7d..e4cbae0d4c 100644
--- a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
@@ -159,7 +159,7 @@
 					return []
 				})
 				.concat(
-					Object.values($app.hiddenInlineScripts).map(async (v) => {
+					Object.values($app.hiddenInlineScripts ?? {}).map(async (v) => {
 						let hex = await hash(v.inlineScript?.content)
 						const staticInputs = collectStaticFields(v.fields)
 						return [`rawscript/${hex}`, staticInputs]
diff --git a/frontend/src/lib/components/apps/store.ts b/frontend/src/lib/components/apps/store.ts
index d5d2e7cb3b..4ee557c2fb 100644
--- a/frontend/src/lib/components/apps/store.ts
+++ b/frontend/src/lib/components/apps/store.ts
@@ -1,7 +1,8 @@
+import type { Policy } from "$lib/gen";
 import { writable } from "svelte/store";
 import type {
     App,
 
 } from './types'
 
-export const importStore = writable<App | undefined>(undefined)
\ No newline at end of file
+export const importStore = writable<{ summary: string, value: App, policy: Policy } | undefined>(undefined)
\ No newline at end of file
diff --git a/frontend/src/routes/(root)/(logged)/apps/add/+page.svelte b/frontend/src/routes/(root)/(logged)/apps/add/+page.svelte
index fc67c266db..4e5c8e9609 100644
--- a/frontend/src/routes/(root)/(logged)/apps/add/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps/add/+page.svelte
@@ -35,10 +35,17 @@
 
 	loadApp()
 
+	let policy: Policy = {
+		on_behalf_of: `u/${$userStore?.username}`,
+		on_behalf_of_email: $userStore?.email,
+		execution_mode: Policy.execution_mode.PUBLISHER
+	}
 	async function loadApp() {
 		if (importJson) {
 			sendUserToast('Loaded from raw JSON')
-			value = importJson
+			summary = importJson.summary
+			value = importJson.value
+			policy = importJson.policy
 		} else if (templatePath) {
 			const template = await AppService.getAppByPath({
 				workspace: $workspaceStore!,
@@ -70,17 +77,7 @@
 {#if value}
 	<div class="h-screen">
 		{#key value}
-			<AppEditor
-				{summary}
-				app={value}
-				path={''}
-				policy={{
-					on_behalf_of: `u/${$userStore?.username}`,
-					on_behalf_of_email: $userStore?.email,
-					execution_mode: Policy.execution_mode.PUBLISHER
-				}}
-				fromHub={hubId != null}
-			/>
+			<AppEditor {summary} app={value} path={''} {policy} fromHub={hubId != null} />
 		{/key}
 	</div>
 {/if}