mirror of
https://github.com/we-promise/sure.git
synced 2026-09-05 23:01:26 +00:00
* Add parent/child category hierarchy to all category selects; add search to account select
Category selection consistency:
- DS::Select (shared component powering the main transaction form,
transaction edit, bulk-update, and transfer category pickers) now
indents subcategories with a corner-down-right icon, matching the
existing transaction-row category dropdown.
- Feed DS::Select-based category pickers with Category.alphabetically_by_hierarchy
(parent name, then parent-before-children, then own name) so children
render directly under their parent.
- Added Category::Group.select_options, a shared helper producing
parent-then-child ordered options (with an indent marker) for plain
HTML <select> elements. Used by:
- Rule builder category condition/action selects
- Bulk 'categorize transactions' select
- CSV/QIF import category mapping select
- Grouped the splits category combobox and the transaction search
category filter checklist the same way, both with the
corner-down-right indent icon used elsewhere.
Account selection:
- Added searchable: true to the account select in the new/edit
transaction form, matching the category and merchant selects next
to it.
* Fix SyntaxError: 'for' is a Ruby reserved keyword
Category::Group.select_options called for(categories) as a bare method
call, but Ruby parses a bare 'for' as the start of a for..in loop
statement, not a method invocation. Qualify it as self.for(categories)
to call the class method explicitly.
Verified with 'ruby -c' on all touched .rb files and ERB.new(...).src
on all touched .erb files.
* Add test coverage for category hierarchy and account search
Model-level:
- Category::GroupTest (new): for() grouping and the new select_options
helper (order + indent labels).
- CategoryTest: alphabetically_by_hierarchy scope ordering.
- Rule::ConditionFilter::TransactionCategoryTest (new)
- Rule::ActionExecutor::SetTransactionCategoryTest (new)
- Import::CategoryMappingTest (new): grouping + 'Add as new category'
still prepends correctly.
Controller/integration-level (asserting actual rendered HTML order):
- SplitsControllerTest: category combobox data-value ordering.
- Transactions::CategorizesControllerTest: bulk-categorize <select>
option ordering.
- TransactionsControllerTest:
- search filter checkbox ordering (q[categories][])
- new-transaction DS::Select category ordering (via trigger id +
ancestor traversal)
- new-transaction account select renders a search box
All new/modified test files verified with 'ruby -c' (syntax) and
cross-checked fixture names, family scoping, route helpers, and field
names against the actual fixtures/routes/views. Ruby/Bundler network
access to rubygems.org is unavailable in this sandbox, so the suite
itself has not been executed — run 'bin/rails test' before merging.
* Align with design-sure conventions: keep domain logic in component, not template
Per .cursor/rules/view_conventions.mdc ('keep domain logic out of the
views'), the parent/child hierarchy check for DS::Select items belongs
in the component class, not inline in the ERB template. DS::Select
already has this exact pattern for other per-item derived properties
(color_for, icon_for, logo_for) — added child? alongside them and
updated the template to call it instead of computing it inline.
Added test/components/DS/select_test.rb (ViewComponent::TestCase,
no rendering needed) covering child? directly: subcategory objects,
root-category objects, non-hierarchical objects (merchants), and the
include_blank placeholder item.
Also did a broader pass against the design-sure .cursor/rules to confirm
the rest of this branch's changes already comply:
- Uses Current.family (never current_family) throughout
- Uses the icon() helper exclusively, never lucide_icon directly
- No new/hardcoded colors; only existing semantic Tailwind tokens
already used elsewhere in these same files
- No changes to sure-design-system.css / application.css
- Extended existing components/partials rather than creating new ones
where one already existed (view_conventions.mdc component-vs-partial
guidance)
- Test additions stay in Minitest + fixtures, avoid system tests,
and test query-method output directly (testing.mdc)
* Address CodeRabbit review: sort category groups, tighten test assertion, move grouping out of view
* Address review: fix arrow leak in rule summaries, filter panel alignment, simplify splits ordering
* fix(pages): set breadcrumbs for changelog and feedback pages (#2889)
* fix(app): set breadcrumbs for changelog and feedback pages
* feat(test): add test to assert breadcrumbs
* fix(test): remove changes
* feat(app): update breadcrumbs to use semantic nav element
* feat(test): add breadcrumb assertions to changelog and feedback pages
* fix(app): replace breadcrumb nav element with div containing data-breadcrumbs attribute
* fix ci failures
* resolved failures
* Regenerate schema.rb from migrations
* Fix test
* Remove schema dump noise
---------
Signed-off-by: Shibu M <23173570+DataEnginr@users.noreply.github.com>
Signed-off-by: Juan José Mata <juanjo.mata@gmail.com>
Co-authored-by: Claude <claude@anthropic.com>
Co-authored-by: Kenrick Tandrian <60643640+KenTandrian@users.noreply.github.com>
Co-authored-by: Juan José Mata <juanjo.mata@gmail.com>
105 lines
2.7 KiB
Ruby
105 lines
2.7 KiB
Ruby
class SplitsController < ApplicationController
|
|
before_action :set_entry
|
|
before_action :require_split_write_permission!, only: %i[create update destroy]
|
|
|
|
def new
|
|
@categories = grouped_categories
|
|
end
|
|
|
|
def create
|
|
unless @entry.transaction.splittable?
|
|
redirect_back_or_to transactions_path, alert: t("splits.create.not_splittable")
|
|
return
|
|
end
|
|
|
|
raw_splits = split_params[:splits]
|
|
raw_splits = raw_splits.values if raw_splits.respond_to?(:values)
|
|
|
|
splits = raw_splits.map do |s|
|
|
{ name: s[:name], amount: s[:amount].to_d * -1, category_id: s[:category_id].presence, excluded: s[:excluded] }
|
|
end
|
|
|
|
@entry.split!(splits)
|
|
@entry.sync_account_later
|
|
|
|
redirect_back_or_to transactions_path, notice: t("splits.create.success")
|
|
rescue ActiveRecord::RecordInvalid => e
|
|
redirect_back_or_to transactions_path, alert: e.message
|
|
end
|
|
|
|
def edit
|
|
resolve_to_parent!
|
|
|
|
unless @entry.split_parent?
|
|
redirect_to transactions_path, alert: t("splits.edit.not_split")
|
|
return
|
|
end
|
|
|
|
@categories = grouped_categories
|
|
@children = @entry.child_entries.includes(:entryable)
|
|
end
|
|
|
|
def update
|
|
resolve_to_parent!
|
|
|
|
unless @entry.split_parent?
|
|
redirect_to transactions_path, alert: t("splits.edit.not_split")
|
|
return
|
|
end
|
|
|
|
raw_splits = split_params[:splits]
|
|
raw_splits = raw_splits.values if raw_splits.respond_to?(:values)
|
|
|
|
splits = raw_splits.map do |s|
|
|
{ name: s[:name], amount: s[:amount].to_d * -1, category_id: s[:category_id].presence, excluded: s[:excluded] }
|
|
end
|
|
|
|
Entry.transaction do
|
|
@entry.unsplit!
|
|
@entry.split!(splits)
|
|
end
|
|
|
|
@entry.sync_account_later
|
|
|
|
redirect_to transactions_path, notice: t("splits.update.success")
|
|
rescue ActiveRecord::RecordInvalid => e
|
|
redirect_to transactions_path, alert: e.message
|
|
end
|
|
|
|
def destroy
|
|
resolve_to_parent!
|
|
|
|
unless @entry.split_parent?
|
|
redirect_to transactions_path, alert: t("splits.edit.not_split")
|
|
return
|
|
end
|
|
|
|
@entry.unsplit!
|
|
@entry.sync_account_later
|
|
|
|
redirect_to transactions_path, notice: t("splits.destroy.success")
|
|
end
|
|
|
|
private
|
|
|
|
def set_entry
|
|
@entry = Current.accessible_entries.find(params[:transaction_id])
|
|
end
|
|
|
|
def require_split_write_permission!
|
|
require_account_permission!(@entry.account, redirect_path: transactions_path)
|
|
end
|
|
|
|
def resolve_to_parent!
|
|
@entry = @entry.parent_entry if @entry.split_child?
|
|
end
|
|
|
|
def split_params
|
|
params.require(:split).permit(splits: [ :name, :amount, :category_id, :excluded ])
|
|
end
|
|
|
|
def grouped_categories
|
|
Current.family.categories.alphabetically_by_hierarchy
|
|
end
|
|
end
|