starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-08-19 16:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix input transforms

Browse Source
This commit is contained in:
Ruben Fiszel
2022-10-26 06:14:42 +02:00
parent a65c4c3570
commit 8a059201c9
7 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/lib/components/InputTransformForm.svelte
+1 -1
View File
@@ -212,5 +212,5 @@
<p>Not recognized arg type {arg.type}</p>
{/if}
{:else}
<p>Arg at {argName} is undefined</p>
<p class="text-sm text-gray-700">Arg at {argName} is undefined</p>
{/if}
frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
+1 -1
View File
@@ -23,7 +23,7 @@
{:else if $selectedId === 'failure'}
<FlowFailureModule />
{:else}
{#each $flowStore.value.modules as flowModule, index (index)}
{#each $flowStore.value.modules as flowModule, index (flowModule.id)}
<FlowModuleWrapper
bind:flowModule
previousModuleId={$flowStore.value.modules[index - 1]?.id}
frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+21 -18
View File
@@ -15,13 +15,13 @@
import { createScriptFromInlineScript, fork } from '$lib/components/flows/flowStateUtils'
import { flowStore } from '$lib/components/flows/flowStore'
import SchemaForm from '$lib/components/SchemaForm.svelte'
import { RawScript, type Flow, type FlowModule } from '$lib/gen'
import { RawScript, type FlowModule } from '$lib/gen'
import FlowCard from '../common/FlowCard.svelte'
import FlowModuleHeader from './FlowModuleHeader.svelte'
import { flowStateStore, type FlowModuleState } from '../flowState'
import { flowStateStore } from '../flowState'
import { scriptLangToEditorLang } from '$lib/utils'
import PropPickerWrapper from '../propPicker/PropPickerWrapper.svelte'
import { afterUpdate, getContext, onDestroy, setContext } from 'svelte'
import { afterUpdate, getContext, setContext } from 'svelte'
import type { FlowEditorContext } from '../types'
import { loadSchemaFromModule } from '../utils'
import { writable, type Writable } from 'svelte/store'
@@ -47,6 +47,15 @@
let panes: HTMLElement
let totalTopGap = 0
let inputTransforms: Record<string, any> =
flowModule.value.type === 'rawscript' || flowModule.value.type === 'script'
? flowModule.value.input_transforms
: {}
$: if (flowModule.value.type === 'rawscript' || flowModule.value.type === 'script') {
flowModule.value.input_transforms = inputTransforms
}
$: stepPropPicker = failureModule
? { pickableProperties: { previous_result: { error: 'the error message' } }, extraLib: '' }
: getStepPropPicker($flowStateStore, parentModule, previousModuleId, $flowStore, previewArgs)
@@ -62,23 +71,17 @@
async function reload(flowModule: FlowModule) {
const { input_transforms, schema } = await loadSchemaFromModule(flowModule)
let hasChanged = false
setTimeout(() => {
if (
(flowModule.value.type == 'script' || flowModule.value.type == 'rawscript') &&
JSON.stringify(flowModule.value.input_transforms) !== JSON.stringify(input_transforms)
) {
inputTransforms = input_transforms
}
})
if (JSON.stringify(schema) !== JSON.stringify($flowStateStore[flowModule.id].schema)) {
$flowStateStore[flowModule.id].schema = schema
hasChanged = true
}
if (
flowModule.value.type == 'script' ||
(flowModule.value.type == 'rawscript' &&
JSON.stringify(flowModule.value.input_transforms) !== JSON.stringify(input_transforms))
) {
flowModule.value.input_transforms = input_transforms
hasChanged = true
}
if (hasChanged) {
flowModule = flowModule
}
}
frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
+1 -1
View File
@@ -79,7 +79,7 @@
}}
failureModule={$selectedId === 'failure'}
/>
{:else}
{:else if flowModule.value.type === 'rawscript' || flowModule.value.type === 'script'}
<FlowModuleComponent bind:flowModule {parentModule} {previousModuleId} />
{/if}
{:else if flowModule.value.type === 'forloopflow'}
frontend/src/lib/components/flows/flowStateUtils.ts
+6 -6
View File
@@ -1,5 +1,5 @@
import type { Schema } from '$lib/common'
import { Script, ScriptService, type FlowModule, type RawScript } from '$lib/gen'
import { Script, ScriptService, type FlowModule, type PathScript, type RawScript } from '$lib/gen'
import { initialCode } from '$lib/script_helpers'
import { userStore, workspaceStore } from '$lib/stores'
import { getScriptByPath } from '$lib/utils'
@@ -57,8 +57,8 @@ export async function pickScript(
path: string,
summary: string,
id: string
): Promise<[FlowModule, FlowModuleState]> {
const flowModule: FlowModule = {
): Promise<[FlowModule & { value: PathScript }, FlowModuleState]> {
const flowModule: FlowModule & { value: PathScript } = {
id,
value: { type: 'script', path, input_transforms: {} },
summary
@@ -129,7 +129,7 @@ export async function createBranchAll(id: string): Promise<[FlowModule, FlowModu
return [branchesFlowModules, flowModuleState]
}
export async function fork(flowModule: FlowModule): Promise<[FlowModule, FlowModuleState]> {
export async function fork(flowModule: FlowModule): Promise<[FlowModule & { value: RawScript }, FlowModuleState]> {
if (flowModule.value.type !== 'script') {
throw new Error('Can only fork a script module')
}
@@ -141,7 +141,7 @@ export async function fork(flowModule: FlowModule): Promise<[FlowModule, FlowMod
return [forkedFlowModule, flowModuleState]
}
async function createInlineScriptModuleFromPath(path: string, id: string): Promise<FlowModule> {
async function createInlineScriptModuleFromPath(path: string, id: string): Promise<FlowModule & { value: RawScript }> {
const { content, language } = await getScriptByPath(path)
return {
@@ -167,7 +167,7 @@ export async function createScriptFromInlineScript(
flowModule: FlowModule,
suffix: string,
schema: Schema
): Promise<[FlowModule, FlowModuleState]> {
): Promise<[FlowModule & { value: PathScript }, FlowModuleState]> {
const flow = get(flowStore)
const user = get(userStore)
frontend/src/lib/components/flows/utils.ts
+4 -5
View File
@@ -19,7 +19,7 @@ export function cleanInputs(flow: Flow | any): Flow {
newFlow.value.modules.forEach((mod) => {
if (mod.value.type == 'rawscript' || mod.value.type == 'script') {
if (Object.keys(mod.input_transforms ?? {}).length > 0) {
mod.value.input_transforms = mod.input_transforms
mod.value.input_transforms = mod.input_transforms!
delete mod.input_transforms
}
Object.values(mod.input_transforms ?? {}).forEach((inp) => {
@@ -81,7 +81,7 @@ export async function loadSchemaFromModule(module: FlowModule): Promise<{
const keys = Object.keys(schema?.properties ?? {})
if (Object.keys(module.input_transforms ?? {}).length > 0) {
mod.input_transforms = module.input_transforms
mod.input_transforms = module.input_transforms!
}
let input_transforms = mod.input_transforms ?? module.input_transforms ?? {}
@@ -124,9 +124,8 @@ export function getDefaultExpr(
previousExpr?: string
) {
const expr = previousExpr ?? `previous_result.${key}`
return `import { previous_result, flow_input, step, variable, resource, params } from 'windmill${
importPath ? `@${importPath}` : ''
}'
return `import { previous_result, flow_input, step, variable, resource, params } from 'windmill${importPath ? `@${importPath}` : ''
}'
${expr}`
}
openflow.openapi.yaml
+2
View File
@@ -185,6 +185,7 @@ components:
- type
- content
- language
- input_transforms
PathScript:
type: object
@@ -203,6 +204,7 @@ components:
required:
- type
- path
- input_transforms
ForloopFlow:
type: object