refactor(charts): unify on Chart.js, remove Chartist #10

notid · 2026-06-02T07:56:27-07:00

notid commented

2026-06-02 07:56:27 -07:00

Summary

The codebase had two charting libraries. The dashboard and expense report already use Chart.js, while the admin page was the sole remaining consumer of Chartist. This unifies everything on Chart.js.

Changes

admin.clj — converted both admin charts from Chartist to Chart.js, using the same Alpine x-data/x-init <canvas> pattern as the dashboard:
- Growth in clients → Chart.js bar
- Changes by hour → Chart.js line
- Reshaped data from Chartist's {:labels … :series [[…]]} to Chart.js's {:labels … :data …}.
- Dropped the now-unused [hiccup2.core :as hiccup] require (only used for the Chartist <script> tags).
ui.clj — removed the global Chartist CSS/JS CDN includes from the base page.

Verification

No chartist references remain in src/clj.
Both namespaces compile; lein cljfmt check passes.
Started a dev server, logged in via /dev-login, and confirmed both admin charts render via live Chart.js instances (screenshot below).

## Summary The codebase had two charting libraries. The dashboard and expense report already use **Chart.js**, while the admin page was the sole remaining consumer of **Chartist**. This unifies everything on Chart.js. ## Changes - `admin.clj` — converted both admin charts from Chartist to Chart.js, using the same Alpine `x-data`/`x-init` `<canvas>` pattern as the dashboard: - **Growth in clients** → Chart.js `bar` - **Changes by hour** → Chart.js `line` - Reshaped data from Chartist's `{:labels … :series [[…]]}` to Chart.js's `{:labels … :data …}`. - Dropped the now-unused `[hiccup2.core :as hiccup]` require (only used for the Chartist `<script>` tags). - `ui.clj` — removed the global Chartist CSS/JS CDN includes from the base page. ## Verification - No `chartist` references remain in `src/clj`. - Both namespaces compile; `lein cljfmt check` passes. - Started a dev server, logged in via `/dev-login`, and confirmed both admin charts render via live Chart.js instances (screenshot below).

notid added 144 commits 2026-06-02 07:56:27 -07:00

transactions page progress. 7c7fc10a8d

transaction links is visible. bd501b512a

progress on transaction page d0c93e1907

test: Add tests for src/clj/auto_ap/ssr/transaction/edit.clj functions f881bdcc93

Makes it so that the edit page works better 59d48342ea

Every action kind of works. d19a2988fd

adds links 17993a0dee

progress on combinining everything 0a797fea3a

Switching to radio. 8429d8516c

Removes old login page, more progress on transactions 7373ef41d1

msot fcb46bf756

much smaller build (hopefully) and transactions progress. e22beb149e

handles home page 04ec980b02

merged 44a8a77027

minor cleanup b1ce23bfcf

fixes dd2f6508fe

fixes d1b04f27c8

progress f3ca8afcc9

Improvements for transaction page 0bae8f3d1b

updated task 5c0ba7cfa4

shows as locked 7f12b31fdf

progress on bulk activities 5a05c144ea

merges a4089836fa

merged d008ec71c3

Merge branch 'master' into get-transactions2-page-working 35f5ed025f

clauding 3489fb19d5

clauding 310906f2ae

done 2df1f71a29

feat(ssr): add test suite for admin account management and document test improvements 791e41cf34

- Added comprehensive test suite for account creation, validation, and grid views
- Documented Datomic entity reference handling patterns in test comments
- Created 5 test improvement todo documents addressing common test anti-patterns
- Todo items cover: removing debug statements, fixing test nesting, strengthening assertions, extracting helpers, and removing doc-only tests

feat(tests): Add comprehensive tests for SSR admin vendors module a7daf839ec

Add 8 BDD-style tests for the vendors module covering grid/list
operations and vendor merge functionality. Tests follow established
patterns from accounts_test.clj and include proper database
verification.

Tests Implemented:
- vendor-grid-loads-with-empty-database
- vendor-fetch-ids-returns-correct-structure
- vendor-fetch-page-returns-vendors
- vendor-hydrate-results-works
- vendor-merge-transfers-references
- vendor-merge-same-vendor-rejected
- vendor-merge-invalid-vendor-handled
- vendor-hydration-includes-all-fields

Key Implementation Details:
- Uses setup-test-data helper with unique temp IDs
- Tests focus on public interface (fetch-page, merge-submit)
- Follows BDD Given/When/Then pattern
- All 8 tests passing (26 assertions)

Documentation:
- Created implementation plan in docs/plans/
- Documented solution patterns in docs/solutions/
- Created code review todos for future improvements

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

feat(tests): Add transaction rules test suite with 8 passing tests 81a15e5f26

Add comprehensive tests for the SSR admin transaction rules module:
- Rule matching by description pattern
- Rule matching returns empty for no matches
- Validation accepts valid data with 100% account allocation
- Validation rejects invalid account totals
- Rule matching by amount range
- Rule matching by bank account
- Security tests for non-admin access
- Execute validation tests

All 8 tests passing with 9 assertions. Tests focus on the unique
rule matching engine functionality that differentiates transaction
rules from other admin modules.

Includes implementation plan documenting 23 test scenarios
and 6-phase approach for complete coverage.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

feat(tests): Add route handler tests for transaction rules dd60d80f03

Add 4 new tests for route handlers:
- page-route-returns-html-response: Tests main page route
- table-route-returns-table-data: Tests HTMX table data route
- delete-route-deletes-rule: Tests delete functionality
- check-badges-route-works: Tests badge checking route

Total: 12 tests with 15 assertions, all passing.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

feat(tests): Add more route handler tests for transaction rules f732ecb560

Add 3 additional route handler tests:
- edit-dialog-route-returns-dialog: Tests edit dialog for existing rules
- account-typeahead-route-works: Tests account typeahead functionality
- location-select-route-works: Tests location selector route

Total: 15 tests with 22 assertions, all passing.

Route coverage now includes:
- page, table, delete, check-badges
- edit-dialog, account-typeahead, location-select

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

feat(tests): Add execute-dialog and new-dialog route tests 69c75ba124

Add 2 more route handler tests:
- execute-dialog-route-works: Tests execution dialog for rules
- new-dialog-route-returns-empty-form: Tests new rule form

Total: 17 tests with 26 assertions, all passing.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Clean up test files by removing comments d8b829db76

Merge branch 'master' into clauding d2b5a08519

merged 931a1aa10f

Merge branch 'staging' into transactions2-with-staging ab3206a82c

feat: pivot staging environment to production alternative UI d03f5674f8

refactor: update nomenclature to app-new for production alternative UI e8c76b8a1a

refactor: rename config file to prod-new.edn 090e5425c6

refactor: remove remaining staging references in app-new configuration 79224fbf13

changes 108cc204a9

terraform fixes 5df1d63f80

merged 8367036f85

merged 3512ad858d

merged df85e30bf6

Merge branch 'master' into staging 6487cccf2d

improved 7eda6849d1

tries sales changes a156ac99fe

fixes bc89a7d586

fixes build 4997a40c00

fixes baef2afc63

Merge branch 'master' into staging 6a7c529c24

stuff 66b0b611e4

fixes 64506705e7

improvements 2c8985203e

Merge branch 'master' into staging 021a2f14f7

Adds clojure agent 83a739ac5b

Merge branch 'master' into staging aae1d2168b

fixes 08b948c24b

Merge branch 'master' into staging e8979738ab

adds unresolved only b42e2a6a44

Add unresolved-only and financial account filters to SSR transaction listing 065d1182d7

Add linking, location, import-batch, and potential-duplicates filters to SSR transactions 6f7f1c7815

Fix linked-to filter to handle empty string as nil 1f9a7080e1

Show potential-duplicates filter only when a bank account is selected c6b55ce567

Fix manual transaction validation: require accounts when approving 0811771ae6

- Add require-approval schema validation for :manual action
- Fix keyword comparison to use :transaction-approval-status/approved
- Move require-approval function before schema definition
- Also fix save handler validation to use correct keyword

Fix form error display for root-level validation errors 4f32527732

When validation errors occur at the root level (e.g., from :fn validators
in multi schemas), they are returned as a vector directly rather than a
map with :errors key. Update default-step-footer to handle both cases.

Add error message to require-approval validator dd4d1a6d4f

Ensure the validation error message shows up properly when users try
to approve a manual transaction without assigning financial accounts.

Fix Datomic conflict when spreading shared location across accounts 8189a7648b

When a transaction account had 'Shared' location, spread-account was
creating multiple accounts with the same :db/id but different locations,
causing a datoms-conflict error in Datomic.

Now generates unique tempids for all spread accounts beyond the first,
preventing entity ID collisions while preserving the original account's
tempid for the first location.

Fixes: Two datoms in the same transaction conflict on :transaction-account/location

Flash transaction row after editing through modal 0692089e39

When a transaction is saved via the edit modal, return the updated row
HTML with {:flash? true} instead of an empty div. This makes the row
flash with the live-added animation, matching the behavior of other
pages like invoices and accounts.

Uses hx-retarget to swap the specific row in the table while also
triggering modalclose to close the modal.

Add design spec for transaction account $/% toggle dbfa04c766

Add $/% toggle for transaction account amounts in manual edit 567db50a66

When editing a transaction manually, users can now toggle between viewing
account amounts as dollar values or percentages. The toggle appears in the
table header as a radio button group ($ / %).

Key features:
- Global toggle switches all accounts simultaneously
- $→%: amounts are converted to percentages of the transaction total
- %→$: uses percentages->dollars with spread-cents for accurate cent distribution
- Form state preserves vendor, memo, approval status when toggling
- Save handler converts % back to $ before persisting to Datomic
- Uses HTMX to re-render only the account grid body on toggle

New route: /toggle-amount-mode
New functions: ->percentage, percentages->dollars, convert-accounts-mode,
              account-grid-body*, toggle-amount-mode

Fix $/% toggle: handle nil amounts and make toggle horizontal 4739769297

- Fix Math/abs nil error when adding new accounts by using (or value 0.0)
- Fix Math/abs nil in account-grid-body* and save-handler for safety
- Make $/% radio toggle display side-by-side using :orientation :horizontal
- Apply fixes to edit-wizard-new-account render, account-grid-body*, and save-handler

Fix toggle-amount-mode: properly update request state with converted accounts and new mode 351659f8eb

The assoc-in call had too many arguments, so the request state wasn't being
updated with the new mode or converted accounts. Using -> threading with
separate assoc-in calls ensures both the accounts and mode are properly set
before re-rendering the grid.

Fix radio-card to pass through HTMX attributes for $/% toggle 535ef4d113

The radio-card component was ignoring HTMX attributes (:hx-post, :hx-target,
etc.) passed to it. Modified the component to extract these attributes and
merge them into each radio input element, so the $/% toggle now properly
triggers HTMX requests when changed.

Fix toggle-amount-mode: set up form cursor context for grid re-render 857a1536ef

The toggle-amount-mode handler was failing because account-grid-body*
uses fc/cursor-map which requires the form cursor context to be set up.
Added manual cursor binding in toggle-amount-mode to create a cursor
pointing to the transaction/accounts vector and bind it to fc/*current*
before rendering the grid.

Fix toggle-amount-mode: avoid cursor context entirely for HTMX re-render acd4184ef0

The previous attempts to set up form cursor context in toggle-amount-mode
were failing because the cursor library's dynamic binding model is complex
and requires specific initialization through fc/start-form.

Instead of trying to recreate the cursor context, this fix:
1. Creates transaction-account-row-no-cursor* that renders rows with explicit
   field names and values (no cursor functions)
2. Rewrites toggle-amount-mode to directly construct the data-grid HTML
   using map-indexed over the accounts vector
3. Removes the broken manual cursor binding attempts
4. Removes unused auto-ap.cursor import

This ensures the toggle handler works independently of the wizard's cursor
context while still producing identical HTML output.

Fix format error in toggle-amount-mode: ensure double values for %f format 918ddd14ff

The format specifier $%,.2f requires floating-point values but
(reduce + 0 ...) can return a Long when all amounts sum to an integer.
Added explicit (double ...) casts and changed initial value to 0.0
to ensure the format call always receives a double.

more fixes 4221d6a0d6

stuff adb6ecb1ff

Adds playwright ddf11a7cb3

improvements 76c6eaddb9

Add e2e tests for bulk coding transactions and fix SSR location validation 8bd0cee1b1

- Create requirements document based on master cljs implementation
- Add Playwright e2e tests covering happy path, validation, and distribution
- Fix hiccup id syntax in SSR bulk code form (div#id.class order)
- Add missing account location validation to SSR bulk code submit
- Enhance test server with multiple transactions and fixed-location account

Add vendor pre-population for bulk code and individual edit forms ba87805d4c

- Add vendor-changed HTMX handlers for both bulk code and individual edit
- Pre-populate default account at 100% when vendor is selected and no accounts exist
- Fix render-accounts-section to render from step-params correctly
- Change bulk code vendor-changed from hx-get to hx-post to include form data
- Add routes for vendor-changed endpoints
- Update e2e tests to cover vendor pre-population
- Run lein cljfmt fix across codebase

Fix bulk code vendor pre-population for single vs multi-client contexts 03bfca35cb

- vendor-default-account now uses raw vendor default account (not client-specific override)
- Account name is clientized via d-accounts/clientize only for single-client contexts
- Added single-client-id helper that returns client ID only when user has exactly one client
- Added multi-client e2e test verifying no pre-population across multiple clients
- Updated test server to support multi-client mode switching via /test-set-client-mode
- Test server now seeds a second client for multi-client scenarios

adds invoices dates 3715910029

feat: support exact client code match in dropdown search 5b2aba561c

When typing in the company dropdown search, check for an exact match
on client code via Datomic before falling back to Solr name search.
This allows users to quickly find clients by typing their code (e.g. NGRV).

fixes 8e3aa13f4d

Merge branch 'integreat-fix-errors' into staging f239b114c3

improvements ae0788e6dd

horizontal 85652a7ce7

fix: use cleansed-query for Solr client name search 712b2c0cb8

Fixes substring search in company dropdown. The search query was
using raw user input instead of the cleansed version that adds a
wildcard suffix (e.g. 'dough' -> 'dough*'). Without the wildcard,
Solr performs exact token matching, so searching 'dough' would not
match 'Doughballs'.

feat: add memo filter and enhance description filter with regex matching 200056098f

- Add new memo filter to transaction page (searches :transaction/memo)
- Enhance existing description filter to use case-insensitive regex
- Both filters support wildcard matching via .* pattern
- Add e2e tests for filter functionality
- Update test data with memo fields

fix: replace broken hx-vals JS with hx-include for transaction nav links f42d937691

The hx-vals attribute with a JavaScript IIFE was causing a SyntaxError
when navigating to the transactions page from any other page. Replaced
with hx-include="#transaction-filters" which correctly preserves
filter state across transaction sub-pages.

Allows upload of CSV of sysco with line item parsing a4d7ac5982

unique locations 11cc887671

transaction dialog now uses sidebar. de73233a08

uses percent 99dd88329e

Merge branch 'integreat-invoices-for-ntg' into staging 78bd1d92e0

general improvements 2f9da3cdd9

fixes a number of issues 4fca49bff0

Merge branch 'integreat-assorted' into staging de933699aa

Fixes logging issues. daea729e8e

should fix invoices df32100ca2

new glimpse test. 7db1e07512

Simplify sysco line item allocation: use actual amounts, default unmatched to food cost (50000) e5a2d0bbba

Add http-port override, login UI improvements, and dev tooling 17eebe5628

restored default. 6ce6a6e0c7

docs: add spec for transaction edit modal simple/advanced mode 2e4152e3fc

docs: fix spec inconsistencies from self-review 6500c44909

docs: add implementation plan for transaction edit simple/advanced mode 724b6d82f5

feat: add edit-wizard-toggle-mode route ab1a2c3368

feat: add simple-mode-fields* for transaction edit modal 00b5303c28

fix: safe cursor indexing in simple-mode-fields* a88dcf4122

feat: extract manual-coding-section* with simple/advanced mode selection 4e22fb1d82

fix: repair vendor-changed swap target and remove unused declare 70a3db9a64

feat: add edit-wizard-toggle-mode-handler 9a7d0b8b18

feat: update edit-vendor-changed-handler to support simple/advanced mode 06fb0ea067

fix: handle absent :transaction/accounts in simple-mode-fields* (ValCursor crash) 9997d60de1

test: add tests for simple/advanced mode in transaction edit modal c9a587a8c5

test: strengthen assertions and add AC6 save round-trip test ebd91f1911

test: add missing AC tests and fix AC numbering 1be83a01f5

test: complete AC17 fields-present assertions c6699dd05a

refactor: remove dead code and redundant assertions in simple/advanced mode tests a7ac7eae35

fix: prefer step-params over snapshot for row-count and existing-row cbb9bc750d

fix: change toggle-mode links from hx-get to hx-post so form data is submitted 79ddda624a

fix: normalize account ref map to db/id in simple mode rendering 3441ae63b4

When a transaction is pre-coded, the snapshot stores :transaction-account/account
as a Datomic ref map {:db/id N} rather than a bare integer. simple-mode-fields*
and the simpleAccountId Alpine initializer both need the integer id, not the map,
to correctly populate the account typeahead value and the x-hx-val binding.

better login page 6814cf1b15

resources 8f0a474fa8

instructions 9659164fdc

merged. b8a0e9c3dc

agent changes 5c2cf8a631

fixes vendor selection bug e156d8bfd8

Cleanup of simple/advanced mode 38ae6f460f

fixes b6649a3d1d

feat(transactions): port manual bank-transaction import to SSR a1098b28f8

Implement the SSR/alpine/htmx manual transaction import, wiring the
already-declared but unhandled ::external-import-page/parse/import routes.
Mirrors the SSR ledger import: paste the exact master-branch Yodlee
positional-column TSV, review parsed rows in an editable grid with per-row
error/warning badges, and import. Every master validation is preserved and
the existing import.transactions engine is reused unchanged
(via import.manual/import-batch), so core components are untouched.

- New ns auto-ap.ssr.transaction.import (page, paste/parse, editable grid,
  two-tier validation, import handler) + admin-only transactions Import nav.
- Two-tier validation: fixable problems (bad date/amount, unknown client or
  bank-account code, missing fields) are hard errors that block the whole
  batch; inherent skip-conditions (non-POSTED, before start-date/locked,
  already-imported) are warnings computed from the engine's own
  categorize-transaction so the grid preview matches the import result.
- Tests: failing-first Playwright e2e (e2e/transaction-import.spec.ts) plus
  unit/integration coverage (ssr/transaction/import_test.clj, 10 tests).
- Deterministic bank-account code in the e2e seed.

Plan: docs/plans/2026-06-01-001-feat-manual-transaction-import-ssr-plan.md

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

fix(review): apply autofix feedback 9cc3418b1b

- Alphabetize the import.clj :require block (AGENTS.md Import Formatting).
- Remove unused imports (digest, strip) flagged by clj-kondo.
- Make the client-not-found classify-table test independent: it previously
  reused the bank-account-not-found input and added zero marginal coverage;
  now seeds an orphan bank account so only the client error fires.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Merge pull request 'feat(transactions): port manual bank-transaction import to SSR' (#9 ) from integreat-add-transaction-manual into staging 569e52d1c1

Reviewed-on: #9

date-choosing 901d9eb508

update 3648597031

fixes d52159637e

refactor(charts): unify on Chart.js, remove Chartist 1f6395382d

The admin page was the only consumer of Chartist while the dashboard and
expense report already use Chart.js. Convert the admin "Growth in clients"
(bar) and "Changes by hour" (line) charts to Chart.js using the same
Alpine x-data/x-init canvas pattern as the dashboard, and drop the global
Chartist CSS/JS includes from the base page.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

notid added 1 commit 2026-06-02 09:16:21 -07:00

fix(ssr): stop content-card forcing always-on scrollbars; add tmp/ scratch dir 19186097d5

content-card used `overflow-scroll`, which renders scrollbar tracks even
when the content fits — visible as superfluous bars around the admin chart
cards. Switch to `overflow-auto` so scrollbars only appear when content
genuinely overflows (e.g. wide data tables still scroll).

Also add a gitignored ./tmp/ scratch directory (tracked via .gitkeep) and
document in AGENTS.md that temp files belong there.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

notid closed this pull request

2026-06-02 09:22:58 -07:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: notid/integreat#10