Skip to content

A platform for community discussion. Free, open, simple.

FIX: uses first item for output of previous nodes (#40691)

Joffrey JAFFEUXd9c765b1ecc5
diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/expression-input.gjs b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/expression-input.gjs
index d104c5f056c..20c63162968 100644
--- a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/expression-input.gjs
+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/expression-input.gjs
@@ -11,7 +11,7 @@ import {
inputConnectionsForNode,
inputIndexForConnection,
inputSummaryForNode,
- nodeItemJsonPath,
+ nodeOutputJsonPath,
outputIndexForConnection,
previousNodeForConnection,
schemaFieldsForNodeInput,
@@ -95,7 +95,10 @@ export default class ExpressionInput extends Component {
fields: schemaFieldsForNodeOutput(runData, ancestor.node.name, {
outputIndex: ancestor.outputIndex,
node: ancestor.node,
- prefix: nodeItemJsonPath(ancestor.node.name),
+ prefix: nodeOutputJsonPath(runData, ancestor.node.name, {
+ outputIndex: ancestor.outputIndex,
+ node: ancestor.node,
+ }),
}),
}))
: [];
diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/context/input.gjs b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/context/input.gjs
index 6a9b6e7d089..fc70e0fadf5 100644
--- a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/context/input.gjs
+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/context/input.gjs
@@ -10,7 +10,7 @@ import {
inputFieldPrefixForConnection,
inputIndexForConnection,
inputSummaryForNode,
- nodeItemJsonPath,
+ nodeOutputJsonPath,
outputIndexForConnection,
outputSummaryForNode,
previousNodeForConnection,
@@ -218,7 +218,10 @@ export default class InputContext extends Component {
{
outputIndex: ancestor.outputIndex,
node: ancestor.node,
- prefix: nodeItemJsonPath(ancestor.node.name),
+ prefix: nodeOutputJsonPath(this.runData, ancestor.node.name, {
+ outputIndex: ancestor.outputIndex,
+ node: ancestor.node,
+ }),
}
);
return {
diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/lib/workflows/data-schema.js b/plugins/discourse-workflows/admin/assets/javascripts/admin/lib/workflows/data-schema.js
index 706c505265a..39b5439d0de 100644
--- a/plugins/discourse-workflows/admin/assets/javascripts/admin/lib/workflows/data-schema.js
+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/lib/workflows/data-schema.js
@@ -44,10 +44,31 @@ function propertySegment(key) {
: `[${JSON.stringify(key)}]`;
}
-export function nodeItemJsonPath(nodeName) {
+export function nodeOutputFirstJsonPath(nodeName, { outputIndex = 0 } = {}) {
+ const branchArg = outputIndex === 0 ? "" : outputIndex;
+ return `$(${JSON.stringify(nodeName)}).first(${branchArg}).json`;
+}
+
+export function nodeOutputLinkedItemJsonPath(nodeName) {
return `$(${JSON.stringify(nodeName)}).item.json`;
}
+export function nodeOutputJsonPath(
+ runData,
+ nodeName,
+ { outputIndex = 0, node } = {}
+) {
+ const run = latestRunWithOutput(runData, nodeName, { node });
+ const output = outputForRun(run, outputIndex);
+ const itemCount = output?.item_count ?? output?.items?.length ?? 0;
+
+ if (itemCount === 1) {
+ return nodeOutputFirstJsonPath(nodeName, { outputIndex });
+ }
+
+ return nodeOutputLinkedItemJsonPath(nodeName);
+}
+
export function nodeOutputItemJsonPath(
nodeName,
{ outputIndex = 0, itemIndex = "$itemIndex" } = {}
diff --git a/plugins/discourse-workflows/test/javascripts/integration/components/workflows/context-input-test.gjs b/plugins/discourse-workflows/test/javascripts/integration/components/workflows/context-input-test.gjs
index 3d7322caa6e..302f9deba42 100644
--- a/plugins/discourse-workflows/test/javascripts/integration/components/workflows/context-input-test.gjs
+++ b/plugins/discourse-workflows/test/javascripts/integration/components/workflows/context-input-test.gjs
@@ -755,6 +755,23 @@ module(
sectionTitles.some((t) => t.includes("First Step")),
"shows ancestor node as section"
);
+
+ const resultField = [
+ ...this.element.querySelectorAll(".workflows-schema-field__key"),
+ ].find((el) => el.textContent.trim() === "result");
+ const dragged = {};
+ const dataTransfer = {
+ setData(type, value) {
+ dragged[type] = value;
+ },
+ };
+
+ await triggerEvent(resultField, "dragstart", { dataTransfer });
+
+ assert.strictEqual(
+ JSON.parse(dragged[WORKFLOW_VARIABLE_MIME]).id,
+ '$("First Step").first().json.result'
+ );
});
test("environment fields match schema symbols", async function (assert) {
diff --git a/plugins/discourse-workflows/test/javascripts/unit/lib/workflows-data-schema-test.js b/plugins/discourse-workflows/test/javascripts/unit/lib/workflows-data-schema-test.js
index 4ae286b0266..16329bb0646 100644
--- a/plugins/discourse-workflows/test/javascripts/unit/lib/workflows-data-schema-test.js
+++ b/plugins/discourse-workflows/test/javascripts/unit/lib/workflows-data-schema-test.js
@@ -6,8 +6,10 @@ import {
inputFieldPrefixForConnection,
inputForRun,
inputSummaryForNode,
- nodeItemJsonPath,
+ nodeOutputFirstJsonPath,
nodeOutputItemJsonPath,
+ nodeOutputJsonPath,
+ nodeOutputLinkedItemJsonPath,
outputForRun,
outputSchemaForNode,
outputSummaryForNode,
@@ -349,13 +351,62 @@ module("Unit | lib | discourse-workflows | data-schema", function () {
);
});
- test("nodeItemJsonPath escapes node names for expressions", function (assert) {
+ test("nodeOutputFirstJsonPath escapes node names and output indexes for expressions", function (assert) {
assert.strictEqual(
- nodeItemJsonPath('Fetch "quoted" \\ data'),
+ nodeOutputFirstJsonPath('Fetch "quoted" \\ data', { outputIndex: 1 }),
+ '$("Fetch \\"quoted\\" \\\\ data").first(1).json'
+ );
+ assert.strictEqual(
+ nodeOutputFirstJsonPath("Fetch data"),
+ '$("Fetch data").first().json'
+ );
+ });
+
+ test("nodeOutputLinkedItemJsonPath escapes node names for expressions", function (assert) {
+ assert.strictEqual(
+ nodeOutputLinkedItemJsonPath('Fetch "quoted" \\ data'),
'$("Fetch \\"quoted\\" \\\\ data").item.json'
);
});
+ test("nodeOutputJsonPath uses the simplest safe output expression", function (assert) {
+ const runData = {
+ Aggregate: [
+ {
+ status: "success",
+ outputs: [
+ {
+ index: 0,
+ items: [{ json: { markdown: "summary" } }],
+ item_count: 1,
+ },
+ ],
+ },
+ ],
+ "Per item": [
+ {
+ status: "success",
+ outputs: [
+ {
+ index: 0,
+ items: [{ json: { name: "Ada" } }, { json: { name: "Grace" } }],
+ item_count: 2,
+ },
+ ],
+ },
+ ],
+ };
+
+ assert.strictEqual(
+ nodeOutputJsonPath(runData, "Aggregate"),
+ '$("Aggregate").first().json'
+ );
+ assert.strictEqual(
+ nodeOutputJsonPath(runData, "Per item"),
+ '$("Per item").item.json'
+ );
+ });
+
test("nodeOutputItemJsonPath builds explicit output and item index references", function (assert) {
assert.strictEqual(
nodeOutputItemJsonPath("Second input", { outputIndex: 1 }),