From ea4165d58bb11fb4409242bb597f4b7514d1bd60 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sat, 4 May 2024 10:56:40 +0200
Subject: [PATCH] fix: improve conditional wrapper for app editor

---
 .../apps/components/display/AppText.svelte    |  9 ++-
 .../layout/AppConditionalWrapper.svelte       |  7 ++-
 .../settingsPanel/AlignmentEditor.svelte      |  2 +-
 .../editor/settingsPanel/GridCondition.svelte | 63 ++++++++++---------
 .../inputEditor/EvalV2InputEditor.svelte      |  1 +
 5 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/frontend/src/lib/components/apps/components/display/AppText.svelte b/frontend/src/lib/components/apps/components/display/AppText.svelte
index f00ab3d1d9..b1e51c6031 100644
--- a/frontend/src/lib/components/apps/components/display/AppText.svelte
+++ b/frontend/src/lib/components/apps/components/display/AppText.svelte
@@ -172,12 +172,17 @@
 			<AlignWrapper {verticalAlignment}>
 				<textarea
 					class={twMerge(
-						'whitespace-pre-wrap !outline-none !border-0 !bg-transparent !resize-none !overflow-hidden !ring-0 !p-0 text-center',
+						'whitespace-pre-wrap !outline-none !border-0 !bg-transparent !resize-none !overflow-hidden !ring-0 !p-0',
 						css?.text?.class,
 						'wm-text',
 						classes,
 						getClasses(),
-						getClassesByType()
+						getClassesByType(),
+						horizontalAlignment === 'center'
+							? 'text-center'
+							: horizontalAlignment === 'right'
+							? 'text-right'
+							: 'text-left'
 					)}
 					on:pointerdown|stopPropagation
 					style={css?.text?.style}
diff --git a/frontend/src/lib/components/apps/components/layout/AppConditionalWrapper.svelte b/frontend/src/lib/components/apps/components/layout/AppConditionalWrapper.svelte
index 00a6fd52ba..b1d78e0a88 100644
--- a/frontend/src/lib/components/apps/components/layout/AppConditionalWrapper.svelte
+++ b/frontend/src/lib/components/apps/components/layout/AppConditionalWrapper.svelte
@@ -68,7 +68,12 @@
 </script>
 
 {#each conditions ?? [] as condition, index}
-	<InputValue key="conditions" {id} input={condition} bind:value={resolvedConditions[index]} />
+	<InputValue
+		key="condition{index + 1}"
+		{id}
+		input={condition}
+		bind:value={resolvedConditions[index]}
+	/>
 {/each}
 
 {#each Object.keys(css ?? {}) as key (key)}
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/AlignmentEditor.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/AlignmentEditor.svelte
index 512e890255..d1254e0042 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/AlignmentEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/AlignmentEditor.svelte
@@ -24,7 +24,7 @@
 		{#if component.horizontalAlignment}
 			<ToggleButtonGroup
 				noWFull
-				on:selected={() => (component = component)}
+				on:selected={() => ($app = $app)}
 				bind:selected={component.horizontalAlignment}
 			>
 				<ToggleButton value="left" icon={AlignStartVertical} />
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/GridCondition.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/GridCondition.svelte
index c1926283e9..f580cf0e5b 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/GridCondition.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/GridCondition.svelte
@@ -21,12 +21,16 @@
 		return { value: condition, id: generateRandomString(), originalIndex: index }
 	})
 
-	$: conditions = items.map((item) => item.value).concat([{
-			type: 'evalv2',
-			expr: 'true',
-			fieldType: 'boolean',
-			connections: []
-		}])
+	$: conditions = items
+		.map((item) => item.value)
+		.concat([
+			{
+				type: 'evalv2',
+				expr: 'true',
+				fieldType: 'boolean',
+				connections: []
+			}
+		])
 
 	const { app, runnableComponents, componentControl } =
 		getContext<AppViewerContext>('AppViewerContext')
@@ -90,7 +94,7 @@
 		}
 
 		$runnableComponents = $runnableComponents
-		for (let i = index; i < items.length - 1; i++) {
+		for (let i = index; i < items.length; i++) {
 			$app!.subgrids![`${component.id}-${i}`] = $app!.subgrids![`${component.id}-${i + 1}`]
 		}
 
@@ -109,7 +113,7 @@
 	}
 
 	function addCondition(): void {
-		const numberOfConditions = items.length
+		const numberOfConditions = conditions.length
 
 		if (!$app.subgrids) {
 			$app.subgrids = {}
@@ -117,7 +121,7 @@
 
 		$app.subgrids[`${component.id}-${numberOfConditions}`] =
 			$app.subgrids[`${component.id}-${numberOfConditions - 1}`]
-		
+
 		$app.subgrids[`${component.id}-${numberOfConditions - 1}`] = []
 
 		const newCondition: AppInputSpec<'boolean', boolean> = {
@@ -132,8 +136,7 @@
 			id: generateRandomString(),
 			originalIndex: items.length
 		})
-
-		component.numberOfSubgrids = items.length
+		component.numberOfSubgrids = items.length + 1
 	}
 </script>
 
@@ -161,27 +164,26 @@
 				<div class="w-full flex flex-row gap-2 items-center relative">
 					<div class={twMerge('grow border p-3 my-2 rounded-md bg-surface relative')}>
 						{#if dragDisabled}
-						<InputsSpecEditor
-							key={`Condition ${index + 1}`}
-							bind:componentInput={item.value}
-							id={component.id}
-							userInputEnabled={false}
-							shouldCapitalize={true}
-							resourceOnly={false}
-							fieldType={condition?.['fieldType']}
-							subFieldType={condition?.['subFieldType']}
-							format={condition?.['format']}
-							selectOptions={condition?.['selectOptions']}
-							tooltip={condition?.['tooltip']}
-							fileUpload={condition?.['fileUpload']}
-							placeholder={condition?.['placeholder']}
-							customTitle={condition?.['customTitle']}
-							displayType={false}
-						/>
+							<InputsSpecEditor
+								key={`condition${index + 1}`}
+								bind:componentInput={item.value}
+								id={component.id}
+								userInputEnabled={false}
+								shouldCapitalize={true}
+								resourceOnly={false}
+								fieldType={condition?.['fieldType']}
+								subFieldType={condition?.['subFieldType']}
+								format={condition?.['format']}
+								selectOptions={condition?.['selectOptions']}
+								tooltip={condition?.['tooltip']}
+								fileUpload={condition?.['fileUpload']}
+								placeholder={condition?.['placeholder']}
+								customTitle={condition?.['customTitle']}
+								displayType={false}
+							/>
 						{:else}
-						<pre><code>{condition?.['expr']}</code></pre>
+							<pre><code>{condition?.['expr']}</code></pre>
 						{/if}
-
 					</div>
 
 					<div class="flex flex-col justify-center gap-2">
@@ -206,7 +208,6 @@
 						</div>
 					</div>
 				</div>
-
 			{/each}
 		</section>
 		<div class="border rounded-md p-3 mb-2">
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
index fc9643de66..f213ecfd81 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
@@ -122,6 +122,7 @@
 					<div
 						class="p-1 !text-2xs absolute rounded-b border-b border-r border-l bg-surface w-full z-[5000] overflow-auto"
 					>
+						<!-- <div class="text-tertiary absolute top-0 right-0 !text-2xs">{id}.{field}</div> -->
 						<div class="float-right text-tertiary cursor-pointer"><X size={14} /></div>
 						<pre class="text-tertiary"
 							>{JSON.stringify($evalPreview[`${id}.${field}`] ?? null, null, 4) ?? 'null'}</pre