diff --git a/backend/openapi.yaml b/backend/openapi.yaml index 74406815a2..5239f0bd10 100644 --- a/backend/openapi.yaml +++ b/backend/openapi.yaml @@ -1470,11 +1470,14 @@ paths: type: string approved: type: boolean + is_trigger: + type: boolean required: - id - summary - app - approved + - is_trigger /scripts/hub/get/{path}: get: diff --git a/backend/src/scripts.rs b/backend/src/scripts.rs index 5d7e3c888f..e52ef741b4 100644 --- a/backend/src/scripts.rs +++ b/backend/src/scripts.rs @@ -256,6 +256,7 @@ struct ScriptSearch { summary: String, app: String, approved: bool, + is_trigger: bool, } async fn list_hub_scripts( diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte index affc44c166..609f0a9ddf 100644 --- a/frontend/src/lib/components/FlowBuilder.svelte +++ b/frontend/src/lib/components/FlowBuilder.svelte @@ -25,7 +25,8 @@ $hubScripts = scripts.map((x) => ({ path: `hub/${x.id}/${x.summary.toLowerCase().replaceAll(/\s+/g, '_')}`, summary: `${x.summary} (${x.app})`, - approved: x.approved + approved: x.approved, + is_trigger: x.is_trigger })) } diff --git a/frontend/src/lib/components/flows/FlowInputs.svelte b/frontend/src/lib/components/flows/FlowInputs.svelte index 9501fed6ee..6f11653426 100644 --- a/frontend/src/lib/components/flows/FlowInputs.svelte +++ b/frontend/src/lib/components/flows/FlowInputs.svelte @@ -2,9 +2,7 @@ import { FlowModuleValue } from '$lib/gen/models/FlowModuleValue' import { faCode } from '@fortawesome/free-solid-svg-icons' - import type { integer } from 'monaco-languageclient' import { createEventDispatcher } from 'svelte' - import type { FlowMode } from './flowStore' import FlowScriptPicker from './pickers/FlowScriptPicker.svelte' import PickHubScript from './pickers/PickHubScript.svelte' import PickScript from './pickers/PickScript.svelte' diff --git a/frontend/src/lib/components/flows/pickers/PickHubScript.svelte b/frontend/src/lib/components/flows/pickers/PickHubScript.svelte index d466bde699..419e61cc6f 100644 --- a/frontend/src/lib/components/flows/pickers/PickHubScript.svelte +++ b/frontend/src/lib/components/flows/pickers/PickHubScript.svelte @@ -10,9 +10,12 @@ type Item = { summary: String; path: String; version?: String } - const items: Item[] = $hubScripts ?? [] + let items: Item[] + $: items = $hubScripts?.filter((x) => x.is_trigger == isTrigger) ?? [] let itemPicker: ItemPicker + $: console.log('X', $hubScripts) + $: console.log(items) const dispatch = createEventDispatcher() @@ -29,7 +32,7 @@ /> itemPicker.openModal()} diff --git a/frontend/src/lib/components/flows/pickers/PickScript.svelte b/frontend/src/lib/components/flows/pickers/PickScript.svelte index 6235a719a8..368671b40b 100644 --- a/frontend/src/lib/components/flows/pickers/PickScript.svelte +++ b/frontend/src/lib/components/flows/pickers/PickScript.svelte @@ -40,7 +40,7 @@ /> itemPicker.openModal()} diff --git a/frontend/src/lib/stores.ts b/frontend/src/lib/stores.ts index 6bf6e2af3f..89a242df81 100644 --- a/frontend/src/lib/stores.ts +++ b/frontend/src/lib/stores.ts @@ -27,6 +27,7 @@ export const hubScripts = writable< path: string summary: string approved: boolean + is_trigger: boolean }> | undefined >(undefined)