feat: app select policy (#3610)

* feat: app select policy * fix: question marks
2026-08-20 00:02:19 +00:00 · 2024-04-25 17:21:00 +02:00
parent 8021919bc6
commit bee719813e
11 changed files with 539 additions and 345 deletions
@@ -4907,6 +4907,8 @@ paths:
                    - language
                force_viewer_static_fields:
                  type: object
+                force_viewer_one_of_fields:
+                  type: object
              required:
                - args
                - component
@@ -9888,6 +9890,10 @@ components:
          type: object
          additionalProperties:
            type: object
+        triggerables_v2:
+          type: object
+          additionalProperties:
+            type: object
        execution_mode:
          type: string
          enum: [viewer, publisher, anonymous]
@@ -143,6 +143,7 @@ pub struct AppHistoryUpdate {
 }

 pub type StaticFields = HashMap<String, Box<RawValue>>;
+pub type OneOfFields = HashMap<String, Vec<Box<RawValue>>>;

 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 #[serde(rename_all = "lowercase")]
@@ -152,6 +153,12 @@ pub enum ExecutionMode {
    Viewer,
 }

+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct PolicyTriggerableInputs {
+    static_inputs: StaticFields,
+    one_of_inputs: OneOfFields,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Policy {
    pub on_behalf_of: Option<String>,
@@ -160,7 +167,10 @@ pub struct Policy {
    // - script/<path>
    // - flow/<path>
    // - rawscript/<sha256>
-    pub triggerables: HashMap<String, StaticFields>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub triggerables: Option<HashMap<String, StaticFields>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub triggerables_v2: Option<HashMap<String, PolicyTriggerableInputs>>,
    pub execution_mode: ExecutionMode,
 }

@@ -934,6 +944,7 @@ pub struct ExecuteApp {
    pub raw_code: Option<RawCode>,
    // if set, the app is executed as viewer with the given static fields
    pub force_viewer_static_fields: Option<StaticFields>,
+    pub force_viewer_one_of_fields: Option<OneOfFields>,
 }

 fn digest(code: &str) -> String {
@@ -966,39 +977,56 @@ async fn execute_component(

    let path = path.to_path();

-    let policy = if let Some(static_fields) = payload.clone().force_viewer_static_fields {
-        let mut hm = HashMap::new();
+    let policy = match payload.clone() {
+        ExecuteApp {
+            force_viewer_static_fields: Some(static_fields),
+            force_viewer_one_of_fields: Some(one_of_fields),
+            ..
+        } => {
+            let mut hm = HashMap::new();

-        if let Some(path) = payload.path.clone() {
-            hm.insert(format!("{}:{path}", payload.component), static_fields);
-        } else {
-            hm.insert(
-                format!(
-                    "{}:{}",
-                    payload.component,
-                    digest(payload.raw_code.clone().unwrap().content.as_str())
-                ),
-                static_fields,
-            );
+            if let Some(path) = payload.path.clone() {
+                hm.insert(
+                    format!("{}:{path}", payload.component),
+                    PolicyTriggerableInputs {
+                        static_inputs: static_fields,
+                        one_of_inputs: one_of_fields,
+                    },
+                );
+            } else {
+                hm.insert(
+                    format!(
+                        "{}:{}",
+                        payload.component,
+                        digest(payload.raw_code.clone().unwrap().content.as_str())
+                    ),
+                    PolicyTriggerableInputs {
+                        static_inputs: static_fields,
+                        one_of_inputs: one_of_fields,
+                    },
+                );
+            }
+            Policy {
+                execution_mode: ExecutionMode::Viewer,
+                triggerables: None,
+                triggerables_v2: Some(hm),
+                on_behalf_of: None,
+                on_behalf_of_email: None,
+            }
        }
-        Policy {
-            execution_mode: ExecutionMode::Viewer,
-            triggerables: hm,
-            on_behalf_of: None,
-            on_behalf_of_email: None,
+        _ => {
+            let policy_o = sqlx::query_scalar!(
+                "SELECT policy from app WHERE path = $1 AND workspace_id = $2",
+                path,
+                &w_id
+            )
+            .fetch_optional(&db)
+            .await?;
+
+            let policy = not_found_if_none(policy_o, "App", path)?;
+
+            serde_json::from_value::<Policy>(policy).map_err(to_anyhow)?
        }
-    } else {
-        let policy_o = sqlx::query_scalar!(
-            "SELECT policy from app WHERE path = $1 AND workspace_id = $2",
-            path,
-            &w_id
-        )
-        .fetch_optional(&db)
-        .await?;
-
-        let policy = not_found_if_none(policy_o, "App", path)?;
-
-        serde_json::from_value::<Policy>(policy).map_err(to_anyhow)?
    };

    let (username, permissioned_as, email) = match policy.execution_mode {
@@ -1133,22 +1161,106 @@ fn build_args(
    path: String,
    args: HashMap<String, Box<RawValue>>,
 ) -> Result<PushArgs<HashMap<String, Box<RawValue>>>> {
-    // disallow var and res access in args coming from the user for security reasons
-    let mut safe_args: HashMap<String, Box<RawValue>> = args.clone();
+
+    let key = format!("{}:{}", component, &path);
+    let (static_inputs, one_of_inputs) = match policy {
+        Policy { triggerables_v2: Some(t), .. } => {
+            let PolicyTriggerableInputs { static_inputs, one_of_inputs } = t
+                .get(&key)
+                .or_else(|| t.get(&path))
+                .map(|x| x.clone())
+                .or_else(|| {
+                    if matches!(policy.execution_mode, ExecutionMode::Viewer) {
+                        Some(PolicyTriggerableInputs {
+                            static_inputs: HashMap::new(),
+                            one_of_inputs: HashMap::new(),
+                        })
+                    } else {
+                        None
+                    }
+                })
+                .ok_or_else(|| {
+                    Error::BadRequest(format!("path {} is not allowed in the app policy", path))
+                })?;
+
+            (static_inputs, one_of_inputs)
+        }
+        Policy { triggerables: Some(t), .. } => {
+            let static_inputs = t
+                .get(&key)
+                .or_else(|| t.get(&path))
+                .map(|x| x.clone())
+                .or_else(|| {
+                    if matches!(policy.execution_mode, ExecutionMode::Viewer) {
+                        Some(HashMap::new())
+                    } else {
+                        None
+                    }
+                })
+                .ok_or_else(|| {
+                    Error::BadRequest(format!("path {} is not allowed in the app policy", path))
+                })?;
+
+            (static_inputs, HashMap::new())
+        }
+        _ => Err(Error::BadRequest(format!(
+            "Policy is missing triggerables for {}",
+            key
+        )))?,
+    };
+
+    let mut args = args.clone();
+    let mut safe_args = HashMap::<String, Box<RawValue>>::new();
+
+    for (k, v) in one_of_inputs {
+        if let Some(arg_val) = args.get(&k) {
+            let arg_str = arg_val.get();
+
+            let options_str_vec = v.iter().map(|x| x.get()).collect::<Vec<&str>>();
+            if options_str_vec.contains(&arg_str) {
+                safe_args.insert(k.to_string(), arg_val.clone());
+                args.remove(&k);
+                continue;
+            }
+
+            // check if multiselect
+            if let Ok(args_str_vec) = serde_json::from_str::<Vec<Box<RawValue>>>(arg_val.get()) {
+                if args_str_vec
+                    .iter()
+                    .all(|x| options_str_vec.contains(&x.get()))
+                {
+                    safe_args.insert(k.to_string(), arg_val.clone());
+                    args.remove(&k);
+                    continue;
+                }
+            }
+
+            return Err(Error::BadRequest(format!(
+                "argument {} with value {} must be one of [{}]",
+                k,
+                arg_str,
+                options_str_vec.join(",")
+            )));
+        }
+    }
+
    for (k, v) in args {
-        let args_str = serde_json::to_string(&v).unwrap_or_else(|_| "".to_string());
-        if args_str.contains("$var:") || args_str.contains("$res:") {
+        let arg_str = serde_json::to_string(&v).unwrap_or_else(|_| "".to_string());
+
+        if !arg_str.contains("$var:") && !arg_str.contains("$res:") {
+            safe_args.insert(k.to_string(), v);
+        } else {
            safe_args.insert(
                k.to_string(),
                RawValue::from_string(
-                    args_str
+                    arg_str
                        .replace(
                            "$var:",
-                            "The following variable has been ommited for security reasons: ",
+                            "The following variable has been omitted for security reasons: ",
                        )
                        .replace(
                            "$res:",
-                            "The following resource has been ommited for security reasons: ",
+                            "The following resource has been omitted for security reasons: ",
                        ),
                )
                .map_err(|e| {
@@ -1160,24 +1272,8 @@ fn build_args(
            );
        }
    }
-    let key = format!("{}:{}", component, &path);
-    let static_args = policy
-        .triggerables
-        .get(&key)
-        .or_else(|| policy.triggerables.get(&path))
-        .map(|x| x.clone())
-        .or_else(|| {
-            if matches!(policy.execution_mode, ExecutionMode::Viewer) {
-                Some(HashMap::new())
-            } else {
-                None
-            }
-        })
-        .ok_or_else(|| {
-            Error::BadRequest(format!("path {} is not allowed in the app policy", path))
-        })?;
    let mut extra = HashMap::new();
-    for (k, v) in static_args {
+    for (k, v) in static_inputs {
        extra.insert(k.to_string(), v.to_owned());
    }
    Ok(PushArgs { extra, args: sqlx::types::Json(safe_args) })
@@ -47,6 +47,8 @@
 	export let extra: Record<string, any> = {}
 	export let displayType: boolean = true
 	export let customErrorMessage: string | undefined = undefined
+	export let hideResourceInput: boolean = false
+	export let resourceInputUnsupported: boolean = false

 	const dispatch = createEventDispatcher()

@@ -158,296 +160,303 @@
 	}
 </script>

-<div class="flex flex-col w-full min-w-[250px]">
-	<div>
-		{#if displayHeader}
-			<FieldHeader
-				prettify
-				{label}
-				{required}
-				{type}
-				{contentEncoding}
-				{format}
-				{displayType}
-				labelClass={css?.label?.class}
-			/>
-		{/if}
-
-		{#if description}
-			<div class={twMerge('text-xs italic pb-1', css?.description?.class)}>
-				<pre class="font-main">{description}</pre>
-			</div>
-		{/if}
-
-		<div class="flex space-x-1">
-			{#if inputCat == 'number'}
-				{#if extra['min'] != undefined && extra['max'] != undefined}
-					<div class="flex w-full gap-1">
-						<span>{extra['min']}</span>
-						<div class="grow">
-							<Range bind:value min={extra['min']} max={extra['max']} />
-						</div>
-						<span>{extra['max']}</span>
-						<span class="mx-2"><Badge large color="blue">{value}</Badge></span>
-					</div>
-				{:else if extra?.currency}
-					<CurrencyInput
-						inputClasses={{
-							formatted: 'px-2 w-full py-1.5 text-black dark:text-white',
-							wrapper: 'w-full windmillapp',
-							formattedZero: 'text-black dark:text-white'
-						}}
-						noColor
-						bind:value
-						currency={extra?.currency}
-						locale={extra?.currencyLocale ?? 'en-US'}
-					/>
-				{:else}
-					<input
-						on:focus={(e) => {
-							dispatch('focus')
-						}}
-						type="number"
-						class={twMerge(
-							valid && error == ''
-								? ''
-								: 'border !border-red-700 !border-opacity-70 focus:!border-red-700 focus:!border-opacity-30'
-						)}
-						placeholder={defaultValue ?? ''}
-						bind:value
-						min={extra['min']}
-						max={extra['max']}
-					/>
-				{/if}
-			{:else if inputCat == 'boolean'}
-				<Toggle
-					on:pointerdown={(e) => {
-						e?.stopPropagation()
-					}}
-					class={valid && error == ''
-						? ''
-						: 'border !border-red-700 !border-opacity-70 focus:!border-red-700 focus:!border-opacity-30'}
-					bind:checked={value}
+{#if !(hideResourceInput && inputCat === 'resource-object')}
+	<div class="flex flex-col w-full min-w-[250px]">
+		<div>
+			{#if displayHeader}
+				<FieldHeader
+					prettify
+					{label}
+					{required}
+					{type}
+					{contentEncoding}
+					{format}
+					{displayType}
+					labelClass={css?.label?.class}
 				/>
-				{#if type == 'boolean' && value == undefined}
-					<span>&nbsp; Not set</span>
-				{/if}
-			{:else if inputCat == 'list'}
-				<div class="w-full">
-					{#if Array.isArray(itemsType?.multiselect) && Array.isArray(value)}
-						<div class="items-start">
-							<Multiselect
-								ulOptionsClass={'!bg-surface-secondary'}
-								bind:selected={value}
-								options={itemsType?.multiselect ?? []}
-								selectedOptionsDraggable={true}
-							/>
+			{/if}
+
+			{#if description}
+				<div class={twMerge('text-xs italic pb-1', css?.description?.class)}>
+					<pre class="font-main">{description}</pre>
+				</div>
+			{/if}
+
+			<div class="flex space-x-1">
+				{#if inputCat == 'number'}
+					{#if extra['min'] != undefined && extra['max'] != undefined}
+						<div class="flex w-full gap-1">
+							<span>{extra['min']}</span>
+							<div class="grow">
+								<Range bind:value min={extra['min']} max={extra['max']} />
+							</div>
+							<span>{extra['max']}</span>
+							<span class="mx-2"><Badge large color="blue">{value}</Badge></span>
 						</div>
-					{:else if Array.isArray(itemsType?.enum) && Array.isArray(value)}
-						<div class="items-start">
-							<Multiselect
-								ulOptionsClass={'!bg-surface-secondary'}
-								bind:selected={value}
-								options={itemsType?.enum ?? []}
-								selectedOptionsDraggable={true}
-							/>
-						</div>
-					{:else if Array.isArray(enum_) && Array.isArray(value)}
-						<div class="items-start">
-							<Multiselect
-								ulOptionsClass={'!bg-surface-secondary'}
-								bind:selected={value}
-								options={enum_ ?? []}
-								selectedOptionsDraggable={true}
+					{:else if extra?.currency}
+						<CurrencyInput
+							inputClasses={{
+								formatted: 'px-2 w-full py-1.5 text-black dark:text-white',
+								wrapper: 'w-full windmillapp',
+								formattedZero: 'text-black dark:text-white'
+							}}
+							noColor
+							bind:value
+							currency={extra?.currency}
+							locale={extra?.currencyLocale ?? 'en-US'}
+						/>
+					{:else}
+						<input
+							on:focus={(e) => {
+								dispatch('focus')
+							}}
+							type="number"
+							class={twMerge(
+								valid && error == ''
+									? ''
+									: 'border !border-red-700 !border-opacity-70 focus:!border-red-700 focus:!border-opacity-30'
+							)}
+							placeholder={defaultValue ?? ''}
+							bind:value
+							min={extra['min']}
+							max={extra['max']}
+						/>
+					{/if}
+				{:else if inputCat == 'boolean'}
+					<Toggle
+						on:pointerdown={(e) => {
+							e?.stopPropagation()
+						}}
+						class={valid && error == ''
+							? ''
+							: 'border !border-red-700 !border-opacity-70 focus:!border-red-700 focus:!border-opacity-30'}
+						bind:checked={value}
+					/>
+					{#if type == 'boolean' && value == undefined}
+						<span>&nbsp; Not set</span>
+					{/if}
+				{:else if inputCat == 'list'}
+					<div class="w-full">
+						{#if Array.isArray(itemsType?.multiselect) && Array.isArray(value)}
+							<div class="items-start">
+								<Multiselect
+									ulOptionsClass={'!bg-surface-secondary'}
+									bind:selected={value}
+									options={itemsType?.multiselect ?? []}
+									selectedOptionsDraggable={true}
+								/>
+							</div>
+						{:else if Array.isArray(itemsType?.enum) && Array.isArray(value)}
+							<div class="items-start">
+								<Multiselect
+									ulOptionsClass={'!bg-surface-secondary'}
+									bind:selected={value}
+									options={itemsType?.enum ?? []}
+									selectedOptionsDraggable={true}
+								/>
+							</div>
+						{:else if Array.isArray(enum_) && Array.isArray(value)}
+							<div class="items-start">
+								<Multiselect
+									ulOptionsClass={'!bg-surface-secondary'}
+									bind:selected={value}
+									options={enum_ ?? []}
+									selectedOptionsDraggable={true}
+								/>
+							</div>
+						{:else}
+							<div class="w-full">
+								{#if Array.isArray(value)}
+									{#each value ?? [] as v, i}
+										<div class="flex flex-row max-w-md mt-1 w-full">
+											{#if itemsType?.type == 'number'}
+												<input type="number" bind:value={v} />
+											{:else if itemsType?.type == 'string' && itemsType?.contentEncoding == 'base64'}
+												<input
+													type="file"
+													class="my-6"
+													on:change={(x) => fileChanged(x, (val) => (value[i] = val))}
+													multiple={false}
+												/>
+											{:else if Array.isArray(itemsType?.enum)}
+												<select
+													on:focus={(e) => {
+														dispatch('focus')
+													}}
+													class="px-6"
+													bind:value={v}
+												>
+													{#each itemsType?.enum ?? [] as e}
+														<option>{e}</option>
+													{/each}
+												</select>
+											{:else}
+												<input type="text" bind:value={v} />
+											{/if}
+											<button
+												transition:fade|local={{ duration: 100 }}
+												class="rounded-full p-1 bg-surface-secondary duration-200 hover:bg-surface-hover ml-2"
+												aria-label="Clear"
+												on:click={() => {
+													value = value.filter((el) => el != v)
+													if (value.length == 0) {
+														value = undefined
+													}
+												}}
+											>
+												<X size={14} />
+											</button>
+										</div>
+									{/each}
+								{:else if value != undefined}
+									List is not an array
+								{/if}
+							</div>
+							<div class="flex my-2">
+								<Button
+									variant="border"
+									color="light"
+									size="sm"
+									btnClasses="mt-1"
+									on:click={() => {
+										if (value == undefined || !Array.isArray(value)) {
+											value = []
+										}
+										value = value.concat('')
+									}}
+									startIcon={{ icon: Plus }}
+								>
+									Add
+								</Button>
+							</div>
+							<span class="ml-2">
+								{(value ?? []).length} item{(value ?? []).length != 1 ? 's' : ''}
+							</span>
+						{/if}
+					</div>
+				{:else if inputCat == 'resource-object'}
+					<LightweightObjectResourceInput
+						{format}
+						bind:value
+						unsupported={resourceInputUnsupported}
+					/>
+				{:else if inputCat == 'object'}
+					{#if properties && Object.keys(properties).length > 0}
+						<div class="p-4 pl-8 border rounded w-full">
+							<LightweightSchemaForm
+								schema={{ properties, $schema: '', required: nestedRequired ?? [], type: 'object' }}
+								bind:args={value}
 							/>
 						</div>
 					{:else}
-						<div class="w-full">
-							{#if Array.isArray(value)}
-								{#each value ?? [] as v, i}
-									<div class="flex flex-row max-w-md mt-1 w-full">
-										{#if itemsType?.type == 'number'}
-											<input type="number" bind:value={v} />
-										{:else if itemsType?.type == 'string' && itemsType?.contentEncoding == 'base64'}
-											<input
-												type="file"
-												class="my-6"
-												on:change={(x) => fileChanged(x, (val) => (value[i] = val))}
-												multiple={false}
-											/>
-										{:else if Array.isArray(itemsType?.enum)}
-											<select
-												on:focus={(e) => {
-													dispatch('focus')
-												}}
-												class="px-6"
-												bind:value={v}
-											>
-												{#each itemsType?.enum ?? [] as e}
-													<option>{e}</option>
-												{/each}
-											</select>
-										{:else}
-											<input type="text" bind:value={v} />
-										{/if}
-										<button
-											transition:fade|local={{ duration: 100 }}
-											class="rounded-full p-1 bg-surface-secondary duration-200 hover:bg-surface-hover ml-2"
-											aria-label="Clear"
-											on:click={() => {
-												value = value.filter((el) => el != v)
-												if (value.length == 0) {
-													value = undefined
-												}
-											}}
-										>
-											<X size={14} />
-										</button>
-									</div>
-								{/each}
-							{:else if value != undefined}
-								List is not an array
-							{/if}
-						</div>
-						<div class="flex my-2">
-							<Button
-								variant="border"
-								color="light"
-								size="sm"
-								btnClasses="mt-1"
-								on:click={() => {
-									if (value == undefined || !Array.isArray(value)) {
-										value = []
-									}
-									value = value.concat('')
-								}}
-								startIcon={{ icon: Plus }}
-							>
-								Add
-							</Button>
-						</div>
-						<span class="ml-2">
-							{(value ?? []).length} item{(value ?? []).length != 1 ? 's' : ''}
-						</span>
-					{/if}
-				</div>
-			{:else if inputCat == 'resource-object'}
-				<LightweightObjectResourceInput {format} bind:value />
-			{:else if inputCat == 'object'}
-				{#if properties && Object.keys(properties).length > 0}
-					<div class="p-4 pl-8 border rounded w-full">
-						<LightweightSchemaForm
-							schema={{ properties, $schema: '', required: nestedRequired ?? [], type: 'object' }}
-							bind:args={value}
+						<textarea
+							bind:this={el}
+							on:focus={(e) => {
+								dispatch('focus')
+							}}
+							use:autosize
+							style="min-height: 5px;"
+							class="col-span-10 {valid && error == ''
+								? ''
+								: 'border !border-red-700 !border-opacity-70 focus:!border-red-700 focus:!border-opacity-30'}"
+							placeholder={defaultValue ? JSON.stringify(defaultValue, null, 4) : ''}
+							bind:value={rawValue}
 						/>
-					</div>
-				{:else}
-					<textarea
-						bind:this={el}
+					{/if}
+				{:else if inputCat == 'enum'}
+					<select
 						on:focus={(e) => {
 							dispatch('focus')
 						}}
-						use:autosize
-						style="min-height: 5px;"
-						class="col-span-10 {valid && error == ''
-							? ''
-							: 'border !border-red-700 !border-opacity-70 focus:!border-red-700 focus:!border-opacity-30'}"
-						placeholder={defaultValue ? JSON.stringify(defaultValue, null, 4) : ''}
-						bind:value={rawValue}
-					/>
-				{/if}
-			{:else if inputCat == 'enum'}
-				<select
-					on:focus={(e) => {
-						dispatch('focus')
-					}}
-					class="px-6"
-					bind:value
-				>
-					{#each enum_ ?? [] as e}
-						<option>{e}</option>
-					{/each}
-				</select>
-			{:else if inputCat == 'date'}
-				<DateTimeInput bind:value />
-			{:else if inputCat == 'base64'}
-				<div class="flex flex-col my-6 w-full">
-					<input
-						type="file"
-						on:change={(x) => fileChanged(x, (val) => (value = val))}
-						multiple={false}
-					/>
-					{#if value?.length}
-						<div class="text-2xs text-tertiary mt-1">File length: {value.length} base64 chars</div>
-					{/if}
-				</div>
-			{:else if inputCat == 'resource-string'}
-				<div class="flex flex-row gap-x-1 w-full">
-					<LightweightResourcePicker
+						class="px-6"
 						bind:value
-						resourceType={format.split('-').length > 1
-							? format.substring('resource-'.length)
-							: undefined}
-					/>
-				</div>
-			{:else if inputCat == 'email'}
-				<input
-					on:focus
-					type="email"
-					class={valid
-						? ''
-						: 'border border-red-700 border-opacity-30 focus:border-red-700 focus:border-opacity-3'}
-					placeholder={defaultValue ?? ''}
-					bind:value
-				/>
-			{:else if inputCat == 'currency'}
-				<input
-					type="number"
-					class={valid
-						? ''
-						: 'border border-red-700 border-opacity-30 focus:border-red-700 focus:border-opacity-3'}
-					placeholder={defaultValue ?? ''}
-					bind:value
-				/>
-			{:else if inputCat == 'string'}
-				<div class="flex flex-col w-full">
-					<div class="flex flex-row w-full items-center justify-between">
-						{#if extra?.['password'] == true}
-							<Password bind:password={value} />
-						{:else}
-							<textarea
-								rows="1"
-								bind:this={el}
-								on:focus={(e) => {
-									dispatch('focus')
-								}}
-								use:autosize
-								class="col-span-10 {valid && error == ''
-									? ''
-									: 'border !border-red-700 !border-opacity-70 focus:!border-red-700 focus:!border-opacity-30'}"
-								placeholder={defaultValue ?? ''}
-								bind:value
-								on:pointerdown|stopPropagation={(e) => {
-									dispatch('inputClicked', e)
-								}}
-							/>
+					>
+						{#each enum_ ?? [] as e}
+							<option>{e}</option>
+						{/each}
+					</select>
+				{:else if inputCat == 'date'}
+					<DateTimeInput bind:value />
+				{:else if inputCat == 'base64'}
+					<div class="flex flex-col my-6 w-full">
+						<input
+							type="file"
+							on:change={(x) => fileChanged(x, (val) => (value = val))}
+							multiple={false}
+						/>
+						{#if value?.length}
+							<div class="text-2xs text-tertiary mt-1">File length: {value.length} base64 chars</div
+							>
 						{/if}
 					</div>
+				{:else if inputCat == 'resource-string'}
+					<div class="flex flex-row gap-x-1 w-full">
+						<LightweightResourcePicker
+							bind:value
+							resourceType={format.split('-').length > 1
+								? format.substring('resource-'.length)
+								: undefined}
+						/>
+					</div>
+				{:else if inputCat == 'email'}
+					<input
+						on:focus
+						type="email"
+						class={valid
+							? ''
+							: 'border border-red-700 border-opacity-30 focus:border-red-700 focus:border-opacity-3'}
+						placeholder={defaultValue ?? ''}
+						bind:value
+					/>
+				{:else if inputCat == 'currency'}
+					<input
+						type="number"
+						class={valid
+							? ''
+							: 'border border-red-700 border-opacity-30 focus:border-red-700 focus:border-opacity-3'}
+						placeholder={defaultValue ?? ''}
+						bind:value
+					/>
+				{:else if inputCat == 'string'}
+					<div class="flex flex-col w-full">
+						<div class="flex flex-row w-full items-center justify-between">
+							{#if extra?.['password'] == true}
+								<Password bind:password={value} />
+							{:else}
+								<textarea
+									rows="1"
+									bind:this={el}
+									on:focus={(e) => {
+										dispatch('focus')
+									}}
+									use:autosize
+									class="col-span-10 {valid && error == ''
+										? ''
+										: 'border !border-red-700 !border-opacity-70 focus:!border-red-700 focus:!border-opacity-30'}"
+									placeholder={defaultValue ?? ''}
+									bind:value
+									on:pointerdown|stopPropagation={(e) => {
+										dispatch('inputClicked', e)
+									}}
+								/>
+							{/if}
+						</div>
+					</div>
+				{/if}
+				<slot name="actions" />
+			</div>
+			{#if error && error != ''}
+				<div class="text-right text-xs text-red-600 dark:text-red-400">
+					{#if error === ''}
+						&nbsp;
+					{:else}
+						{error}
+					{/if}
 				</div>
 			{/if}
-			<slot name="actions" />
 		</div>
-		{#if error && error != ''}
-			<div class="text-right text-xs text-red-600 dark:text-red-400">
-				{#if error === ''}
-					&nbsp;
-				{:else}
-					{error}
-				{/if}
-			</div>
-		{/if}
 	</div>
-</div>
+{/if}

 <style>
 	input::-webkit-outer-spin-button,
@@ -4,6 +4,7 @@
 	export let format: string
 	export let value: any
 	export let disablePortal = false
+	export let unsupported = false

 	function isString(value: any) {
 		return typeof value === 'string' || value instanceof String
@@ -33,13 +34,20 @@
 </script>

 <div class="flex flex-row w-full flex-wrap gap-x-2 gap-y-0.5">
-	<LightweightResourcePicker
-		{disablePortal}
-		on:change={(e) => {
-			path = e.detail
-			resourceToValue()
-		}}
-		bind:value={path}
-		resourceType={format.split('-').length > 1 ? format.substring('resource-'.length) : undefined}
-	/>
+	{#if unsupported}
+		<div class=" text-xs text-yellow-600 dark:text-yellow-500">
+			Resource argument is unsupported for security reasons and won't be displayed, use the resource
+			select component instead.
+		</div>
+	{:else}
+		<LightweightResourcePicker
+			{disablePortal}
+			on:change={(e) => {
+				path = e.detail
+				resourceToValue()
+			}}
+			bind:value={path}
+			resourceType={format.split('-').length > 1 ? format.substring('resource-'.length) : undefined}
+		/>
+	{/if}
 </div>
@@ -14,6 +14,8 @@
 	export let isValid: boolean = true
 	export let defaultValues: Record<string, any> = {}
 	export let dynamicEnums: Record<string, any> = {}
+	export let hideResourceInput: boolean = false
+	export let resourceInputUnsupported: boolean = false

 	let inputCheck: { [id: string]: boolean } = {}
 	let errors: { [id: string]: string } = {}
@@ -87,6 +89,8 @@
 					on:inputClicked
 					{displayType}
 					{css}
+					{hideResourceInput}
+					{resourceInputUnsupported}
 				/>
 			{/if}
 		{/if}
@@ -25,7 +25,7 @@
 	export let configuration: RichConfigurations
 	export let customCss: ComponentCustomCSS<'schemaformcomponent'> | undefined = undefined

-	const { worldStore, connectingInput, app, selectedComponent, componentControl } =
+	const { worldStore, connectingInput, app, selectedComponent, componentControl, mode } =
 		getContext<AppViewerContext>('AppViewerContext')
 	const iterContext = getContext<ListContext>('ListWrapperContext')
 	const listInputs: ListInputs | undefined = getContext<ListInputs>('ListInputs')
@@ -127,6 +127,8 @@
 				displayType={Boolean(resolvedConfig.displayType)}
 				largeGap={Boolean(resolvedConfig.largeGap)}
 				{css}
+				hideResourceInput={$mode === 'preview'}
+				resourceInputUnsupported={$mode === 'dnd'}
 			/>
 		</div>
 	{:else}
@@ -20,7 +20,7 @@
 	} from '../../types'
 	import { computeGlobalContext, eval_like } from './eval'
 	import InputValue from './InputValue.svelte'
-	import { selectId } from '../../editor/appUtils'
+	import { collectOneOfFields, selectId } from '../../editor/appUtils'
 	import ResultJobLoader from '$lib/components/ResultJobLoader.svelte'
 	import { userStore } from '$lib/stores'
 	import { get } from 'svelte/store'
@@ -315,10 +315,13 @@
 					}
 				}

+				const oneOfRunnableInputs = collectOneOfFields(fields, $app)
+
 				const requestBody = {
 					args: nonStaticRunnableInputs,
 					component: id,
-					force_viewer_static_fields: !isEditor ? undefined : staticRunnableInputs
+					force_viewer_static_fields: !isEditor ? undefined : staticRunnableInputs,
+					force_viewer_one_of_fields: !isEditor ? undefined : oneOfRunnableInputs
 				}

 				if (runnable?.type === 'runnableByName') {
@@ -82,6 +82,7 @@
 	import { getInsertInput } from '../components/display/dbtable/queries/insert'
 	import { getUpdateInput } from '../components/display/dbtable/queries/update'
 	import { getDeleteInput } from '../components/display/dbtable/queries/delete'
+	import { collectOneOfFields } from './appUtils'

 	async function hash(message) {
 		try {
@@ -267,7 +268,8 @@

 		console.log('allTriggers', allTriggers)

-		policy.triggerables = Object.fromEntries(
+		delete policy.triggerables
+		policy.triggerables_v2 = Object.fromEntries(
 			allTriggers.filter(Boolean) as [string, Record<string, any>][]
 		)
 	}
@@ -278,15 +280,19 @@
 		fields: Record<string, any>
 	): Promise<[string, Record<string, any>] | undefined> {
 		const staticInputs = collectStaticFields(fields)
+		const oneOfInputs = collectOneOfFields(fields, $app)
 		if (runnable?.type == 'runnableByName') {
 			console.log('processRunnable:content', runnable.inlineScript?.content)

 			let hex = await hash(runnable.inlineScript?.content)
 			console.log('hex', hex, id)
-			return [`${id}:rawscript/${hex}`, staticInputs]
+			return [`${id}:rawscript/${hex}`, { static_inputs: staticInputs, one_of_inputs: oneOfInputs }]
 		} else if (runnable?.type == 'runnableByPath') {
 			let prefix = runnable.runType !== 'hubscript' ? runnable.runType : 'script'
-			return [`${id}:${prefix}/${runnable.path}`, staticInputs]
+			return [
+				`${id}:${prefix}/${runnable.path}`,
+				{ static_inputs: staticInputs, one_of_inputs: oneOfInputs }
+			]
 		}
 	}

@@ -26,7 +26,8 @@ import type {
 	EvalAppInput,
 	EvalV2AppInput,
 	InputConnectionEval,
-	StaticAppInputOnDemand
+	StaticAppInputOnDemand,
+	AppInputs
 } from '../inputType'
 import { get, type Writable } from 'svelte/store'
 import { deepMergeWithPriority } from '$lib/utils'
@@ -914,3 +915,60 @@ export function recursivelyFilterKeyInJSON(
 	})
 	return filteredJSON
 }
+
+export function collectOneOfFields(fields: AppInputs, app: App) {
+	return Object.fromEntries(
+		Object.entries(fields ?? {})
+			.filter(([k, v]) => v.type == 'evalv2')
+			.map(([k, v]) => {
+				let field = v as EvalV2AppInput
+				if (!field.connections || field.connections.length !== 1) {
+					return [k, undefined]
+				}
+				const c = field.connections[0]
+
+				const gridItem = findGridItem(app, c.componentId)
+
+				if (field.expr !== c.componentId + '.' + c.id) {
+					return [k, undefined]
+				}
+
+				if (gridItem) {
+					const c = gridItem.data as AppComponent
+					if (c) {
+						if (
+							c.type === 'resourceselectcomponent' ||
+							c.type === 'selectcomponent' ||
+							c.type === 'multiselectcomponent'
+						) {
+							if (
+								(c.type === 'selectcomponent' || c.type === 'multiselectcomponent') &&
+								c.configuration?.create?.type === 'static' &&
+								c.configuration?.create?.value === true
+							) {
+								return [k, undefined]
+							}
+							if (c.configuration?.items?.type === 'static') {
+								const items = c.configuration.items.value
+								if (items && Array.isArray(items)) {
+									if (c.type === 'multiselectcomponent') {
+										return [k, items]
+									} else {
+										const options = items
+											.filter(
+												(item) => item && typeof item === 'object' && 'value' in item && item.value
+											)
+											.map((item) => item.value)
+
+										return [k, options]
+									}
+								}
+							}
+						}
+					}
+				}
+
+				return [k, undefined]
+			})
+	)
+}
@@ -2107,6 +2107,7 @@ This is a paragraph.
 					type: 'static',
 					fieldType: 'array',
 					subFieldType: 'labeledresource',
+					allowTypeChange: false,
 					value: []
 				} as StaticAppInput,
 				placeholder: {
@@ -70,6 +70,7 @@
 					loading={meta?.['loading']}
 					documentationLink={meta?.['documentationLink']}
 					markdownTooltip={meta?.['markdownTooltip']}
+					allowTypeChange={meta?.['allowTypeChange']}
 					{displayType}
 					{recomputeOnInputChanged}
 					{showOnDemandOnlyToggle}