Docker/Maybe
Docker/Maybe
1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-07-20 05:39:39 +02:00
Code Issues Releases Activity Actions 1

Fix AND prefix on rule form (#2234)

Browse source 
* Fix AND prefix on rule form

This new condition prefix data target is used to ensure the AND prefix is added/removed to additional conditions/groups when there aren't any saved conditions yet.

* Ensure the condition group "Add condition" button is type button to avoid form submission

* Add prefix update when removing a subcondition

* Use data condition to update the prefix on conditions, condition groups, and subconditions

* Use condition remove instead of element remove for condition groups so prefix logic runs

* Add back explicit show_prefixes to ensure subconditions never have a prefix

* Run the prefix update runs on a load of a form, which handles prefixes on an edit since no conditions change

* Ensure saved items that are marked for removal don't impact the index

* Simplify logic since we don't process subconditions

* Clean up comments

* Add primary_condition_title field to rule model
This commit is contained in:
Alex Hatzenbuhler 2025-05-13 09:34:41 -05:00 • committed by GitHub
parent df8e22afe9
commit 30d3eef67f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 70 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/javascript/controllers/rules_controller.js
View file

@ -11,11 +11,17 @@ export default class extends Controller {
"effectiveDateInput",
];
connect() {
// Update condition prefixes on first connection (form render on edit)
this.updateConditionPrefixes();
}
addConditionGroup() {
this.#appendTemplate(
this.conditionGroupTemplateTarget,
this.conditionsListTarget,
);
this.updateConditionPrefixes();
}
addCondition() {
@ -23,6 +29,7 @@ export default class extends Controller {
this.conditionTemplateTarget,
this.conditionsListTarget,
);
this.updateConditionPrefixes();
}
addAction() {
@ -45,4 +52,27 @@ export default class extends Controller {
#uniqueKey() {
return Date.now();
}
// Updates the prefix visibility of all conditions and condition groups
// This is also called by the rule/conditions_controller when a subcondition is removed
updateConditionPrefixes() {
const conditions = Array.from(this.conditionsListTarget.children);
let conditionIndex = 0;
conditions.forEach((condition) => {
// Only process visible conditions, this prevents conditions that are marked for removal and hidden
// from being added to the index. This is important when editing a rule.
if (!condition.classList.contains('hidden')) {
const prefixEl = condition.querySelector('[data-condition-prefix]');
if (prefixEl) {
if (conditionIndex === 0) {
prefixEl.classList.add('hidden');
} else {
prefixEl.classList.remove('hidden');
}
conditionIndex++;
}
}
});
}
}