windmill-components 1.60.3 → 1.83.1

package/components/apps/editor/settingsPanel/triggerLists/TriggerBadgesList.svelte

@@ -0,0 +1,156 @@
+<script>import { Button } from '../../../../common';
+import { classNames } from '../../../../../utils';
+import { Plus, X } from 'lucide-svelte';
+import { getContext } from 'svelte';
+import { getAllRecomputeIdsForComponent } from '../../appUtils';
+export let inputDependencies = [];
+export let inlineScript;
+export let onClick = false;
+export let onLoad = false;
+export let id = undefined;
+export let doNotRecomputeOnInputChanged = false;
+const colors = {
+    red: 'text-red-800 border-red-600 bg-red-100',
+    green: 'text-green-800 border-green-600 bg-green-100',
+    indigo: 'text-indigo-800 border-indigo-600 bg-indigo-100',
+    blue: 'text-blue-800 border-blue-600 bg-blue-100'
+};
+let badgeClass = 'inline-flex items-center rounded-md px-2 py-0.5 text-xs font-medium border';
+const { app, worldStore } = getContext('AppViewerContext');
+const { connectingInput } = getContext('AppViewerContext');
+let addingDependency = false;
+function applyConnection() {
+    if (!$connectingInput.opened && $connectingInput.input !== undefined && addingDependency) {
+        if ($connectingInput.input.connection) {
+            const x = {
+                id: $connectingInput.input.connection.componentId,
+                key: $connectingInput.input.connection.path
+            };
+            if (!inlineScript) {
+                return;
+            }
+            if (inlineScript.refreshOn?.find((y) => y.id === x.id && y.key === x.key)) {
+                return;
+            }
+            if (!inlineScript.refreshOn) {
+                inlineScript.refreshOn = [x];
+            }
+            else {
+                inlineScript.refreshOn.push(x);
+            }
+            inlineScript = JSON.parse(JSON.stringify(inlineScript));
+            addingDependency = false;
+        }
+        $connectingInput = {
+            opened: false,
+            input: undefined,
+            hoveredComponent: undefined
+        };
+        $app = $app;
+        $worldStore = $worldStore;
+    }
+}
+$: frontendDependencies =
+    inlineScript?.language === 'frontend'
+        ? inlineScript?.refreshOn?.map((x) => `${x.id} - ${x.key}`) ?? []
+        : undefined;
+$: $connectingInput && applyConnection();
+$: recomputedBadges = getAllRecomputeIdsForComponent($app, id);
+function deleteDep(index) {
+    if (inlineScript) {
+        inlineScript.refreshOn?.splice(index, 1);
+    }
+    inlineScript = inlineScript;
+}
+</script>
+
+<div class="flex w-full flex-col items-start gap-2 mt-2 mb-1">
+	{#if recomputedBadges.length === 0 && !onLoad && !onClick && inputDependencies?.length === 0 && !frontendDependencies}
+		<p class="text-xs font-semibold text-slate-800 ">
+			This script has no triggers. It will never run.
+		</p>
+	{:else}
+		<div class="text-sm font-semibold text-gray-800 ">Triggered by</div>
+
+		{#if onLoad || onClick}
+			<div class="w-full">
+				<div class="text-xs font-semibold text-slate-800 mb-1">Events</div>
+				<div class="flex flex-row gap-2 flex-wrap">
+					{#if onLoad}
+						<span class={classNames(badgeClass, colors['green'])}>Start</span>
+						<span class={classNames(badgeClass, colors['green'])}>Refresh</span>
+					{/if}
+					{#if onClick}
+						<span class={classNames(badgeClass, colors['green'])}>Click</span>
+					{/if}
+				</div>
+			</div>
+		{/if}
+		{#if inputDependencies.length > 0 && !doNotRecomputeOnInputChanged}
+			<div class="w-full">
+				<div class="flex justify-between items-center mb-1">
+					<div class="text-xs font-semibold text-slate-800">Change on values</div>
+				</div>
+				<div class="flex flex-row gap-2 flex-wrap">
+					{#each inputDependencies as label}
+						<span class={classNames(badgeClass, colors['blue'])}>
+							{label}
+						</span>
+					{/each}
+				</div>
+			</div>
+		{/if}
+
+		{#if recomputedBadges?.length > 0}
+			<div class="w-full">
+				<div class="text-xs font-semibold text-slate-800 mb-1">Computation of</div>
+				<div class="flex flex-row gap-2 flex-wrap">
+					{#each recomputedBadges as badge}
+						<span class={classNames(badgeClass, colors['indigo'])}>{badge}</span>
+					{/each}
+				</div>
+			</div>
+		{/if}
+	{/if}
+	{#if frontendDependencies && !doNotRecomputeOnInputChanged}
+		<div class="w-full">
+			<div class="flex justify-between items-center">
+				<div class="text-xs font-semibold text-slate-800 mb-1">Change on values</div>
+				{#if inlineScript?.language === 'frontend'}
+					<Button
+						variant="border"
+						size="xs"
+						color="light"
+						btnClasses="!px-1 !py-0.5"
+						on:click={() => {
+							addingDependency = true
+							$connectingInput = {
+								opened: true,
+								input: undefined,
+								hoveredComponent: undefined
+							}
+						}}
+					>
+						<div class="flex flex-row gap-1 items-center">
+							Add dependency
+							<Plus size={14} />
+						</div>
+					</Button>
+				{/if}
+			</div>
+			<div class="flex flex-row gap-2 flex-wrap">
+				{#each frontendDependencies as label, index}
+					<span class={classNames(badgeClass, colors['red'])}>
+						{label}
+						<button
+							on:click={() => deleteDep(index)}
+							class="bg-red-300 cursor-pointer hover:bg-red-400 ml-1 rounded-md"
+						>
+							<X size={18} class="p-0.5" />
+						</button>
+					</span>
+				{/each}
+			</div>
+		</div>
+	{/if}
+</div>

package/components/apps/editor/settingsPanel/triggerLists/TriggerBadgesList.svelte.d.ts

@@ -0,0 +1,22 @@
+import { SvelteComponentTyped } from "svelte";
+import type { InlineScript } from '../../../types';
+declare const __propDef: {
+    props: {
+        inputDependencies?: string[] | undefined;
+        inlineScript: InlineScript | undefined;
+        onClick?: boolean | undefined;
+        onLoad?: boolean | undefined;
+        id?: string | undefined;
+        doNotRecomputeOnInputChanged?: boolean | undefined;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type TriggerBadgesListProps = typeof __propDef.props;
+export type TriggerBadgesListEvents = typeof __propDef.events;
+export type TriggerBadgesListSlots = typeof __propDef.slots;
+export default class TriggerBadgesList extends SvelteComponentTyped<TriggerBadgesListProps, TriggerBadgesListEvents, TriggerBadgesListSlots> {
+}
+export {};

package/components/apps/editor/settingsPanel/triggerLists/triggerListUtils.d.ts

@@ -0,0 +1,2 @@
+import type { StaticAppInput, ConnectedAppInput, RowAppInput, UserAppInput } from '../../../inputType';
+export declare function getDependencies(fields: Record<string, StaticAppInput | ConnectedAppInput | RowAppInput | UserAppInput> | undefined): string[];

package/components/apps/editor/settingsPanel/triggerLists/triggerListUtils.js

@@ -0,0 +1,11 @@
+export function getDependencies(fields) {
+    let dependencies = [];
+    if (!fields)
+        return dependencies;
+    Object.values(fields).forEach((field) => {
+        if (field.type === 'connected' && dependencies && field.connection) {
+            dependencies.push(`${field.connection.componentId} - ${field.connection.path}`);
+        }
+    });
+    return dependencies;
+}

package/components/apps/gridUtils.d.ts

@@ -4,10 +4,10 @@ declare const Breakpoints: {
     sm: number;
     lg: number;
 };
+declare const WIDE_GRID_COLUMNS: 12;
+declare const NARROW_GRID_COLUMNS: 3;
 declare const columnConfiguration: ColumnConfiguration;
 declare const gridColumns: number[];
-declare function disableDrag(component: GridItem): GridItem;
 declare function toggleFixed(component: GridItem): GridItem;
 declare function isFixed(component: GridItem): boolean;
-declare function enableDrag(component: GridItem): GridItem;
-export { gridColumns, columnConfiguration, disableDrag, enableDrag, Breakpoints, toggleFixed, isFixed };
+export { gridColumns, WIDE_GRID_COLUMNS, NARROW_GRID_COLUMNS, columnConfiguration, Breakpoints, toggleFixed, isFixed };

package/components/apps/gridUtils.js

@@ -2,20 +2,15 @@ const Breakpoints = {
     sm: 640,
     lg: 1024
 };
+const WIDE_GRID_COLUMNS = 12;
+const NARROW_GRID_COLUMNS = 3;
 const columnConfiguration = [
-    [Breakpoints.lg, 12],
-    [Breakpoints.sm, 3]
+    [Breakpoints.lg, WIDE_GRID_COLUMNS],
+    [Breakpoints.sm, NARROW_GRID_COLUMNS]
 ];
 const gridColumns = columnConfiguration.map((value) => value[1]);
-function disableDrag(component) {
-    gridColumns.forEach((column) => {
-        component[column].customDragger = true;
-        component[column].customResizer = true;
-    });
-    return component;
-}
 function toggleFixed(component) {
-    const nValue = !component[gridColumns[0]].fixed;
+    const nValue = !(component[gridColumns[0]]?.fixed ?? false);
     gridColumns.forEach((column) => {
         component[column].fixed = nValue;
     });
@@ -30,11 +25,4 @@ function isFixed(component) {
     });
     return fixed;
 }
-function enableDrag(component) {
-    gridColumns.forEach((column) => {
-        component[column].customDragger = false;
-        component[column].customResizer = false;
-    });
-    return component;
-}
-export { gridColumns, columnConfiguration, disableDrag, enableDrag, Breakpoints, toggleFixed, isFixed };
+export { gridColumns, WIDE_GRID_COLUMNS, NARROW_GRID_COLUMNS, columnConfiguration, Breakpoints, toggleFixed, isFixed };

package/components/apps/inputType.d.ts

@@ -1,6 +1,6 @@
-import type { staticValues } from './editor/componentsPanel/componentStaticValues';
+import type { ReadFileAs } from '../common/fileInput/model';
 import type { InlineScript } from './types';
-export type InputType = 'text' | 'textarea' | 'template' | 'number' | 'boolean' | 'select' | 'date' | 'time' | 'datetime' | 'object' | 'array' | 'any';
+export type InputType = 'integer' | 'text' | 'textarea' | 'template' | 'number' | 'boolean' | 'select' | 'icon-select' | 'color' | 'date' | 'time' | 'datetime' | 'object' | 'array' | 'any' | 'labeledresource' | 'labeledselect' | 'tab-select';
 export type InputConnection = {
     componentId: string;
     path: string;
@@ -13,6 +13,10 @@ export type UserInput<U> = {
     type: 'user';
     value: U | undefined;
 };
+export type UploadInput = {
+    type: 'upload';
+    value: string;
+};
 export type EvalInput = {
     type: 'eval';
     expr: string;
@@ -29,13 +33,13 @@ export type TemplateInput = {
     eval: string;
     type: 'template';
 };
-type RunnableByPath = {
+export type RunnableByPath = {
     path: string;
     schema: any;
     runType: 'script' | 'flow' | 'hubscript';
     type: 'runnableByPath';
 };
-type RunnableByName = {
+export type RunnableByName = {
     name: string;
     inlineScript: InlineScript | undefined;
     type: 'runnableByName';
@@ -43,24 +47,41 @@ type RunnableByName = {
 export type Runnable = RunnableByPath | RunnableByName | undefined;
 export type ResultInput = {
     runnable: Runnable;
-    fields: Record<string, (StaticAppInput | ConnectedAppInput | RowAppInput | UserAppInput)>;
+    transformer?: InlineScript & {
+        language: 'frontend';
+    };
+    fields: Record<string, StaticAppInput | ConnectedAppInput | RowAppInput | UserAppInput>;
     type: 'runnable';
     value?: any;
+    doNotRecomputeOnInputChanged?: boolean;
 };
-type AppInputSpec<T extends InputType, U, V extends InputType = never> = (StaticInput<U> | ConnectedInput | UserInput<U> | RowInput | EvalInput | ResultInput | TemplateInput) & InputConfiguration<T, U, V>;
-type InputConfiguration<T extends InputType, U, V extends InputType> = {
+type AppInputSpec<T extends InputType, U, V extends InputType = never> = (StaticInput<U> | ConnectedInput | UserInput<U> | RowInput | EvalInput | UploadInput | ResultInput | TemplateInput) & InputConfiguration<T, V>;
+type InputConfiguration<T extends InputType, V extends InputType> = {
     fieldType: T;
     subFieldType?: V;
     format?: string | undefined;
+    fileUpload?: {
+        /** Use `*` to accept anything. */
+        accept: string;
+        /**
+         * Controls if user is allowed to select multiple files.
+         * @default false
+         */
+        multiple?: boolean;
+        /**
+         * Controls if the uploaded file(s) will be converted or not.
+         * @default false
+         */
+        convertTo?: ReadFileAs;
+    };
+};
+export type StaticOptions = {
+    selectOptions: readonly string[] | readonly {
+        value: string;
+        label: string;
+    }[];
 };
-export type AppInput = AppInputSpec<'text', string> | AppInputSpec<'textarea', string> | AppInputSpec<'template', string> | AppInputSpec<'number', number> | AppInputSpec<'boolean', boolean> | AppInputSpec<'date', string> | AppInputSpec<'time', string> | AppInputSpec<'datetime', string> | AppInputSpec<'any', any> | AppInputSpec<'object', Record<string | number, any>> | AppInputSpec<'object', string> | (AppInputSpec<'select', string> & {
-    /**
-     * One of the keys of `staticValues` from `lib/components/apps/editor/componentsPanel/componentStaticValues`
-     */
-    optionValuesKey: keyof typeof staticValues;
-}) | AppInputSpec<'array', string[], 'text'> | AppInputSpec<'array', string[], 'textarea'> | AppInputSpec<'array', number[], 'number'> | AppInputSpec<'array', boolean[], 'boolean'> | AppInputSpec<'array', string[], 'date'> | AppInputSpec<'array', string[], 'time'> | AppInputSpec<'array', string[], 'datetime'> | AppInputSpec<'array', object[], 'object'> | (AppInputSpec<'array', string[], 'select'> & {
-    optionValuesKey: keyof typeof staticValues;
-});
+export type AppInput = AppInputSpec<'text', string> | AppInputSpec<'textarea', string> | AppInputSpec<'template', string> | AppInputSpec<'number', number> | AppInputSpec<'boolean', boolean> | AppInputSpec<'date', string> | AppInputSpec<'time', string> | AppInputSpec<'datetime', string> | AppInputSpec<'any', any> | AppInputSpec<'object', Record<string | number, any>> | AppInputSpec<'object', string> | (AppInputSpec<'select', string> & StaticOptions) | AppInputSpec<'icon-select', string> | AppInputSpec<'color', string> | AppInputSpec<'array', string[], 'text'> | AppInputSpec<'array', string[], 'textarea'> | AppInputSpec<'array', number[], 'number'> | AppInputSpec<'array', boolean[], 'boolean'> | AppInputSpec<'array', string[], 'date'> | AppInputSpec<'array', string[], 'time'> | AppInputSpec<'array', string[], 'datetime'> | AppInputSpec<'array', object[], 'object'> | (AppInputSpec<'array', string[], 'select'> & StaticOptions) | AppInputSpec<'array', object[], 'labeledresource'> | AppInputSpec<'array', object[], 'labeledselect'> | AppInputSpec<'labeledselect', object> | AppInputSpec<'labeledresource', object> | AppInputSpec<'array', object[], 'tab-select'>;
 export type RowAppInput = Extract<AppInput, {
     type: 'row';
 }>;
@@ -79,5 +100,17 @@ export type ResultAppInput = Extract<AppInput, {
 export type EvalAppInput = Extract<AppInput, {
     type: 'eval';
 }>;
+export type UploadAppInput = Extract<AppInput, {
+    type: 'upload';
+}>;
+export type RichAppInput = AppInput | {
+    type: 'oneOf';
+    oneOf: string[];
+    configuration: Record<string, AppInput>;
+} | {
+    type: 'group';
+    title: string;
+    configuration: Record<string, AppInput>;
+};
 export type AppInputs = Record<string, AppInput>;
 export {};

package/components/apps/rx.d.ts

@@ -1,10 +1,11 @@
 import type { AppInput } from './inputType';
 import { type Writable } from 'svelte/store';
 export interface Subscriber<T> {
-    next(v: T): any;
+    id?: string;
+    next(v: T): void;
 }
 export interface Observable<T> {
-    subscribe(x: Subscriber<T>): any;
+    subscribe(x: Subscriber<T>): void;
 }
 export interface Output<T> extends Observable<T> {
     set(x: T, force?: boolean): void;
@@ -15,13 +16,16 @@ export interface Input<T> extends Subscriber<T> {
 }
 export type World = {
     outputsById: Record<string, Record<string, Output<any>>>;
-    connect: <T>(inputSpec: AppInput, next: (x: T) => void) => Input<T>;
-    state: Writable<number>;
+    connect: <T>(inputSpec: AppInput, next: (x: T) => void, id?: string) => Input<T>;
+    stateId: Writable<number>;
+    newOutput: <T>(id: string, name: string, previousValue: T) => Output<T>;
+    initializedOutputs: number;
+    initialized: boolean;
 };
-export declare function buildWorld(components: Record<string, string[]>, previousWorld: World | undefined, context: Record<string, any>): World;
+export declare function buildWorld(context: Record<string, any>): Writable<World>;
 export declare function buildObservableWorld(): {
-    connect: <T>(inputSpec: AppInput, next: (x: T) => void) => Input<T>;
+    connect: <T>(inputSpec: AppInput, next: (x: T) => void, id?: string) => Input<T>;
     newOutput: <T_1>(id: string, name: string, state: Writable<number>, previousValue: T_1) => Output<T_1>;
 };
-export declare function cachedInput<T>(nextParan: (x: T) => void): Input<T>;
+export declare function cachedInput<T>(nextParan: (x: T) => void, id?: string): Input<T>;
 export declare function settableOutput<T>(state: Writable<number>, previousValue: T): Output<T>;

package/components/apps/rx.js

@@ -1,40 +1,60 @@
 import { writable } from 'svelte/store';
-export function buildWorld(components, previousWorld, context) {
+import { deepEqual } from 'fast-equals';
+export function buildWorld(context) {
     const newWorld = buildObservableWorld();
-    const state = writable(0);
+    const stateId = writable(0);
+    let writableWorld = undefined;
     const outputsById = {
         ctx: Object.fromEntries(Object.entries(context).map(([k, v]) => {
-            return [k, newWorld.newOutput('ctx', k, state, v)];
-        }))
+            return [k, newWorld.newOutput('ctx', k, stateId, v)];
+        })),
+        state: {}
     };
-    for (const [k, outputs] of Object.entries(components)) {
-        outputsById[k] = {};
-        for (const o of outputs) {
-            outputsById[k][o] = newWorld.newOutput(k, o, state, previousWorld?.outputsById[k]?.[o]?.peak());
+    function newOutput(id, name, previousValue) {
+        if (outputsById[id]?.[name]) {
+            writableWorld?.update((x) => x);
+            return outputsById[id][name];
         }
+        let o = newWorld.newOutput(id, name, stateId, previousValue);
+        if (!outputsById[id]) {
+            outputsById[id] = {};
+        }
+        outputsById[id][name] = o;
+        writableWorld?.update((x) => x);
+        return o;
     }
-    state.update((x) => x + 1);
-    return { outputsById, connect: newWorld.connect, state };
+    stateId.update((x) => x + 1);
+    writableWorld = writable({
+        outputsById,
+        connect: newWorld.connect,
+        stateId,
+        newOutput,
+        initializedOutputs: 0,
+        initialized: false
+    });
+    return writableWorld;
 }
 export function buildObservableWorld() {
     const observables = {};
-    function connect(inputSpec, next) {
+    function connect(inputSpec, next, id) {
         if (inputSpec.type === 'static') {
             return {
+                id,
                 peak: () => inputSpec.value,
                 next: () => { }
             };
         }
         else if (inputSpec.type === 'connected') {
-            const input = cachedInput(next);
             const connection = inputSpec.connection;
             if (!connection) {
                 return {
+                    id,
                     peak: () => undefined,
                     next: () => { }
                 };
             }
             const { componentId, path } = connection;
+            const input = cachedInput(next, `${componentId}-${path}-${id}`);
             const [p] = path ? path.split('.')[0].split('[') : [undefined];
             let obs = observables[`${componentId}.${p}`];
             if (!obs) {
@@ -50,6 +70,7 @@ export function buildObservableWorld() {
         }
         else if (inputSpec.type === 'user') {
             return {
+                id,
                 peak: () => inputSpec.value,
                 next: () => { }
             };
@@ -68,7 +89,7 @@ export function buildObservableWorld() {
         newOutput
     };
 }
-export function cachedInput(nextParan) {
+export function cachedInput(nextParan, id) {
     let value = undefined;
     function peak() {
         return value;
@@ -78,6 +99,7 @@ export function cachedInput(nextParan) {
         nextParan(x);
     }
     return {
+        id,
         peak,
         next
     };
@@ -86,16 +108,20 @@ export function settableOutput(state, previousValue) {
     let value = previousValue;
     const subscribers = [];
     function subscribe(x) {
-        if (!subscribers.includes(x)) {
+        let currentSubscriber = subscribers.findIndex((y) => y === x || (y.id && y.id === x.id));
+        if (currentSubscriber == -1) {
             subscribers.push(x);
-            // Send the current value to the new subscriber if it already exists
-            if (value !== undefined) {
-                x.next(value);
-            }
+        }
+        else {
+            subscribers[currentSubscriber] = x;
+        }
+        // Send the current value to the new subscriber if it already exists
+        if (value !== undefined) {
+            x.next(value);
         }
     }
     function set(x, force = false) {
-        if (value != x || force) {
+        if (!deepEqual(value, x) || force) {
             state.update((x) => x + 1);
             value = x;
             subscribers.forEach((x) => x.next(value));

package/components/apps/store.d.ts

@@ -1,2 +1,7 @@
+import type { Policy } from "../../gen";
 import type { App } from './types';
-export declare const importStore: import("svelte/store").Writable<App | undefined>;
+export declare const importStore: import("svelte/store").Writable<{
+    summary: string;
+    value: App;
+    policy: Policy;
+} | undefined>;