From a0acdc1217967562bb349a2b718c82af74b8bc45 Mon Sep 17 00:00:00 2001
From: Faton Ramadani <faton.ramadani14@gmail.com>
Date: Thu, 23 May 2024 20:36:39 +0200
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20Add=20missing=20loading=20stat?=
 =?UTF-8?q?e=20for=20non-runnable=20components=20=E2=80=A6=20(#3797)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): Add missing loading state for non-runnable components + fix select and aggrid styling

* fix(frontend): remove log

* fix(frontend): improve code

* fix(frontend): improve code

* fix(frontend): Fix refreshIndicator styling
---
 .../display/table/AppAggridTable.svelte       |  4 +-
 .../display/table/theme/windmill-theme.css    |  2 +-
 .../helpers/NonRunnableComponent.svelte       | 46 ++++++++++++++++++-
 .../helpers/RefreshIndicator.svelte           | 21 +++++++++
 .../apps/components/inputs/AppSelect.svelte   |  4 +-
 frontend/src/lib/components/apps/rx.ts        | 10 +++-
 frontend/src/lib/defaults.ts                  |  5 +-
 7 files changed, 82 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/lib/components/apps/components/helpers/RefreshIndicator.svelte

diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
index 59c990c1c3635..f46412a223042 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
@@ -304,8 +304,8 @@
 							$componentControl[id] = {
 								agGrid: { api: e.api, columnApi: e.columnApi },
 								setSelectedIndex: (index) => {
-									if(index === null) {
-										e.api.deselectAll();
+									if (index === null) {
+										e.api.deselectAll()
 										outputs?.selectedRow?.set({})
 										outputs?.selectedRowIndex.set(0)
 									} else {
diff --git a/frontend/src/lib/components/apps/components/display/table/theme/windmill-theme.css b/frontend/src/lib/components/apps/components/display/table/theme/windmill-theme.css
index 2a4bd70cf0191..577604d290159 100644
--- a/frontend/src/lib/components/apps/components/display/table/theme/windmill-theme.css
+++ b/frontend/src/lib/components/apps/components/display/table/theme/windmill-theme.css
@@ -7,7 +7,7 @@
 .ag-theme-alpine,
 .ag-theme-alpine-dark,
 .ag-theme-alpine-auto-dark {
-	--ag-alpine-active-color: rgb(255, 239, 254);
+	--ag-alpine-active-color: rgb(96, 165, 250);
 	--ag-selected-row-background-color: rgb(219, 234, 254, 0.5);
 	--ag-row-hover-color: rgb(191, 219, 254, 0.5);
 	--ag-column-hover-color: rgba(33, 150, 243, 0.1);
diff --git a/frontend/src/lib/components/apps/components/helpers/NonRunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/NonRunnableComponent.svelte
index 8a7a19fe9023d..d183a5eef78df 100644
--- a/frontend/src/lib/components/apps/components/helpers/NonRunnableComponent.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/NonRunnableComponent.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
 	import { getContext } from 'svelte'
-	import type { AppInput } from '../../inputType'
+	import type { AppInput, InputConnectionEval } from '../../inputType'
 	import type { Output } from '../../rx'
 	import type { AppViewerContext } from '../../types'
 	import InputValue from './InputValue.svelte'
 	import InitializeComponent from './InitializeComponent.svelte'
+	import RefreshIndicator from './RefreshIndicator.svelte'
 
 	export let componentInput: AppInput
 	export let id: string
@@ -25,6 +26,46 @@
 		outputs?.result?.set(v, true)
 	}
 
+	let loading: boolean = false
+	let loadingStates: { [key: string]: boolean } = {}
+	let subscriptions: Array<() => void> = []
+
+	function updateGlobalLoading() {
+		loading = Object.values(loadingStates).some((state) => state === true)
+	}
+
+	function builtSubscriptions(connections: InputConnectionEval[]) {
+		// If we are rebuilding the subscriptions, we need to unsubscribe from the previous ones
+		if (subscriptions.length > 0) {
+			subscriptions.forEach((unsubscribe) => unsubscribe?.())
+			subscriptions = []
+			loadingStates = {}
+			loading = false
+		}
+
+		connections.forEach((connection) => {
+			const output = $worldStore.outputsById[connection.componentId]
+
+			if (output?.loading?.subscribe) {
+				const unsubscribe = output.loading.subscribe(
+					{
+						id: `loading-${connection.componentId}`,
+						next: (isConnectionLoading: boolean) => {
+							loadingStates[connection.componentId] = isConnectionLoading
+							updateGlobalLoading()
+						}
+					},
+					loadingStates[connection.componentId]
+				)
+				subscriptions.push(unsubscribe)
+			}
+		})
+	}
+
+	$: componentInput.type === 'evalv2' &&
+		componentInput.connections &&
+		builtSubscriptions(componentInput.connections)
+
 	$: result != undefined && outputs && setOutput(result)
 </script>
 
@@ -39,6 +80,9 @@
 {#if render || hasChildrens}
 	<div class={render ? 'h-full w-full' : 'invisible h-0 overflow-hidden'}>
 		<slot />
+		<div class="flex absolute top-1 right-1 z-50 app-component-refresh-btn">
+			<RefreshIndicator {loading} />
+		</div>
 	</div>
 {:else}
 	<div class="w-full h-full" />
diff --git a/frontend/src/lib/components/apps/components/helpers/RefreshIndicator.svelte b/frontend/src/lib/components/apps/components/helpers/RefreshIndicator.svelte
new file mode 100644
index 0000000000000..020385c8ae3a9
--- /dev/null
+++ b/frontend/src/lib/components/apps/components/helpers/RefreshIndicator.svelte
@@ -0,0 +1,21 @@
+<script lang="ts">
+	import { LoaderIcon } from 'lucide-svelte'
+	import Popover from '$lib/components/Popover.svelte'
+
+	export let loading: boolean
+</script>
+
+{#if loading}
+	<Popover>
+		<div class={'bg-blue-100 dark:bg-blue-400 transition-all p-1 rounded-component'}>
+			<LoaderIcon size={14} class="animate-spin text-blue-800 dark:text-white" />
+		</div>
+		<svelte:fragment slot="text">
+			{#if loading}
+				Refreshing...
+			{:else}
+				Refresh
+			{/if}
+		</svelte:fragment>
+	</Popover>
+{/if}
diff --git a/frontend/src/lib/components/apps/components/inputs/AppSelect.svelte b/frontend/src/lib/components/apps/components/inputs/AppSelect.svelte
index 73cbb05b3cadb..8cc19b9edbd72 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppSelect.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppSelect.svelte
@@ -21,7 +21,6 @@
 	import { Bug } from 'lucide-svelte'
 	import Popover from '$lib/components/Popover.svelte'
 	import ResolveStyle from '../helpers/ResolveStyle.svelte'
-	import { twMerge } from 'tailwind-merge'
 
 	export let id: string
 	export let configuration: RichConfigurations
@@ -227,6 +226,7 @@
 				inAppEditor={true}
 				--border-radius="0.250rem"
 				--clear-icon-color="#6b7280"
+				--border={$darkMode ? '1px solid #6b7280' : '1px solid #d1d5db'}
 				bind:filterText
 				on:filter={handleFilter}
 				on:clear={onClear}
@@ -238,7 +238,7 @@
 					? SELECT_INPUT_DEFAULT_STYLE.containerStylesDark
 					: SELECT_INPUT_DEFAULT_STYLE.containerStyles) + css?.input?.style}
 				{value}
-				class={twMerge($darkMode ? '!border-gray-500' : '!border-gray-300', css?.input?.class)}
+				class={css?.input?.class}
 				placeholder={resolvedConfig.placeholder}
 				disabled={resolvedConfig.disabled}
 				on:focus={() => {
diff --git a/frontend/src/lib/components/apps/rx.ts b/frontend/src/lib/components/apps/rx.ts
index a8ff8308a48a5..16b795817a38a 100644
--- a/frontend/src/lib/components/apps/rx.ts
+++ b/frontend/src/lib/components/apps/rx.ts
@@ -8,7 +8,7 @@ export interface Subscriber<T> {
 }
 
 export interface Observable<T> {
-	subscribe(x: Subscriber<T>, previousValue: T): void
+	subscribe(x: Subscriber<T>, previousValue: T): () => void
 }
 export interface Output<T> extends Observable<T> {
 	set(x: T, force?: boolean): void
@@ -154,6 +154,14 @@ export function settableOutput<T>(state: Writable<number>, previousValue: T): Ou
 		if (value !== undefined && !deepEqual(value, npreviousValue)) {
 			x.next(value)
 		}
+
+		// return a callback to unsubscribe
+		return () => {
+			const index = subscribers.findIndex((y) => y === x || (y.id && y.id === x.id))
+			if (index !== -1) {
+				subscribers.splice(index, 1)
+			}
+		}
 	}
 
 	let lastHash: any = undefined
diff --git a/frontend/src/lib/defaults.ts b/frontend/src/lib/defaults.ts
index 0e76a226c169a..03674449820ff 100644
--- a/frontend/src/lib/defaults.ts
+++ b/frontend/src/lib/defaults.ts
@@ -1,7 +1,6 @@
 export const SELECT_INPUT_DEFAULT_STYLE = {
 	inputStyles: 'border-radius: 0;',
-	containerStyles:
-		'--height: 34px; --padding: 0 0 0 8px; --font-size: 0.875rem; --border: 1px solid #d1d5db;',
+	containerStyles: '--height: 34px; --padding: 0 0 0 8px; --font-size: 0.875rem;',
 	containerStylesDark:
-		'--height: 34px; --padding: 0 0 0 8px; --font-size: 0.875rem; --border: 1px solid #374151; --background: #3b4252; --disabled-background: #2a2f3a; --list-background: #3b4252;--item-is-active-bg:#434c5e;--item-hover-bg:#4c566a;'
+		'--height: 34px; --padding: 0 0 0 8px; --font-size: 0.875rem; --background: #3b4252; --disabled-background: #2a2f3a; --list-background: #3b4252;--item-is-active-bg:#434c5e;--item-hover-bg:#4c566a;'
 } as const