gavin/maybe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 28 Wiki Activity

Fix subconditions and condition group form (#2256)

Browse Source
This commit was merged in pull request #2256.
This commit is contained in:
Alex Hatzenbuhler
2025-05-19 12:34:02 -05:00
committed by GitHub
parent e569ad0a8c
commit 1b4577e21e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/controllers/rule/conditions_controller.js
View File

@@ -13,7 +13,7 @@ export default class extends Controller {
addSubCondition() {
const html = this.subConditionTemplateTarget.innerHTML.replaceAll(
"IDX_PLACEHOLDER",
"IDX_CHILD_PLACEHOLDER",
this.#uniqueKey(),
);
@@ -110,6 +110,6 @@ export default class extends Controller {
}
#uniqueKey() {
return Math.random().toString(36).substring(2, 15);
return Date.now();
}
}

4
app/views/rule/conditions/_condition_group.html.erb
View File

@@ -28,13 +28,13 @@
<%# Sub-condition template, used by Stimulus controller to add new sub-conditions dynamically %>
<template data-rule--conditions-target="subConditionTemplate">
<%= form.fields_for :sub_conditions, Rule::Condition.new(parent: condition, condition_type: rule.condition_filters.first.key), child_index: "IDX_PLACEHOLDER" do |scf| %>
<%= form.fields_for :sub_conditions, Rule::Condition.new(parent: condition, condition_type: rule.condition_filters.first.key), child_index: "IDX_CHILD_PLACEHOLDER" do |scf| %>
<%= render "rule/conditions/condition", form: scf, show_prefix: false %>
<% end %>
</template>
<ul data-rule--conditions-target="subConditionsList" class="space-y-3">
<%= form.fields_for :sub_conditions do |scf| %>
<%= form.fields_for :sub_conditions, condition.sub_conditions.select(&:persisted?) do |scf| %>
<%= render "rule/conditions/condition", form: scf, show_prefix: false %>
<% end %>
</ul>