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

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

2
app/views/rules/_form.html.erb
View file

@ -12,7 +12,7 @@
<section class="space-y-4">
<h3 class="text-sm font-medium text-primary">If <%= rule.resource_type %></h3>
<%# Condition template, used by Stimulus controller to add new conditions dynamically %>
<%# Condition Group template, used by Stimulus controller to add new conditions dynamically %>
<template data-rules-target="conditionGroupTemplate">
<%= f.fields_for :conditions, Rule::Condition.new(rule: rule, condition_type: "compound", operator: "and"), child_index: "IDX_PLACEHOLDER" do |cf| %>
<%= render "rule/conditions/condition_group", form: cf %>

8
app/views/rules/_rule.html.erb
View file

@ -4,12 +4,8 @@
<div class="text-sm space-y-1.5">
<% if rule.conditions.any? %>
<p class="flex items-center flex-wrap gap-1.5">
<span class="px-2 py-1 border border-alpha-black-200 rounded-full">
<% if rule.conditions.first.compound? %>
If <%= rule.conditions.first.sub_conditions.first.filter.label %> <%= rule.conditions.first.sub_conditions.first.operator %> <%= rule.conditions.first.sub_conditions.first.value_display %>
<% else %>
If <%= rule.conditions.first.filter.label %> <%= rule.conditions.first.operator %> <%= rule.conditions.first.value_display %>
<% end %>
<span class="px-2 py-1 border border-secondary rounded-full">
<%= rule.primary_condition_title %>
</span>
<% if rule.conditions.count > 1 %>