mirror of
https://github.com/Donkie/Spoolman.git
synced 2026-10-21 17:42:16 -05:00
470d8f3bcc
* Add filtering and sorting for custom fields * Fix tests and make code postgres compatible * Fix bugs and expand test coverage for custom field filter/sort * trigger CI * fix: address extra field filter review feedback * fix: clean up custom field table state handling * docs: update extra field table view description * fix: narrow boolean custom field filter syntax * Expand test coverage for all custom field types/entities and fix range filter/sort - Add comprehensive tests covering all 9 field types (text, integer, float, boolean, single-choice, multi-choice, datetime, integer_range, float_range) for filter and sort on spool, filament, and vendor entities - Add invalid-filter 400 tests for float, integer_range, and float_range - Fix integer_range/float_range filter to use LIKE pattern matching against Python's deterministic json.dumps output instead of fragile .contains() - Add integer_range/float_range sort support via a @compiles helper (_JsonArrayFirstElement) that emits CAST(col AS JSON)->>0 on PostgreSQL and JSON_EXTRACT(col, '$[0]') on SQLite/MariaDB - Add logger and __all__ to extra_fields.py (aligns with PR #893) - All tests verified passing on postgres, sqlite, and mariadb * Add filter UI for all custom field types and fix range filters - Add text input filter dropdown for text fields (substring search) - Add range input filter dropdowns (min/max) for integer, float, integer_range, and float_range fields - Add datetime picker filter dropdown for datetime fields - Fix boolean "No" filter to use empty value so it correctly matches unset/false fields - Fix integer_range/float_range filter to use numeric comparisons instead of LIKE-based exact matching (stored_min >= filter_min, stored_max <= filter_max) - Add range filter support for integer/float fields (min:max format) - Add _JsonArraySecondElement cross-database helper for extracting second JSON array element * Range filter for integer/float fields and fix range_field filter semantics Backend: - Add _JsonArraySecondElement cross-database helper (mirrors _JsonArrayFirstElement) - integer_range/float_range filter now uses numeric comparisons: stored_min >= filter_min and stored_max <= filter_max (was LIKE exact match) - integer/float filter now supports min:max range format in addition to exact match: stored_value >= min and/or stored_value <= max Frontend: - integer and float fields now use a range filter dropdown (min/max inputs) instead of a single exact-value input Tests: - Fix integer_range/float_range spool and vendor tests broken by new >= semantics (filter values updated to discriminate between test entries) - Add range filter tests (min only, max only, both) for integer and float fields * Replace 12 copy-pasted numeric field tests with 4 parametrized tests Introduce a _create_entity helper and @pytest.mark.parametrize("entity_type", ["spool", "filament", "vendor"]) to run each numeric field type test against all three entity types from a single test function. - Removes 12 individual tests (integer/float/integer_range/float_range × 3 entities) - Adds 4 parametrized tests covering the same ground plus the previously missing min-only / max-only range filter cases for filament and vendor - Uses try/finally for cleanup so entities are always deleted even on assertion failure * Add datetime range filter and restore integer/float range filter support - Backend: add datetime range filter using '|' separator (ISO dates contain ':') - Backend: restore integer/float range filter support (lost during attribution rewrite) - Frontend: replace single DateTimePicker with From/To range pickers for datetime fields * Use local timezone in filter picker; add range filter tests The DateTimeRangeFilterDropdown was initializing pickers with dayjs.utc(), causing them to display and accept UTC times directly. The entry form shows local time and converts to UTC, so the filter was inconsistent: entering the same displayed time would produce a filter value 2h offset from what was stored (in UTC+2), making exact boundaries fail unexpectedly. Fix: initialize picker values with dayjs() (local mode) so the filter picker behaves the same as the entry form — shows local times and converts to UTC. Tests: replace 3 separate entity-specific datetime tests with one parametrized test covering spool/filament/vendor, and add range filter cases (start|, |end, start|end). * Replace all entity-specific tests with parametrized tests Replace 16 separate spool/filament/vendor tests for text, boolean, single-choice, multi-choice, and empty-filter with 5 parametrized tests that run against all three entity types. Each test is now defined once and executed 3 times, eliminating copy-paste and ensuring consistent coverage across all entity types. Parametrize invalid-filter-value 400 tests across all entity types The non-numeric-value error uses "Invalid integer/float range filter value" while the missing-colon error uses "Invalid range filter value". Both contain "range filter value", so use that as the assertion substring. * Align custom filter dropdowns with Ant Design choice filter style All three custom filter dropdowns (text, number range, datetime range) now match the built-in choice filter footer: a border-top separator, Reset as a link button on the left (disabled when no filter is active), and OK as a primary button on the right. * fix(fields): correct custom-field filter edge cases across databases - Float exact-match filters now compare numerically (cast to Float) instead of by JSON string, so float fields stored as integer JSON (e.g. "2") or non-canonical decimals (e.g. "2.50") match an equivalent filter. - integer_range/float_range filter and sort no longer return HTTP 500 on CockroachDB: the PostgreSQL '->>' JSON extraction is now also registered for the cockroachdb dialect, which previously fell back to the unsupported JSON_EXTRACT function. - Text exact-match and single-choice equality use ensure_ascii=False so non-ASCII values match how the frontend's JSON.stringify stores them. Co-authored-by: Dieter Blomme <dieterblomme@gmail.com> * test(fields): expand custom-field filter/sort coverage Add tests covering filter composition (multiple extra fields, extra + built-in, filter one field / sort another), pagination total-count, unknown-field handling, text case-insensitivity/substring/non-ASCII, numeric multi-value OR, boolean empty semantics and token rejection, multi-choice substring collisions, empty filters on numeric fields, null-bounded ranges, and additional invalid-value 400 paths. Verified against sqlite, postgres, mariadb and cockroachdb. Co-authored-by: Dieter Blomme <dieterblomme@gmail.com> * style(client): format column.tsx with prettier The custom-field filter dropdowns' Reset buttons were written as one-line onClick handlers that prettier wraps across multiple lines. Apply prettier so the CI style check passes. Co-authored-by: Dieter Blomme <dieterblomme@gmail.com> * fix(fields): decode JSON scalars in-DB for text/choice/datetime custom-field filters Match text, single-choice and datetime custom-field filters against the database-decoded JSON scalar (new _JsonScalarText cross-dialect helper: #>> '{}' on postgres/cockroachdb, JSON_UNQUOTE(JSON_EXTRACT) on mysql, json_extract on sqlite) instead of reconstructing the exact JSON serialization the client wrote. This decouples matching from json.dumps/JSON.stringify encoding quirks (non-ASCII escaping, surrounding quotes). Also escape LIKE wildcards so '%' and '_' in text and multi-choice queries match literally rather than acting as wildcards. Verified against sqlite, postgres, mariadb and cockroachdb. Co-authored-by: Dieter Blomme <dieterblomme@gmail.com> * test(fields): cover LIKE-wildcard escaping in custom-field filters Add parametrized tests (spool/filament/vendor) asserting that '%' and '_' are matched literally in text and multi-choice filters, that a literal '/' (the internal LIKE escape char) matches literally, and that single-choice equality handles a '%' value exactly. Co-authored-by: Dieter Blomme <dieterblomme@gmail.com> --------- Co-authored-by: Donkie <daniel.cf.hultgren@gmail.com> Co-authored-by: akira69 <akira69@gmail.com>