Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update last value when triggering nested flows with array values #16180

Merged
merged 8 commits into from Nov 9, 2022
2 changes: 1 addition & 1 deletion api/src/flows.ts
Expand Up @@ -292,7 +292,7 @@ class FlowManager {
const database = (context.database as Knex) ?? getDatabase();
const schema = (context.schema as SchemaOverview) ?? (await getSchema({ database }));

const keyedData: Record<string, unknown> = {
const keyedData: Record<string, unknown> = (context.data as Record<string, unknown>) ?? {
[TRIGGER_KEY]: data,
[LAST_KEY]: data,
[ACCOUNTABILITY_KEY]: context?.accountability ?? null,
Expand Down
1 change: 1 addition & 0 deletions api/src/operations/exec/index.test.ts
Expand Up @@ -111,6 +111,7 @@ test('Allows modules that are whitelisted', () => {

expect(
config.handler({ code: testCode }, {
data: {},
env: {
FLOWS_EXEC_ALLOWED_MODULES: 'bytes',
},
Expand Down
5 changes: 5 additions & 0 deletions api/src/operations/exec/index.ts
Expand Up @@ -13,6 +13,11 @@ export default defineOperationApi<Options>({
const opts: NodeVMOptions = {
eval: false,
wasm: false,
sandbox: {
$trigger: data['$trigger'],
$accountability: data['$accountability'],
$last: data['$last'],
},
};

if (allowedModules.length > 0) {
Expand Down
7 changes: 6 additions & 1 deletion api/src/operations/trigger/index.ts
Expand Up @@ -17,7 +17,12 @@ export default defineOperationApi<Options>({
let result: unknown | unknown[];

if (Array.isArray(payloadObject)) {
result = await Promise.all(payloadObject.map((payload) => flowManager.runOperationFlow(flow, payload, context)));
result = await Promise.all(
payloadObject.map((payload) => {
const updatedData = { ...context.data, $last: payload };
return flowManager.runOperationFlow(flow, payload, { ...context, data: updatedData });
})
);
} else {
result = await flowManager.runOperationFlow(flow, payloadObject, context);
}
Expand Down