Skip to content

[O2B-1552] Move ad hoc filters inside runs overviews model to filtering model#2106

Open
NarrowsProjects wants to merge 82 commits intomainfrom
improv/O2B-1552/Move-ad-hoc-filters-inside-runsOverviewModel-to-filteringModel
Open

[O2B-1552] Move ad hoc filters inside runs overviews model to filtering model#2106
NarrowsProjects wants to merge 82 commits intomainfrom
improv/O2B-1552/Move-ad-hoc-filters-inside-runsOverviewModel-to-filteringModel

Conversation

@NarrowsProjects
Copy link
Copy Markdown
Collaborator

@NarrowsProjects NarrowsProjects commented Mar 10, 2026 •
edited
Loading

I have a JIRA ticket

  • branch and/or PR name(s) include(s) JIRA ID
  • issue has "Fix version" assigned
  • issue "Status" is set to "In review"
  • PR labels are selected

Notable changes for users:

  • The monte carlo reproducable as not bad filters from the runs per .... overview pages has been changed to also be cleared when the 'reset all filters' button is pressed to be in line with all other filters.

Notable changes for developers:

Filter restructuring

  • ddflpFilter, dcsFilter, and epnFilter have been moved to the filteringModel.
  • detectorsQc[_id][notBadFraction] filters have been moved to a new model: MultiCompositeFilterModel.
  • gaq[notBadFraction] now uses its own filter model with unique normalization logic: GaqFilterModel.

New filter models

  • GaqFilterModel

    • Dedicated model for gaq[notBadFraction].
    • Implements custom normalization logic.

  • ToggleFilterModel

    • Introduced for toggle-based filters.
    • mcReproducibleAsNotBad has been converted to use this model.

  • MultiCompositeFilterModel

    • New flexible model:
      • Can be instantiated with filters.
      • Supports adding filters dynamically after instantiation.
    • Computes normalized values based on:
      • Insertion keys
      • Normalized child filters

Shared filter behavior

  • mcReproducibleAsNotBad:
    • Converted into a ToggleFilterModel.
    • Integrated into both:
      • GaqFilterModel
      • MultiCompositeFilterModel
    • Important: both models must use the same instance for correct behavior.

New components

  • RadioButtonFilter
    • Replaces filters associated with the restructured filter models.
  • ToggleFilter (component + model)
    • Introduced alongside ToggleFilterModel.

Renaming

  • detectorsQc[_id][notBadFraction] → detectorsQcNotBadFraction[_id]

    • Reduces nesting within the filterModel.

Implementation note

  • This approach avoids:

    • Creating a custom wrapper around NumericalComparisonFilterModel solely for normalization, or
    • Nesting MultiCompositeFilterModel within another MultiCompositeFilterModel to achieve automatic normalization.

Changes made to the database:

  • N/A

Guust and others added 30 commits February 20, 2026 10:23
chore: remove redundant model assignment.
722caf7
chore: move all filters denoted as so to a filteringModel
f161cae
Make filterInputModel extend filterModel
9faffaf
rename inputfilter to ParsedInputFilter
247943b
implement authorfilter with ParsedInputFilterModel changes
114285d
re-implement filter
f39f7ae
add tag-filters to the filtering object
df1fea3
replace titleFilter and contentFilter with RawTextFilterModels
96ca85f
make Authorfilter an implementation of RawTextFilterModel
93b3291
add runs filter to the filteringmodel
5a5e830
add environments filter to the filteringmodel
b5e7148
add lhcFills filter to the filteringmodel
3507ba0
add created filter to the filteringmodel
9c63409
move the sort 'filter' to fetchlogs, since it doesn't actually filter…
5500b3e 
… anything
change filter to rawTextFilter for title
a09ae8b
fix test by changing event type to 'change'
512999b
fix content and author tests
0f15812
import openFilteringPanel and resetFilters
7b641ca
fix createdAt filter test
5ab8218
change event types to change
4c96d73
fix isAnyFilterActive
18ce4dc
remove _raw as from authorfilterModel, as it serves no purpose
685dd38
chore: removed ParsedInputFilterModel
4e132fd
chore: add toLowerCase to filterQueryParam computation
caf9812
@NarrowsProjects
[O2B-1530] Lhc fills add sb duration filter (#2080)
41c5a72 
* Filtering by stableBeamsStart and stableBeamsEnd has been added to LHC Fills overview page
* lhcFills endpoint & DTO validation modified and testing added for the aforementioned changes
---------

Co-authored-by: GuustMetz <guust.metz@cern.ch>
Co-authored-by: Guust <metzguust@gmail.com>
@isaachilly
[O2B-1544] Fix pagination for filtered envs and add a test (#2096)
f38f597 
* Replaced the two-query pattern with a single queryBuilder in GetAllEnvironmentsUseCase. The previous approach was redundant following Sequelize performance improvements; furthermore, the original implementation's logic was flawed which resulted in the pagination bug.
remove the combination operator from runs
3efdf1d
remove the combination operator from envirionments
fc61bea
remove the combination operator from lhcFills
9c4df68
make filter computation much more compact using filteringmodel.normalize
b860320
isaachilly
isaachilly reviewed Mar 26, 2026
View reviewed changes
Comment thread test/public/runs/overview.test.js Outdated
it('Should successfully filter runs by their trigger value', async () => {
await navigateToRunsOverview(page);
const filterInputSelectorPrefix = '#triggerValueCheckbox';
const filterInputSelectorPrefix = '#checkboxes-checkbox-';
Copy link
Copy Markdown
Collaborator

@isaachilly isaachilly Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above comment you can then add back the appropriate ID.

Copy link
Copy Markdown
Collaborator Author

@NarrowsProjects NarrowsProjects Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Taken care of

NarrowsProjects added 13 commits April 15, 2026 08:46
@NarrowsProjects NarrowsProjects changed the title [O2B-1552] Move ad hoc filters inside runs overview model to filtering model [O2B-1552] Move ad hoc filters inside runs overviews model to filtering model Apr 17, 2026
@NarrowsProjects NarrowsProjects mentioned this pull request Apr 17, 2026
Merged
4 tasks
Base automatically changed from improv/O2B-1547/Migrate-LhcPeriodOverviewModel-to-use-FilteringModel-pattern to main April 17, 2026 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@graduta graduta Awaiting requested review from graduta graduta is a code owner

@isaachilly isaachilly Awaiting requested review from isaachilly

Requested changes must be addressed to merge this pull request.

Assignees

@NarrowsProjects NarrowsProjects

Labels

frontend javascript Pull requests that update Javascript code

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@NarrowsProjects @isaachilly