windmill-components 1.430.6 → 1.434.1

package/package/components/AppConnectInner.svelte

@@ -2,7 +2,7 @@
 import IconedResourceType from './IconedResourceType.svelte';
 import { OauthService, ResourceService, VariableService } from '../gen';
 import { emptyString, truncateRev, urlize } from '../utils';
-import { createEventDispatcher } from 'svelte';
+import { createEventDispatcher, onDestroy } from 'svelte';
 import Path from './Path.svelte';
 import { Button, Skeleton } from './common';
 import ApiConnectForm from './ApiConnectForm.svelte';
@@ -139,8 +139,32 @@ function popupListener(event) {
         return;
     }
     window.removeEventListener('message', popupListener);
+    processPopupData(data);
+}
+function handleStorageEvent(event) {
+    if (event.key === 'oauth-callback') {
+        try {
+            processPopupData(JSON.parse(event.newValue));
+            console.log('OAuth from storage', event.newValue);
+            // Clean up
+            localStorage.removeItem('oauth-callback');
+            window.removeEventListener('storage', handleStorageEvent);
+        }
+        catch (e) {
+            console.error('Error processing oauth-callback', e);
+        }
+    }
+    else {
+        console.log('Storage event', event.key);
+    }
+}
+onDestroy(() => {
+    window.removeEventListener('message', popupListener);
+    window.removeEventListener('storage', handleStorageEvent);
+});
+function processPopupData(data) {
     if (data.type === 'error') {
-        sendUserToast(event.data.error, true);
+        sendUserToast(data.error, true);
         step = 2;
     }
     else if (data.type === 'success') {
@@ -192,6 +216,7 @@ export async function next() {
         // 	window.location.href = url.toString()
         // } else {
         window.addEventListener('message', popupListener);
+        window.addEventListener('storage', handleStorageEvent);
         window.open(url.toString(), '_blank', 'popup=true');
         step += 1;
         // 	dispatch('close')

package/package/components/ConfirmButton.svelte

@@ -0,0 +1,31 @@
+<script>import { Button } from './common';
+import { Check, X } from 'lucide-svelte';
+import { createEventDispatcher } from 'svelte';
+export let confirmation = 'Are you sure?';
+let firstClick = false;
+const dispatch = createEventDispatcher();
+</script>
+
+	<div class="p-2 flex flex-row w-full gap-2">
+{#if !firstClick}
+	<Button
+		on:click={() => {
+			firstClick = true
+		}}><slot /></Button
+	>
+{:else}
+		{confirmation}
+		<Button
+			color="red"
+			on:click={() => {
+				firstClick = false
+				dispatch('click')
+			}}><Check /></Button
+		>
+		<Button
+			on:click={() => {
+				firstClick = false
+			}}><X /></Button
+		>
+{/if}
+	</div>

package/package/components/ConfirmButton.svelte.d.ts

@@ -0,0 +1,20 @@
+import { SvelteComponent } from "svelte";
+declare const __propDef: {
+    props: {
+        confirmation?: string | undefined;
+    };
+    events: {
+        click: CustomEvent<any>;
+    } & {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {
+        default: {};
+    };
+};
+export type ConfirmButtonProps = typeof __propDef.props;
+export type ConfirmButtonEvents = typeof __propDef.events;
+export type ConfirmButtonSlots = typeof __propDef.slots;
+export default class ConfirmButton extends SvelteComponent<ConfirmButtonProps, ConfirmButtonEvents, ConfirmButtonSlots> {
+}
+export {};

package/package/components/DiffEditor.svelte

@@ -42,12 +42,8 @@ async function loadDiffEditor() {
     if (defaultOriginal !== undefined &&
         defaultModified !== undefined &&
         defaultLang !== undefined) {
-        console.log('SETUP');
         setupModel(defaultLang, defaultOriginal, defaultModified, defaultModifiedLang);
     }
-    else {
-        console.log('NO SETUP', defaultOriginal, defaultModified, defaultLang);
-    }
 }
 export function setupModel(lang, original, modified, modifiedLang) {
     diffEditor?.setModel({
@@ -62,7 +58,6 @@ export function setupModel(lang, original, modified, modifiedLang) {
     }
 }
 export function setOriginal(code) {
-    console.log('setOriginal', code);
     diffEditor?.getModel()?.original?.setValue(code);
     defaultOriginal = code;
 }
@@ -77,7 +72,6 @@ export function getModified() {
     return diffEditor?.getModel()?.modified.getValue() ?? '';
 }
 export function show() {
-    console.log('show');
     open = true;
 }
 export function hide() {

package/package/components/FlowStatusViewerInner.svelte

@@ -67,36 +67,42 @@ function onFlowModuleId() {
     }
 }
 function updateModuleStates(moduleState, key, newValue, keepType) {
-    moduleState.update((x) => {
-        if (newValue.selectedForloop != undefined &&
-            x[key]?.selectedForloop != undefined &&
-            newValue.selectedForloop != x[key].selectedForloop) {
-            if (newValue.type == 'InProgress') {
-                x[key].type = 'InProgress';
-            }
-            return x;
-        }
-        if (x[key]?.selectedForLoopSetManually) {
-            if (newValue.selectedForloop != undefined &&
-                x[key]?.selectedForloop != newValue.selectedForloop) {
-                return x;
-            }
-            else {
-                newValue.selectedForLoopSetManually = true;
-                newValue.selectedForloopIndex = x[key]?.selectedForloopIndex;
-                newValue.selectedForloop = x[key]?.selectedForloop;
-            }
+    const state = get(moduleState);
+    if (newValue.selectedForloop != undefined &&
+        state[key]?.selectedForloop != undefined &&
+        newValue.selectedForloop != state[key].selectedForloop) {
+        if (newValue.type == 'InProgress' && state[key]?.type != 'InProgress') {
+            moduleState.update((state) => {
+                state[key].type = 'InProgress';
+                return state;
+            });
         }
-        else if (x[key]?.selectedForloopIndex != undefined) {
-            newValue.selectedForloopIndex = x[key]?.selectedForloopIndex;
-            newValue.selectedForloop = x[key]?.selectedForloop;
+        return;
+    }
+    if (state[key]?.selectedForLoopSetManually) {
+        if (newValue.selectedForloop != undefined &&
+            state[key]?.selectedForloop != newValue.selectedForloop) {
+            return state;
         }
-        if (keepType && (x[key]?.type == 'Success' || x[key]?.type == 'Failure')) {
-            newValue.type = x[key].type;
+        else {
+            newValue.selectedForLoopSetManually = true;
+            newValue.selectedForloopIndex = state[key]?.selectedForloopIndex;
+            newValue.selectedForloop = state[key]?.selectedForloop;
         }
-        x[key] = newValue;
-        return x;
-    });
+    }
+    else if (state[key]?.selectedForloopIndex != undefined) {
+        newValue.selectedForloopIndex = state[key]?.selectedForloopIndex;
+        newValue.selectedForloop = state[key]?.selectedForloop;
+    }
+    if (keepType && (state[key]?.type == 'Success' || state[key]?.type == 'Failure')) {
+        newValue.type = state[key].type;
+    }
+    if (!deepEqual(state[key], newValue)) {
+        moduleState.update((state) => {
+            state[key] = newValue;
+            return state;
+        });
+    }
 }
 function buildSubflowKey(key, prefix) {
     return prefix ? 'subflow:' + prefix + key : key;
@@ -146,10 +152,10 @@ async function refresh(clearLoop, rootJob) {
     }
     for (let [k, rec] of Object.entries(recursiveRefresh)) {
         if (rootJob != undefined && rootJob != k) {
-            return;
+            continue;
         }
         await tick();
-        await rec(clearLoop, false);
+        await rec(clearLoop, undefined);
     }
 }
 function updateRecursiveRefresh(jobId) {
@@ -469,28 +475,39 @@ function onJobsLoaded(mod, job, force) {
 }
 async function setIteration(j, id, clicked, modId, isForloop) {
     if (modId) {
-        if (clicked) {
-            await globalRefreshes?.[modId]?.(true, id);
+        let globalState = globalModuleStates?.[globalModuleStates?.length - 1];
+        let globalStateGet = globalState ? get(globalState) : undefined;
+        let state = globalStateGet?.[modId];
+        if (clicked && state?.selectedForloop) {
+            await globalRefreshes?.[modId]?.(true, state.selectedForloop);
         }
-        globalModuleStates?.[globalModuleStates?.length - 1]?.update((topLevelModuleStates) => {
-            let state = topLevelModuleStates?.[modId];
-            if (state) {
-                let manualOnce = state.selectedForLoopSetManually;
-                if (clicked ||
-                    (!manualOnce &&
-                        (state == undefined || !isForloop || j >= (state.selectedForloopIndex ?? -1)))) {
-                    let setManually = clicked || manualOnce;
+        let manualOnce = state?.selectedForLoopSetManually;
+        if (clicked ||
+            (!manualOnce &&
+                (state == undefined || !isForloop || j >= (state.selectedForloopIndex ?? -1)))) {
+            let setManually = clicked || manualOnce;
+            let newState = {
+                ...(state ?? {}),
+                selectedForloop: id,
+                selectedForloopIndex: j,
+                selectedForLoopSetManually: setManually
+            };
+            const selectedNotEqual = id != state?.selectedForloop ||
+                j != state?.selectedForloopIndex ||
+                setManually != state?.selectedForLoopSetManually;
+            if (selectedNotEqual) {
+                console.log('not equal');
+                globalState?.update((topLevelModuleStates) => {
                     topLevelModuleStates[modId] = {
-                        ...(topLevelModuleStates[modId] ?? {}),
-                        selectedForloop: id,
-                        selectedForloopIndex: j,
-                        selectedForLoopSetManually: setManually ?? false
+                        type: 'WaitingForPriorSteps',
+                        args: {},
+                        ...newState
                     };
+                    return topLevelModuleStates;
                     // clicked && callGlobRefresh(modId, {index: j, job: id, selectedManually: setManually ?? false})
-                }
+                });
             }
-            return topLevelModuleStates;
-        });
+        }
         if (clicked) {
             await globalRefreshes?.[modId]?.(false, id);
         }
@@ -564,9 +581,12 @@ function innerJobLoaded(jobLoaded, j, clicked, force) {
                 duration_ms: jobLoaded.duration_ms
             });
         }
-        if (jobLoaded.job_kind == 'script' || jobLoaded.job_kind == 'flowscript' || jobLoaded.job_kind == 'preview') {
+        if (jobLoaded.job_kind == 'script' ||
+            jobLoaded.job_kind == 'flowscript' ||
+            jobLoaded.job_kind == 'preview') {
             let id = undefined;
-            if ((innerModule?.type == 'forloopflow' || innerModule?.type == 'whileloopflow') && innerModule.modules.length == 1) {
+            if ((innerModule?.type == 'forloopflow' || innerModule?.type == 'whileloopflow') &&
+                innerModule.modules.length == 1) {
                 id = innerModule?.modules?.[0]?.id;
             }
             if (id) {
@@ -1029,7 +1049,12 @@ function allModulesForTimeline(modules, expandedSubflows) {
 								let detail = e.detail
 								if (detail.manuallySet) {
 									let rootJobId = detail.id
-									await globalRefreshes?.[detail.moduleId]?.(true, rootJobId)
+									await tick()
+
+									let previousId = $localModuleStates[detail.moduleId]?.selectedForloop
+									if (previousId) {
+										await globalRefreshes?.[detail.moduleId]?.(true, previousId)
+									}
 
 									$localModuleStates[detail.moduleId] = {
 										...$localModuleStates[detail.moduleId],

package/package/components/InstanceSettings.svelte

@@ -1,6 +1,6 @@
 <script>import { settings, settingsKeys } from './instanceSettings';
 import { Button, Skeleton, Tab, TabContent, Tabs } from './common';
-import { SettingService, SettingsService } from '../gen';
+import { IndexSearchService, SettingService, SettingsService } from '../gen';
 import Toggle from './Toggle.svelte';
 import SecondsInput from './common/seconds/SecondsInput.svelte';
 import Tooltip from './Tooltip.svelte';
@@ -28,6 +28,7 @@ import Popover from './Popover.svelte';
 import { base } from '../base';
 import { createEventDispatcher } from 'svelte';
 import { setLicense } from '../enterpriseUtils';
+import ConfirmButton from './ConfirmButton.svelte';
 export let tab = 'Core';
 export let hideTabs = false;
 export let hideSave = false;
@@ -1066,6 +1067,24 @@ function setupSnowflakeUrls() {
 																bind:value={values[setting.key].refresh_log_index_period}
 															/>
 														</div>
+														<h3>Reset Index</h3>
+															This buttons will clear the whole index, and the service will start reindexing from scratch. Full text search might be down during this time.
+															<div>
+																<ConfirmButton
+																	on:click={async () => {
+																		let r = await IndexSearchService.clearIndex({idxName: "JobIndex"})
+																		console.log("asasd")
+																		sendUserToast(r)
+																	}}>Clear <b>Jobs</b> Index</ConfirmButton
+																>
+																<ConfirmButton
+																	on:click={async () => {
+																		let r = await IndexSearchService.clearIndex({idxName: "ServiceLogIndex"})
+																		console.log("asasd")
+																		sendUserToast(r)
+																	}}>Clear <b>Service Logs</b> Index</ConfirmButton
+																>
+															</div>
 													{/if}
 												</div>
 											{:else if setting.fieldType == 'smtp_connect'}

package/package/components/Login.svelte

@@ -13,7 +13,7 @@ import { Button, Skeleton } from './common';
 import { sendUserToast } from '../toast';
 import { isCloudHosted } from '../cloud';
 import { refreshSuperadmin } from '../refreshUser';
-import { createEventDispatcher, onMount } from 'svelte';
+import { createEventDispatcher, onDestroy, onMount } from 'svelte';
 export let rd = undefined;
 export let email = undefined;
 export let password = undefined;
@@ -134,7 +134,7 @@ async function redirectUser() {
 }
 async function loadLogins() {
     const allLogins = await OauthService.listOauthLogins();
-    logins = allLogins.oauth.map(login => ({
+    logins = allLogins.oauth.map((login) => ({
         type: login.type,
         displayName: login.display_name || login.type
     }));
@@ -163,14 +163,38 @@ function popupListener(event) {
     if (event.origin !== window.location.origin) {
         return;
     }
+    processPopupData(data);
+    window.removeEventListener('message', popupListener);
+}
+function processPopupData(data) {
     if (data.type === 'error') {
-        sendUserToast(event.data.error, true);
+        sendUserToast(data.error, true);
     }
     else if (data.type === 'success') {
-        window.removeEventListener('message', popupListener);
         dispatch('login');
     }
 }
+function handleStorageEvent(event) {
+    if (event.key === 'oauth-success') {
+        try {
+            processPopupData(JSON.parse(event.newValue));
+            console.log('oauth-success from storage');
+            // Clean up
+            localStorage.removeItem('oauth-success');
+            window.removeEventListener('storage', handleStorageEvent);
+        }
+        catch (e) {
+            console.error('Could not process oauth-success from storage', e);
+        }
+    }
+    else {
+        console.log('Storage event', event.key);
+    }
+}
+onDestroy(() => {
+    window.removeEventListener('message', popupListener);
+    window.removeEventListener('storage', handleStorageEvent);
+});
 function storeRedirect(provider) {
     if (rd) {
         try {
@@ -184,6 +208,7 @@ function storeRedirect(provider) {
     if (popup) {
         localStorage.setItem('closeUponLogin', 'true');
         window.addEventListener('message', popupListener);
+        window.addEventListener('storage', handleStorageEvent);
         window.open(url, '_blank', 'popup');
     }
     else {
@@ -202,14 +227,14 @@ $: error && sendUserToast(error, true);
 			{/each}
 		{:else}
 			{#each providers as { type, icon }}
-				{#if logins?.some(login => login.type === type)}
+				{#if logins?.some((login) => login.type === type)}
 					<Button
 						color="light"
 						variant="border"
 						startIcon={{ icon, classes: 'h-4' }}
 						on:click={() => storeRedirect(type)}
 					>
-						{logins.find(login => login.type === type)?.displayName}
+						{logins.find((login) => login.type === type)?.displayName}
 					</Button>
 				{/if}
 			{/each}