windmill-components 1.309.7 → 1.339.2

package/package/components/WorkspaceGroup.svelte

@@ -3,7 +3,7 @@ import { Alert, Button, Drawer } from './common';
 import Multiselect from 'svelte-multiselect';
 import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte';
 import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte';
-import { ConfigService } from '../gen';
+import { ConfigService, WorkspaceService } from '../gen';
 import ConfirmationModal from './common/confirmationModal/ConfirmationModal.svelte';
 import { createEventDispatcher } from 'svelte';
 import { sendUserToast } from '../toast';
@@ -15,6 +15,7 @@ import DrawerContent from './common/drawer/DrawerContent.svelte';
 import Section from './Section.svelte';
 import Label from './Label.svelte';
 import AutoComplete from 'simple-svelte-autocomplete';
+import YAML from 'yaml';
 export let name;
 export let config;
 export let activeWorkers;
@@ -62,9 +63,9 @@ const defaultTags = [
     'powershell',
     'dependency',
     'flow',
-    'hub',
     'other',
-    'bun'
+    'bun',
+    'php'
 ];
 const nativeTags = [
     'nativets',
@@ -99,6 +100,13 @@ $: {
         }
     }
 }
+let workspaceTag = '';
+export let defaultTagPerWorkspace = undefined;
+let workspaces = [];
+async function listWorkspaces() {
+    workspaces = await WorkspaceService.listWorkspacesAsSuperAdmin();
+}
+$: $superadmin && listWorkspaces();
 const dispatch = createEventDispatcher();
 async function deleteWorkerGroup() {
     await ConfigService.deleteConfig({ name: 'worker__' + name });
@@ -283,12 +291,21 @@ let createdTags = [];
 								size="xs"
 								on:click={() => {
 									if (nconfig != undefined) {
-										nconfig.worker_tags = defaultTags.concat(nativeTags)
+										nconfig.worker_tags = defaultTagPerWorkspace
+											? defaultTags.concat(nativeTags).map((nt) => `${nt}-${workspaceTag}`)
+											: defaultTags.concat(nativeTags)
+
 										dirty = true
 									}
 								}}
+								disabled={defaultTagPerWorkspace && !workspaceTag}
 							>
-								Reset to all tags <Tooltip>{defaultTags.concat(nativeTags).join(', ')}</Tooltip>
+								Reset to all tags <Tooltip
+									>{(defaultTagPerWorkspace
+										? defaultTags.concat(nativeTags).map((nt) => `${nt}-${workspaceTag}`)
+										: defaultTags.concat(nativeTags)
+									).join(', ')}</Tooltip
+								>
 							</Button>
 							<Button
 								variant="contained"
@@ -296,12 +313,20 @@ let createdTags = [];
 								size="xs"
 								on:click={() => {
 									if (nconfig != undefined) {
-										nconfig.worker_tags = defaultTags
+										nconfig.worker_tags = defaultTagPerWorkspace
+											? defaultTags.map((nt) => `${nt}-${workspaceTag}`)
+											: defaultTags
 										dirty = true
 									}
 								}}
+								disabled={defaultTagPerWorkspace && !workspaceTag}
 							>
-								Reset to all tags minus native ones <Tooltip>{defaultTags.join(', ')}</Tooltip>
+								Reset to all tags minus native ones <Tooltip
+									>{(defaultTagPerWorkspace
+										? defaultTags.map((nt) => `${nt}-${workspaceTag}`)
+										: defaultTags
+									).join(', ')}</Tooltip
+								>
 							</Button>
 							<Button
 								variant="contained"
@@ -309,13 +334,37 @@ let createdTags = [];
 								size="xs"
 								on:click={() => {
 									if (nconfig != undefined) {
-										nconfig.worker_tags = nativeTags
+										nconfig.worker_tags = defaultTagPerWorkspace
+											? nativeTags.map((nt) => `${nt}-${workspaceTag}`)
+											: nativeTags
 										dirty = true
 									}
 								}}
+								disabled={defaultTagPerWorkspace && !workspaceTag}
 							>
-								Reset to native tags <Tooltip>{nativeTags.join(', ')}</Tooltip>
+								Reset to native tags <Tooltip
+									>{(defaultTagPerWorkspace
+										? nativeTags.map((nt) => `${nt}-${workspaceTag}`)
+										: nativeTags
+									).join(', ')}</Tooltip
+								>
 							</Button>
+
+							{#if defaultTagPerWorkspace}
+								<AutoComplete
+									bind:selectedItem={workspaceTag}
+									noInputStyles
+									hideArrow={true}
+									items={workspaces.map((w) => w.id)}
+									inputClassName={'flex !font-gray-600 !font-primary !bg-surface-primary ' +
+										(!workspaceTag ? '!border-red-600/60 !dark:border-red-400/70' : '')}
+									dropdownClassName="!text-sm !py-2 !rounded-sm  !border-gray-200 !border !shadow-md"
+									className="!font-gray-600 !font-primary !bg-surface-primary"
+									create
+									onCreate={(c) => c}
+									placeholder="Workspace ID"
+								/>
+							{/if}
 						</div>
 						<div class="max-w mt-2 items-center gap-1 pt-2">
 							{#if nconfig?.worker_tags !== undefined && nconfig?.worker_tags.length > 0}
@@ -733,6 +782,22 @@ let createdTags = [];
 			</div>
 		</Button>
 
+		<Button
+			color="light"
+			size="xs"
+			on:click={() => {
+				navigator.clipboard.writeText(
+					YAML.stringify({
+						name,
+						...config
+					})
+				)
+				sendUserToast('Worker config copied to clipboard as YAML')
+			}}
+		>
+			copy config
+		</Button>
+
 		{#if config}
 			<Button
 				color="light"

package/package/components/WorkspaceGroup.svelte.d.ts

@@ -13,6 +13,7 @@ declare const __propDef: {
         };
         activeWorkers: number;
         customTags: string[] | undefined;
+        defaultTagPerWorkspace?: boolean | undefined;
     };
     events: {
         reload: CustomEvent<any>;

package/package/components/app_connect.d.ts

@@ -0,0 +1,7 @@
+export declare const apiTokenApps: Record<string, {
+    img?: string;
+    instructions: string[];
+    linkedSecret?: string;
+}>;
+export declare function linkedSecretValue(x: string): number;
+export declare function forceSecretValue(resourceType: string): string | undefined;

package/package/components/app_connect.js

@@ -0,0 +1,78 @@
+export const apiTokenApps = {
+    airtable: {
+        img: '/airtable_connect.png',
+        instructions: [
+            'Go to <a href="https://airtable.com/create/tokens" target="_blank" rel=”noopener noreferrer”>https://airtable.com/create/tokens</a>',
+            'Click on "Create new token"',
+            'Set a name, specify the scopes or the access level and click on "Create token"',
+            'Copy the token'
+        ]
+    },
+    discord_webhook: {
+        img: '/discord_webhook.png',
+        instructions: ['Click on Server Settings', 'Click on Integration', 'Find "Webhooks"'],
+        linkedSecret: 'webhook_url'
+    },
+    toggl: {
+        img: '/toggl_connect.png',
+        instructions: [
+            'Go to <a href="https://track.toggl.com/profile" target="_blank" rel=”noopener noreferrer”>https://track.toggl.com/profile</a>',
+            'Find "API Token"'
+        ]
+    },
+    mailchimp: {
+        img: '/mailchimp_connect.png',
+        instructions: [
+            'Go to <a href="https://admin.mailchimp.com/account/api" target="_blank" rel=”noopener noreferrer”>https://admin.mailchimp.com/account/api</a>',
+            'Find "Your API Keys"'
+        ]
+    },
+    sendgrid: {
+        img: '/sendgrid_connect.png',
+        instructions: [
+            'Go to <a href="https://app.sendgrid.com/settings/api_keys" target="_blank" rel=”noopener noreferrer”>https://app.sendgrid.com/settings/api_keys</a>',
+            'Create an API key',
+            'Copy your key'
+        ]
+    },
+    supabase: {
+        img: '/supabase_connect.png',
+        instructions: ['Go to the API Settings of your app to find the project URL and key']
+    },
+    square: {
+        img: '/square_connect.gif',
+        instructions: [
+            'Go to <a href="https://developer.squareup.com/apps" target="_blank" rel=”noopener noreferrer”>https://developer.squareup.com/apps</a>',
+            'In the left pane, choose Credentials',
+            'At the top of the page, choose Production mode for a production access token or Sandbox mode for a Sandbox access token.'
+        ]
+    }
+};
+export function linkedSecretValue(x) {
+    let r = 0;
+    let lowerCasedX = x.toLowerCase();
+    if (lowerCasedX.includes('secret')) {
+        r += 10;
+    }
+    if (lowerCasedX.includes('password')) {
+        r += 5;
+    }
+    if (lowerCasedX.includes('private')) {
+        r += 4;
+    }
+    if (lowerCasedX.includes('key')) {
+        r += 3;
+    }
+    if (lowerCasedX.includes('token')) {
+        r += 2;
+    }
+    if (lowerCasedX.includes('pass')) {
+        r += 1;
+    }
+    return r;
+}
+export function forceSecretValue(resourceType) {
+    if (resourceType == 'git_repository') {
+        return 'url';
+    }
+}

package/package/components/apps/components/buttons/AppButton.svelte

@@ -147,7 +147,6 @@ let css = initCss($app.css?.buttoncomponent, customCss);
 		if (iterContext && listInputs) {
 			listInputs.set(id, inputOutput)
 		}
-		console.log('success', r)
 	}}
 	refreshOnStart={resolvedConfig.triggerOnAppLoad}
 >

package/package/components/apps/components/display/AppAlert.svelte

@@ -7,7 +7,7 @@ import ResolveStyle from '../helpers/ResolveStyle.svelte';
 import { twMerge } from 'tailwind-merge';
 import InitializeComponent from '../helpers/InitializeComponent.svelte';
 import { Alert } from '../../../common';
-import { AlignWrapper } from '../helpers';
+import AlignWrapper from '../helpers/AlignWrapper.svelte';
 export let id;
 export let configuration;
 export let customCss = undefined;

package/package/components/apps/components/display/AppCustomComponent.svelte

@@ -2,8 +2,8 @@
 import { initOutput } from '../../editor/appUtils';
 import InitializeComponent from '../helpers/InitializeComponent.svelte';
 import { sendUserToast } from '../../../../toast';
-import { RunnableWrapper } from '../helpers';
 import { Loader2 } from 'lucide-svelte';
+import RunnableWrapper from '../helpers/RunnableWrapper.svelte';
 export let id;
 export let render;
 export let componentInput;

package/package/components/apps/components/display/AppDisplayComponent.svelte

@@ -50,10 +50,10 @@ let css = initCss($app.css?.displaycomponent, customCss);
 {/each}
 
 <RunnableWrapper {outputs} {render} {componentInput} {id} bind:initializing bind:result>
-	<div class="flex flex-col w-full h-full">
+	<div class="flex flex-col w-full h-full component-wrapper">
 		<div
 			class={twMerge(
-				'w-full border-b px-2 text-xs p-1 font-semibold bg-gray-500 text-white rounded-t-sm',
+				'w-full border-b p-2 text-xs font-semibold text-primary bg-surface-secondary',
 				css?.header?.class,
 				'wm-rich-result-header'
 			)}

package/package/components/apps/components/display/AppDownload.svelte

@@ -5,11 +5,11 @@ import { components } from '../../editor/component';
 import { initCss, transformBareBase64IfNecessary } from '../../utils';
 import ResolveConfig from '../helpers/ResolveConfig.svelte';
 import InitializeComponent from '../helpers/InitializeComponent.svelte';
-import { AlignWrapper } from '../helpers';
 import { Button } from '../../../common';
 import { loadIcon } from '../icon';
 import ComponentErrorHandler from '../helpers/ComponentErrorHandler.svelte';
 import ResolveStyle from '../helpers/ResolveStyle.svelte';
+import AlignWrapper from '../helpers/AlignWrapper.svelte';
 export let id;
 export let configuration;
 export let customCss = undefined;

package/package/components/apps/components/display/AppIcon.svelte

@@ -1,13 +1,13 @@
 <script>import { getContext } from 'svelte';
 import { initConfig, initOutput } from '../../editor/appUtils';
 import { initCss } from '../../utils';
-import { AlignWrapper } from '../helpers';
 import { loadIcon } from '../icon';
 import InitializeComponent from '../helpers/InitializeComponent.svelte';
 import { components } from '../../editor/component';
 import ResolveConfig from '../helpers/ResolveConfig.svelte';
 import { twMerge } from 'tailwind-merge';
 import ResolveStyle from '../helpers/ResolveStyle.svelte';
+import AlignWrapper from '../helpers/AlignWrapper.svelte';
 export let id;
 export let horizontalAlignment = 'left';
 export let verticalAlignment = undefined;

package/package/components/apps/components/display/AppJobIdFlowStatus.svelte

@@ -44,10 +44,10 @@ $: jobId = resolvedConfig.jobId;
 {/each}
 
 <RunnableWrapper {outputs} {render} {componentInput} {id}>
-	<div class="flex flex-col w-full h-full">
+	<div class="flex flex-col w-full h-full component-wrapper">
 		<div
 			class={twMerge(
-				'w-full border-b px-2 text-xs p-1 font-semibold bg-gray-500 text-white rounded-t-sm',
+				'w-full border-b p-2 text-xs font-semibold text-primary bg-surface-secondary',
 				css?.header?.class
 			)}
 			style={css?.header?.style}

package/package/components/apps/components/display/AppJobIdLogComponent.svelte

@@ -53,10 +53,10 @@ $: if (resolvedConfig.jobId) {
 <TestJobLoader bind:this={testJobLoader} bind:isLoading={testIsLoading} bind:job={testJob} />
 
 <RunnableWrapper {outputs} {render} {componentInput} {id}>
-	<div class="flex flex-col w-full h-full">
+	<div class="flex flex-col w-full h-full component-wrapper">
 		<div
 			class={twMerge(
-				'w-full border-b px-2 text-xs p-1 font-semibold bg-gray-500 text-white rounded-t-sm',
+				'w-full border-b p-2 text-xs font-semibold text-primary bg-surface-secondary',
 				css?.header?.class
 			)}
 			style={css?.header?.style}
@@ -65,7 +65,7 @@ $: if (resolvedConfig.jobId) {
 		</div>
 		<div
 			style={css?.container?.style}
-			class={twMerge('p-2 grow overflow-auto', css?.container?.class, 'wm-log-container')}
+			class={twMerge('grow overflow-auto', css?.container?.class, 'wm-log-container')}
 		>
 			<LogViewer
 				jobId={testJob?.id}

package/package/components/apps/components/display/AppMap.svelte

@@ -159,7 +159,7 @@ function updateRegionOutput() {
         }
     }
 }
-function handleSyncRegion() {
+async function handleSyncRegion() {
     const gridItem = findGridItem($app, id);
     if (!map || !gridItem) {
         return;
@@ -179,6 +179,7 @@ function handleSyncRegion() {
         gridItem.data.configuration.longitude.value = center[0];
         //@ts-ignore
         gridItem.data.configuration.latitude.value = center[1];
+        $app = $app;
     }
 }
 </script>
@@ -207,7 +208,7 @@ function handleSyncRegion() {
 {/each}
 
 {#if render}
-	<div class="relative h-full w-full">
+	<div class="relative h-full w-full component-wrapper">
 		<div
 			on:pointermove={updateRegionOutput}
 			on:wheel={updateRegionOutput}

package/package/components/apps/components/display/AppMenu.svelte

@@ -5,12 +5,12 @@ import { components } from '../../editor/component';
 import { initCss } from '../../utils';
 import ResolveConfig from '../helpers/ResolveConfig.svelte';
 import InitializeComponent from '../helpers/InitializeComponent.svelte';
-import { AlignWrapper } from '../helpers';
 import { Button } from '../../../common';
 import { loadIcon } from '../icon';
 import ResolveStyle from '../helpers/ResolveStyle.svelte';
 import Menu from '../../../common/menu/MenuV2.svelte';
 import { AppButton } from '../buttons';
+import AlignWrapper from '../helpers/AlignWrapper.svelte';
 export let id;
 export let configuration;
 export let customCss = undefined;

package/package/components/apps/components/display/AppPdf.svelte

@@ -189,17 +189,13 @@ let css = initCss($app.css?.pdfcomponent, customCss);
 <InitializeComponent {id} />
 
 {#if render}
-	<div class="relative flex flex-col w-full h-full bg-gray-100">
+	<div class="relative flex flex-col w-full h-full bg-gray-100 component-wrapper">
 		{#if source && zoom}
 			{#if pages?.length}
 				<div
 					bind:clientWidth={controlsWidth}
 					bind:clientHeight={controlsHeight}
-					class="flex {$mode !== 'preview'
-						? 'w-[calc(100%-2px)] top-[1px]'
-						: 'w-full top-0'} {wideView
-						? 'justify-center gap-14'
-						: '!justify-between'} overflow-x-auto bg-surface border mx-auto py-1"
+					class="flex flex-row w-full justify-between overflow-x-auto bg-surface border-b mx-auto py-1"
 				>
 					<div class="flex justify-start items-center px-2 text-secondary text-sm">
 						<Button
@@ -275,15 +271,11 @@ let css = initCss($app.css?.pdfcomponent, customCss);
 							disabled={!doc}
 							size="xs"
 							color="light"
-							variant="border"
 							title="Download PDF"
 							aria-label="Download PDF"
 							btnClasses="!font-medium !px-2"
 						>
-							{#if wideView}
-								<span class="mr-1"> Download </span>
-							{/if}
-							<Download size={16} />
+							<Download size={14} />
 						</Button>
 					</div>
 				</div>

package/package/components/apps/components/display/AppText.svelte

@@ -146,12 +146,17 @@ function autosize() {
 			<AlignWrapper {verticalAlignment}>
 				<textarea
 					class={twMerge(
-						'whitespace-pre-wrap !outline-none !border-0 !bg-transparent !resize-none !overflow-hidden !ring-0 !p-0 text-center',
+						'whitespace-pre-wrap !outline-none !border-0 !bg-transparent !resize-none !overflow-hidden !ring-0 !p-0',
 						css?.text?.class,
 						'wm-text',
 						classes,
 						getClasses(),
-						getClassesByType()
+						getClassesByType(),
+						horizontalAlignment === 'center'
+							? 'text-center'
+							: horizontalAlignment === 'right'
+							? 'text-right'
+							: 'text-left'
 					)}
 					on:pointerdown|stopPropagation
 					style={css?.text?.style}

package/package/components/apps/components/display/charts/AppAgCharts.svelte

@@ -163,15 +163,17 @@ $: resolvedDatasetsValues = resolvedDatasets?.map((d) => {
     };
 });
 $: resolvedXData && resolvedDatasets && resolvedDatasetsValues && chartInstance && updateChart();
-$: result && updateChartByResult();
+$: result && chartInstance && updateChartByResult();
 function updateChartByResult() {
     if (!result || !chartInstance) {
         return;
     }
+    if (typeof result !== 'object') {
+        return;
+    }
     const options = {
         container: document.getElementById(`agchart-${id}`),
-        data: result?.['data'],
-        series: result?.['series']
+        ...result
     };
     outputs.result.set({
         data: result?.['data'],
@@ -259,6 +261,7 @@ onMount(() => {
 		class={twMerge('w-full h-full', css?.container?.class, 'wm-agchart')}
 		style={css?.container?.style ?? ''}
 	>
+		<!-- {JSON.stringify(result)} -->
 		<div id={`agchart-${id}`} class="h-full w-full" />
 	</div>
 </RunnableWrapper>

package/package/components/apps/components/display/dbtable/AppDbExplorer.svelte

@@ -13,13 +13,14 @@ import Portal from 'svelte-portal';
 import { sendUserToast } from '../../../../../toast';
 import DbExplorerCount from './DbExplorerCount.svelte';
 import AppAggridExplorerTable from '../table/AppAggridExplorerTable.svelte';
-import { RunnableWrapper } from '../../helpers';
 import InsertRowRunnable from './InsertRowRunnable.svelte';
 import DeleteRow from './DeleteRow.svelte';
 import InitializeComponent from '../../helpers/InitializeComponent.svelte';
 import { getSelectInput } from './queries/select';
 import DebouncedInput from '../../helpers/DebouncedInput.svelte';
 import { CancelablePromise } from '../../../../../gen';
+import RefreshButton from '../../helpers/RefreshButton.svelte';
+import RunnableWrapper from '../../helpers/RunnableWrapper.svelte';
 export let id;
 export let configuration;
 export let customCss = undefined;
@@ -61,7 +62,7 @@ function computeInput(columnDefs, whereClause, resource) {
         input = getSelectInput(resource, resolvedConfig.type.configuration[resolvedConfig.type.selected].table, columnDefs, whereClause, resolvedConfig.type.selected);
     }, 1000);
 }
-const { app, worldStore, mode, selectedComponent, runnableComponents } = getContext('AppViewerContext');
+const { app, worldStore, mode, selectedComponent } = getContext('AppViewerContext');
 const editorContext = getContext('AppEditorContext');
 let input = undefined;
 let quicksearch = '';
@@ -116,19 +117,6 @@ function updateOneOfConfiguration(oneOfConfiguration, resolvedConfig, patch) {
         };
     });
 }
-let isCallbackAdded = false;
-function addOnRecomputeCallback() {
-    $runnableComponents[id].cb = [
-        ...$runnableComponents[id].cb,
-        () => new CancelablePromise(async (resolve) => {
-            await dbExplorerCount?.computeCount(true);
-            aggrid?.clearRows();
-            resolve();
-        })
-    ];
-    isCallbackAdded = true;
-}
-$: $runnableComponents[id]?.cb && !isCallbackAdded && addOnRecomputeCallback();
 async function listTables() {
     let resource = resolvedConfig.type.configuration?.[resolvedConfig.type.selected]?.resource;
     if (!resource)
@@ -386,6 +374,7 @@ function onDelete(e) {
 let refreshCount = 0;
 $: hideSearch = resolvedConfig.hideSearch;
 $: hideInsert = resolvedConfig.hideInsert;
+let loading = false;
 </script>
 
 {#each Object.keys(components['dbexplorercomponent'].initialData.configuration) as key (key)}
@@ -440,34 +429,46 @@ $: hideInsert = resolvedConfig.hideInsert;
 	bind:runnableComponent
 	componentInput={input}
 	autoRefresh={false}
+	bind:loading
 	{render}
 	{id}
 	{outputs}
+	overrideCallback={() =>
+		new CancelablePromise(async (resolve) => {
+			await dbExplorerCount?.computeCount(true)
+
+			aggrid?.clearRows()
+			resolve()
+		})}
+	overrideAutoRefresh={true}
 >
 	<div class="h-full" bind:clientHeight={componentContainerHeight}>
 		{#if !(hideSearch === true && hideInsert === true)}
-			<div class="flex p-2 justify-between gap-4" bind:clientHeight={buttonContainerHeight}>
+			<div class="flex py-2 h-12 justify-between gap-4" bind:clientHeight={buttonContainerHeight}>
 				{#if hideSearch !== true}
 					<DebouncedInput
 						class="w-full max-w-[300px]"
 						type="text"
 						bind:value={quicksearch}
-						placeholder="Quicksearch"
+						placeholder="Search..."
 					/>
 				{/if}
-				{#if hideInsert !== true}
-					<Button
-						startIcon={{ icon: Plus }}
-						color="dark"
-						size="xs"
-						on:click={() => {
-							args = {}
-							insertDrawer?.openDrawer()
-						}}
-					>
-						Insert
-					</Button>
-				{/if}
+				<div class="flex flex-row gap-2">
+					<RefreshButton {id} {loading} />
+					{#if hideInsert !== true}
+						<Button
+							startIcon={{ icon: Plus }}
+							color="dark"
+							size="xs2"
+							on:click={() => {
+								args = {}
+								insertDrawer?.openDrawer()
+							}}
+						>
+							Insert
+						</Button>
+					{/if}
+				</div>
 			</div>
 		{/if}
 		{#if resolvedConfig.type.configuration?.[resolvedConfig?.type?.selected]?.resource && resolvedConfig.type.configuration?.[resolvedConfig?.type?.selected]?.table}
@@ -487,6 +488,7 @@ $: hideInsert = resolvedConfig.hideInsert;
 					containerHeight={componentContainerHeight - (buttonContainerHeight ?? 0)}
 					on:update={onUpdate}
 					on:delete={onDelete}
+					allowColumnDefsActions={false}
 					{actions}
 				/>
 			{/key}

package/package/components/apps/components/display/dbtable/InsertRow.svelte

@@ -1,5 +1,5 @@
 <script>import LightweightSchemaForm from '../../../../LightweightSchemaForm.svelte';
-import { ColumnIdentity, getFieldType } from './utils';
+import { ColumnIdentity } from './utils';
 import init, { parse_sql, parse_mysql, parse_bigquery, parse_snowflake, parse_mssql } from 'windmill-sql-datatype-parser-wasm';
 import wasmUrl from 'windmill-sql-datatype-parser-wasm/windmill_sql_datatype_parser_wasm_bg.wasm?url';
 init(wasmUrl);
@@ -18,13 +18,11 @@ $: fields = columnDefs
     const name = column.field;
     const isPrimaryKey = column.isprimarykey;
     const defaultValue = column.defaultValueNull ? null : column.defaultUserValue;
-    const fieldType = getFieldType(type, dbType);
     return {
         type,
         name,
         isPrimaryKey,
         defaultValue,
-        fieldType,
         identity: column.isidentity,
         nullable: column.isnullable
     };
@@ -77,9 +75,8 @@ async function builtSchema(fields, dbType) {
         };
         const parsedArg = columnDefs.find((arg) => arg.field === field.name);
         if (parsedArg) {
-            let typ = rawTypeToSchemaType(parseSQLArgs(parsedArg.datatype, dbType));
+            let typ = rawTypeToSchemaType(parseSQLArgs(parsedArg.datatype.split('(')[0].trim(), dbType));
             argSigToJsonSchemaType(typ, schemaProperty);
-            console.log('schemaProperty', schemaProperty, field.name, typ, parseSQLArgs(parsedArg.datatype, dbType));
         }
         if (field.defaultValue) {
             if (schemaProperty.type === 'number' || schemaProperty.type === 'integer') {
@@ -111,7 +108,7 @@ $: builtSchema(fields ?? [], dbType);
 export let isInsertable = false;
 $: if (schema) {
     const requiredFields = schema.required ?? [];
-    const filledFields = Object.keys(args).filter((key) => args[key] !== undefined && args[key] !== null);
+    const filledFields = Object.keys(args).filter((key) => args[key] !== undefined && args[key] !== null && args[key] !== '');
     isInsertable = requiredFields.every((field) => filledFields.includes(field));
 }
 </script>

package/package/components/apps/components/display/dbtable/queries/delete.js

@@ -4,7 +4,7 @@ function deleteWithAllValues(table, columns, dbType) {
     switch (dbType) {
         case 'postgresql': {
             const conditions = columns
-                .map((c, i) => `($${i + 1}::${c.datatype} IS NULL AND ${c.field} IS NULL OR ${c.field} = $${i + 1}::${c.datatype})`)
+                .map((c, i) => `($${i + 1}::text::${c.datatype} IS NULL AND ${c.field} IS NULL OR ${c.field} = $${i + 1}::text::${c.datatype})`)
                 .join('\n    AND ');
             query += `\nDELETE FROM ${table} \nWHERE ${conditions} RETURNING 1;`;
             return query;