mirror of
https://github.com/we-promise/sure.git
synced 2026-04-08 06:44:52 +00:00
* Add security remapping support to holdings - Introduced `provider_security` tracking for holdings with schema updates. - Implemented security remap/reset workflows in `Holding` model and UI. - Updated routes, controllers, and tests to support new functionality. - Enhanced client-side interaction with Stimulus controller for remapping. # Conflicts: # app/components/UI/account/activity_feed.html.erb # db/schema.rb * Refactor "New transaction" to "New activity" across UI and tests - Updated localized strings, button labels, and ARIA attributes. - Improved error handling in holdings' current price display. - Scoped fallback queries in `provider_import_adapter` to prevent overwrites. - Added safeguard for offline securities in price fetching logic. * Update security remapping to merge holdings on collision by deleting duplicates - Removed error handling for collisions in `remap_security!`. - Added logic to merge holdings by deleting duplicates on conflicting dates. - Modified associated test to validate merging behavior. * Update security remapping to merge holdings on collision by combining qty and amount - Modified `remap_security!` to merge holdings by summing `qty` and `amount` on conflicting dates. - Adjusted logic to calculate `price` for merged holdings. - Updated test to validate new merge behavior. * Improve DOM handling in Turbo redirect action & enhance holdings merge logic - Updated Turbo's custom `redirect` action to use the "replace" option for cleaner DOM updates without clearing the cache. - Enhanced holdings merge logic to calculate weighted average cost basis during security remapping, ensuring more accurate cost_basis updates. * Track provider_security_id during security updates to support reset workflows * Fix provider tracking: guard nil ticker lookups and preserve merge attrs - Guard fallback 1b lookup when security.ticker is blank to avoid matching NULL tickers - Preserve external_id, provider_security_id, account_provider_id during collision merge * Fix schema.rb version after merge (includes tax_treatment migration) * fix: Rename migration to run after schema version The migration 20260117000001 was skipped in CI because it had a timestamp earlier than the schema version (2026_01_17_200000). CI loads schema.rb directly and only runs migrations with versions after the schema version. Renamed to 20260119000001 so it runs correctly. * Update schema: remove Coinbase tables, add new fields and indexes * Update schema: add back `tax_treatment` field with default value "taxable" * Improve Turbo redirect action: use "replace" to avoid form submission in history * Lock merged holdings to prevent provider overwrites and fix activity feed template indentation * Refactor holdings transfer logic: enforce currency checks during collisions and enhance merge handling --------- Signed-off-by: Juan José Mata <juanjo.mata@gmail.com> Co-authored-by: luckyPipewrench <luckypipewrench@proton.me> Co-authored-by: Juan José Mata <juanjo.mata@gmail.com>
164 lines
7.3 KiB
Plaintext
164 lines
7.3 KiB
Plaintext
<%= turbo_frame_tag dom_id(account, "entries") do %>
|
|
<div class="bg-container px-3 py-4 lg:p-4 shadow-border-xs rounded-xl" data-controller="checkbox-toggle">
|
|
<div class="flex items-center justify-between mb-4" data-testid="activity-menu">
|
|
<%= tag.h2 t("accounts.show.activity.title"), class: "font-medium text-lg" %>
|
|
|
|
<%# Show menu if: manual (can add balance) OR non-crypto (can add transactions) %>
|
|
<%# This hides the menu only for linked crypto accounts who have no actions %>
|
|
<% if !account.linked? || !account.crypto? %>
|
|
<%= render DS::Menu.new(variant: "button") do |menu| %>
|
|
<% menu.with_button(text: t("accounts.show.activity.new"), variant: "secondary", icon: "plus") %>
|
|
|
|
<% unless account.linked? %>
|
|
<% menu.with_item(
|
|
variant: "link",
|
|
text: t("accounts.show.activity.new_balance"),
|
|
icon: "circle-dollar-sign",
|
|
href: new_valuation_path(account_id: account.id),
|
|
data: { turbo_frame: :modal }) %>
|
|
<% end %>
|
|
|
|
<% unless account.crypto? %>
|
|
<% if account.investment? %>
|
|
<% menu.with_item(
|
|
variant: "link",
|
|
text: t("accounts.show.activity.new_activity"),
|
|
icon: "arrow-left-right",
|
|
href: new_trade_path(account_id: account.id),
|
|
data: { turbo_frame: :modal }) %>
|
|
<% else %>
|
|
<% menu.with_item(
|
|
variant: "link",
|
|
text: t("accounts.show.activity.new_transaction"),
|
|
icon: "credit-card",
|
|
href: new_transaction_path(account_id: account.id),
|
|
data: { turbo_frame: :modal }) %>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<% menu.with_item(
|
|
variant: "link",
|
|
text: t("accounts.show.activity.new_transfer"),
|
|
icon: "arrow-right-left",
|
|
href: new_transfer_path(from_account_id: account.id),
|
|
data: { turbo_frame: :modal }) %>
|
|
<% end %>
|
|
<% end %>
|
|
</div>
|
|
|
|
<div>
|
|
<%= form_with url: account_path(account),
|
|
id: "entries-search",
|
|
scope: :q,
|
|
method: :get,
|
|
data: { controller: "auto-submit-form" } do |form| %>
|
|
<div class="flex gap-2 mb-4">
|
|
<div class="grow">
|
|
<div class="flex items-center px-3 py-2 gap-2 border border-secondary rounded-lg focus-within:ring-gray-100 focus-within:border-gray-900">
|
|
<%= helpers.icon("search") %>
|
|
|
|
<%= hidden_field_tag :account_id, account.id %>
|
|
|
|
<%= form.search_field :search,
|
|
placeholder: t("accounts.show.activity.search.placeholder"),
|
|
value: search,
|
|
class: "form-field__input placeholder:text-sm placeholder:text-secondary",
|
|
"data-auto-submit-form-target": "auto" %>
|
|
</div>
|
|
</div>
|
|
|
|
<%= render DS::Menu.new(variant: "button", no_padding: true) do |menu| %>
|
|
<% menu.with_button(
|
|
id: "activity-status-filter-button",
|
|
type: "button",
|
|
text: t("accounts.show.activity.filter"),
|
|
variant: "outline",
|
|
icon: "list-filter"
|
|
) %>
|
|
|
|
<% menu.with_custom_content do %>
|
|
<div class="p-3 space-y-3 min-w-[160px]">
|
|
<p class="text-xs font-medium text-secondary uppercase"><%= t("accounts.show.activity.status") %></p>
|
|
<div class="flex items-center gap-3">
|
|
<%= check_box_tag "q[status][]",
|
|
"confirmed",
|
|
params.dig(:q, :status)&.include?("confirmed"),
|
|
id: "q_status_confirmed",
|
|
class: "checkbox checkbox--light",
|
|
form: "entries-search",
|
|
onchange: "document.getElementById('entries-search').requestSubmit()" %>
|
|
<%= label_tag "q_status_confirmed", t("accounts.show.activity.confirmed"), class: "text-sm text-primary" %>
|
|
</div>
|
|
<div class="flex items-center gap-3">
|
|
<%= check_box_tag "q[status][]",
|
|
"pending",
|
|
params.dig(:q, :status)&.include?("pending"),
|
|
id: "q_status_pending",
|
|
class: "checkbox checkbox--light",
|
|
form: "entries-search",
|
|
onchange: "document.getElementById('entries-search').requestSubmit()" %>
|
|
<%= label_tag "q_status_pending", t("accounts.show.activity.pending"), class: "text-sm text-primary" %>
|
|
</div>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
<% end %>
|
|
<%= button_tag type: "button",
|
|
id: "toggle-checkboxes-button",
|
|
aria: { label: t(".toggle_selection_checkboxes") },
|
|
class: "lg:hidden font-medium whitespace-nowrap inline-flex items-center gap-1 rounded-lg px-3 py-2 text-sm text-primary border border-secondary hover:bg-surface-hover",
|
|
data: {
|
|
action: "click->checkbox-toggle#toggle",
|
|
checkbox_toggle_target: "toggleButton"
|
|
} do %>
|
|
<%= helpers.icon("list-todo") %>
|
|
<% end %>
|
|
</div>
|
|
</div>
|
|
|
|
<% if activity_dates.empty? %>
|
|
<%= tag.p t("accounts.show.activity.no_entries"), class: "text-secondary text-sm p-4" %>
|
|
<% else %>
|
|
<%= tag.div id: dom_id(account, "entries_bulk_select"),
|
|
data: {
|
|
controller: "bulk-select",
|
|
bulk_select_singular_label_value: "entry",
|
|
bulk_select_plural_label_value: "entries"
|
|
} do %>
|
|
<div id="entry-selection-bar" data-bulk-select-target="selectionBar" class="flex justify-center hidden">
|
|
<%= render "entries/selection_bar" %>
|
|
</div>
|
|
|
|
<div class="grid bg-container-inset rounded-xl grid-cols-12 items-center uppercase text-xs font-medium text-secondary px-5 py-3 mb-4">
|
|
<div class="pl-0.5 col-span-8 flex items-center gap-4">
|
|
<%= check_box_tag "selection_entry",
|
|
class: "checkbox checkbox--light hidden lg:block",
|
|
data: {
|
|
action: "bulk-select#togglePageSelection",
|
|
checkbox_toggle_target: "selectionEntry"
|
|
} %>
|
|
<%= tag.p t("accounts.show.activity.date") %>
|
|
</div>
|
|
|
|
<%= tag.p t("accounts.show.activity.amount"), class: "col-span-4 justify-self-end" %>
|
|
</div>
|
|
|
|
<div>
|
|
<div class="space-y-4">
|
|
<% activity_dates.each do |activity_date_data| %>
|
|
<%= render UI::Account::ActivityDate.new(
|
|
account: account,
|
|
data: activity_date_data
|
|
) %>
|
|
<% end %>
|
|
</div>
|
|
|
|
<div class="p-4 bg-container rounded-bl-lg rounded-br-lg">
|
|
<%= render "shared/pagination", pagy: pagy %>
|
|
</div>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
</div>
|
|
<% end %>
|