diff --git a/app/apps/bank_sync/tests/test_bank_sync.py b/app/apps/bank_sync/tests/test_bank_sync.py
index c9f28d9c..97bf797d 100644
--- a/app/apps/bank_sync/tests/test_bank_sync.py
+++ b/app/apps/bank_sync/tests/test_bank_sync.py
@@ -7,6 +7,7 @@ from decimal import Decimal
from unittest.mock import MagicMock, patch
from django.contrib.auth import get_user_model
+from django.contrib.messages import get_messages
from django.core.exceptions import ValidationError
from django.core.files.uploadedfile import SimpleUploadedFile
from django.test import TestCase
@@ -879,7 +880,10 @@ class ExportRestoreTests(TestCase):
response = self.client.post(
reverse("restore_form"), {"zip_file": upload}, HTTP_HX_REQUEST="true"
)
- self.assertEqual(response.status_code, 204)
+ self.assertIn(
+ "Data restored successfully",
+ [m.message for m in get_messages(response.wsgi_request)],
+ )
service = BankSyncService._base_manager.get()
self.assertEqual(service.owner, self.other)
diff --git a/app/apps/export_app/forms.py b/app/apps/export_app/forms.py
index 7d50ffb1..b4b4e9bf 100644
--- a/app/apps/export_app/forms.py
+++ b/app/apps/export_app/forms.py
@@ -1,139 +1,107 @@
-from apps.common.widgets.crispy.submit import NoClassSubmit
-from crispy_forms.bootstrap import FormActions
-from crispy_forms.helper import FormHelper
-from crispy_forms.layout import HTML, Layout
from django import forms
from django.utils.translation import gettext_lazy as _
class ExportForm(forms.Form):
+ # Rendered by export_app/fragments/export.html, in declaration order
users = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("Users"),
initial=True,
)
accounts = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("Accounts"),
initial=True,
)
currencies = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("Currencies"),
initial=True,
)
transactions = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("Transactions"),
initial=True,
)
categories = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("Categories"),
initial=True,
)
- tags = forms.BooleanField(
- required=False,
- widget=forms.CheckboxInput(),
- label=_("Tags"),
- initial=False,
- )
entities = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("Entities"),
initial=False,
)
- recurring_transactions = forms.BooleanField(
+ tags = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
- label=_("Recurring Transactions"),
- initial=True,
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
+ label=_("Tags"),
+ initial=False,
)
installment_plans = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("Installment Plans"),
initial=True,
)
+ recurring_transactions = forms.BooleanField(
+ required=False,
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
+ label=_("Recurring Transactions"),
+ initial=True,
+ )
quick_transactions = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("Quick Transactions"),
initial=True,
)
- exchange_rates = forms.BooleanField(
- required=False,
- widget=forms.CheckboxInput(),
- label=_("Exchange Rates"),
- initial=False,
- )
exchange_rates_services = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("Automatic Exchange Rates"),
initial=False,
)
+ exchange_rates = forms.BooleanField(
+ required=False,
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
+ label=_("Exchange Rates"),
+ initial=False,
+ )
bank_sync = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("Bank Sync"),
help_text=_("Includes the providers' API keys"),
initial=False,
)
rules = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("Rules"),
initial=True,
)
dca = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("DCA"),
initial=False,
)
import_profiles = forms.BooleanField(
required=False,
- widget=forms.CheckboxInput(),
+ widget=forms.CheckboxInput(attrs={"class": "checkbox"}),
label=_("Import Profiles"),
initial=True,
)
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
-
- self.helper = FormHelper()
- self.helper.form_tag = False
- self.helper.form_method = "post"
- self.helper.layout = Layout(
- "users",
- "accounts",
- "investment_classes",
- "currencies",
- "transactions",
- "categories",
- "entities",
- "tags",
- "installment_plans",
- "recurring_transactions",
- "quick_transactions",
- "exchange_rates_services",
- "exchange_rates",
- "bank_sync",
- "rules",
- "dca",
- "import_profiles",
- FormActions(
- NoClassSubmit("submit", _("Export"), css_class="btn btn-primary"),
- ),
- )
-
class RestoreForm(forms.Form):
zip_file = forms.FileField(
@@ -178,38 +146,11 @@ class RestoreForm(forms.Form):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
-
- self.helper = FormHelper()
- self.helper.form_tag = False
- self.helper.form_method = "post"
- self.helper.layout = Layout(
- "zip_file",
- HTML('
'),
- "users",
- "accounts",
- "currencies",
- "transactions",
- "sub_transactions",
- "transactions_categories",
- "transactions_entities",
- "transactions_tags",
- "installment_plans",
- "recurring_transactions",
- "quick_transactions",
- "automatic_exchange_rates",
- "exchange_rates",
- "bank_sync_services",
- "bank_sync_accounts",
- "transaction_rules",
- "transaction_rules_actions",
- "transaction_rules_update_or_create",
- "dca_strategies",
- "dca_entries",
- "import_profiles",
- FormActions(
- NoClassSubmit("submit", _("Restore"), css_class="btn btn-primary"),
- ),
- )
+ # Rendered by export_app/fragments/restore.html
+ for name, field in self.fields.items():
+ field.widget.attrs.update(
+ {"class": "file-input w-full", "accept": ".zip" if name == "zip_file" else ".csv"}
+ )
def clean(self):
cleaned_data = super().clean()
diff --git a/app/apps/export_app/views.py b/app/apps/export_app/views.py
index 3a521ddc..5cab9d08 100644
--- a/app/apps/export_app/views.py
+++ b/app/apps/export_app/views.py
@@ -3,7 +3,7 @@ import zipfile
from io import BytesIO
from django.contrib import messages
-from django.contrib.auth.decorators import login_required, user_passes_test
+from django.contrib.auth.decorators import login_required
from django.db import transaction
from django.http import HttpResponse
from django.shortcuts import render
@@ -51,21 +51,26 @@ from apps.export_app.resources.transactions import (
)
from apps.export_app.resources.users import UserResource
from apps.common.decorators.demo import disabled_on_demo
+from apps.common.decorators.user import is_superuser
logger = logging.getLogger()
@login_required
@disabled_on_demo
-@user_passes_test(lambda u: u.is_superuser)
+@is_superuser
@require_http_methods(["GET"])
def export_index(request):
- return render(request, "export_app/pages/index.html")
+ return render(
+ request,
+ "export_app/pages/index.html",
+ {"form": ExportForm(), "restore_form": RestoreForm()},
+ )
@login_required
@disabled_on_demo
-@user_passes_test(lambda u: u.is_superuser)
+@is_superuser
@require_http_methods(["GET", "POST"])
def export_form(request):
timestamp = timezone.localtime(timezone.now()).strftime("%Y-%m-%dT%H-%M-%S")
@@ -98,93 +103,104 @@ def export_form(request):
export_dca = form.cleaned_data.get("dca", False)
export_import_profiles = form.cleaned_data.get("import_profiles", False)
- exports = []
- if export_users:
- exports.append((UserResource().export(), "users"))
- if export_accounts:
- exports.append((AccountResource().export(), "accounts"))
- exports.append(
- (InvestmentClassResource().export(), "investment_classes")
- )
- if export_currencies:
- exports.append((CurrencyResource().export(), "currencies"))
- if export_transactions:
- exports.append((TransactionResource().export(), "transactions"))
- if export_categories:
- exports.append(
- (TransactionCategoyResource().export(), "transactions_categories")
- )
- if export_tags:
- exports.append((TransactionTagResource().export(), "transactions_tags"))
- if export_entities:
- exports.append(
- (TransactionEntityResource().export(), "transactions_entities")
- )
- if export_installment_plans:
- exports.append(
- (InstallmentPlanResource().export(), "installment_plans")
- )
- if export_recurring_transactions:
- exports.append(
- (RecurringTransactionResource().export(), "recurring_transactions")
- )
- if export_quick_transactions:
- exports.append(
- (QuickTransactionResource().export(), "quick_transactions")
- )
- sub_transaction_parents = [
- parent
- for parent, exported in (
- ("transaction", export_transactions),
- ("installment_plan", export_installment_plans),
- ("recurring_transaction", export_recurring_transactions),
- ("quick_transaction", export_quick_transactions),
- )
- if exported
- ]
- if sub_transaction_parents:
- exports.append(
- (
- SubTransactionResource(parents=sub_transaction_parents).export(),
- "sub_transactions",
+ try:
+ exports = []
+ if export_users:
+ exports.append((UserResource().export(), "users"))
+ if export_accounts:
+ exports.append((AccountResource().export(), "accounts"))
+ exports.append(
+ (InvestmentClassResource().export(), "investment_classes")
)
- )
- if export_exchange_rates_services:
- exports.append(
- (ExchangeRateServiceResource().export(), "automatic_exchange_rates")
- )
- if export_exchange_rates:
- exports.append((ExchangeRateResource().export(), "exchange_rates"))
- if form.cleaned_data.get("bank_sync"):
- exports.append((BankSyncServiceResource().export(), "bank_sync_services"))
- exports.append((BankSyncAccountResource().export(), "bank_sync_accounts"))
- if export_rules:
- exports.append(
- (TransactionRuleResource().export(), "transaction_rules")
- )
- exports.append(
- (
- TransactionRuleActionResource().export(),
- "transaction_rules_actions",
+ if export_currencies:
+ exports.append((CurrencyResource().export(), "currencies"))
+ if export_transactions:
+ exports.append((TransactionResource().export(), "transactions"))
+ if export_categories:
+ exports.append(
+ (TransactionCategoyResource().export(), "transactions_categories")
)
- )
- exports.append(
- (
- UpdateOrCreateTransactionRuleResource().export(),
- "transaction_rules_update_or_create",
+ if export_tags:
+ exports.append((TransactionTagResource().export(), "transactions_tags"))
+ if export_entities:
+ exports.append(
+ (TransactionEntityResource().export(), "transactions_entities")
)
- )
- if export_dca:
- exports.append((DCAStrategyResource().export(), "dca_strategies"))
- exports.append(
- (
- DCAEntryResource().export(),
- "dca_entries",
+ if export_installment_plans:
+ exports.append(
+ (InstallmentPlanResource().export(), "installment_plans")
)
- )
- if export_import_profiles:
- exports.append((ImportProfileResource().export(), "import_profiles"))
+ if export_recurring_transactions:
+ exports.append(
+ (RecurringTransactionResource().export(), "recurring_transactions")
+ )
+ if export_quick_transactions:
+ exports.append(
+ (QuickTransactionResource().export(), "quick_transactions")
+ )
+ sub_transaction_parents = [
+ parent
+ for parent, exported in (
+ ("transaction", export_transactions),
+ ("installment_plan", export_installment_plans),
+ ("recurring_transaction", export_recurring_transactions),
+ ("quick_transaction", export_quick_transactions),
+ )
+ if exported
+ ]
+ if sub_transaction_parents:
+ exports.append(
+ (
+ SubTransactionResource(parents=sub_transaction_parents).export(),
+ "sub_transactions",
+ )
+ )
+ if export_exchange_rates_services:
+ exports.append(
+ (ExchangeRateServiceResource().export(), "automatic_exchange_rates")
+ )
+ if export_exchange_rates:
+ exports.append((ExchangeRateResource().export(), "exchange_rates"))
+ if form.cleaned_data.get("bank_sync"):
+ exports.append((BankSyncServiceResource().export(), "bank_sync_services"))
+ exports.append((BankSyncAccountResource().export(), "bank_sync_accounts"))
+ if export_rules:
+ exports.append(
+ (TransactionRuleResource().export(), "transaction_rules")
+ )
+ exports.append(
+ (
+ TransactionRuleActionResource().export(),
+ "transaction_rules_actions",
+ )
+ )
+ exports.append(
+ (
+ UpdateOrCreateTransactionRuleResource().export(),
+ "transaction_rules_update_or_create",
+ )
+ )
+ if export_dca:
+ exports.append((DCAStrategyResource().export(), "dca_strategies"))
+ exports.append(
+ (
+ DCAEntryResource().export(),
+ "dca_entries",
+ )
+ )
+ if export_import_profiles:
+ exports.append((ImportProfileResource().export(), "import_profiles"))
+ except Exception as e:
+ logger.error("Error exporting", exc_info=e)
+ messages.error(
+ request,
+ _("There was an error exporting your data. Check the logs for more details."),
+ )
+ return HttpResponse(status=204, headers={"HX-Trigger": "updated"})
+
+ if exports:
+ messages.success(request, _("Export ready, your download has started"))
if len(exports) >= 2:
with zipfile.ZipFile(zip_buffer, "w", zipfile.ZIP_DEFLATED) as zip_file:
for dataset, name in exports:
@@ -212,9 +228,9 @@ def export_form(request):
)
return response
else:
- return HttpResponse(
- _("You have to select at least one export"),
- )
+ # 204, or the download extension would save this message as a file
+ messages.warning(request, _("You have to select at least one export"))
+ return HttpResponse(status=204, headers={"HX-Trigger": "updated"})
else:
form = ExportForm()
@@ -225,7 +241,7 @@ def export_form(request):
@only_htmx
@login_required
@disabled_on_demo
-@user_passes_test(lambda u: u.is_superuser)
+@is_superuser
@require_http_methods(["GET", "POST"])
def import_form(request):
if request.method == "POST":
@@ -234,12 +250,7 @@ def import_form(request):
try:
process_imports(request, form.cleaned_data)
messages.success(request, _("Data restored successfully"))
- return HttpResponse(
- status=204,
- headers={
- "HX-Trigger": "hide_offcanvas, updated",
- },
- )
+ form = RestoreForm() # a fresh form clears the chosen files and old errors
except Exception as e:
logger.error("Error importing", exc_info=e)
messages.error(
diff --git a/app/templates/export_app/fragments/export.html b/app/templates/export_app/fragments/export.html
index 9b3364e7..477296ee 100644
--- a/app/templates/export_app/fragments/export.html
+++ b/app/templates/export_app/fragments/export.html
@@ -1,13 +1,31 @@
-{% extends "extends/offcanvas.html" %}
-{% load crispy_forms_tags %}
{% load i18n %}
-{% block title %}{% translate 'Export' %}{% endblock %}
-
-{% block body %}
-
-
+
diff --git a/app/templates/export_app/fragments/restore.html b/app/templates/export_app/fragments/restore.html
index edf6ddf3..7f3e5781 100644
--- a/app/templates/export_app/fragments/restore.html
+++ b/app/templates/export_app/fragments/restore.html
@@ -1,17 +1,44 @@
-{% extends "extends/offcanvas.html" %}
-{% load crispy_forms_tags %}
{% load i18n %}
-{% block title %}{% translate 'Restore' %}{% endblock %}
-
-{% block body %}
-
-
+
diff --git a/app/templates/export_app/pages/index.html b/app/templates/export_app/pages/index.html
index e53f230d..59d06e84 100644
--- a/app/templates/export_app/pages/index.html
+++ b/app/templates/export_app/pages/index.html
@@ -4,20 +4,21 @@
{% block title %}{% translate 'Export and Restore' %}{% endblock %}
{% block content %}
-
-
-
-
+
+
{% translate 'Export and Restore' %}
+
+
+
+
{% translate 'Export' %}
+ {% include "export_app/fragments/export.html" %}
+
+
+
+
+
{% translate 'Restore' %}
+ {% include "export_app/fragments/restore.html" with form=restore_form %}
+
+
{% endblock %}
diff --git a/frontend/src/js/_htmx.js b/frontend/src/js/_htmx.js
index 2094246d..917316bb 100644
--- a/frontend/src/js/_htmx.js
+++ b/frontend/src/js/_htmx.js
@@ -49,13 +49,11 @@ htmx.defineExtension('htmx-download', {
document.body.appendChild(link);
link.click();
- // Cleanup
- setTimeout(() => {
- URL.revokeObjectURL(url);
- link.remove();
- }, 100);
+ // Cleanup. Safari still reads the blob after click(), revoking early truncates the file
+ link.remove();
+ setTimeout(() => URL.revokeObjectURL(url), 60000);
- } else {
+ } else if (xhr.status !== 204) {
console.warn(`[htmx-download] Unexpected response status: ${xhr.status}`);
}