Skip to content

armgit / maybe

Public Imported from GitHub
0

The personal finance app for everyone

Add ability to delete Account (#582)

Mattiaf6540c03efd4
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 86d579ec..0a533420 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,6 +1,7 @@
class AccountsController < ApplicationController
include Filterable
before_action :authenticate_user!
+ before_action :set_account, only: %i[ show update destroy sync ]
def new
@account = Account.new(
@@ -10,7 +11,6 @@ class AccountsController < ApplicationController
end
def show
- @account = Current.family.accounts.find(params[:id])
@balance_series = @account.series(period: @period)
@valuation_series = @account.valuations.to_series
end
@@ -19,8 +19,6 @@ class AccountsController < ApplicationController
end
def update
- @account = Current.family.accounts.find(params[:id])
-
if @account.update(account_params.except(:accountable_type))
@account.sync_later if account_params[:is_active] == "1"
@@ -50,8 +48,12 @@ class AccountsController < ApplicationController
end
end
+ def destroy
+ @account.destroy!
+ redirect_to accounts_path, notice: t(".success")
+ end
+
def sync
- @account = Current.family.accounts.find(params[:id])
@account.sync_later
respond_to do |format|
@@ -67,6 +69,10 @@ class AccountsController < ApplicationController
private
+ def set_account
+ @account = Current.family.accounts.find(params[:id])
+ end
+
def account_params
params.require(:account).permit(:name, :accountable_type, :balance, :currency, :subtype, :is_active)
end
diff --git a/app/models/account.rb b/app/models/account.rb
index ec039faa..550e0279 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -6,7 +6,6 @@ class Account < ApplicationRecord
broadcasts_refreshes
belongs_to :family
-
has_many :balances, dependent: :destroy
has_many :valuations, dependent: :destroy
has_many :transactions, dependent: :destroy
diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erb
index e315c3c5..1b3f9eee 100644
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@@ -17,8 +17,17 @@
<%= lucide_icon("chevron-down", class: "w-5 h-5 text-gray-500") %>
</div>
</div>
- <div class="cursor-not-allowed">
- <%= lucide_icon("more-horizontal", class: "w-5 h-5 text-gray-500") %>
+ <div class="relative cursor-pointer" data-controller="dropdown">
+ <div class="flex hover:bg-gray-100 p-2 rounded" data-action="click->dropdown#toggleMenu">
+ <%= lucide_icon("more-horizontal", class: "w-5 h-5 text-gray-500") %>
+ </div>
+ <div class="absolute z-10 top-10 right-0 border border-alpha-black-25 bg-white rounded-lg shadow-xs hidden" data-dropdown-target="menu">
+ <div class="w-48 px-3 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+ <%= button_to account_path(@account), method: :delete, class: "block w-full py-2 text-red-600 hover:text-red-800 flex items-center", data: { turbo_confirm: { title: t("custom_turbo_confirm.account_destroy.title"), body: t("custom_turbo_confirm.account_destroy.body_html"), accept: t("custom_turbo_confirm.account_destroy.accept", name: @account.name) } } do %>
+ <%= lucide_icon("trash-2", class: "w-5 h-5 mr-2") %> Delete account
+ <% end %>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/config/locales/views/account/en.yml b/config/locales/views/account/en.yml
index 1404a941..acdf8cff 100644
--- a/config/locales/views/account/en.yml
+++ b/config/locales/views/account/en.yml
@@ -3,6 +3,8 @@ en:
accounts:
create:
success: New account created successfully
+ destroy:
+ success: Account deleted successfully
index:
new_account: New account
new:
diff --git a/config/locales/views/shared/en.yml b/config/locales/views/shared/en.yml
index 2c522eac..f3aaaba1 100644
--- a/config/locales/views/shared/en.yml
+++ b/config/locales/views/shared/en.yml
@@ -1,6 +1,14 @@
---
en:
custom_turbo_confirm:
+ account_destroy:
+ accept: Delete "%{name}"
+ body_html: "<p>By deleting this account, you will erase its value history, affecting
+ various aspects of your overall account. This action will have a direct impact
+ on your net worth calculations and the account graphs.</p><br /> <p>After
+ deletion, there is no way you'll be able to restore the account information
+ because you'll need to add it as a new account.</p>"
+ title: Delete account?
default:
accept: Confirm
body_html: "<p>You will not be able to undo this decision</p>"