Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tidy up organisation lists #3215

Merged
merged 3 commits into from
Oct 9, 2024
Merged

Tidy up organisation lists #3215

merged 3 commits into from
Oct 9, 2024

Commits on Oct 7, 2024

  1. Tidy up organisation model tests 

    This brings the spec more in line with others. It also removes some
spec-level setup, since it was only used in a couple of tests - setting
it up before every tests feels inefficient
    @yndajas
    yndajas committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    df5a120 View commit details
    Browse the repository at this point in the history

  2. Split organisation index into two tabs 

    ... one for active organisations, one for inactive. This will reduce the
closed organisation noise and make it easier to look through active
organisations by default. We'll separately set a default order on
organisations so that closed ones come last, but this felt like a nicer
way to handle the organisations index, and follows the pattern
established by the applications index

This required a change to a 2SV integration test so that it looks for a
table within the active tab/container, since both tabs and hence both
tables are within the underlying HTML. Initially I looked to extend
existing methods in the `HtmlTableHelpers` file to allow us to look for
a table within the right container, but I noticed that the helper's
methods were only used in this integration test. Since their use case
was specific to this spec, I've opted to reduce the abstraction here and
keep it simple, similar to recent minor shifts in the approach to access
and permissions integration tests. This reduces complexity in the
codebase, and brings all the relevant code closer to the context of the
tests - I'm not always a proponent of this approach, but it felt
appropriate here given the limited use case!
    @yndajas
    yndajas committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    b1192fa View commit details
    Browse the repository at this point in the history

  3. Order active organisations before closed ones 

    Given all the organisation autocompletes filter out closed organisations
and the organisations index is now tabbed, the closed ordering might
only affect the users index filter at present. We could alternatively
just sort manually in this use case

Ordering by a Boolean field seemed a little tricky, but this helepd:
https://stackoverflow.com/a/12334676/4002016
    @yndajas
    yndajas committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    c5a7c56 View commit details
    Browse the repository at this point in the history