Skip to content

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

FEATURE: add user action node (#41113)

Sam4ed274b7010a
diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/canvas/node-panel.gjs b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/canvas/node-panel.gjs
index d976cc1adc5..0ca554dfca2 100644
--- a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/canvas/node-panel.gjs
+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/canvas/node-panel.gjs
@@ -6,7 +6,7 @@ import { action } from "@ember/object";
import DButton from "discourse/ui-kit/d-button";
import dIcon from "discourse/ui-kit/helpers/d-icon";
import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";
-import { i18n } from "discourse-i18n";
+import I18n, { i18n } from "discourse-i18n";
import { nodeTypePresenter } from "../../../lib/workflows/node-types";
const NodeTypeItem = <template>
@@ -62,6 +62,18 @@ function presenterFor(nodeType) {
return nodeType ? nodeTypePresenter(nodeType) : null;
}
+export function sortNodeTypesByLabel(nodeTypes) {
+ return [...(nodeTypes || [])].sort((left, right) =>
+ nodeTypePresenter(left).label.localeCompare(
+ nodeTypePresenter(right).label,
+ I18n.currentBcp47Locale,
+ {
+ sensitivity: "base",
+ }
+ )
+ );
+}
+
export default class NodePanel extends Component {
@tracked selectedCategory = null;
@tracked selectedOperationNodeType = null;
@@ -71,8 +83,10 @@ export default class NodePanel extends Component {
}
get availableNodeTypes() {
- return (this.args.nodeTypes || []).filter(
- (nodeType) => nodeType.available !== false
+ return sortNodeTypesByLabel(
+ (this.args.nodeTypes || []).filter(
+ (nodeType) => nodeType.available !== false
+ )
);
}
diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/assignment-collection.gjs b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/assignment-collection.gjs
index 83885ce01d2..e84c6fb142c 100644
--- a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/assignment-collection.gjs
+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/assignment-collection.gjs
@@ -135,13 +135,19 @@ export default class AssignmentCollection extends Component {
as |collection index item|
>
<div class="workflows-property-engine__collection-row">
- <div class="workflows-property-engine__collection-delete">
- <DButton
- @action={{fn this.removeAssignment collection.remove index}}
- @icon="trash-can"
- class="btn-transparent btn-small btn-danger"
- />
- </div>
+ <DButton
+ @action={{fn this.removeAssignment collection.remove index}}
+ @icon="xmark"
+ class="workflows-property-engine__collection-delete"
+ @translatedAriaLabel={{i18n
+ "discourse_workflows.property_engine.remove_assignment"
+ name=item.name
+ }}
+ @translatedTitle={{i18n
+ "discourse_workflows.property_engine.remove_assignment"
+ name=item.name
+ }}
+ />
<collection.Object
class="workflows-property-engine__collection-fields"
diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/boolean-control.gjs b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/boolean-control.gjs
index fc447c8f659..bad9a640199 100644
--- a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/boolean-control.gjs
+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/boolean-control.gjs
@@ -107,6 +107,7 @@ export default class BooleanControl extends Component {
@name={{@fieldName}}
@title={{this.label}}
@showTitle={{true}}
+ @showOptional={{@showOptional}}
@type="custom"
@format={{this.format}}
@onSet={{@onSet}}
@@ -133,6 +134,7 @@ export default class BooleanControl extends Component {
@tooltip={{this.tooltip}}
@type="toggle"
@format={{this.format}}
+ @showOptional={{@showOptional}}
@validation={{this.validation}}
as |field|
>
diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/collection.gjs b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/collection.gjs
index a652f1c2d09..f442330212c 100644
--- a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/collection.gjs
+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/collection.gjs
@@ -7,8 +7,10 @@ import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";
import dIcon from "discourse/ui-kit/helpers/d-icon";
import { i18n } from "discourse-i18n";
import {
+ fieldControl,
fieldValue,
findNodeType,
+ isExpression,
normalizePropertyOptions,
propertyDescription,
propertyLabel,
@@ -40,6 +42,15 @@ export default class Collection extends Component {
);
}
+ get addOptionLabel() {
+ const labelKey =
+ this.args.schema?.type_options?.add_optional_field_button_text;
+
+ return labelKey
+ ? i18n(labelKey)
+ : i18n("discourse_workflows.property_engine.add_option");
+ }
+
get isArrayCollection() {
return Boolean(this.args.emptyItem);
}
@@ -76,9 +87,21 @@ export default class Collection extends Component {
return this.availableOptions.length > 0;
}
+ usesInlineControl(option) {
+ return (
+ fieldControl(option) === "boolean" &&
+ !isExpression(this.currentValue[option.name])
+ );
+ }
+
@action
- optionPath(name) {
- return `${this.args.fieldName}.${name}`;
+ collectionRowClass(option) {
+ return [
+ "workflows-property-engine__collection-row",
+ this.usesInlineControl(option) ? "--inline-control" : null,
+ ]
+ .filter(Boolean)
+ .join(" ");
}
@action
@@ -163,37 +186,48 @@ export default class Collection extends Component {
/>
{{/if}}
{{else}}
- {{#each this.selectedOptions key="name" as |option|}}
- <div class="workflows-property-engine__collection-row">
- <div class="workflows-property-engine__collection-delete">
+ <@form.Object @name={{@fieldName}} as |object item|>
+ {{#each this.selectedOptions key="name" as |option|}}
+ <div class={{this.collectionRowClass option}}>
+
<DButton
@action={{fn this.removeOption option}}
- @icon="trash-can"
- class="btn-transparent btn-small btn-danger"
+ @icon="xmark"
+ class="workflows-property-engine__collection-delete"
+ @translatedAriaLabel={{i18n
+ "discourse_workflows.property_engine.remove_assignment"
+ name=(this.optionLabel option)
+ }}
+ @translatedTitle={{i18n
+ "discourse_workflows.property_engine.remove_assignment"
+ name=(this.optionLabel option)
+ }}
/>
- </div>
- <div class="workflows-property-engine__collection-fields">
- <Field
- @form={{@form}}
- @formApi={{@formApi}}
- @configuration={{this.currentValue}}
- @connections={{@connections}}
- @credentials={{@credentials}}
- @fieldName={{this.optionPath option.name}}
- @label={{this.optionLabel option}}
- @node={{@node}}
- @nodeDefinition={{this.nodeDefinition}}
- @nodeParameters={{@nodeParameters}}
- @nodeType={{@nodeType}}
- @nodes={{@nodes}}
- @nodeTypes={{@nodeTypes}}
- @schema={{option}}
- @session={{@session}}
- />
+ <div class="workflows-property-engine__collection-fields">
+ <Field
+ @form={{object}}
+ @formApi={{@formApi}}
+ @configuration={{item}}
+ @connections={{@connections}}
+ @credentials={{@credentials}}
+ @fieldName={{option.name}}
+ @label={{this.optionLabel option}}
+ @node={{@node}}
+ @nodeDefinition={{this.nodeDefinition}}
+ @nodeParameters={{@nodeParameters}}
+ @nodeType={{@nodeType}}
+ @nodes={{@nodes}}
+ @nodeTypes={{@nodeTypes}}
+ @schema={{option}}
+ @session={{@session}}
+ @showOptional={{false}}
+ />
+ </div>
</div>
- </div>
- {{/each}}
+
+ {{/each}}
+ </@form.Object>
{{#if this.hasAvailableOptions}}
<DMenu
@@ -202,7 +236,7 @@ export default class Collection extends Component {
@modalForwardRecipient={{true}}
>
<:trigger>
- {{i18n "discourse_workflows.property_engine.add_option"}}
+ {{this.addOptionLabel}}
{{dIcon "chevron-down"}}
</:trigger>
<:content as |menu|>
diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/field.gjs b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/field.gjs
index 4b00292d1c0..e0623d8693f 100644
--- a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/field.gjs
+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/field.gjs
@@ -101,6 +101,10 @@ export default class Field extends Component {
return fieldShowLabel(this.args.schema);
}
+ get showOptional() {
+ return this.args.showOptional ?? true;
+ }
+
get format() {
return fieldFormat(this.args.schema);
}
@@ -181,6 +185,7 @@ export default class Field extends Component {
@nodeTypes={{@nodeTypes}}
@schema={{@schema}}
@session={{@session}}
+ @showOptional={{this.showOptional}}
@dynamicValueHint={{this.dynamicValueHint}}
@onSet={{@onSet}}
@onBeforeStartTestSession={{@onBeforeStartTestSession}}
@@ -190,6 +195,7 @@ export default class Field extends Component {
@name={{@fieldName}}
@title={{this.fieldTitle}}
@showTitle={{this.showLabel}}
+ @showOptional={{this.showOptional}}
@description={{this.fieldDescription}}
@tooltip={{this.fieldTooltip}}
@type={{this.resolvedFieldType}}
diff --git a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/fixed-collection.gjs b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/fixed-collection.gjs
index 0b08325b492..1257cb825a3 100644
--- a/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/fixed-collection.gjs
+++ b/plugins/discourse-workflows/admin/assets/javascripts/admin/components/workflows/configurators/fixed-collection.gjs
@@ -331,13 +331,20 @@ export default class FixedCollection extends Component {
as |collection index item|
>
<div class="workflows-property-engine__collection-row">
- <div class="workflows-property-engine__collection-delete">
- <DButton
- @action={{fn this.removeItem group collection.remove index}}
- @icon="trash-can"
- class="btn-transparent btn-small btn-danger"
- />
- </div>
+
+ <DButton
+ @action={{fn this.removeItem group collection.remove index}}
+ @icon="xmark"
+ class="workflows-property-engine__collection-delete"
+ @translatedAriaLabel={{i18n
+ "discourse_workflows.property_engine.remove_assignment"
+ name=item.name
+ }}
+ @translatedTitle={{i18n
+ "discourse_workflows.property_engine.remove_assignment"
+ name=item.name
+ }}
+ />
<collection.Object
class={{if
@@ -428,8 +435,8 @@ export default class FixedCollection extends Component {
subCollection.remove
subIndex
}}
- @icon="trash-can"
- class="btn-flat btn-danger btn-small"
+ @icon="xmark"
+ class="workflows-property-engine__collection-delete"
/>
</subCollection.Object>
</object.Collection>
diff --git a/plugins/discourse-workflows/assets/stylesheets/common/configurator/configurator.scss b/plugins/discourse-workflows/assets/stylesheets/common/configurator/configurator.scss
index f63a7cebb64..fbc7a4d0642 100644
--- a/plugins/discourse-workflows/assets/stylesheets/common/configurator/configurator.scss
+++ b/plugins/discourse-workflows/assets/stylesheets/common/configurator/configurator.scss
@@ -1,3 +1,7 @@
+.form-kit__object:has(.workflows-property-engine__collection-row) {
+ --form-kit-gutter-y: var(--space-6);
+}
+
.workflows-configurator {
&__tabs {
display: flex;
@@ -76,20 +80,6 @@
display: none;
}
- .form-kit__errors-summary {
- width: 100%;
- max-width: none;
- }
-
- .form-kit__control-custom {
- width: 100%;
- }
-
- .form-kit__field-toggle {
- width: 100%;
- position: relative;
- }
-
.form-kit__section > .btn-default {
width: 100%;
justify-content: center;
@@ -135,15 +125,14 @@
&__mode-control {
position: absolute;
- top: calc(-1 * var(--space-1));
+ inset-block-start: calc(-1 * var(--space-1));
transform: translateY(-100%);
- right: 0;
- z-index: 2;
+ inset-inline-end: 0;
&.--toggle {
- top: 50%;
+ inset-block-start: 50%;
transform: translateY(-50%);
- right: 50px;
+ inset-inline-end: 50px;
}
}
@@ -169,21 +158,34 @@
}
&__collection-row {
- display: flex;
- align-items: start;
-
- + .workflows-property-engine__collection-row {
- border-top: 2px solid var(--primary-low-mid);
- padding-top: var(--space-4);
- margin-top: var(--space-4);
- }
+ position: relative;
+ border: 1px dashed var(--primary-low);
+ padding: var(--space-5) var(--space-2) var(--space-4);
+ border-radius: var(--d-border-radius-large);
+ background: var(--primary-very-low);
}
&__collection-delete {
- display: flex;
- align-items: center;
- flex-shrink: 0;
- padding-top: var(--space-1);
+ position: absolute;
+ inset-block-start: 0;
+ inset-inline-end: 0;
+ transform: translate(25%, -50%);
+ padding: var(--space-half);
+ border-radius: 6px;
+ font-size: var(--font-down-1-rem);
+ background: var(--secondary);
+ border: 1px solid var(--primary-low-mid);
+
+ &:hover {
+ .discourse-no-touch & {
+ background: var(--secondary);
+ border: 1px solid var(--primary-low-mid);
+
+ .d-icon {
+ color: var(--danger);
+ }
+ }
+ }
}
&__collection-fields {
diff --git a/plugins/discourse-workflows/assets/stylesheets/common/variable/variable-input.scss b/plugins/discourse-workflows/assets/stylesheets/common/variable/variable-input.scss
index b6d1046a7bc..9afd773d084 100644
--- a/plugins/discourse-workflows/assets/stylesheets/common/variable/variable-input.scss
+++ b/plugins/discourse-workflows/assets/stylesheets/common/variable/variable-input.scss
@@ -244,7 +244,6 @@
}
.workflows-property-engine__collection-fields & {
- background: transparent;
min-height: 100px;
&:focus-within {
diff --git a/plugins/discourse-workflows/config/locales/client.en.yml b/plugins/discourse-workflows/config/locales/client.en.yml
index b4e50816c56..f8387215875 100644
--- a/plugins/discourse-workflows/config/locales/client.en.yml
+++ b/plugins/discourse-workflows/config/locales/client.en.yml
@@ -236,6 +236,7 @@ en:
"action:data_table": "Data table"
"action:group": "Group"
"action:badge": "Badge"
+ "action:user": "User"
"trigger:form": "Form trigger"
"action:form": "Form"
"action:limit": "Limit"
@@ -278,6 +279,7 @@ en:
"action:data_table": "Read, write, or query a workflow data table"
"action:group": "Read, check, or update group membership"
"action:badge": "Grant or revoke a badge"
+ "action:user": "Look up or update a user"
"trigger:form": "Generates a public web form and fires when it is submitted"
"action:form": "Adds a page to a multi-step form"
"action:limit": "Keep only the first or last N items"
@@ -360,6 +362,18 @@ en:
group_id_placeholder: "Select a group"
manage_groups: "Manage groups"
actor_username: "Performed by user"
+ user:
+ operation: "Operation"
+ operations:
+ get: "Get user"
+ edit: "Edit user"
+ username: "User"
+ updates: "Fields"
+ bio_raw: "Bio"
+ title: "Title"
+ trust_level: "Trust level"
+ trust_level_locked: "Lock trust level"
+ actor_username: "Performed by user"
badge:
operation: "Operation"
operations:
@@ -541,6 +555,7 @@ en:
add_item: "Add item"
add_option: "Add option"
add_field: "Add field"
+ remove_assignment: "Remove %{name}"
remove_item: "Remove item"
dynamic_hint: "Must resolve to %{value}."
assignment_types:
diff --git a/plugins/discourse-workflows/config/locales/server.en.yml b/plugins/discourse-workflows/config/locales/server.en.yml
index ee6ccc7998a..18e3255a6c0 100644
--- a/plugins/discourse-workflows/config/locales/server.en.yml
+++ b/plugins/discourse-workflows/config/locales/server.en.yml
@@ -79,6 +79,11 @@ en:
edit_failed: "Failed to edit post."
unknown_operation: "Unknown operation: %{operation}."
invalid_filter: "Invalid post filter fragment: %{fragments}."
+ user:
+ unknown_operation: "Unknown operation: %{operation}."
+ invalid_updates: "User updates must be an object."
+ invalid_trust_level: "Invalid trust level: %{level}."
+ update_failed: "Failed to update user: %{errors}"
send_personal_message:
no_recipients: "At least one personal message recipient is required."
credential:
diff --git a/plugins/discourse-workflows/lib/discourse_workflows/ai/tools/workflow_node_catalog.rb b/plugins/discourse-workflows/lib/discourse_workflows/ai/tools/workflow_node_catalog.rb
index dc22d41ef73..134d6f347b5 100644
--- a/plugins/discourse-workflows/lib/discourse_workflows/ai/tools/workflow_node_catalog.rb
+++ b/plugins/discourse-workflows/lib/discourse_workflows/ai/tools/workflow_node_catalog.rb
@@ -66,6 +66,21 @@ module DiscourseWorkflows
"user.staff" => "boolean",
}.freeze
+ USER_ACTION_SCHEMA =
+ USER_SCHEMA.merge(
+ "user" => "Discourse user lookup/update payload",
+ "user.title" => "string|null",
+ "user.bio_raw" => "string|null",
+ "user.manual_locked_trust_level" => "integer|null",
+ "user.trust_level_locked" => "boolean",
+ "user.user_fields" => "object",
+ "user.groups" => "array<object>",
+ "user.groups[].id" => "integer",
+ "user.groups[].name" => "string",
+ "user.groups[].full_name" => "string|null",
+ "user.groups[].automatic" => "boolean",
+ ).freeze
+
GROUP_MEMBERSHIP_SCHEMA = {
"group_membership" => "Group membership check result",
"group_membership.group_id" => "integer",
@@ -89,6 +104,7 @@ module DiscourseWorkflows
"tag_names" => "array<string>",
},
"action:post" => POST_SCHEMA,
+ "action:user" => USER_ACTION_SCHEMA,
"action:send_personal_message" => TOPIC_LIST_ITEM_SCHEMA.merge(POST_SCHEMA),
"action:send_chat_message" => {
"channel_id" => "integer",
@@ -191,6 +207,29 @@ module DiscourseWorkflows
},
},
],
+ "action:user" => [
+ {
+ name: "Look up a post author",
+ parameters: {
+ operation: "get",
+ username: "={{ $json.user.username }}",
+ actor_username: "system",
+ },
+ },
+ {
+ name: "Set a user title and trust level",
+ parameters: {
+ operation: "edit",
+ username: "={{ $json.user.username }}",
+ updates: {
+ title: "Member",
+ trust_level: "2",
+ trust_level_locked: true,
+ },
+ actor_username: "system",
+ },
+ },
+ ],
"action:topic" => [
{
name: "Get trigger topic details",
@@ -265,6 +304,8 @@ module DiscourseWorkflows
"action:ai_agent" =>
"ai agent bot llm classify summarize generate sentiment triage runner run as permissions uploads attachments",
"action:group" => "group membership member belongs friend friends",
+ "action:user" =>
+ "user profile bio title trust level lock groups fields lookup edit update",
}.freeze
def self.signature
diff --git a/plugins/discourse-workflows/lib/discourse_workflows/executor/node_execution_context.rb b/plugins/discourse-workflows/lib/discourse_workflows/executor/node_execution_context.rb
index 6ca605409a0..a6c31fe5e4b 100644
--- a/plugins/discourse-workflows/lib/discourse_workflows/executor/node_execution_context.rb
+++ b/plugins/discourse-workflows/lib/discourse_workflows/executor/node_execution_context.rb
@@ -301,7 +301,7 @@ module DiscourseWorkflows
end
if username.present?
- user = User.find_by(username: username)
+ user = User.find_by_username(username)
raise DiscourseWorkflows::NodeError, "User '#{username}' not found" if user.nil?
else
user = User.find_by(id: id)
diff --git a/plugins/discourse-workflows/lib/discourse_workflows/executor/parameter_resolver.rb b/plugins/discourse-workflows/lib/discourse_workflows/executor/parameter_resolver.rb
index f81c6b14199..a0ce4b81c48 100644
--- a/plugins/discourse-workflows/lib/discourse_workflows/executor/parameter_resolver.rb
+++ b/plugins/discourse-workflows/lib/discourse_workflows/executor/parameter_resolver.rb
@@ -78,6 +78,7 @@ module DiscourseWorkflows
def resolve_parameter_value(value, schema = nil)
return value if no_data_expression?(schema)
return resolve_fixed_collection_value(value, schema) if fixed_collection_schema?(schema)
+ return resolve_collection_value(value, schema) if collection_schema?(schema)
resolved_value =
case value
@@ -117,6 +118,29 @@ module DiscourseWorkflows
end
end
+ def resolve_collection_value(value, schema)
+ if value.is_a?(Hash)
+ return(
+ value.transform_values.with_index do |option_value, index|
+ option_name = value.keys[index]
+ option_schema = collection_option_schema(schema, option_name)
+ resolve_parameter_value(option_value, option_schema)
+ end
+ )
+ end
+
+ resolve_parameter_value(value, schema_value(schema, :item_schema))
+ end
+
+ def collection_option_schema(schema, option_name)
+ option =
+ Array(schema_value(schema, :options)).find do |entry|
+ (schema_value(entry, :name) || "").to_s == option_name.to_s
+ end
+
+ option&.except(:name, "name", :display_name, "display_name")
+ end
+
def resolve_fixed_collection_group_value(value, row_schema)
case value
when Array
@@ -181,7 +205,11 @@ module DiscourseWorkflows
end
def fixed_collection_schema?(schema)
- schema_value(schema, :type) == :fixed_collection
+ schema_value(schema, :type).to_s == "fixed_collection"
+ end
+
+ def collection_schema?(schema)
+ schema_value(schema, :type).to_s == "collection"
end
def no_data_expression?(schema)
@@ -189,7 +217,7 @@ module DiscourseWorkflows
end
def coerce_parameter_value(value, schema)
- return value if schema_value(schema, :type) != :boolean
+ return value if schema_value(schema, :type).to_s != "boolean"
BOOLEAN_TYPE.cast(value) == true
end
diff --git a/plugins/discourse-workflows/lib/discourse_workflows/node_type.rb b/plugins/discourse-workflows/lib/discourse_workflows/node_type.rb
index 6d7247b9696..abc5895c9a8 100644
--- a/plugins/discourse-workflows/lib/discourse_workflows/node_type.rb
+++ b/plugins/discourse-workflows/lib/discourse_workflows/node_type.rb
@@ -151,6 +151,12 @@ module DiscourseWorkflows
.filter_map { |name| name.strip.presence }
end
+ def self.trust_level_options
+ TrustLevel.levels.map do |name, level|
+ { value: level.to_s, label_key: "trust_levels.names.#{name}" }
+ end
+ end
+
def initialize(**)
end
diff --git a/plugins/discourse-workflows/lib/discourse_workflows/nodes/modal/v1.rb b/plugins/discourse-workflows/lib/discourse_workflows/nodes/modal/v1.rb
index 4a51e6d2bad..9f8a29a1522 100644
--- a/plugins/discourse-workflows/lib/discourse_workflows/nodes/modal/v1.rb
+++ b/plugins/discourse-workflows/lib/discourse_workflows/nodes/modal/v1.rb
@@ -118,7 +118,7 @@ module DiscourseWorkflows
username = exec_ctx.get_node_parameter("target_user", 0).presence
if username
- user = User.find_by(username: username)
+ user = ::User.find_by(username: username)
if user.nil?
raise_node_error!(
I18n.t("discourse_workflows.errors.modal.user_not_found", username: username),
diff --git a/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_edited/v1.rb b/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_edited/v1.rb
index a5e6fcc9330..493ec23ac01 100644
--- a/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_edited/v1.rb
+++ b/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_edited/v1.rb
@@ -5,13 +5,6 @@ module DiscourseWorkflows
module PostEdited
class V1 < NodeType
POST_SCOPE_OPTIONS = %w[first_post replies all_posts].freeze
- TRUST_LEVEL_OPTIONS = [
- { value: "0", label_key: "trust_levels.names.newuser" },
- { value: "1", label_key: "trust_levels.names.basic" },
- { value: "2", label_key: "trust_levels.names.member" },
- { value: "3", label_key: "trust_levels.names.regular" },
- { value: "4", label_key: "trust_levels.names.leader" },
- ].freeze
description(
name: "trigger:post_edited",
@@ -46,7 +39,7 @@ module DiscourseWorkflows
trust_levels: {
type: :multi_options,
required: false,
- options: TRUST_LEVEL_OPTIONS,
+ options: trust_level_options,
},
},
)
diff --git a/plugins/discourse-workflows/lib/discourse_workflows/nodes/user/v1.rb b/plugins/discourse-workflows/lib/discourse_workflows/nodes/user/v1.rb
new file mode 100644
index 00000000000..eec9c6e2cf7
--- /dev/null
+++ b/plugins/discourse-workflows/lib/discourse_workflows/nodes/user/v1.rb
@@ -0,0 +1,244 @@
+# frozen_string_literal: true
+
+module DiscourseWorkflows
+ module Nodes
+ module User
+ class V1 < NodeType
+ OPERATIONS = %w[get edit].freeze
+ UPDATE_OPTIONS = [
+ { name: "bio_raw", type: :string, required: false, ui: { control: :textarea } },
+ { name: "title", type: :string, required: false },
+ { name: "trust_level", type: :options, required: true, options: trust_level_options },
+ { name: "trust_level_locked", type: :boolean, required: false },
+ ].freeze
+ MISSING = DiscourseWorkflows::Executor::NodeExecutionContext::MISSING
+
+ description(
+ name: "action:user",
+ version: "1.0",
+ defaults: {
+ icon: "user",
+ color: "blue",
+ },
+ group: "discourse_actions",
+ capabilities: {
+ run_scope: "per_item",
+ },
+ properties: {
+ operation: {
+ type: :options,
+ required: true,
+ options: OPERATIONS,
+ default: "get",
+ ui: {
+ expression: true,
+ },
+ },
+ username: {
+ type: :string,
+ required: true,
+ ui: {
+ control: :user,
+ },
+ },
+ updates: {
+ type: :collection,
+ required: false,
+ options: UPDATE_OPTIONS,
+ type_options: {
+ add_optional_field_button_text: "discourse_workflows.property_engine.add_field",
+ },
+ display_options: {
+ show: {
+ operation: ["edit"],
+ },
+ },
+ },
+ actor_username: {
+ type: :string,
+ required: false,
+ default: "system",
+ ui: {
+ control: :actor,
+ },
+ },
+ },
+ )
+
+ def execute(exec_ctx)
+ items =
+ exec_ctx.input_items.map.with_index do |_item, item_index|
+ operation = exec_ctx.get_node_parameter("operation", item_index, default: "get")
+ user =
+ exec_ctx.find_user(username: exec_ctx.get_node_parameter("username", item_index))
+ actor = exec_ctx.actor_from_parameter("actor_username", item_index)
+
+ wrap(process(exec_ctx, user, actor, operation, item_index))
+ end
+
+ [items]
+ end
+
+ private
+
+ def process(exec_ctx, user, actor, operation, item_index)
+ case operation
+ when "get"
+ get_user(user, actor.guardian)
+ when "edit"
+ edit_user(exec_ctx, user, actor, item_index)
+ else
+ raise_node_error!(
+ I18n.t("discourse_workflows.errors.user.unknown_operation", operation: operation),
+ )
+ end
+ end
+
+ def get_user(user, guardian)
+ guardian.ensure_can_see_profile!(user)
+ { user: user_data(user, guardian) }
+ end
+
+ def edit_user(exec_ctx, user, actor, item_index)
+ guardian = actor.guardian
+ updates = update_parameters(exec_ctx, item_index)
+ attributes = editable_attributes(updates)
+ trust_level = updates.fetch("trust_level", MISSING)
+ trust_level_locked = updates.fetch("trust_level_locked", MISSING)
+
+ update_profile_fields(user, actor, guardian, attributes) if attributes.present?
+ change_trust_level(user, actor, guardian, trust_level) unless trust_level.equal?(MISSING)
+ unless trust_level_locked.equal?(MISSING)
+ update_trust_level_lock(user, actor, guardian, trust_level_locked)
+ end
+
+ { user: user_data(user.reload, guardian) }
+ end
+
+ def update_parameters(exec_ctx, item_index)
+ updates = exec_ctx.get_node_parameter("updates", item_index, default: {})
+ return legacy_update_parameters(exec_ctx, item_index) if updates.blank?
+ return updates.deep_stringify_keys if updates.is_a?(Hash)
+
+ raise_node_error!(I18n.t("discourse_workflows.errors.user.invalid_updates"))
+ end
+
+ def legacy_update_parameters(exec_ctx, item_index)
+ UPDATE_OPTIONS.each_with_object({}) do |field, updates|
+ name = field[:name]
+ value = exec_ctx.get_node_parameter(name, item_index, default: MISSING)
+ updates[name] = value unless value.equal?(MISSING)
+ end
+ end
+
+ def editable_attributes(updates)
+ {}.tap do |attributes|
+ attributes[:bio_raw] = updates["bio_raw"] if updates.key?("bio_raw")
+ attributes[:title] = updates["title"].to_s if updates.key?("title")
+ end
+ end
+
+ def update_profile_fields(user, actor, guardian, attributes)
+ guardian.ensure_can_edit!(user)
+ guardian.ensure_can_grant_title!(user, attributes[:title]) if attributes.key?(:title)
+
+ return if UserUpdater.new(actor, user).update(attributes)
+
+ errors = validation_errors_for(user)
+ raise_node_error!(
+ I18n.t(
+ "discourse_workflows.errors.user.update_failed",
+ errors: errors.presence || I18n.t("errors.messages.invalid"),
+ ),
+ )
+ end
+
+ def change_trust_level(user, actor, guardian, trust_level)
+ guardian.ensure_can_change_trust_level!(user)
+ trust_level = normalize_trust_level(trust_level)
+
+ if user.manual_locked_trust_level.nil?
+ lock_trust_level_for_manual_change(user, trust_level)
+ end
+ user.change_trust_level!(trust_level, log_action_for: actor)
+ end
+
+ def lock_trust_level_for_manual_change(user, trust_level)
+ if [0, 1, 2].include?(trust_level) &&
+ Promotion.public_send("tl#{trust_level + 1}_met?", user)
+ user.manual_locked_trust_level = trust_level
+ user.save!
+ elsif trust_level == 3 && Promotion.tl3_lost?(user)
+ user.manual_locked_trust_level = trust_level
+ user.save!
+ end
+ end
+
+ def update_trust_level_lock(user, actor, guardian, trust_level_locked)
+ guardian.ensure_can_change_trust_level!(user)
+
+ user.manual_locked_trust_level = trust_level_locked ? user.trust_level : nil
+ user.save!
+
+ StaffActionLogger.new(actor).log_lock_trust_level(user)
+ Promotion.recalculate(user, actor)
+ end
+
+ def normalize_trust_level(value)
+ trust_level = Integer(value, exception: false)
+ return trust_level if trust_level && TrustLevel.valid?(trust_level)
+
+ raise_node_error!(
+ I18n.t("discourse_workflows.errors.user.invalid_trust_level", level: value.inspect),
+ )
+ end
+
+ def user_data(user, guardian)
+ include_profile_details = include_profile_details?(user, guardian)
+
+ serialize_user(user, guardian: guardian).merge(
+ title: user.title,
+ bio_raw: include_profile_details ? user.user_profile.bio_raw : nil,
+ manual_locked_trust_level: user.manual_locked_trust_level,
+ trust_level_locked: !user.manual_locked_trust_level.nil?,
+ user_fields:
+ (
+ if include_profile_details
+ user.user_fields(guardian.allowed_user_field_ids(user))
+ else
+ {}
+ end
+ ),
+ groups: groups_data(user, guardian),
+ )
+ end
+
+ def include_profile_details?(user, guardian)
+ guardian.public_can_see_profiles? && !guardian.restrict_user_fields?(user)
+ end
+
+ def groups_data(user, guardian)
+ groups = user.groups.visible_groups(guardian.user)
+ groups = groups.members_visible_groups(guardian.user) if guardian.user != user
+
+ groups
+ .order(:name)
+ .map do |group|
+ {
+ id: group.id,
+ name: group.name,
+ full_name: group.full_name,
+ automatic: group.automatic,
+ }
+ end
+ end
+
+ def validation_errors_for(user)
+ [user, user.user_profile, user.user_option].compact
+ .flat_map { |record| record.errors.full_messages }
+ .join(", ")
+ end
+ end
+ end
+ end
+end
diff --git a/plugins/discourse-workflows/plugin.rb b/plugins/discourse-workflows/plugin.rb
index 31719670624..d9cbc58a0d7 100644
--- a/plugins/discourse-workflows/plugin.rb
+++ b/plugins/discourse-workflows/plugin.rb
@@ -45,6 +45,7 @@ register_svg_icon "pause"
register_svg_icon "window-maximize"
register_svg_icon "user-plus"
register_svg_icon "grip-vertical"
+register_svg_icon "paragraph"
register_svg_icon "arrow-down-a-z"
add_admin_route "discourse_workflows.admin.title", "discourse-workflows", use_new_show_route: true
diff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/ai/tools/workflow_node_catalog_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/ai/tools/workflow_node_catalog_spec.rb
index 39ea6dab72b..7da3230b7e1 100644
--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/ai/tools/workflow_node_catalog_spec.rb
+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/ai/tools/workflow_node_catalog_spec.rb
@@ -84,6 +84,17 @@ RSpec.describe DiscourseWorkflows::Ai::Tools::WorkflowNodeCatalog do
"post.topic_id" => "integer",
"post.post_url" => "string",
)
+ expect(nodes_by_type.dig("action:user", :output_schema)).to include(
+ "user.id" => "integer",
+ "user.username" => "string",
+ "user.bio_raw" => "string|null",
+ "user.title" => "string|null",
+ "user.manual_locked_trust_level" => "integer|null",
+ "user.trust_level_locked" => "boolean",
+ "user.user_fields" => "object",
+ "user.groups" => "array<object>",
+ "user.groups[].name" => "string",
+ )
expect(nodes_by_type.dig("action:send_personal_message", :output_schema)).to include(
"topic.id" => "integer",
"topic.slug" => "string",
@@ -97,7 +108,7 @@ RSpec.describe DiscourseWorkflows::Ai::Tools::WorkflowNodeCatalog do
result =
invoke_tool(
query:
- "trigger topic_closed action topic get condition filter chat message dm group membership",
+ "trigger topic_closed action topic get condition filter chat message dm group membership user profile trust title",
include_examples: true,
)
node_types = result[:nodes].map { |node| node[:type] }
@@ -107,6 +118,7 @@ RSpec.describe DiscourseWorkflows::Ai::Tools::WorkflowNodeCatalog do
"action:topic",
"condition:filter",
"action:group",
+ "action:user",
"action:send_chat_message",
"action:send_personal_message",
)
@@ -126,6 +138,7 @@ RSpec.describe DiscourseWorkflows::Ai::Tools::WorkflowNodeCatalog do
result = invoke_tool(include_examples: true)
filter_node = result[:nodes].find { |node| node[:type] == "condition:filter" }
group_node = result[:nodes].find { |node| node[:type] == "action:group" }
+ user_node = result[:nodes].find { |node| node[:type] == "action:user" }
topic_node = result[:nodes].find { |node| node[:type] == "action:topic" }
post_node = result[:nodes].find { |node| node[:type] == "action:post" }
personal_message_node =
@@ -164,6 +177,16 @@ RSpec.describe DiscourseWorkflows::Ai::Tools::WorkflowNodeCatalog do
),
),
)
+ expect(user_node[:examples]).to contain_exactly(
+ include(parameters: include(operation: "get", username: "={{ $json.user.username }}")),
+ include(
+ parameters:
+ include(
+ operation: "edit",
+ updates: include(title: "Member", trust_level: "2", trust_level_locked: true),
+ ),
+ ),
+ )
expect(personal_message_node[:examples]).to contain_exactly(
include(
parameters:
diff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/executor/node_execution_context_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/executor/node_execution_context_spec.rb
index 2eb642e7ce2..b4a1fb0e388 100644
--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/executor/node_execution_context_spec.rb
+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/executor/node_execution_context_spec.rb
@@ -553,6 +553,12 @@ RSpec.describe DiscourseWorkflows::Executor::NodeExecutionContext do
expect(ctx.find_user(username: user.username)).to eq(user)
end
+ it "finds a user by mixed-case username" do
+ ctx = described_class.new(input_items: [], resolver: nil)
+
+ expect(ctx.find_user(username: user.username.upcase)).to eq(user)
+ end
+
it "finds a user by id" do
ctx = described_class.new(input_items: [], resolver: nil)
diff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/executor/parameter_resolver_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/executor/parameter_resolver_spec.rb
index 8efd8bec902..7a92af0804e 100644
--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/executor/parameter_resolver_spec.rb
+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/executor/parameter_resolver_spec.rb
@@ -128,6 +128,28 @@ RSpec.describe DiscourseWorkflows::Executor::ParameterResolver do
sandbox&.dispose
end
+ it "resolves collection option values with their option schemas" do
+ resolver, expression_resolver, sandbox =
+ build_resolver(
+ { "updates" => { "title" => "={{ $json.title }}", "trust_level_locked" => "false" } },
+ schema: {
+ updates: {
+ type: :collection,
+ options: [
+ { name: "title", type: :string },
+ { name: "trust_level_locked", type: :boolean },
+ ],
+ },
+ },
+ items: [{ "json" => { "title" => "Member" } }],
+ )
+
+ expect(resolver.resolve("updates", 0)).to eq("title" => "Member", "trust_level_locked" => false)
+ ensure
+ expression_resolver&.dispose
+ sandbox&.dispose
+ end
+
it "coerces boolean values using the property schema" do
resolver, expression_resolver, sandbox =
build_resolver(
diff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/user_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/user_spec.rb
new file mode 100644
index 00000000000..b6a28b94317
--- /dev/null
+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/user_spec.rb
@@ -0,0 +1,233 @@
+# frozen_string_literal: true
+
+RSpec.describe DiscourseWorkflows::Nodes::User::V1 do
+ fab!(:user)
+ fab!(:admin)
+
+ describe "#execute" do
+ it "gets user fields and group memberships", :aggregate_failures do
+ user.user_profile.update!(bio_raw: "Original bio")
+ user.update!(title: "Original title", manual_locked_trust_level: TrustLevel[1])
+ user_field = Fabricate(:user_field)
+ user.set_user_field(user_field.id, "Field value")
+ user.save_custom_fields
+ public_group = Fabricate(:group, name: "public_group")
+ staff_group =
+ Fabricate(
+ :group,
+ name: "staff_group",
+ visibility_level: Group.visibility_levels[:staff],
+ members_visibility_level: Group.visibility_levels[:staff],
+ )
+ public_group.add(user)
+ staff_group.add(user)
+
+ result = execute_node(configuration: { "operation" => "get", "username" => user.username })
+
+ expect(result["user"]).to include(
+ "id" => user.id,
+ "username" => user.username,
+ "title" => "Original title",
+ "bio_raw" => "Original bio",
+ "manual_locked_trust_level" => TrustLevel[1],
+ "trust_level_locked" => true,
+ )
+ expect(result.dig("user", "user_fields")).to include(user_field.id.to_s => "Field value")
+ expect(result.dig("user", "groups").map { |group| group["name"] }).to include(
+ public_group.name,
+ staff_group.name,
+ )
+ expect(result["user"]).not_to have_key("email")
+ end
+
+ it "updates the bio and title", :aggregate_failures do
+ result =
+ execute_node(
+ configuration: {
+ "operation" => "edit",
+ "username" => user.username,
+ "updates" => {
+ "bio_raw" => "Updated bio",
+ "title" => "Updated title",
+ },
+ "actor_username" => admin.username,
+ },
+ )
+
+ expect(user.reload.user_profile.bio_raw).to eq("Updated bio")
+ expect(user.title).to eq("Updated title")
+ expect(result.dig("user", "bio_raw")).to eq("Updated bio")
+ expect(result.dig("user", "title")).to eq("Updated title")
+ end
+
+ it "only changes fields included in updates", :aggregate_failures do
+ user.user_profile.update!(bio_raw: "Existing bio")
+ user.update!(title: "Existing title")
+
+ execute_node(
+ configuration: {
+ "operation" => "edit",
+ "username" => user.username,
+ "updates" => {
+ "title" => "Updated title",
+ },
+ "actor_username" => admin.username,
+ },
+ )
+
+ expect(user.reload.title).to eq("Updated title")
+ expect(user.user_profile.bio_raw).to eq("Existing bio")
+ end
+
+ it "changes and locks the trust level", :aggregate_failures do
+ result =
+ execute_node(
+ configuration: {
+ "operation" => "edit",
+ "username" => user.username,
+ "updates" => {
+ "trust_level" => "2",
+ "trust_level_locked" => true,
+ },
+ "actor_username" => admin.username,
+ },
+ )
+
+ expect(user.reload.trust_level).to eq(TrustLevel[2])
+ expect(user.manual_locked_trust_level).to eq(TrustLevel[2])
+ expect(result.dig("user", "trust_level")).to eq(TrustLevel[2])
+ expect(result.dig("user", "trust_level_locked")).to eq(true)
+ end
+
+ it "unlocks the trust level", :aggregate_failures do
+ user.update!(manual_locked_trust_level: TrustLevel[2], trust_level: TrustLevel[2])
+
+ result =
+ execute_node(
+ configuration: {
+ "operation" => "edit",
+ "username" => user.username,
+ "updates" => {
+ "trust_level_locked" => false,
+ },
+ "actor_username" => admin.username,
+ },
+ )
+
+ expect(user.reload.manual_locked_trust_level).to be_nil
+ expect(result.dig("user", "trust_level_locked")).to eq(false)
+ end
+
+ it "raises when the actor cannot edit profile fields" do
+ other_user = Fabricate(:user)
+
+ expect do
+ execute_node(
+ configuration: {
+ "operation" => "edit",
+ "username" => user.username,
+ "updates" => {
+ "bio_raw" => "Denied bio",
+ },
+ "actor_username" => other_user.username,
+ },
+ )
+ end.to raise_error(Discourse::InvalidAccess)
+ end
+
+ it "raises when the actor cannot change trust level" do
+ expect do
+ execute_node(
+ configuration: {
+ "operation" => "edit",
+ "username" => user.username,
+ "updates" => {
+ "trust_level" => "2",
+ },
+ "actor_username" => user.username,
+ },
+ )
+ end.to raise_error(Discourse::InvalidAccess)
+ end
+
+ it "raises when the trust level is invalid" do
+ expect do
+ execute_node(
+ configuration: {
+ "operation" => "edit",
+ "username" => user.username,
+ "updates" => {
+ "trust_level" => "9",
+ },
+ },
+ )
+ end.to raise_error(DiscourseWorkflows::NodeError, "Invalid trust level: \"9\".")
+ end
+
+ it "supports legacy top-level updates", :aggregate_failures do
+ user.user_profile.update!(bio_raw: "Existing bio")
+ user.update!(title: "Existing title")
+
+ result =
+ execute_node(
+ configuration: {
+ "operation" => "edit",
+ "username" => user.username,
+ "bio_raw" => "",
+ "title" => "",
+ "trust_level" => "2",
+ "trust_level_locked" => true,
+ "actor_username" => admin.username,
+ },
+ )
+
+ expect(user.reload.user_profile.bio_raw).to eq("")
+ expect(user.title).to eq("")
+ expect(user.trust_level).to eq(TrustLevel[2])
+ expect(user.manual_locked_trust_level).to eq(TrustLevel[2])
+ expect(result.dig("user", "bio_raw")).to eq("")
+ expect(result.dig("user", "title")).to eq("")
+ expect(result.dig("user", "trust_level_locked")).to eq(true)
+ end
+
+ it "raises when the actor cannot see the profile" do
+ SiteSetting.allow_users_to_hide_profile = true
+ user.user_option.update!(hide_profile: true)
+ other_user = Fabricate(:user)
+
+ expect do
+ execute_node(
+ configuration: {
+ "operation" => "get",
+ "username" => user.username,
+ "actor_username" => other_user.username,
+ },
+ )
+ end.to raise_error(Discourse::InvalidAccess)
+ end
+
+ it "raises when the operation is unknown" do
+ expect do
+ execute_node(configuration: { "operation" => "delete", "username" => user.username })
+ end.to raise_error(DiscourseWorkflows::NodeError, "Unknown operation: delete.")
+ end
+
+ it "raises when updates is not an object" do
+ expect do
+ execute_node(
+ configuration: {
+ "operation" => "edit",
+ "username" => user.username,
+ "updates" => "title",
+ },
+ )
+ end.to raise_error(DiscourseWorkflows::NodeError, "User updates must be an object.")
+ end
+
+ it "raises when the user does not exist" do
+ expect do
+ execute_node(configuration: { "operation" => "get", "username" => "missing_user" })
+ end.to raise_error(DiscourseWorkflows::NodeError, "User 'missing_user' not found")
+ end
+ end
+end
diff --git a/plugins/discourse-workflows/test/javascripts/integration/components/workflows/property-engine-test.gjs b/plugins/discourse-workflows/test/javascripts/integration/components/workflows/property-engine-test.gjs
index ca8911fa01a..ff8df7dd71c 100644
--- a/plugins/discourse-workflows/test/javascripts/integration/components/workflows/property-engine-test.gjs
+++ b/plugins/discourse-workflows/test/javascripts/integration/components/workflows/property-engine-test.gjs
@@ -469,6 +469,141 @@ module("Integration | Component | workflows property engine", function (hooks) {
assert.strictEqual(document.activeElement, keyInput);
});
+ test("renders collection options as addable fields", async function (assert) {
+ this.setProperties({
+ configuration: { updates: {} },
+ formApi: null,
+ nodeType: "action:user",
+ schema: {
+ updates: {
+ type: "collection",
+ type_options: {
+ add_optional_field_button_text:
+ "discourse_workflows.property_engine.add_field",
+ },
+ options: [
+ {
+ name: "title",
+ type: "string",
+ required: false,
+ },
+ ],
+ },
+ },
+ registerApi: (api) => {
+ this.set("formApi", api);
+ },
+ });
+
+ await render(
+ <template>
+ <Form
+ @data={{this.configuration}}
+ @onRegisterApi={{this.registerApi}}
+ as |form transientData|
+ >
+ <PropertyEngineConfigurator
+ @form={{form}}
+ @formApi={{this.formApi}}
+ @configuration={{transientData}}
+ @nodeType={{this.nodeType}}
+ @schema={{this.schema}}
+ @session={{this.session}}
+ />
+ </Form>
+ </template>
+ );
+
+ assert.dom(".workflows-property-engine__collection-row").doesNotExist();
+ assert
+ .dom(".workflows-property-engine__add-attrs-btn")
+ .hasText("Add field");
+
+ await click(".workflows-property-engine__add-attrs-btn");
+ await waitFor(".dropdown-menu__item .btn-transparent");
+ await click(findAll(".dropdown-menu__item .btn-transparent")[0]);
+
+ assert.dom(".workflows-property-engine__collection-row input").exists();
+ assert.dom(".form-kit__container-optional").doesNotExist();
+
+ await fillIn(
+ ".workflows-property-engine__collection-row input",
+ "Updated title"
+ );
+
+ assert.deepEqual(this.formApi.get("updates"), { title: "Updated title" });
+
+ await click(".workflows-property-engine__collection-delete");
+
+ assert.deepEqual(this.formApi.get("updates"), {});
+ });
+
+ test("renders collection boolean options inline", async function (assert) {
+ this.setProperties({
+ configuration: { updates: {} },
+ formApi: null,
+ nodeType: "action:user",
+ schema: {
+ updates: {
+ type: "collection",
+ options: [
+ {
+ name: "trust_level_locked",
+ type: "boolean",
+ required: false,
+ },
+ ],
+ },
+ },
+ registerApi: (api) => {
+ this.set("formApi", api);
+ },
+ });
+
+ await render(
+ <template>
+ <Form
+ @data={{this.configuration}}
+ @onRegisterApi={{this.registerApi}}
+ as |form transientData|
+ >
+ <PropertyEngineConfigurator
+ @form={{form}}
+ @formApi={{this.formApi}}
+ @configuration={{transientData}}
+ @nodeType={{this.nodeType}}
+ @schema={{this.schema}}
+ @session={{this.session}}
+ />
+ </Form>
+ </template>
+ );
+
+ await click(".workflows-property-engine__add-attrs-btn");
+ await waitFor(".dropdown-menu__item .btn-transparent");
+ await click(findAll(".dropdown-menu__item .btn-transparent")[0]);
+
+ assert
+ .dom(".workflows-property-engine__collection-row")
+ .hasClass("--inline-control", "boolean rows use the inline row modifier");
+ assert
+ .dom(
+ ".workflows-property-engine__collection-row .d-toggle-switch__checkbox"
+ )
+ .hasAttribute("aria-checked", "false");
+ assert.deepEqual(this.formApi.get("updates"), {
+ trust_level_locked: false,
+ });
+
+ await click(
+ ".workflows-property-engine__collection-row .d-toggle-switch__checkbox"
+ );
+
+ assert.deepEqual(this.formApi.get("updates"), {
+ trust_level_locked: true,
+ });
+ });
+
test("renders fixed collections with missing group data", async function (assert) {
this.setProperties({
configuration: { entries: {} },
diff --git a/plugins/discourse-workflows/test/javascripts/unit/components/workflows/canvas/node-panel-test.js b/plugins/discourse-workflows/test/javascripts/unit/components/workflows/canvas/node-panel-test.js
new file mode 100644
index 00000000000..3479769f897
--- /dev/null
+++ b/plugins/discourse-workflows/test/javascripts/unit/components/workflows/canvas/node-panel-test.js
@@ -0,0 +1,18 @@
+import { module, test } from "qunit";
+import { sortNodeTypesByLabel } from "discourse/plugins/discourse-workflows/admin/components/workflows/canvas/node-panel";
+
+module("Unit | Component | Workflows | Canvas | NodePanel", function () {
+ test("sorts node types by translated label", function (assert) {
+ const sorted = sortNodeTypesByLabel([
+ { identifier: "action:user" },
+ { identifier: "action:send_chat_message" },
+ { identifier: "action:badge" },
+ ]);
+
+ assert.deepEqual(
+ sorted.map((nodeType) => nodeType.identifier),
+ ["action:badge", "action:send_chat_message", "action:user"],
+ "the node panel order is alphabetical by label"
+ );
+ });
+});