mirror of
https://github.com/we-promise/sure.git
synced 2026-04-15 18:14:14 +00:00
* Reorganize import UI with Financial Tools / Raw Data tabs Split the flat list of import sources into two tabbed sections using DS::Tabs: "Financial Tools" (Mint, Quicken/QIF, YNAB coming soon) and "Raw Data" (transactions, investments, accounts, categories, rules, documents). This prepares for adding more tool-specific importers without cluttering the list. https://claude.ai/code/session_01BM4SBWNhATqoKTEvy3qTS3 * Fix import controller test to account for YNAB coming soon entry The new YNAB "coming soon" disabled entry adds a 5th aria-disabled element to the import dialog. https://claude.ai/code/session_01BM4SBWNhATqoKTEvy3qTS3 * Fix system tests to click Raw Data tab before selecting import type Transaction, trade, and account imports are now under the Raw Data tab and need an explicit tab click before the buttons are visible. https://claude.ai/code/session_01BM4SBWNhATqoKTEvy3qTS3 * feat: Add bulk import for NDJSON export files Implements an import flow that accepts the full all.ndjson file from data exports, allowing users to restore their complete data including: - Accounts with accountable types - Categories with parent relationships - Tags and merchants - Transactions with category, merchant, and tag references - Trades with securities - Valuations - Budgets and budget categories - Rules with conditions and actions (including compound conditions) Key changes: - Add BulkImport model extending Import base class - Add Family::DataImporter to handle NDJSON parsing and import logic - Update imports controller and views to support NDJSON workflow - Skip configuration/mapping steps for structured NDJSON imports - Add i18n translations for bulk import UI - Add tests for BulkImport and DataImporter * fix: Fix category import and test query issues - Add default lucide_icon ("shapes") for categories when not provided - Fix valuation test to use proper ActiveRecord joins syntax * Linter errors * fix: Add default color for tags when not provided in import * fix: Add default kind for transactions when not provided in import * Fix test * Fix tests * Fix remaining merge conflicts from PR 766 cherry-pick Resolve conflict markers in test fixtures and clean up BulkImport entry in new.html.erb to use the _import_option partial consistently. https://claude.ai/code/session_01BM4SBWNhATqoKTEvy3qTS3 * Import Sure `.ndjson` * Remove `.ndjson` import from raw data * Fix support for Sure "bulk" import from old branch * Linter * Fix CI test * Fix more CI tests * Fix tests * Fix tests / move PDF import to first tab * Remove redundant title --------- Co-authored-by: Claude <noreply@anthropic.com>
169 lines
8.7 KiB
Plaintext
169 lines
8.7 KiB
Plaintext
<%= content_for :header_nav do %>
|
||
<%= render "imports/nav", import: @import %>
|
||
<% end %>
|
||
|
||
<%= content_for :previous_path, imports_path %>
|
||
|
||
<% if @import.is_a?(SureImport) %>
|
||
<div class="space-y-4" data-controller="drag-and-drop-import">
|
||
<!-- Overlay -->
|
||
<%= render "imports/drag_drop_overlay", title: t("import.uploads.sure_import.drop_title"), subtitle: t("import.uploads.sure_import.drop_subtitle") %>
|
||
|
||
<div class="space-y-4 mx-auto max-w-md">
|
||
<div class="text-center space-y-2">
|
||
<h1 class="text-3xl text-primary font-medium"><%= t("import.uploads.sure_import.title") %></h1>
|
||
<p class="text-secondary text-sm"><%= t("import.uploads.sure_import.description") %></p>
|
||
</div>
|
||
|
||
<%= styled_form_with model: @import, scope: :import, url: import_upload_path(@import), multipart: true, class: "space-y-2", data: { drag_and_drop_import_target: "form" } do |form| %>
|
||
<div class="flex flex-col items-center justify-center w-full h-64 border border-secondary border-dashed rounded-xl cursor-pointer" data-controller="file-upload" data-action="click->file-upload#triggerFileInput" data-file-upload-target="uploadArea">
|
||
<div class="flex flex-col items-center justify-center pt-5 pb-6">
|
||
<div data-file-upload-target="uploadText" class="flex flex-col items-center">
|
||
<%= icon("database", size: "lg", class: "mb-4 mx-auto") %>
|
||
<p class="mb-2 text-md text-gray text-center">
|
||
<span class="font-medium text-primary"><%= t("import.uploads.sure_import.browse") %></span> <%= t("import.uploads.sure_import.browse_hint") %>
|
||
</p>
|
||
</div>
|
||
|
||
<div class="flex flex-col gap-4 items-center hidden mb-2" data-file-upload-target="fileName">
|
||
<span class="text-primary">
|
||
<%= icon("file-text", size: "lg", color: "current") %>
|
||
</span>
|
||
<p class="text-md font-medium text-primary"></p>
|
||
</div>
|
||
|
||
<%= form.file_field :ndjson_file, class: "hidden", accept: ".ndjson,.json", "data-auto-submit-form-target": "auto", "data-file-upload-target": "input", "data-drag-and-drop-import-target": "input" %>
|
||
</div>
|
||
</div>
|
||
|
||
<%= form.submit t("import.uploads.sure_import.upload_button"), disabled: @import.complete? %>
|
||
<% end %>
|
||
</div>
|
||
|
||
<div class="flex justify-center">
|
||
<span class="text-secondary text-sm">
|
||
<%= t("import.uploads.sure_import.hint_html") %>
|
||
</span>
|
||
</div>
|
||
</div>
|
||
<% elsif @import.is_a?(QifImport) %>
|
||
<%# ── QIF upload – fixed format, account required ── %>
|
||
<div class="space-y-4 mx-auto max-w-md">
|
||
<div class="text-center space-y-2">
|
||
<h1 class="text-3xl text-primary font-medium"><%= t(".qif_title") %></h1>
|
||
<p class="text-secondary text-sm"><%= t(".qif_description") %></p>
|
||
</div>
|
||
|
||
<%= styled_form_with model: @import, scope: :import, url: import_upload_path(@import), multipart: true, class: "space-y-4" do |form| %>
|
||
<%= form.select :account_id,
|
||
@import.family.accounts.visible.pluck(:name, :id),
|
||
{ label: t(".qif_account_label"), include_blank: t(".qif_account_placeholder"), selected: @import.account_id },
|
||
required: true %>
|
||
|
||
<label for="import_import_file" class="flex flex-col items-center justify-center w-full h-64 border border-secondary border-dashed rounded-xl cursor-pointer" data-controller="file-upload" data-file-upload-target="uploadArea">
|
||
<div class="flex flex-col items-center justify-center pt-5 pb-6">
|
||
<div data-file-upload-target="uploadText" class="flex flex-col items-center">
|
||
<%= icon("plus", size: "lg", class: "mb-4 mx-auto") %>
|
||
<p class="mb-2 text-md text-gray text-center">
|
||
<span class="font-medium text-primary"><%= t(".browse") %></span> <%= t(".qif_file_prompt") %>
|
||
</p>
|
||
<p class="text-xs text-secondary"><%= t(".qif_file_hint") %></p>
|
||
</div>
|
||
|
||
<div class="flex flex-col gap-4 items-center hidden mb-2" data-file-upload-target="fileName">
|
||
<span class="text-primary">
|
||
<%= icon("file-text", size: "lg", color: "current") %>
|
||
</span>
|
||
<p class="text-md font-medium text-primary"></p>
|
||
</div>
|
||
|
||
<%= form.file_field :import_file,
|
||
accept: ".qif",
|
||
id: "import_import_file",
|
||
class: "hidden",
|
||
"data-file-upload-target": "input" %>
|
||
</div>
|
||
</label>
|
||
|
||
<%= form.submit t(".qif_submit"), disabled: @import.complete? %>
|
||
<% end %>
|
||
</div>
|
||
|
||
<% else %>
|
||
<%# ── Standard CSV upload ── %>
|
||
<div class="space-y-4" data-controller="drag-and-drop-import">
|
||
<!-- Overlay -->
|
||
<%= render "imports/drag_drop_overlay", title: "Drop CSV to upload", subtitle: "Your file will be uploaded automatically" %>
|
||
|
||
<div class="space-y-4 mx-auto max-w-md">
|
||
<div class="text-center space-y-2">
|
||
<h1 class="text-3xl text-primary font-medium"><%= t(".title") %></h1>
|
||
<p class="text-secondary text-sm"><%= t(".description") %></p>
|
||
</div>
|
||
|
||
<%= render DS::Tabs.new(active_tab: params[:tab] || "csv-upload", url_param_key: "tab", testid: "import-tabs") do |tabs| %>
|
||
<% tabs.with_nav do |nav| %>
|
||
<% nav.with_btn(id: "csv-upload", label: "Upload CSV") %>
|
||
<% nav.with_btn(id: "csv-paste", label: "Copy & Paste") %>
|
||
<% end %>
|
||
|
||
<% tabs.with_panel(tab_id: "csv-upload") do %>
|
||
<%= styled_form_with model: @import, scope: :import, url: import_upload_path(@import), multipart: true, class: "space-y-2", data: { drag_and_drop_import_target: "form" } do |form| %>
|
||
<%= form.select :col_sep, Import::SEPARATORS, label: true %>
|
||
|
||
<% if @import.type == "TransactionImport" || @import.type == "TradeImport" %>
|
||
<%= form.select :account_id, @import.family.accounts.visible.pluck(:name, :id), { label: "Account (optional)", include_blank: "Multi-account import", selected: @import.account_id } %>
|
||
<% end %>
|
||
|
||
<label for="import_import_file_csv" class="flex flex-col items-center justify-center w-full h-64 border border-secondary border-dashed rounded-xl cursor-pointer" data-controller="file-upload" data-file-upload-target="uploadArea">
|
||
<div class="flex flex-col items-center justify-center pt-5 pb-6">
|
||
<div data-file-upload-target="uploadText" class="flex flex-col items-center">
|
||
<%= icon("plus", size: "lg", class: "mb-4 mx-auto") %>
|
||
<p class="mb-2 text-md text-gray text-center">
|
||
<span class="font-medium text-primary"><%= t(".browse") %></span> <%= t(".csv_file_prompt") %>
|
||
</p>
|
||
</div>
|
||
|
||
<div class="flex flex-col gap-4 items-center hidden mb-2" data-file-upload-target="fileName">
|
||
<span class="text-primary">
|
||
<%= icon("file-text", size: "lg", color: "current") %>
|
||
</span>
|
||
<p class="text-md font-medium text-primary"></p>
|
||
</div>
|
||
|
||
<%= form.file_field :import_file, id: "import_import_file_csv", class: "hidden", "data-auto-submit-form-target": "auto", "data-file-upload-target": "input", "data-drag-and-drop-import-target": "input" %>
|
||
</div>
|
||
</label>
|
||
|
||
<%= form.submit "Upload CSV", disabled: @import.complete? %>
|
||
<% end %>
|
||
<% end %>
|
||
|
||
<% tabs.with_panel(tab_id: "csv-paste") do %>
|
||
<%= styled_form_with model: @import, scope: :import, url: import_upload_path(@import), multipart: true, class: "space-y-2" do |form| %>
|
||
<%= form.select :col_sep, Import::SEPARATORS, label: true %>
|
||
|
||
<% if @import.type == "TransactionImport" || @import.type == "TradeImport" %>
|
||
<%= form.select :account_id, @import.family.accounts.visible.pluck(:name, :id), { label: "Account (optional)", include_blank: "Multi-account import", selected: @import.account_id } %>
|
||
<% end %>
|
||
|
||
<%= form.text_area :raw_file_str,
|
||
rows: 10,
|
||
required: true,
|
||
placeholder: "Paste your CSV file contents here",
|
||
"data-auto-submit-form-target": "auto" %>
|
||
|
||
<%= form.submit "Upload CSV", disabled: @import.complete? %>
|
||
<% end %>
|
||
<% end %>
|
||
<% end %>
|
||
</div>
|
||
|
||
<div class="flex justify-center">
|
||
<span class="text-secondary text-sm">
|
||
<%= link_to "Download a sample CSV", "/imports/#{@import.id}/upload/sample_csv", class: "text-primary underline", data: { turbo: false } %> to see the required CSV format
|
||
</span>
|
||
</div>
|
||
</div>
|
||
<% end %>
|