From d2cbf72c76437cd8409896f80cef6377447e63ba Mon Sep 17 00:00:00 2001
From: Faton Ramadani <faton.ramadani14@gmail.com>
Date: Tue, 20 Dec 2022 10:34:50 +0100
Subject: [PATCH] feat(frontend): Add an input field to edit inline script name
 (#1033)

---
 .../InlineScriptEditor.svelte                 | 100 +++++++++---------
 .../InlineScriptsPanel.svelte                 |  11 +-
 .../InlineScriptsPanelList.svelte             |  10 +-
 3 files changed, 59 insertions(+), 62 deletions(-)

diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditor.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditor.svelte
index 23334eaaf8..7aad84efc9 100644
--- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptEditor.svelte
@@ -7,7 +7,7 @@
 	import { getContext } from 'svelte'
 	import type { AppEditorContext } from '../../types'
 	import SimpleEditor from '$lib/components/SimpleEditor.svelte'
-	import { Check, CheckCheck, CheckCircle, Code2, X } from 'lucide-svelte'
+	import { CheckCircle, Code2, X } from 'lucide-svelte'
 	import FlowScriptPicker from '$lib/components/flows/pickers/FlowScriptPicker.svelte'
 	import type { ResultAppInput } from '../../inputType'
 	import InlineScriptEditorDrawer from './InlineScriptEditorDrawer.svelte'
@@ -17,11 +17,11 @@
 
 	let inlineScriptEditorDrawer: InlineScriptEditorDrawer
 	export let componentInput: ResultAppInput
-	export let selectedScriptName: string | undefined = undefined
 
-	$: shouldDisplay =
-		componentInput.runnable?.type === 'runnableByName' &&
-		componentInput.runnable?.name === selectedScriptName
+	const name =
+		componentInput.runnable?.type === 'runnableByName' ? componentInput.runnable?.name : ''
+
+	$: shouldDisplay = componentInput.runnable?.type === 'runnableByName'
 	const { appPath } = getContext<AppEditorContext>('AppEditorContext')
 
 	let validCode = false
@@ -76,44 +76,48 @@
 {#if shouldDisplay}
 	{#if componentInput?.runnable?.type === 'runnableByName' && componentInput?.runnable?.inlineScript}
 		<div class="h-full p-4 flex flex-col gap-2 ">
-			<div class="flex w-full flex-row-reverse gap-2 items-center">
-				<Button
-					size="xs"
-					color="light"
-					variant="border"
-					on:click={() => {
-						if (selectedScriptName) {
-							inlineScriptEditorDrawer?.openDrawer()
-						}
-					}}
-				>
-					<div class="flex gap-1 items-center">
-						<Code2 size={16} />
-						Open full editor
-					</div>
-				</Button>
-				<Button
-					size="xs"
-					color="light"
-					variant="border"
-					iconOnly
-					startIcon={{ icon: faTrash }}
-					on:click={() => {
-						if (componentInput?.runnable?.type === 'runnableByName') {
-							componentInput.runnable = undefined
-							componentInput.fields = {}
-						}
-					}}
-				/>
-				{#if validCode}
-					<Badge color="green">
-						<CheckCircle size={16} />
-					</Badge>
-				{:else}
-					<Badge color="red">
-						<X size={16} />
-					</Badge>
+			<div class="flex justify-between w-full flex-row items-center">
+				{#if componentInput?.runnable?.name}
+					<input bind:value={componentInput.runnable.name} />
 				{/if}
+				<div class="flex w-full flex-row gap-2 items-center justify-end">
+					{#if validCode}
+						<Badge color="green">
+							<CheckCircle size={16} />
+						</Badge>
+					{:else}
+						<Badge color="red">
+							<X size={16} />
+						</Badge>
+					{/if}
+
+					<Button
+						size="xs"
+						color="light"
+						variant="border"
+						iconOnly
+						startIcon={{ icon: faTrash }}
+						on:click={() => {
+							if (componentInput?.runnable?.type === 'runnableByName') {
+								componentInput.runnable = undefined
+								componentInput.fields = {}
+							}
+						}}
+					/>
+					<Button
+						size="xs"
+						color="light"
+						variant="border"
+						on:click={() => {
+							inlineScriptEditorDrawer?.openDrawer()
+						}}
+					>
+						<div class="flex gap-1 items-center">
+							<Code2 size={16} />
+							Open full editor
+						</div>
+					</Button>
+				</div>
 			</div>
 
 			{#if componentInput?.runnable?.type === 'runnableByName' && componentInput?.runnable?.inlineScript}
@@ -152,9 +156,7 @@
 						label={lang}
 						{lang}
 						on:click={() => {
-							if (selectedScriptName) {
-								createInlineScriptByLanguage(lang, selectedScriptName)
-							}
+							createInlineScriptByLanguage(lang, name)
 						}}
 					/>
 				{/each}
@@ -163,18 +165,14 @@
 					label={`PostgreSQL`}
 					lang="pgsql"
 					on:click={() => {
-						if (selectedScriptName) {
-							createInlineScriptByLanguage(Script.language.DENO, selectedScriptName, 'pgsql')
-						}
+						createInlineScriptByLanguage(Script.language.DENO, name, 'pgsql')
 					}}
 				/>
 				<FlowScriptPicker
 					label={`MySQL`}
 					lang="mysql"
 					on:click={() => {
-						if (selectedScriptName) {
-							createInlineScriptByLanguage(Script.language.DENO, selectedScriptName, 'mysql')
-						}
+						createInlineScriptByLanguage(Script.language.DENO, name, 'mysql')
 					}}
 				/>
 			</div>
diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte
index d2acdaf83f..b0ca39d442 100644
--- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte
+++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte
@@ -8,19 +8,18 @@
 
 	const { app } = getContext<AppEditorContext>('AppEditorContext')
 
-	let selectedScriptName: string | undefined = undefined
+	let selectedScriptComponentId: string | undefined = undefined
 </script>
 
 <SplitPanesWrapper>
 	<Pane size={25}>
-		<InlineScriptsPanelList bind:selectedScriptName />
+		<InlineScriptsPanelList bind:selectedScriptComponentId />
 	</Pane>
 	<Pane size={75}>
 		{#each $app.grid as gridComponent, index (index)}
-			<InlineScriptEditor
-				bind:componentInput={gridComponent.data.componentInput}
-				{selectedScriptName}
-			/>
+			{#if gridComponent.data.id === selectedScriptComponentId}
+				<InlineScriptEditor bind:componentInput={gridComponent.data.componentInput} />
+			{/if}
 		{/each}
 	</Pane>
 </SplitPanesWrapper>
diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanelList.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanelList.svelte
index 9a1911b0e8..3bfebb84ad 100644
--- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanelList.svelte
+++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanelList.svelte
@@ -6,12 +6,12 @@
 	import type { AppEditorContext } from '../../types'
 	import PanelSection from '../settingsPanel/common/PanelSection.svelte'
 
-	export let selectedScriptName: string | undefined = undefined
+	export let selectedScriptComponentId: string | undefined = undefined
 
 	const { app } = getContext<AppEditorContext>('AppEditorContext')
 
-	function selectInlineScript(name: string) {
-		selectedScriptName = name
+	function selectInlineScript(id: string) {
+		selectedScriptComponentId = id
 	}
 
 	$: componentInlineScripts = $app.grid.reduce((acc, gridComponent) => {
@@ -38,9 +38,9 @@
 					<div
 						class="{classNames(
 							'border flex justify-between flex-row w-full items-center p-2 rounded-md cursor-pointer hover:bg-blue-50 hover:text-blue-400',
-							selectedScriptName === name ? 'bg-blue-100 text-blue-600' : ''
+							selectedScriptComponentId === id ? 'bg-blue-100 text-blue-600' : ''
 						)},"
-						on:click={() => selectInlineScript(name)}
+						on:click={() => selectInlineScript(id)}
 					>
 						<span class="text-xs">{name}</span>
 						<Badge color="dark-indigo">{id}</Badge>