From 33c07d3e63f96673719ecb15e45f4cd9e18be80e Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 28 Mar 2023 16:58:43 +0200
Subject: [PATCH] feat(frontend): add pagination

---
 .../components/display/table/AppTable.svelte  | 108 +++++++++++-------
 .../display/table/AppTableFooter.svelte       |   3 +-
 .../components/display/table/tableOptions.ts  |   2 +-
 .../components/helpers/DebouncedInput.svelte  |   1 +
 .../apps/components/helpers/InputValue.svelte |   4 +-
 .../helpers/RunnableComponent.svelte          |   4 +-
 .../apps/components/helpers/eval.ts           |   8 +-
 .../apps/editor/component/components.ts       |   8 ++
 .../propertyPicker/ObjectViewer.svelte        |   3 -
 .../(root)/(logged)/run/[...run]/+page.svelte |   2 +-
 10 files changed, 87 insertions(+), 56 deletions(-)

diff --git a/frontend/src/lib/components/apps/components/display/table/AppTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppTable.svelte
index dfdb74a8c0..a5567405b0 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppTable.svelte
@@ -17,10 +17,11 @@
 	import AppTableFooter from './AppTableFooter.svelte'
 	import { tableOptions } from './tableOptions'
 	import Alert from '$lib/components/common/alert/Alert.svelte'
-	import type { ButtonComponent } from '../../../editor/component'
+	import { components, type ButtonComponent } from '../../../editor/component'
 	import { concatCustomCss } from '../../../utils'
 	import { twMerge } from 'tailwind-merge'
-	import { initOutput } from '$lib/components/apps/editor/appUtils'
+	import { initConfig, initOutput } from '$lib/components/apps/editor/appUtils'
+	import ResolveConfig from '../../helpers/ResolveConfig.svelte'
 
 	export let id: string
 	export let componentInput: AppInput | undefined
@@ -34,9 +35,19 @@
 
 	let result: Record<string, any>[] | undefined = undefined
 
-	let search: 'By Runnable' | 'By Component' | 'Disabled' | undefined = undefined
+	const { app, worldStore, componentControl, selectedComponent, hoverStore, mode } =
+		getContext<AppViewerContext>('AppViewerContext')
+
 	let searchValue = ''
-	let pagination: boolean | undefined = true
+
+	let outputs = initOutput($worldStore, id, {
+		selectedRowIndex: 0,
+		selectedRow: undefined,
+		loading: false,
+		result: [],
+		search: '',
+		page: 1
+	})
 
 	$: setSearch(searchValue)
 
@@ -52,8 +63,13 @@
 
 	let table = createSvelteTable(options)
 
-	const { app, worldStore, componentControl, selectedComponent, hoverStore, mode } =
-		getContext<AppViewerContext>('AppViewerContext')
+	let resolvedConfig = initConfig(
+		components['tablecomponent'].initialData.configuration,
+		configuration
+	) as {
+		search: 'By Component' | 'By Runnable' | 'Disabled' | undefined
+		manualPagination: boolean
+	}
 
 	let selectedRowIndex = -1
 
@@ -78,25 +94,6 @@
 		outputs &&
 		toggleRow({ original: result[0] }, 0)
 
-	function setOptions(filteredResult: Array<Record<string, any>>) {
-		if (!Array.isArray(result)) {
-			return
-		}
-
-		const headers = Array.from(new Set(result.flatMap((row) => Object.keys(row))))
-
-		$options = {
-			...tableOptions,
-			data: filteredResult,
-			columns: headers.map((header) => {
-				return {
-					accessorKey: header,
-					cell: (info) => info.getValue()
-				}
-			})
-		}
-	}
-
 	function searchInResult(result: Array<Record<string, any>>, searchValue: string) {
 		if (searchValue === '') {
 			return result
@@ -120,25 +117,48 @@
 
 	let filteredResult: Array<Record<string, any>> = []
 
-	$: filteredResult && setOptions(filteredResult)
-	$: search === 'By Component' && (filteredResult = searchInResult(result ?? [], searchValue))
-	$: (search === 'By Runnable' || search === 'Disabled') && (filteredResult = result ?? [])
-	let outputs = initOutput($worldStore, id, {
-		selectedRowIndex: 0,
-		selectedRow: undefined,
-		loading: false,
-		result: [],
-		search: ''
-	})
+	function setFilteredResult() {
+		if (resolvedConfig.search === 'By Runnable' || resolvedConfig.search === 'Disabled') {
+			filteredResult = result ?? []
+		} else {
+			filteredResult = searchInResult(result ?? [], searchValue)
+		}
+	}
+	$: (result || resolvedConfig.search || searchValue) && setFilteredResult()
+
+	$: outputs.page.set($table.getState().pagination.pageIndex)
 
 	function rerender() {
+		if (!Array.isArray(result)) {
+			return
+		}
+
+		const headers = Array.from(
+			new Set(result.flatMap((row) => (typeof row == 'object' ? Object.keys(row) : [])))
+		)
+
+		$options = {
+			...tableOptions,
+			manualPagination: resolvedConfig.manualPagination,
+			data: filteredResult,
+			columns: headers.map((header) => {
+				return {
+					accessorKey: header,
+					cell: (info) => info.getValue()
+				}
+			})
+		}
 		table = createSvelteTable(options)
 		if (result) {
 			toggleRow({ original: result[0] }, 0, true)
 		}
+
+		if (outputs.page.peak()) {
+			$table.setPageIndex(outputs?.page.peak())
+		}
 	}
 
-	$: result && rerender()
+	$: filteredResult && rerender()
 
 	$: css = concatCustomCss($app.css?.tablecomponent, customCss)
 
@@ -159,7 +179,14 @@
 	}
 </script>
 
-<InputValue {id} input={configuration.search} bind:value={search} />
+{#each Object.keys(components['tablecomponent'].initialData.configuration) as key (key)}
+	<ResolveConfig
+		{id}
+		{key}
+		bind:resolvedConfig={resolvedConfig[key]}
+		configuration={configuration[key]}
+	/>
+{/each}
 
 <RunnableWrapper {outputs} {render} {componentInput} {id} bind:initializing bind:result>
 	{#if Array.isArray(result) && result.every(isObject)}
@@ -171,7 +198,7 @@
 			)}
 			style={css?.container?.style ?? ''}
 		>
-			{#if search !== 'Disabled'}
+			{#if resolvedConfig.search !== 'Disabled'}
 				<div class="px-2 py-1">
 					<div class="flex items-center">
 						<div class="grow max-w-[300px]">
@@ -354,8 +381,9 @@
 			</div>
 
 			<AppTableFooter
-				paginationEnabled={pagination}
-				{result}
+				paginationEnabled
+				manualPagination={resolvedConfig.manualPagination}
+				result={filteredResult}
 				{table}
 				class={css?.tableFooter?.class}
 				style={css?.tableFooter?.style}
diff --git a/frontend/src/lib/components/apps/components/display/table/AppTableFooter.svelte b/frontend/src/lib/components/apps/components/display/table/AppTableFooter.svelte
index f37f1f9406..79d4727d62 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppTableFooter.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppTableFooter.svelte
@@ -11,6 +11,7 @@
 
 	export let result: Array<T>
 	export let paginationEnabled: boolean = false
+	export let manualPagination: boolean
 	export let table: Readable<Table<T>>
 	let c = ''
 	export { c as class }
@@ -31,7 +32,7 @@
 	class={twMerge('px-2 py-1 text-xs gap-2 items-center justify-between', c, 'flex flex-row')}
 	{style}
 >
-	{#if paginationEnabled && result.length > (tableOptions.initialState?.pagination?.pageSize ?? 25)}
+	{#if (paginationEnabled && result.length > (tableOptions.initialState?.pagination?.pageSize ?? 25)) || manualPagination}
 		<div class="flex items-center gap-2 flex-row">
 			<Button
 				size="xs"
diff --git a/frontend/src/lib/components/apps/components/display/table/tableOptions.ts b/frontend/src/lib/components/apps/components/display/table/tableOptions.ts
index 24541e1b85..dfc144d8bb 100644
--- a/frontend/src/lib/components/apps/components/display/table/tableOptions.ts
+++ b/frontend/src/lib/components/apps/components/display/table/tableOptions.ts
@@ -10,7 +10,7 @@ const tableOptions: TableOptions<Record<string, any>> = {
 		pagination: {
 			pageSize: 25
 		}
-	},
+	}
 }
 
 export { tableOptions }
diff --git a/frontend/src/lib/components/apps/components/helpers/DebouncedInput.svelte b/frontend/src/lib/components/apps/components/helpers/DebouncedInput.svelte
index 1ec7ab3970..7e37bc0a3c 100644
--- a/frontend/src/lib/components/apps/components/helpers/DebouncedInput.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/DebouncedInput.svelte
@@ -23,6 +23,7 @@
 <input
 	bind:value
 	{placeholder}
+	on:pointerdown|stopPropagation
 	on:keyup={debounce}
 	class={parentClass}
 	{...$$restProps}
diff --git a/frontend/src/lib/components/apps/components/helpers/InputValue.svelte b/frontend/src/lib/components/apps/components/helpers/InputValue.svelte
index b67d90f030..03767c2bd0 100644
--- a/frontend/src/lib/components/apps/components/helpers/InputValue.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/InputValue.svelte
@@ -85,7 +85,7 @@
 		try {
 			const r = await eval_like(
 				input.expr,
-				computeGlobalContext($worldStore, id, extraContext),
+				computeGlobalContext($worldStore, extraContext),
 				true,
 				$state,
 				$mode == 'dnd',
@@ -107,7 +107,7 @@
 			try {
 				const r = await eval_like(
 					'`' + input.eval + '`',
-					computeGlobalContext($worldStore, id, extraContext),
+					computeGlobalContext($worldStore, extraContext),
 					true,
 					$state,
 					$mode == 'dnd',
diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
index e1ebdbc504..20443708e5 100644
--- a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
@@ -150,7 +150,7 @@
 			try {
 				const r = await eval_like(
 					runnable.inlineScript?.content,
-					computeGlobalContext($worldStore, id, {}),
+					computeGlobalContext($worldStore, {}),
 					false,
 					$state,
 					$mode == 'dnd',
@@ -256,7 +256,7 @@
 			$worldStore.newOutput(id, 'raw', res)
 			res = await eval_like(
 				transformer.content,
-				computeGlobalContext($worldStore, id, { result: res }),
+				computeGlobalContext($worldStore, { result: res }),
 				false,
 				$state,
 				$mode == 'dnd',
diff --git a/frontend/src/lib/components/apps/components/helpers/eval.ts b/frontend/src/lib/components/apps/components/helpers/eval.ts
index cba8ab92d4..0b7853362f 100644
--- a/frontend/src/lib/components/apps/components/helpers/eval.ts
+++ b/frontend/src/lib/components/apps/components/helpers/eval.ts
@@ -2,15 +2,11 @@ import { sendUserToast } from '$lib/utils'
 import { isPlainObject } from 'lodash'
 import type { World } from '../../rx'
 
-export function computeGlobalContext(
-	world: World | undefined,
-	id: string | undefined,
-	extraContext: any = {}
-) {
+export function computeGlobalContext(world: World | undefined, extraContext: any = {}) {
 	return {
 		...Object.fromEntries(
 			Object.entries(world?.outputsById ?? {})
-				.filter(([k, _]) => k != id && k != 'state')
+				.filter(([k, _]) => k != 'state')
 				.map(([key, value]) => {
 					return [
 						key,
diff --git a/frontend/src/lib/components/apps/editor/component/components.ts b/frontend/src/lib/components/apps/editor/component/components.ts
index 28c73f88d2..36dc276b1b 100644
--- a/frontend/src/lib/components/apps/editor/component/components.ts
+++ b/frontend/src/lib/components/apps/editor/component/components.ts
@@ -788,6 +788,14 @@ Hello \${ctx.username}
 					onlyStatic: true,
 					selectOptions: selectOptions.tableSearchOptions,
 					value: 'Disabled'
+				},
+				manualPagination: {
+					fieldType: 'boolean',
+					type: 'static',
+					onlyStatic: true,
+					value: false,
+					tooltip:
+						'Pagination would not be handled by the component but by the script itself. Connect to the pagination output'
 				}
 			},
 			componentInput: {
diff --git a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
index fd10e04f0d..4428be7d3d 100644
--- a/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
+++ b/frontend/src/lib/components/propertyPicker/ObjectViewer.svelte
@@ -126,9 +126,6 @@
 			{pluralize(Object.keys(json).length, Array.isArray(json) ? 'item' : 'key')}
 		</span>
 	{/if}
-	{#if !isLast && collapsed}
-		<span class="text-black">,</span>
-	{/if}
 {:else if topBrackets}
 	<span class="text-black">{openBracket}{closeBracket}</span>
 {:else}
diff --git a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
index 14fc5a2072..6d6204e65a 100644
--- a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
@@ -198,7 +198,7 @@
 				{/if}
 				<Button
 					href={runHref}
-					disabled={isRunning || not_same_workspace}
+					disabled={not_same_workspace}
 					color="blue"
 					size="md"
 					startIcon={{ icon: faRefresh }}>Run again</Button