Skip to content

fix(custom-fields): align #773 filter/sort with current master#858

Closed
akira69 wants to merge 5 commits intoDonkie:masterfrom
akira69:feat/ui-improvements-upstream-split
Closed

fix(custom-fields): align #773 filter/sort with current master#858
akira69 wants to merge 5 commits intoDonkie:masterfrom
akira69:feat/ui-improvements-upstream-split

Conversation

@akira69
Copy link
Copy Markdown

@akira69 akira69 commented Feb 22, 2026

Summary

This PR is intended as the small add-on / current-master alignment layer for upstream PR #773.

Conceptually:

  • #773 is the main custom-field filter/sort feature
  • #858 is the follow-up needed to keep that work aligned with current master

Important Branch Note

Although the intended scope here is the follow-up layer, this branch currently still contains the inherited #773 custom-field commits as its base.

So reviewers should read the scope like this:

  • the underlying feature comes from #773
  • the reason this branch still matters is the follow-up alignment/fix work on top of that feature set

If the #773 work is updated directly, this PR may no longer need to exist separately.

What #773 Covers

The primary custom-field feature set comes from #773, including:

  • custom-field sort/filter behavior in list tables
  • backend filter/sort support for custom-field types:
    • text
    • integer / float
    • boolean
    • choice (single + multi)
    • datetime
    • integer / float ranges
  • range sorting using the low-end value
  • integration coverage for custom-field filter/sort behavior

What #858 Adds

The follow-up work here is the current-master alignment layer:

  • f70d801 fix(ts): align custom-field filter/sort typings with current master

In practice, this fixes the frontend/state-mapping edge so custom-field sort and filter state stays attached to the correct dynamic column when dataIndex is array-based.

Files directly relevant to that add-on:

  • client/src/components/column.tsx
  • client/src/utils/sorting.ts

Scope Boundary

This PR is only about custom/extra-field filter and sort behavior.

It does not include the broader searchable filter UX for standard columns. That work remains separate in #862.

So:

  • #858 = custom-field / extra-field filter-sort behavior and alignment
  • #862 = broader filter-dropdown UX improvements for normal columns

Validation

  • Frontend build:
    • docker run --rm -v "$PWD:/app" -w /app/client -e VITE_APIURL=/api/v1 -e NPM_CONFIG_CACHE=/tmp/.npm -e XDG_CONFIG_HOME=/tmp/.config -e HOME=/tmp node:20 /bin/bash -lc "npm ci && npm run build"
  • Integration coverage remains tied to the #773 custom-field stack:
    • tests_integration/tests/fields/test_filter_sort.py

Out of Scope

The following remain separate:

  • table interactions / resizing (#861)
  • searchable filter dropdown UX (#862)
  • color / hex preview UI (#863)
  • save / clear button state styling (#864)
  • spool-count column extraction (#865)
  • floating edit action layout (#866)
  • column button wording (#867)
  • show-page header touch-ups (#868)

Merge Coordination

  1. #773 remains the primary feature reference for this area.
  2. #858 should be treated as the follow-up alignment layer for that work, even though the branch still contains the inherited #773 commits.
  3. If #773 is updated directly, the cleanest outcome may be to fold the f70d801 follow-up into that branch and close #858.
  4. #862 and #865 do not duplicate this feature, but they touch adjacent API/database plumbing and may need a small rebase.

Shared touchpoints with #862 / #865:

  • spoolman/api/v1/filament.py
  • spoolman/database/filament.py

Additional shared touchpoints with #862:

  • spoolman/api/v1/spool.py
  • spoolman/database/spool.py
  • client/src/components/column.tsx

Expected conflict scope is shared function signatures and adjacent logic, not duplicate feature behavior.

@akira69 akira69 force-pushed the feat/ui-improvements-upstream-split branch from 8cf7854 to d3877c9 Compare February 22, 2026 15:48
@akira69 akira69 changed the title feat(ui/tables): filtering, column controls, and list UX improvements feat(ui): table controls, filtering fixes, and list performance Feb 22, 2026
@akira69 akira69 force-pushed the feat/ui-improvements-upstream-split branch 3 times, most recently from 09b01a7 to 2f46cab Compare February 22, 2026 19:43
@akira69 akira69 force-pushed the feat/ui-improvements-upstream-split branch from 93f167e to 4265d5a Compare February 23, 2026 15:14
@akira69 akira69 marked this pull request as ready for review February 23, 2026 16:43
@akira69 akira69 marked this pull request as draft February 23, 2026 20:52
@akira69 akira69 force-pushed the feat/ui-improvements-upstream-split branch from 5327ceb to 31dccf7 Compare February 23, 2026 22:26
akira69 added a commit to akira69/Spoolman_Labels that referenced this pull request Feb 24, 2026
@akira69 akira69 force-pushed the feat/ui-improvements-upstream-split branch from 31dccf7 to 004851e Compare February 24, 2026 04:42
akira69 added a commit to akira69/Spoolman_Labels that referenced this pull request Feb 24, 2026
@akira69 akira69 force-pushed the feat/ui-improvements-upstream-split branch from 004851e to 7f5e300 Compare February 24, 2026 05:51
akira69 added a commit to akira69/Spoolman_Labels that referenced this pull request Feb 24, 2026
@akira69 akira69 force-pushed the feat/ui-improvements-upstream-split branch from 7f5e300 to 2e1e738 Compare February 24, 2026 06:01
@akira69 akira69 force-pushed the feat/ui-improvements-upstream-split branch from 2e1e738 to 1908c55 Compare February 24, 2026 07:15
@akira69 akira69 changed the title feat(ui): table controls, filtering fixes, and list performance feat(custom-fields): filter/sort dynamic fields across all types Feb 24, 2026
@akira69 akira69 force-pushed the feat/ui-improvements-upstream-split branch from 1908c55 to 31830b0 Compare February 26, 2026 17:52
@akira69 akira69 force-pushed the feat/ui-improvements-upstream-split branch from 31830b0 to f70d801 Compare February 26, 2026 20:25
@akira69 akira69 changed the title feat(custom-fields): filter/sort dynamic fields across all types fix(custom-fields): align #773 filter/sort with current master Mar 2, 2026
@akira69 akira69 closed this Mar 2, 2026
@akira69 akira69 reopened this Mar 2, 2026
@akira69
Copy link
Copy Markdown
Author

akira69 commented Mar 26, 2026

Closing this as superseded by #893 for the active PR 773 review-fix path.

The meaningful pieces from here are now covered there:

  • backend review fixes: 9711495
  • frontend table-state / TS cleanup: 3208f8d
  • user-facing extra-fields settings copy update: 9abd208

Helper PR: #893
PR 773 review thread: #773

@akira69 akira69 closed this Mar 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants