windmill-components 1.309.7 → 1.352.0

package/package/components/AppConnectInner.svelte

@@ -0,0 +1,507 @@
+<script>import { workspaceStore } from '../stores';
+import IconedResourceType from './IconedResourceType.svelte';
+import { OauthService, ResourceService, VariableService } from '../gen';
+import { emptyString, truncateRev, urlize } from '../utils';
+import { createEventDispatcher } from 'svelte';
+import Path from './Path.svelte';
+import { Button, Skeleton } from './common';
+import ApiConnectForm from './ApiConnectForm.svelte';
+import SearchItems from './SearchItems.svelte';
+import WhitelistIp from './WhitelistIp.svelte';
+import { sendUserToast } from '../toast';
+import OauthScopes from './OauthScopes.svelte';
+import Markdown from 'svelte-exmarkdown';
+import autosize from '../autosize';
+import Required from './Required.svelte';
+import Toggle from './Toggle.svelte';
+import { Pen } from 'lucide-svelte';
+import GfmMarkdown from './GfmMarkdown.svelte';
+import { apiTokenApps, forceSecretValue, linkedSecretValue } from './app_connect';
+export let step = 1;
+export let resourceType = '';
+export let isGoogleSignin = false;
+export let disabled = false;
+export let manual = true;
+let isValid = true;
+const nativeLanguagesCategory = [
+    'postgresql',
+    'mysql',
+    'bigquery',
+    'snowflake',
+    'mssql',
+    'graphql'
+];
+let filter = '';
+let value = '';
+let valueToken = undefined;
+let connects = undefined;
+let connectsManual = undefined;
+let args = {};
+let renderDescription = true;
+$: linkedSecretCandidates = apiTokenApps[resourceType]?.linkedSecret
+    ? [apiTokenApps[resourceType]?.linkedSecret]
+    : args != undefined
+        ? Object.keys(args).filter((x) => ['token', 'secret', 'key', 'pass', 'private'].some((y) => x.toLowerCase().includes(y)))
+        : undefined;
+$: linkedSecret =
+    forceSecretValue(resourceType) ??
+        linkedSecretCandidates?.sort((ua, ub) => linkedSecretValue(ub) - linkedSecretValue(ua))?.[0];
+let scopes = [];
+let extra_params = [];
+let path;
+let description = '';
+let resourceTypeInfo = undefined;
+let pathError = '';
+export async function open(rt) {
+    if (!rt) {
+        loadResourceTypes();
+    }
+    step = 1;
+    value = '';
+    description = '';
+    resourceType = rt ?? '';
+    valueToken = undefined;
+    await loadConnects();
+    manual = !connects?.includes(resourceType);
+    if (rt) {
+        next();
+    }
+}
+async function loadConnects() {
+    if (!connects) {
+        connects = (await OauthService.listOauthConnects()).filter((x) => x != 'supabase_wizard');
+    }
+}
+const connectAndManual = ['gitlab'];
+$: isGoogleSignin =
+    step == 1 &&
+        (resourceType == 'google' ||
+            resourceType == 'gmail' ||
+            resourceType == 'gcal' ||
+            resourceType == 'gdrive' ||
+            resourceType == 'gsheets');
+$: disabled =
+    (step == 1 && resourceType == '') ||
+        (step == 2 &&
+            value == '' &&
+            args &&
+            args['token'] == '' &&
+            args['password'] == '' &&
+            args['api_key'] == '' &&
+            args['key'] == '' &&
+            linkedSecret != undefined) ||
+        step == 3 ||
+        (step == 4 && pathError != '') ||
+        !isValid;
+export async function loadResourceTypes() {
+    if (connectsManual) {
+        return;
+    }
+    const availableRts = await ResourceService.listResourceTypeNames({
+        workspace: $workspaceStore
+    });
+    connectsManual = availableRts
+        .filter((x) => connectAndManual.includes(x) || !Object.keys(connects ?? {}).includes(x))
+        .map((x) => [
+        x,
+        apiTokenApps[x] ?? {
+            instructions: '',
+            img: undefined,
+            linkedSecret: undefined
+        }
+    ]);
+    const filteredNativeLanguages = filteredConnectsManual?.filter((o) => nativeLanguagesCategory?.includes(o[0]) ?? false);
+    try {
+        filteredConnectsManual = [
+            ...(filteredNativeLanguages ?? []),
+            ...(filteredConnectsManual ?? []).filter(([key, _]) => !nativeLanguagesCategory.includes(key))
+        ];
+    }
+    catch (e) { }
+}
+function popupListener(event) {
+    let data = event.data;
+    if (event.origin !== window.location.origin) {
+        return;
+    }
+    if (data.type === 'error') {
+        sendUserToast(event.data.error, true);
+        step = 2;
+    }
+    else if (data.type === 'success') {
+        resourceType = data.resource_type;
+        value = data.res.access_token;
+        valueToken = data.res;
+        step = 4;
+    }
+}
+async function getScopesAndParams() {
+    const connect = await OauthService.getOauthConnect({ client: resourceType });
+    scopes = connect.scopes ?? [];
+    extra_params = Object.entries(connect.extra_params ?? {});
+}
+async function getResourceTypeInfo() {
+    resourceTypeInfo = await ResourceService.getResourceType({
+        workspace: $workspaceStore,
+        path: resourceType
+    });
+}
+export async function next() {
+    if (step == 1) {
+        if (manual) {
+            getResourceTypeInfo();
+            args = {};
+        }
+        else {
+            getResourceTypeInfo();
+            getScopesAndParams();
+        }
+        step += 1;
+    }
+    else if (step == 2 && !manual) {
+        const url = new URL(`/api/oauth/connect/${resourceType}`, window.location.origin);
+        url.searchParams.append('scopes', scopes.join('+'));
+        if (extra_params.length > 0) {
+            extra_params.forEach(([key, value]) => url.searchParams.append(key, value));
+        }
+        // if (!newPageOAuth) {
+        // 	window.location.href = url.toString()
+        // } else {
+        window.addEventListener('message', popupListener, { once: true });
+        window.open(url.toString(), '_blank', 'popup=true');
+        step += 1;
+        // 	dispatch('close')
+        // }
+    }
+    else {
+        let exists = await VariableService.existsVariable({
+            workspace: $workspaceStore,
+            path
+        });
+        if (exists) {
+            throw Error(`Variable at path ${path} already exists. Delete it or pick another path`);
+        }
+        exists = await ResourceService.existsResource({
+            workspace: $workspaceStore,
+            path
+        });
+        if (exists) {
+            throw Error(`Resource at path ${path} already exists. Delete it or pick another path`);
+        }
+        let account = undefined;
+        if (valueToken?.expires_in != undefined) {
+            account = Number(await OauthService.createAccount({
+                workspace: $workspaceStore,
+                requestBody: {
+                    refresh_token: valueToken.refresh_token ?? '',
+                    expires_in: valueToken.expires_in,
+                    client: resourceType
+                }
+            }));
+        }
+        const resourceValue = args;
+        let saveVariable = false;
+        if (!manual || linkedSecret != undefined) {
+            let v = manual ? args[linkedSecret ?? ''] : value;
+            if (typeof v == 'string' && v != '' && !v.startsWith('$var:')) {
+                saveVariable = true;
+                await VariableService.createVariable({
+                    workspace: $workspaceStore,
+                    requestBody: {
+                        path,
+                        value: v,
+                        is_secret: true,
+                        description: emptyString(description)
+                            ? `${manual ? 'Token' : 'OAuth token'} for ${resourceType}`
+                            : description,
+                        is_oauth: !manual,
+                        account: account
+                    }
+                });
+                resourceValue[linkedSecret ?? 'token'] = `$var:${path}`;
+            }
+        }
+        await ResourceService.createResource({
+            workspace: $workspaceStore,
+            requestBody: {
+                resource_type: resourceType,
+                path,
+                value: resourceValue,
+                description
+            }
+        });
+        dispatch('refresh', path);
+        dispatch('close');
+        sendUserToast(`Saved resource${saveVariable ? ' and variable' : ''} path: ${path}`);
+        step = 1;
+        resourceType = '';
+    }
+}
+export async function back() {
+    if (step == 4) {
+        step -= 2;
+    }
+    else if (step > 1) {
+        step -= 1;
+    }
+    if (step == 1) {
+        loadConnects();
+        loadResourceTypes();
+    }
+}
+const dispatch = createEventDispatcher();
+let filteredConnects = [];
+let filteredConnectsManual = [];
+let editScopes = false;
+</script>
+
+<SearchItems
+	{filter}
+	items={connects
+		? connects
+				.sort((a, b) => a.localeCompare(b))
+				.map((key) => ({
+					key
+				}))
+		: undefined}
+	bind:filteredItems={filteredConnects}
+	f={(x) => x.key}
+/>
+<SearchItems
+	{filter}
+	items={connectsManual?.sort((a, b) => a[0].localeCompare(b[0]))}
+	bind:filteredItems={filteredConnectsManual}
+	f={(x) => x[0]}
+/>
+
+{#if step == 1}
+	<div class="w-12/12 pb-2 flex flex-row my-1 gap-1">
+		<input
+			type="text"
+			placeholder="Search resource type"
+			bind:value={filter}
+			class="text-2xl grow"
+		/>
+	</div>
+
+	<h2 class="mb-4">OAuth APIs</h2>
+	<div class="grid sm:grid-cols-2 md:grid-cols-3 gap-x-2 gap-y-1 items-center mb-2">
+		{#if filteredConnects}
+			{#each filteredConnects as { key }}
+				<Button
+					size="sm"
+					variant="border"
+					color={key === resourceType ? 'blue' : 'light'}
+					btnClasses={key === resourceType ? '!border-2' : 'm-[1px]'}
+					on:click={() => {
+						manual = false
+						resourceType = key
+						next()
+					}}
+				>
+					<IconedResourceType name={key} after={true} width="20px" height="20px" />
+				</Button>
+			{/each}
+		{:else}
+			{#each new Array(3) as _}
+				<Skeleton layout={[[2]]} />
+			{/each}
+		{/if}
+	</div>
+	{#if connects && connects.length == 0}
+		<div class="text-secondary text-sm w-full"
+			>No OAuth APIs has been setup on the instance. To add oauth APIs, first sync the resource
+			types with the hub, then add oauth configuration. See <a
+				href="https://www.windmill.dev/docs/misc/setup_oauth">documentation</a
+			>
+		</div>
+	{/if}
+
+	<h2 class="mt-8 mb-4">Others</h2>
+
+	{#if connectsManual && connectsManual?.length < 10}
+		<div class="text-secondary p-2">
+			Resource Types have not been synced with the hub. Go to the admins workspace to sync them (and
+			add a schedule to do daily):
+			<p class="mt-4"
+				>1. Go to the "admins" workspaces:
+				<img src="/sync_resource_types.png" alt="sync resource types" class="mt-2" />
+			</p>
+			<p class="mt-4">
+				2: Run the synchronization script:
+				<img src="/sync_resource_types2.png" alt="sync resource types" class="mt-2" />
+			</p>
+		</div>
+	{/if}
+
+	<div class="grid sm:grid-cols-2 md:grid-cols-3 gap-x-2 gap-y-1 items-center mb-2">
+		{#if filteredConnectsManual}
+			{#each filteredConnectsManual as [key, _]}
+				{#if nativeLanguagesCategory.includes(key)}
+					<Button
+						size="sm"
+						variant="border"
+						color={key === resourceType ? 'blue' : 'light'}
+						btnClasses={key === resourceType ? '!border-2' : 'm-[1px]'}
+						on:click={() => {
+							manual = true
+							resourceType = key
+							next()
+						}}
+					>
+						<IconedResourceType name={key} after={true} width="20px" height="20px" />
+					</Button>
+				{/if}
+			{/each}
+		{/if}
+	</div>
+
+	<div class="mt-8 mb-4" />
+	<div class="grid sm:grid-cols-2 md:grid-cols-3 gap-x-2 gap-y-1 items-center mb-2">
+		{#if filteredConnectsManual}
+			{#each filteredConnectsManual as [key, _]}
+				{#if !nativeLanguagesCategory.includes(key)}
+					<!-- Exclude specific items -->
+					<Button
+						size="sm"
+						variant="border"
+						color={key === resourceType ? 'blue' : 'light'}
+						btnClasses={key === resourceType ? '!border-2' : 'm-[1px]'}
+						on:click={() => {
+							manual = true
+							resourceType = key
+							next()
+						}}
+					>
+						<IconedResourceType name={key} after={true} width="20px" height="20px" />
+					</Button>
+				{/if}
+			{/each}
+		{:else}
+			{#each new Array(9) as _}
+				<Skeleton layout={[[2]]} />
+			{/each}
+		{/if}
+	</div>
+{:else if step == 2 && manual}
+	<Path
+		bind:error={pathError}
+		bind:path
+		initialPath=""
+		namePlaceholder={resourceType}
+		kind="resource"
+	/>
+
+	{#if apiTokenApps[resourceType]}
+		<h2 class="mt-4 mb-2">Instructions</h2>
+		<div class="pl-10">
+			<ol class="list-decimal">
+				{#each apiTokenApps[resourceType].instructions as step}
+					<li>
+						{@html step}
+					</li>
+				{/each}
+			</ol>
+		</div>
+		{#if apiTokenApps[resourceType].img}
+			<div class="mt-4 w-full overflow-hidden">
+				<img class="m-auto max-h-60" alt="connect" src={apiTokenApps[resourceType].img} />
+			</div>
+		{/if}
+	{:else if !emptyString(resourceTypeInfo?.description)}
+		<h4 class="mt-8 mb-2">{resourceTypeInfo?.name} description</h4>
+		<div class="text-sm">
+			<Markdown md={urlize(resourceTypeInfo?.description ?? '', 'md')} />
+		</div>
+	{/if}
+	{#if resourceType == 'postgresql' || resourceType == 'mysql' || resourceType == 'mongodb'}
+		<WhitelistIp />
+	{/if}
+
+	<h4 class="mt-8 inline-flex items-center gap-4"
+		>Resource description <Required required={false} />
+		<div class="flex gap-1 items-center">
+			<Toggle size="xs" bind:checked={renderDescription} />
+			<Pen size={14} />
+		</div>
+	</h4>
+	{#if renderDescription}
+		<div>
+			<div class="flex flex-row-reverse text-2xs text-tertiary -mt-1">GH Markdown</div>
+			<textarea use:autosize bind:value={description} placeholder={'Resource description'} />
+		</div>
+	{:else if description == undefined || description == ''}
+		<div class="text-sm text-tertiary">No description provided</div>
+	{:else}
+		<div class="mt-2" />
+		<GfmMarkdown md={description} />
+	{/if}
+	<div class="mt-12">
+		{#key resourceTypeInfo}
+			<ApiConnectForm
+				{linkedSecret}
+				{linkedSecretCandidates}
+				{resourceType}
+				{resourceTypeInfo}
+				bind:args
+				bind:isValid
+			/>
+		{/key}
+	</div>
+{:else if step == 2 && !manual}
+	{#if manual == false && resourceType != ''}
+		<h1 class="mb-4">{resourceType}</h1>
+		<div class="my-4 text-secondary"
+			>Click connect to create a resource backed by an oauth connection, whose token is fetched from
+			the external services and refreshed automatically if needed before expiration (using its
+			refresh token)</div
+		>
+		<h4 class="mb-2">Description</h4>
+		<div class="text-sm mb-8">
+			<Markdown md={urlize(resourceTypeInfo?.description ?? '', 'md')} />
+		</div>
+		<h3 class="mb-4 flex gap-4"
+			>Scopes <button
+				on:click={() => {
+					editScopes = !editScopes
+				}}><Pen size={14} /></button
+			></h3
+		>
+
+		{#if editScopes}
+			<OauthScopes bind:scopes />
+		{:else}
+			<div class="flex flex-col gap-1">
+				{#each scopes as scope}
+					<div class="py-0.5 pl-2 text-xs">- {scope}</div>
+				{/each}
+			</div>
+		{/if}
+	{/if}
+{:else if step == 3 && !manual}
+	Finish connection in popup window
+{:else}
+	<Path
+		initialPath=""
+		namePlaceholder={resourceType}
+		bind:error={pathError}
+		bind:path
+		kind="resource"
+	/>
+	{#if apiTokenApps[resourceType] || !manual}
+		<ul class="mt-10">
+			<li>
+				1. A secret variable containing the {apiTokenApps[resourceType]?.linkedSecret ?? 'token'}
+				<span class="font-bold">{truncateRev(value, 5, '*****')}</span>
+				will be stored a
+				<span class="font-mono whitespace-nowrap">{path}</span>.
+			</li>
+			<li class="mt-4">
+				2. The resource containing that token will be stored at the same path <span
+					class="font-mono whitespace-nowrap">{path}</span
+				>. The Variable and Resource will be "linked together", they will be deleted and renamed
+				together.
+			</li></ul
+		>
+	{/if}
+{/if}

package/package/components/AppConnectInner.svelte.d.ts

@@ -0,0 +1,28 @@
+import { SvelteComponent } from "svelte";
+declare const __propDef: {
+    props: {
+        step?: number | undefined;
+        resourceType?: string | undefined;
+        isGoogleSignin?: boolean | undefined;
+        disabled?: boolean | undefined;
+        manual?: boolean | undefined;
+        open?: ((rt?: string) => Promise<void>) | undefined;
+        loadResourceTypes?: (() => Promise<void>) | undefined;
+        next?: (() => Promise<void>) | undefined;
+        back?: (() => Promise<void>) | undefined;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type AppConnectInnerProps = typeof __propDef.props;
+export type AppConnectInnerEvents = typeof __propDef.events;
+export type AppConnectInnerSlots = typeof __propDef.slots;
+export default class AppConnectInner extends SvelteComponent<AppConnectInnerProps, AppConnectInnerEvents, AppConnectInnerSlots> {
+    get open(): (rt?: string | undefined) => Promise<void>;
+    get loadResourceTypes(): () => Promise<void>;
+    get next(): () => Promise<void>;
+    get back(): () => Promise<void>;
+}
+export {};

package/package/components/ArgEnum.svelte

@@ -9,9 +9,11 @@ export let defaultValue;
 export let valid;
 export let create;
 export let required;
+export let enumLabels = undefined;
 const dispatch = createEventDispatcher();
 let customItems = [];
 function onCreate(newItem) {
+    console.log(newItem);
     customItems = [...customItems, newItem];
     return newItem;
 }
@@ -20,7 +22,8 @@ function onCreate(newItem) {
 <div class="w-full flex-col">
 	<div class="w-full">
 		<AutoComplete
-			items={[...(required ? [] : ['']), ...(enum_ ?? []), ...customItems]}
+			items={[...(required ? [] : ['']), ...(enum_ ? enum_ : []), ...customItems]}
+			labelFunction={(val) => (enumLabels ? enumLabels[val] ?? val : val)}
 			bind:selectedItem={value}
 			inputClassName={twMerge(
 				'bg-surface-secondary flex',

package/package/components/ArgEnum.svelte.d.ts

@@ -1,14 +1,16 @@
 import { SvelteComponent } from "svelte";
+import type { EnumType } from '../common';
 declare const __propDef: {
     props: {
         disabled: boolean;
         value: any;
-        enum_: string[] | undefined;
+        enum_: EnumType;
         autofocus: boolean | null;
         defaultValue: string | undefined;
         valid: boolean;
         create: boolean;
         required: boolean;
+        enumLabels?: Record<string, string> | undefined;
     };
     events: {
         focus: CustomEvent<any>;

package/package/components/ArgInfo.svelte

@@ -1,4 +1,4 @@
-<script>import { ResourceService } from '../gen';
+<script>import { ResourceService, VariableService } from '../gen';
 import { workspaceStore } from '../stores';
 import { copyToClipboard, truncate } from '../utils';
 import { ClipboardCopy, Expand } from 'lucide-svelte';
@@ -13,8 +13,16 @@ function isString(value) {
     return typeof value === 'string' || value instanceof String;
 }
 async function getResource(path) {
-    jsonViewerContent = (await ResourceService.getResource({ workspace: $workspaceStore, path }))
-        .value;
+    jsonViewerContent = await ResourceService.getResourceValue({
+        workspace: $workspaceStore,
+        path
+    });
+}
+async function getVariable(path) {
+    jsonViewerContent = await VariableService.getVariableValue({
+        workspace: $workspaceStore,
+        path
+    });
 }
 </script>
 
@@ -53,6 +61,14 @@ async function getResource(path) {
 			jsonViewer.toggleDrawer()
 		}}>{value}</button
 	>
+{:else if isString(value) && value.startsWith('$var:')}
+	<button
+		class="text-xs text-blue-500"
+		on:click={async () => {
+			await getVariable(value.substring('$res:'.length))
+			jsonViewer.toggleDrawer()
+		}}>{value}</button
+	>
 {:else if typeof value !== 'object'}
 	{truncate(JSON.stringify(value), 100)}
 	{#if JSON.stringify(value).length > 100}