mirror of
https://github.com/we-promise/sure.git
synced 2026-09-09 08:34:26 +00:00
William Wei MingandCursor
8cffeaaefd
* fix(ds): resolve remaining DS Drift findings from #1971 Migrate leftover preference currency badges and the admin invitation delete control to DS::Pill / DS::Button. Drop a redundant Enable Banking beta_label default now that the locale key exists. Closes #1971 Co-authored-by: Cursor <cursoragent@cursor.com> * chore(ds): drop duplicate admin invite button from #1971 PR Leave the invitation delete DS::Button migration to #2979, which also touches admin/users/index.html.erb, to avoid a same-hunk merge conflict. Co-authored-by: Cursor <cursoragent@cursor.com> * chore(ds): drop duplicate Enable Banking beta_label from #1971 PR #2977 already removes the same t(..., default:) on select_bank; leave that hunk there so the two PRs don't touch the identical line. Co-authored-by: Cursor <cursoragent@cursor.com> * chore(ds): drop redundant DS::Pill size: :sm defaults size: :sm is already the initializer default; remove the explicit arg from the preferences currency pills per review. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com>
293 lines
15 KiB
ERB
293 lines
15 KiB
ERB
<%= content_for :page_title, t(".page_title") %>
|
|
<%= settings_section title: t(".general_title"), subtitle: t(".general_subtitle") do %>
|
|
<div>
|
|
<%= styled_form_with model: @user, class: "space-y-4", data: { controller: "auto-submit-form" } do |form| %>
|
|
<%= form.hidden_field :redirect_to, value: "preferences" %>
|
|
<%= form.select :locale,
|
|
language_options,
|
|
{ label: t(".language"), include_blank: t(".language_auto") },
|
|
{ data: { auto_submit_form_target: "auto" } } %>
|
|
<%= form.fields_for :family do |family_form| %>
|
|
<%= family_form.select :timezone,
|
|
timezone_options,
|
|
{ label: t(".timezone") },
|
|
{ data: { auto_submit_form_target: "auto" } } %>
|
|
<%= family_form.select :date_format,
|
|
Family::DATE_FORMATS,
|
|
{ label: t(".date_format") },
|
|
{ data: { auto_submit_form_target: "auto" } } %>
|
|
<%= form.select :default_account_order,
|
|
AccountOrder.all.map { |order| [ order.label, order.key ] },
|
|
{ label: t(".default_account_order") },
|
|
{ data: { auto_submit_form_target: "auto" } } %>
|
|
<%= family_form.select :country,
|
|
country_options,
|
|
{ label: t(".country") },
|
|
{ data: { auto_submit_form_target: "auto" } } %>
|
|
<p class="text-xs italic pl-2 text-secondary"><%= t(".translations_notice") %></p>
|
|
<% end %>
|
|
<% end %>
|
|
</div>
|
|
<% end %>
|
|
<%= settings_section title: t(".budget_title"), subtitle: t(".budget_subtitle") do %>
|
|
<div>
|
|
<%= styled_form_with model: @user, class: "space-y-4", data: { controller: "auto-submit-form" } do |form| %>
|
|
<%= form.hidden_field :redirect_to, value: "preferences" %>
|
|
<%= form.fields_for :family do |family_form| %>
|
|
<%= family_form.select :month_start_day,
|
|
(1..28).map { |day| [localized_ordinal(day), day] },
|
|
{ label: t(".month_start_day"), hint: t(".month_start_day_hint") },
|
|
{ data: { auto_submit_form_target: "auto" } } %>
|
|
<% if @user.family.uses_custom_month_start? %>
|
|
<%= render DS::Alert.new(message: t(".month_start_day_warning"), variant: :warning) %>
|
|
<% end %>
|
|
<% if Current.user.admin? && preview_features_enabled? %>
|
|
<div class="flex items-center justify-between">
|
|
<div class="space-y-1">
|
|
<p class="text-sm flex items-center gap-1.5">
|
|
<%= t(".personal_budgets") %>
|
|
<%= render DS::Pill.new(label: t("shared.preview"), size: :sm) %>
|
|
</p>
|
|
<p class="text-secondary text-sm"><%= t(".personal_budgets_hint") %></p>
|
|
</div>
|
|
<%= family_form.toggle :personal_budgets,
|
|
data: { auto_submit_form_target: "auto" } %>
|
|
</div>
|
|
|
|
<% if @user.family.personal_budgets? %>
|
|
<div class="flex items-center justify-between">
|
|
<div class="space-y-1">
|
|
<p class="text-sm"><%= t(".household_budget_enabled") %></p>
|
|
<p class="text-secondary text-sm"><%= t(".household_budget_enabled_hint") %></p>
|
|
</div>
|
|
<%= family_form.toggle :household_budget_enabled,
|
|
data: { auto_submit_form_target: "auto" } %>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
<% end %>
|
|
<% end %>
|
|
</div>
|
|
<% end %>
|
|
<% if @user.family.personal_budgets? && preview_features_enabled? %>
|
|
<%= settings_section title: t(".budget_sharing_title"), subtitle: t(".budget_sharing_subtitle") do %>
|
|
<% if @family_members.any? %>
|
|
<%= styled_form_with url: settings_budget_shares_path, method: :patch, class: "space-y-4", data: { controller: "auto-submit-form" } do |form| %>
|
|
<div class="bg-container-inset rounded-xl p-1">
|
|
<% @family_members.each_with_index do |member, index| %>
|
|
<% share = @budget_shares[member.id] %>
|
|
<% select_id = "budget_share_permission_#{member.id}" %>
|
|
<input type="hidden" name="budget_shares[members][<%= index %>][viewer_id]" value="<%= member.id %>">
|
|
<div class="flex items-center justify-between gap-3 bg-container p-4 shadow-border-xs rounded-lg mt-2">
|
|
<div class="flex items-center gap-2 min-w-0">
|
|
<div class="w-8 h-8 shrink-0 rounded-full bg-surface-inset flex items-center justify-center text-xs font-medium text-secondary">
|
|
<%= member.initials %>
|
|
</div>
|
|
<span class="text-sm text-primary truncate"><%= member.display_name %></span>
|
|
</div>
|
|
<label for="<%= select_id %>" class="sr-only"><%= t(".budget_sharing_permission_label", name: member.display_name) %></label>
|
|
<select id="<%= select_id %>" name="budget_shares[members][<%= index %>][permission]" class="text-sm border border-primary rounded-lg px-3 py-1.5 bg-container text-primary" data-auto-submit-form-target="auto">
|
|
<option value="" <%= "selected" if share.nil? %>><%= t(".budget_sharing_permissions.none") %></option>
|
|
<% BudgetShare::PERMISSIONS.each do |perm| %>
|
|
<option value="<%= perm %>" <%= "selected" if share&.permission == perm %>>
|
|
<%= t(".budget_sharing_permissions.#{perm}") %>
|
|
</option>
|
|
<% end %>
|
|
</select>
|
|
</div>
|
|
<% end %>
|
|
</div>
|
|
<% end %>
|
|
<% else %>
|
|
<p class="text-sm text-secondary"><%= t(".budget_sharing_no_members", moniker: family_moniker_downcase) %></p>
|
|
<% end %>
|
|
<% end %>
|
|
<% end %>
|
|
<% if Current.user.admin? %>
|
|
<%= settings_section title: t(".currencies_title", moniker: family_moniker), subtitle: t(".currencies_subtitle", moniker: family_moniker_downcase) do %>
|
|
<% selected_count_translations = t(".selected_currencies_count") %>
|
|
<div class="space-y-4"
|
|
data-controller="currency-preferences"
|
|
data-currency-preferences-base-currency-value="<%= @user.family.primary_currency_code %>"
|
|
data-currency-preferences-locale-value="<%= I18n.locale %>"
|
|
data-currency-preferences-selected-count-translations-value="<%= selected_count_translations.to_json %>">
|
|
<% additional_preview_currencies = @user.family.secondary_enabled_currency_objects.first(6) %>
|
|
<% additional_currency_count = @user.family.secondary_enabled_currency_objects.count %>
|
|
<div class="rounded-xl border border-secondary p-4 bg-container-inset">
|
|
<div class="grid gap-4 md:grid-cols-2">
|
|
<div>
|
|
<p class="text-xs font-medium uppercase tracking-wide text-secondary"><%= t(".base_currency_label") %></p>
|
|
<div class="mt-2">
|
|
<p class="text-sm font-medium text-primary"><%= @user.family.primary_currency_code %></p>
|
|
<p class="text-sm text-secondary"><%= currency_label(@user.family.primary_currency_code) %></p>
|
|
</div>
|
|
</div>
|
|
<div class="md:border-l md:border-secondary md:pl-4">
|
|
<p class="text-xs font-medium uppercase tracking-wide text-secondary"><%= t(".additional_currencies_label") %></p>
|
|
<% if additional_preview_currencies.any? %>
|
|
<div class="mt-2 flex flex-wrap gap-2">
|
|
<% additional_preview_currencies.each do |currency| %>
|
|
<%= render DS::Pill.new(label: currency.iso_code, tone: :neutral, marker: false) %>
|
|
<% end %>
|
|
<% if additional_currency_count > additional_preview_currencies.count %>
|
|
<%= render DS::Pill.new(
|
|
label: t(".currencies_more", count: additional_currency_count - additional_preview_currencies.count),
|
|
tone: :neutral,
|
|
marker: false
|
|
) %>
|
|
<% end %>
|
|
</div>
|
|
<% else %>
|
|
<p class="mt-2 text-sm text-secondary"><%= t(".no_additional_currencies") %></p>
|
|
<% end %>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="flex justify-end">
|
|
<%= render DS::Button.new(
|
|
text: t(".manage_currencies"),
|
|
type: :button,
|
|
class: "md:w-auto w-full justify-center",
|
|
data: { action: "currency-preferences#open" }
|
|
) %>
|
|
</div>
|
|
<%= render DS::Dialog.new(
|
|
id: "currency-preferences-dialog",
|
|
auto_open: false,
|
|
disable_frame: true,
|
|
width: "md",
|
|
data: { currency_preferences_target: "dialog" }
|
|
) do |dialog| %>
|
|
<% dialog.with_header(title: t(".manage_currencies"), subtitle: t(".manage_currencies_subtitle")) %>
|
|
<% dialog.with_body do %>
|
|
<% primary_currency_code = @user.family.primary_currency_code %>
|
|
<% selected_currency_codes = @user.family.enabled_currency_codes %>
|
|
<% base_currency_rows, other_currency_rows = Money::Currency.as_options.partition { |currency| currency.iso_code == primary_currency_code } %>
|
|
<% currency_rows = base_currency_rows + other_currency_rows %>
|
|
<%= styled_form_with model: @user, url: user_path(@user), class: "space-y-4", data: { action: "turbo:submit-end->currency-preferences#handleSubmitEnd" } do |form| %>
|
|
<%= form.hidden_field :redirect_to, value: "preferences" %>
|
|
<%= hidden_field_tag "user[family_attributes][id]", @user.family.id %>
|
|
<%= hidden_field_tag "user[family_attributes][enabled_currencies][]", primary_currency_code, id: nil %>
|
|
<div class="flex flex-wrap items-center justify-between gap-3">
|
|
<div class="flex flex-wrap gap-2">
|
|
<%= render DS::Button.new(
|
|
text: t(".select_all_currencies"),
|
|
type: :button,
|
|
variant: :ghost,
|
|
size: :sm,
|
|
data: { action: "currency-preferences#selectAll" }
|
|
) %>
|
|
<%= render DS::Button.new(
|
|
text: t(".select_base_only"),
|
|
type: :button,
|
|
variant: :ghost,
|
|
size: :sm,
|
|
data: { action: "currency-preferences#selectBaseOnly" }
|
|
) %>
|
|
</div>
|
|
<p class="text-sm font-medium text-secondary"
|
|
data-currency-preferences-target="selectedCount"
|
|
role="status"
|
|
aria-live="polite"
|
|
aria-atomic="true"></p>
|
|
</div>
|
|
<div data-controller="list-filter" class="space-y-3">
|
|
<%= render DS::SearchInput.new(
|
|
placeholder: t(".currency_search_placeholder"),
|
|
data: {
|
|
list_filter_target: "input",
|
|
action: "input->list-filter#filter"
|
|
}
|
|
) %>
|
|
<div data-list-filter-target="list" class="max-h-80 overflow-auto rounded-xl border border-secondary divide-y divide-alpha-black-100 theme-dark:divide-alpha-white-100">
|
|
<p class="hidden px-4 py-3 text-sm text-secondary" data-list-filter-target="emptyMessage">
|
|
<%= t(".no_matching_currencies") %>
|
|
</p>
|
|
<% currency_rows.each do |currency| %>
|
|
<% checked = selected_currency_codes.include?(currency.iso_code) %>
|
|
<% base_currency = currency.iso_code == primary_currency_code %>
|
|
<label class="<%= class_names(
|
|
"filterable-item flex items-start gap-3 px-4 py-3 cursor-pointer transition-colors hover:bg-surface-inset",
|
|
"bg-surface-inset": base_currency,
|
|
"cursor-default": base_currency
|
|
) %>"
|
|
data-filter-name="<%= "#{currency.iso_code} #{currency.name}" %>">
|
|
<%= check_box_tag "user[family_attributes][enabled_currencies][]",
|
|
currency.iso_code,
|
|
checked,
|
|
disabled: base_currency,
|
|
class: "checkbox checkbox--light mt-0.5",
|
|
data: {
|
|
currency_preferences_target: "checkbox",
|
|
action: "change->currency-preferences#updateSelectedCount"
|
|
} %>
|
|
<div class="min-w-0 flex-1">
|
|
<div class="flex items-start justify-between gap-3">
|
|
<div class="min-w-0">
|
|
<div class="flex items-center gap-2">
|
|
<span class="text-sm font-medium text-primary"><%= currency.iso_code %></span>
|
|
<% if base_currency %>
|
|
<%= render DS::Pill.new(label: t(".base_currency_badge"), tone: :neutral, marker: false) %>
|
|
<% end %>
|
|
</div>
|
|
<p class="mt-0.5 text-sm text-secondary"><%= currency.name %></p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</label>
|
|
<% end %>
|
|
</div>
|
|
</div>
|
|
<div class="flex justify-end gap-2">
|
|
<%= render DS::Button.new(text: t("shared.cancel"), type: :button, variant: :ghost, data: { action: "DS--dialog#close" }) %>
|
|
<%= render DS::Button.new(text: t(".save_currencies"), type: :submit) %>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
<% end %>
|
|
</div>
|
|
<% end %>
|
|
<%= settings_section title: t(".sharing_title", moniker: family_moniker), subtitle: t(".sharing_subtitle", moniker: family_moniker_downcase) do %>
|
|
<div>
|
|
<%= styled_form_with model: @user, class: "space-y-4", data: { controller: "auto-submit-form" } do |form| %>
|
|
<%= form.hidden_field :redirect_to, value: "preferences" %>
|
|
<%= form.fields_for :family do |family_form| %>
|
|
<%= family_form.select :default_account_sharing,
|
|
[
|
|
[t(".sharing_shared"), "shared"],
|
|
[t(".sharing_private"), "private"]
|
|
],
|
|
{ label: t(".sharing_default_label") },
|
|
{ data: { auto_submit_form_target: "auto" } } %>
|
|
<% end %>
|
|
<% end %>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<%# Preview features toggle — visible to all users, not just admins. Lives at
|
|
the bottom of Preferences as a standalone card (no section header) so the
|
|
toggle row is the entire surface. Posts directly to
|
|
settings#preferences#update via the Settings::PreferencesController,
|
|
matching the auto-submit pattern used on the Appearance page. %>
|
|
<%= settings_section do %>
|
|
<%= form_with url: settings_preferences_path, method: :patch,
|
|
data: { controller: "auto-submit-form" } do |f| %>
|
|
<%# Wrapping the row in <label for=…> makes the title + description
|
|
themselves a click target for the toggle, so the cursor-pointer
|
|
affordance on the container is honest. %>
|
|
<label for="user_preview_features_enabled" class="flex cursor-pointer items-center gap-4 justify-between">
|
|
<div class="text-sm space-y-1">
|
|
<p class="text-primary font-medium"><%= t(".preview.title") %></p>
|
|
<p class="text-secondary"><%= t(".preview.description") %></p>
|
|
</div>
|
|
<%= render DS::Toggle.new(
|
|
id: "user_preview_features_enabled",
|
|
name: "user[preview_features_enabled]",
|
|
checked: @user.preview_features_enabled?,
|
|
data: { auto_submit_form_target: "auto" }
|
|
) %>
|
|
</label>
|
|
<% end %>
|
|
<% end %>
|