mirror of
https://github.com/we-promise/sure.git
synced 2026-05-27 14:34:56 +00:00
* refactor(design-system): migrate 9 hand-rolled buttons with orphan btn-- classes to DS::Button / DS::Link Part of #1715 §5. The `btn`, `btn--primary`, `btn--outline`, `btn--ghost`, `btn--sm` CSS classes have no backing styles anywhere in the codebase (no .btn definition in app/assets/, no Bootstrap dependency). These callsites have been rendering unstyled buttons / links since the underlying CSS was last removed. Migrate the 9 broken callsites: - `app/views/transactions/show.html.erb` — duplicate-merge action buttons (×2): `button_to ... class: "btn btn--primary btn--sm"` / `class: "btn btn--outline btn--sm"` → DS::Button with href + variant + size + `data: { turbo_method: :post }`. - `app/views/snaptrade_items/select_existing_account.html.erb` — "Go to Provider Settings" link → DS::Link primary sm. - `app/views/indexa_capital_items/select_existing_account.html.erb` — same pattern → DS::Link primary sm. - `app/views/import/confirms/show.html.erb` — Publish button + Cancel link → DS::Button primary full-width + DS::Link ghost full-width. - `app/views/simplefin_items/new.html.erb` — Cancel link (`class: "btn"` only) + Connect submit → DS::Link secondary + bare `f.submit` (already routes to DS::Button via StyledFormBuilder). - `app/views/settings/providers/_ibkr_panel.html.erb`, `_snaptrade_panel.html.erb`, `_indexa_capital_panel.html.erb` — strip the orphan `class: "btn btn--primary"` from `f.submit` callers; the submit is already a styled DS::Button via the form builder. The next PR in this chain (Phase B) will tackle the larger inline- button cluster (~29 files, 38 instances) — provider panels and provider-item flows hand-rolling the same `inline-flex items-center justify-center rounded-lg px-4 py-2 text-sm font-medium text-inverse bg-inverse hover:bg-inverse-hover focus:outline-none focus:ring-2 focus:ring-primary transition-colors` string. * refactor(design-system): migrate 38 hand-rolled provider buttons to DS::Button / DS::Link (#1715 §5 part B) Bulk sweep of the second cluster from §5. 29 files, 38 button instances — each one hand-rolled the same long Tailwind string for the primary action button: inline-flex items-center justify-center rounded-lg px-4 py-2 text-sm font-medium text-inverse bg-inverse hover:bg-inverse-hover focus:outline-none focus:ring-2 focus:ring-primary transition-colors (some variations used `button-bg-primary hover:button-bg-primary-hover` instead of `bg-inverse hover:bg-inverse-hover` — same intent). Every instance is now a DS::Button / DS::Link with `variant: :primary`, which: - Picks up the new focus-ring + touch-target work from #1840 once that merges. - Stops duplicating the long Tailwind string across 29 files — single source of truth in `DS::Buttonish::VARIANTS[:primary]`. - Picks up consistent `aria-label` derivation for icon-only forms. - Removes the misnamed `focus:ring-primary` (no token) — the new ring comes from `base.css` automatically. Migration patterns applied: - `f.submit text, class: "inline-flex …"` inside `styled_form_with` → bare `<%= f.submit text %>`. StyledFormBuilder routes through DS::Button. - `link_to text, path, class: "inline-flex …"` → DS::Link primary. - `button_to text, path, method: :X, class: "inline-flex …"` → DS::Button with `href: path` and `data: { turbo_method: :X }`. - `submit_tag text, class: "inline-flex …"` inside raw `form_with` → DS::Button with `type: :submit`. Notable adjustments: - `holdings/show.html.erb` — the form was `form_with` (not styled). Switched to `styled_form_with` so `f.submit` routes through DS::Button. `f.combobox` (hotwire_combobox) still works through the styled builder. - Two `link_to settings_providers_path` callsites in `coinstats_items/new.html.erb` + `enable_banking_items/new.html.erb` had `w-full inline-flex … hidden md:inline-flex` — the responsive pair conflicted (both `inline-flex` and `hidden md:inline-flex` on the same element). Migrated to `full_width: true` without the responsive split; the buttons now render at all breakpoints consistently. (Pre-existing copy-paste bug, fixed in passing.) - `enable_banking_panel` add-connection button gained `icon: "plus"` via the DS::Button API; the explicit `gap-2 … icon "plus"` markup is now redundant. Sibling buttons that don't match the primary spec (destructive trash, secondary outline-bordered, button-bg-secondary-strong on holdings/show.html.erb, etc.) are intentionally left alone — they need their own audit pass once #1840 lands and the focus-ring behavior on those variants is stable. * fix(review): restore SimpleFIN submit styling + i18n provider_form label - SimpleFIN new modal: switch form_with -> styled_form_with so f.submit picks up the DS::Button render via styled builder (Codex #1860). - _provider_form: replace hardcoded "Save and connect" with t(".save_and_connect") and add scoped key under settings.providers.provider_form (CodeRabbit).
194 lines
10 KiB
Plaintext
194 lines
10 KiB
Plaintext
<div class="space-y-4">
|
|
<%
|
|
eb_link = link_to("Enable Banking", "https://enablebanking.com", target: "_blank", rel: "noopener noreferrer", class: "text-primary font-medium underline")
|
|
%>
|
|
<%= render "settings/providers/setup_steps",
|
|
steps: [
|
|
t("settings.providers.enable_banking_panel.step_1_html", link: eb_link),
|
|
t("settings.providers.enable_banking_panel.step_2"),
|
|
t("settings.providers.enable_banking_panel.step_3"),
|
|
t("settings.providers.enable_banking_panel.callback_url_instruction", callback_url: enable_banking_callback_url)
|
|
] %>
|
|
|
|
<% error_msg = local_assigns[:error_message] || @error_message %>
|
|
<% if error_msg.present? %>
|
|
<%= render DS::Alert.new(message: error_msg, variant: :error) %>
|
|
<% end %>
|
|
|
|
<%
|
|
# Use local family variable if available (e.g., from Sidekiq broadcast), otherwise fall back to Current.family (HTTP requests)
|
|
family = local_assigns[:family] || Current.family
|
|
enable_banking_item = family.enable_banking_items.first_or_initialize(name: "Enable Banking Connection")
|
|
is_new_record = enable_banking_item.new_record?
|
|
# Check if there are any authenticated connections (have session_id)
|
|
has_authenticated_connections = family.enable_banking_items.where.not(session_id: nil).exists?
|
|
%>
|
|
|
|
<%= styled_form_with model: enable_banking_item,
|
|
url: is_new_record ? enable_banking_items_path : enable_banking_item_path(enable_banking_item),
|
|
scope: :enable_banking_item,
|
|
method: is_new_record ? :post : :patch,
|
|
data: { turbo: true },
|
|
class: "space-y-3" do |form| %>
|
|
|
|
<%= form.select :country_code,
|
|
options_for_select([
|
|
["Austria (AT)", "AT"],
|
|
["Belgium (BE)", "BE"],
|
|
["Bulgaria (BG)", "BG"],
|
|
["Croatia (HR)", "HR"],
|
|
["Cyprus (CY)", "CY"],
|
|
["Czech Republic (CZ)", "CZ"],
|
|
["Denmark (DK)", "DK"],
|
|
["Estonia (EE)", "EE"],
|
|
["Finland (FI)", "FI"],
|
|
["France (FR)", "FR"],
|
|
["Germany (DE)", "DE"],
|
|
["Greece (GR)", "GR"],
|
|
["Hungary (HU)", "HU"],
|
|
["Iceland (IS)", "IS"],
|
|
["Ireland (IE)", "IE"],
|
|
["Italy (IT)", "IT"],
|
|
["Latvia (LV)", "LV"],
|
|
["Liechtenstein (LI)", "LI"],
|
|
["Lithuania (LT)", "LT"],
|
|
["Luxembourg (LU)", "LU"],
|
|
["Malta (MT)", "MT"],
|
|
["Netherlands (NL)", "NL"],
|
|
["Norway (NO)", "NO"],
|
|
["Poland (PL)", "PL"],
|
|
["Portugal (PT)", "PT"],
|
|
["Romania (RO)", "RO"],
|
|
["Slovakia (SK)", "SK"],
|
|
["Slovenia (SI)", "SI"],
|
|
["Spain (ES)", "ES"],
|
|
["Sweden (SE)", "SE"],
|
|
["United Kingdom (GB)", "GB"]
|
|
], enable_banking_item.country_code),
|
|
{ label: true, include_blank: t("settings.providers.enable_banking_panel.select_country") },
|
|
{ label: t("settings.providers.enable_banking_panel.country_label"), class: "form-field__input" } %>
|
|
|
|
<% if has_authenticated_connections && !is_new_record %>
|
|
<%= render DS::Alert.new(
|
|
variant: :warning,
|
|
title: t("settings.providers.enable_banking_panel.config_locked_title"),
|
|
message: t("settings.providers.enable_banking_panel.config_locked_message")
|
|
) %>
|
|
<% end %>
|
|
|
|
<%= form.text_field :application_id,
|
|
label: t("settings.providers.enable_banking_panel.application_id_label"),
|
|
placeholder: is_new_record ? t("settings.providers.enable_banking_panel.application_id_placeholder_new") : t("settings.providers.enable_banking_panel.application_id_placeholder_update"),
|
|
value: enable_banking_item.application_id,
|
|
disabled: has_authenticated_connections && !is_new_record %>
|
|
|
|
<%= form.text_area :client_certificate,
|
|
label: t("settings.providers.enable_banking_panel.client_certificate_label"),
|
|
placeholder: "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----\n-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----",
|
|
rows: 6,
|
|
class: "form-field__input font-mono text-xs",
|
|
disabled: has_authenticated_connections && !is_new_record %>
|
|
|
|
<div class="flex justify-end">
|
|
<%= form.submit is_new_record ? t("settings.providers.enable_banking_panel.save_and_connect") : t("settings.providers.enable_banking_panel.update_connection") %>
|
|
</div>
|
|
<% end %>
|
|
|
|
<% items = local_assigns[:enable_banking_items] || @enable_banking_items || family.enable_banking_items.where.not(client_certificate: nil) %>
|
|
<% if items&.any? %>
|
|
<%
|
|
# Find the first item with valid session to use for "Add Connection" button
|
|
item_for_new_connection = items.find(&:session_valid?)
|
|
# Check if any item needs initial connection (configured but no session yet)
|
|
item_needing_connection = items.find { |i| !i.session_valid? && !i.session_expired? }
|
|
%>
|
|
<div class="border-t border-primary pt-4 space-y-3">
|
|
<% items.each do |item| %>
|
|
<div class="flex items-center justify-between p-3 rounded-lg bg-container border border-primary">
|
|
<div class="flex items-center gap-3">
|
|
<% if item.syncing? %>
|
|
<div class="w-2 h-2 bg-inverse rounded-full animate-pulse"></div>
|
|
<div>
|
|
<p class="text-sm font-medium text-primary"><%= item.aspsp_name || t("settings.providers.enable_banking_panel.syncing", default: "Syncing") %></p>
|
|
<p class="text-xs text-secondary"><%= t("settings.providers.enable_banking_panel.syncing", default: "Syncing") %></p>
|
|
</div>
|
|
<% elsif item.sync_error.present? %>
|
|
<div class="w-2 h-2 bg-destructive rounded-full"></div>
|
|
<div>
|
|
<p class="text-sm font-medium text-primary"><%= item.aspsp_name || t("settings.providers.enable_banking_panel.connection_error") %></p>
|
|
<p class="text-xs text-destructive" title="<%= item.sync_error %>"><%= item.sync_error.truncate(50) %></p>
|
|
</div>
|
|
<% elsif item.session_valid? %>
|
|
<div class="w-2 h-2 bg-success rounded-full"></div>
|
|
<div>
|
|
<p class="text-sm font-medium text-primary"><%= item.aspsp_name || t("settings.providers.enable_banking_panel.connected_bank") %></p>
|
|
<p class="text-xs text-secondary">
|
|
<%= t("settings.providers.enable_banking_panel.session_expires", date: item.session_expires_at&.strftime("%b %d, %Y") || t("settings.providers.enable_banking_panel.unknown")) %>
|
|
</p>
|
|
</div>
|
|
<% elsif item.session_expired? %>
|
|
<div class="w-2 h-2 bg-warning rounded-full"></div>
|
|
<div>
|
|
<p class="text-sm font-medium text-primary"><%= item.aspsp_name || t("settings.providers.enable_banking_panel.connection") %></p>
|
|
<p class="text-xs text-destructive"><%= t("settings.providers.enable_banking_panel.session_expired_reconnect") %></p>
|
|
</div>
|
|
<% else %>
|
|
<div class="w-2 h-2 bg-secondary rounded-full"></div>
|
|
<div>
|
|
<p class="text-sm font-medium text-primary"><%= t("settings.providers.enable_banking_panel.configured") %></p>
|
|
<p class="text-xs text-secondary"><%= t("settings.providers.enable_banking_panel.ready_to_link") %></p>
|
|
</div>
|
|
<% end %>
|
|
</div>
|
|
|
|
<div class="flex items-center gap-2">
|
|
<% if item.session_valid? %>
|
|
<%= button_to sync_enable_banking_item_path(item),
|
|
method: :post,
|
|
class: "inline-flex items-center justify-center rounded-lg px-3 py-1.5 text-xs font-medium text-primary bg-container border border-primary hover:bg-surface-inset transition-colors",
|
|
data: { turbo: false } do %>
|
|
<%= t("settings.providers.enable_banking_panel.sync") %>
|
|
<% end %>
|
|
<% elsif item.session_expired? %>
|
|
<%= button_to reauthorize_enable_banking_item_path(item),
|
|
method: :post,
|
|
class: "inline-flex items-center justify-center rounded-lg px-3 py-1.5 text-xs font-medium text-white bg-warning hover:opacity-90 transition-colors",
|
|
data: { turbo: false } do %>
|
|
<%= t("settings.providers.enable_banking_panel.reconnect") %>
|
|
<% end %>
|
|
<% else %>
|
|
<%= render DS::Link.new(
|
|
text: t("settings.providers.enable_banking_panel.connect_bank"),
|
|
href: select_bank_enable_banking_item_path(item),
|
|
variant: :primary,
|
|
size: :sm,
|
|
data: { turbo_frame: "modal" }
|
|
) %>
|
|
<% end %>
|
|
|
|
<%= button_to enable_banking_item_path(item),
|
|
method: :delete,
|
|
class: "inline-flex items-center justify-center rounded-lg px-3 py-1.5 text-xs font-medium text-destructive hover:bg-destructive/10 transition-colors",
|
|
data: { turbo_confirm: t("settings.providers.enable_banking_panel.remove_confirm") } do %>
|
|
<%= t("settings.providers.enable_banking_panel.remove") %>
|
|
<% end %>
|
|
</div>
|
|
</div>
|
|
<% end %>
|
|
|
|
<%# Add Connection button below the list - only show if we have a valid session to copy credentials from %>
|
|
<% if item_for_new_connection %>
|
|
<div class="flex justify-center pt-2">
|
|
<%= render DS::Button.new(
|
|
text: t("settings.providers.enable_banking_panel.add_connection"),
|
|
icon: "plus",
|
|
href: new_connection_enable_banking_item_path(item_for_new_connection),
|
|
variant: :primary,
|
|
data: { turbo_method: :post, turbo_frame: "modal" }
|
|
) %>
|
|
</div>
|
|
<% end %>
|
|
</div>
|
|
<% end %>
|
|
</div>
|