From 2f7ebe9eab90ae17a13711a672d7f85c49adb3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?=
 <43071496+adam-kov@users.noreply.github.com>
Date: Thu, 24 Nov 2022 13:34:26 +0100
Subject: [PATCH] feat(frontend): Add guard against script overwrite (#944)

* feat(frontend): Add guard against script overwrite

* fix: Error message flash up
---
 .../editor/contextPanel/ContextPanel.svelte   | 44 +++++++++++++++----
 .../components/common/drawer/Drawer.svelte    |  7 ++-
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/frontend/src/lib/components/apps/editor/contextPanel/ContextPanel.svelte b/frontend/src/lib/components/apps/editor/contextPanel/ContextPanel.svelte
index 80578ce46e..f79453a1dd 100644
--- a/frontend/src/lib/components/apps/editor/contextPanel/ContextPanel.svelte
+++ b/frontend/src/lib/components/apps/editor/contextPanel/ContextPanel.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { fade } from 'svelte/transition'
 	import type { Schema } from '$lib/common'
 	import { Drawer } from '$lib/components/common'
 	import Badge from '$lib/components/common/badge/Badge.svelte'
@@ -18,6 +19,10 @@
 
 	const { connectingInput, staticOutputs, app, worldStore } =
 		getContext<AppEditorContext>('AppEditorContext')
+	let newScriptPath: string
+	let ignorePathError = false
+
+	$: isTakenPath = Object.keys($app.inlineScripts).includes(newScriptPath)
 
 	function connectInput(id: string, name: string) {
 		if ($connectingInput) {
@@ -34,10 +39,9 @@
 	}
 
 	function createScript() {
-		const input = document.getElementById('scriptPath') as HTMLInputElement
-		const scriptPath = input.value
-
-		const path = `${appPath}/inline-script/${scriptPath}`
+		// To prevent the error message flashing up just before the drawer is closed
+		ignorePathError = true
+		const path = `${appPath}/inline-script/${newScriptPath}`
 		const inlineScript = {
 			content: DENO_INIT_CODE_CLEAR,
 			language: Preview.language.DENO,
@@ -46,15 +50,20 @@
 		}
 
 		if ($app.inlineScripts) {
-			$app.inlineScripts[scriptPath] = inlineScript
+			$app.inlineScripts[newScriptPath] = inlineScript
 		} else {
 			$app.inlineScripts = {
-				[scriptPath]: inlineScript
+				[newScriptPath]: inlineScript
 			}
 		}
 		scriptCreationDrawer.closeDrawer()
 	}
 
+	function afterCreateScript() {
+		newScriptPath = ''
+		ignorePathError = false
+	}
+
 	let selectedScript:
 		| { content: string; language: Preview.language; path: string; schema: Schema }
 		| undefined = undefined
@@ -63,15 +72,32 @@
 	let scriptCreationDrawer: Drawer
 </script>
 
-<Drawer bind:this={scriptCreationDrawer} size="1000px">
+<Drawer bind:this={scriptCreationDrawer} size="600px" on:afterClose={afterCreateScript}>
 	<DrawerContent
 		title="Script creation"
 		on:close={() => {
 			scriptCreationDrawer.closeDrawer()
 		}}
 	>
-		<input value="" id="scriptPath" />
-		<Button on:click={createScript}>Create</Button>
+		<label for="pathInput" class="text-sm font-semibold">
+			Script name
+		</label>
+		<div class="flex justify-between items-center gap-4">
+			<input id="pathInput" class="grow min-w-[150px]" bind:value={newScriptPath} />
+			<Button 
+				on:click={createScript}
+				size="sm"
+				disabled={isTakenPath}
+				startIcon={{icon: faPlus}}
+			>
+				Create
+			</Button>
+		</div>
+	{#if isTakenPath && !ignorePathError}
+		<div transition:fade={{ duration: 100 }} class="text-sm text-red-600 h-5 mt-1">
+			This name is already used.
+		</div>
+	{/if}
 	</DrawerContent>
 </Drawer>
 
diff --git a/frontend/src/lib/components/common/drawer/Drawer.svelte b/frontend/src/lib/components/common/drawer/Drawer.svelte
index 7ad96eba70..16fe240999 100644
--- a/frontend/src/lib/components/common/drawer/Drawer.svelte
+++ b/frontend/src/lib/components/common/drawer/Drawer.svelte
@@ -7,6 +7,8 @@
 	export let placement = 'right'
 	export let size = '600px'
 
+	$: durationMs = duration * 1000
+
 	export function toggleDrawer() {
 		open = !open
 	}
@@ -16,6 +18,9 @@
 	}
 	export function closeDrawer() {
 		open = false
+		setTimeout(() => {
+			dispatch('afterClose')
+		}, durationMs)
 	}
 
 	export function isOpen() {
@@ -56,7 +61,7 @@
 	$: open ? dispatch('open') : dispatch('close')
 
 	let timeout = true
-	$: !open ? setTimeout(() => (timeout = true), duration * 1000) : (timeout = false)
+	$: !open ? setTimeout(() => (timeout = true), durationMs) : (timeout = false)
 	onMount(() => {
 		mounted = true
 		scrollLock(open)