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

DwC filter fixups #4222

Merged
merged 9 commits into from
Feb 25, 2025
Merged

DwC filter fixups #4222

merged 9 commits into from
Feb 25, 2025

Conversation

kleintom
Copy link
Contributor

Fixes:

  • sending a DwC filter result to AD filter or CE filter causes an exception (commit 1)
  • In Filter DwC, puts the dropdown attributes select in alphabetical order, puts the columns in the filter results table in alphabetical order (commit 2)
  • you can now choose whether integer and decimal attributes should be matched with 'Exact' (currently they're always wildcard matched). This seems useful to me, but maybe there's a reason to not do it? (Incidentally I think that means all dwc fields now get an 'Exact' checkbox option.)
    • Reloads the checkbox state on page reload (currently checkbox goes away)
  • fixes exceptions when returning to DwC filter after having sent DwC filter to another filter (commit 8)
  • fixes exceptions when filtering on dwc_occurrence_type or dwc_occurrenc_id (commit 3)
  • "fixes" x-overflow in rows of the Attributes selected table (I was perhaps too quick to switch to grid from table here... please push back if this doesn't bring you joy)

@kleintom
Fix sending dwc_occurrences filter result to AD filter or CE filter
9f2fabf
@kleintom
Alphabetize dwc fields lists in Filter DwC dwc_occurrences
5ee1e9c 
The Attributes file determines the columns order of the filter results table,
the ByAttribute.vue file determines the dropdown select field order of dwc attributes in the DwC Occurrences filter.

The default ByAttribute order comes from the model order of those attributes: in the three cases where that facet is currently used, two were alphabetical, dwc_occurrences was mostly alphabetical except that new attributes migrated after the initial model creation were added at the end out of order.
@kleintom
Refactor ByAttribute filter facet, adjust logic
5bdb0ed 
Logic adjustment:
* Allow integer and decimal types to be Exact (formerly were always only wildcard - ...maybe there was a specific reason for that?)
* Restore 'Exact' checkbox state on page reload (formerly dropped the checkbox and just said 'Empty' after reload)
@kleintom
Remove explicit dwc_occurrence_filter attribute facets
16911a2 
They're already handled by the Attributes concern - doing it again explicitly in the filter causes two issues:
* duplicates existing query (minor issue)
* more seriously, if you permit array values for your attribute you can cause an exception since the attributes concern code assumes the attribute accessors return not-arrays.
@kleintom
Fix duplicate query term for attribute in Attributes filter concern
fe05d55
@kleintom
Switch from table to grid for ByAttribute filter selections
a12e0c5 
Fixes x-overflow issues with long attribute names and values - maybe there's a way to accomplish this with table...
@kleintom
Remove is_flagged_for_rebuild from dwc_occurrences filter ATTRIBUTE…
20b86ea 
…S list

The UI list draws from this list, so this removes it at both the UI and the filter level.
@kleintom
Make dwc_occurrence a filter route so that it can be sent to other fi…
52c5671 
…lters

More specifically so that you can return to a dwc filter after having sent it to, e.g., filter AD. Currently going back to DwC from AD throws an exception.
@kleintom
Set 'Any' attribute values to undefined, not null, in filter by attri…
9cd0ece 
…bute

LOL, this shouldn't make a difference, but Object.js's removeEmptyProperties didn't check for null (it does check for undefined), it turns out `typeof null == 'object'` for historical reasons (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/typeof#typeof_null) and then this line checking for an empty object blows up:
`(typeof value === 'object' && !Object.keys(value).length)`

All attributes never selected are by default undefined, so this is better in that sense anyway.
@jlpereira jlpereira merged commit f0aecbb into SpeciesFileGroup:development Feb 25, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kleintom @jlpereira