Skip to content

[O2B-1547] Migrate lhc period overview model to use filtering model pattern #2105

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

Open
NarrowsProjects wants to merge 4 commits into
base: improv/O2B-1549/Migrate-AnchoredSimulationPassesOverviewModel-and-SimulationPassesPerLhcPeriodOverviewModel-to-use-FilteringModel-pattern
Choose a base branch
from
Open

[O2B-1547] Migrate lhc period overview model to use filtering model pattern #2105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e5d567
chore: add filteringModel to overviewmodel class
Mar 10, 2026
05461dd
feat: move namesFilterModel to the filteringModel
Mar 10, 2026
102c1b6
feat: move yearsFilterModel to the filteringModel
Mar 10, 2026
e2ab763
feat: move pdpBeamTypes to the filteringModel
Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/public/views/lhcPeriods/ActiveColumns/lhcPeriodsActiveColumns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export const lhcPeriodsActiveColumns = {
name: 'Name',
visible: true,
sortable: true,
filter: ({ namesFilterModel }) => textFilter(
namesFilterModel,
filter: ({ filteringModel }) => textFilter(
filteringModel.get('names'),
{ class: 'w-75 mt1', placeholder: 'e.g. LHC22a, lhc23b, ...' },
),
classes: 'w-15',
Expand Down Expand Up @@ -92,8 +92,8 @@ export const lhcPeriodsActiveColumns = {
visible: true,
sortable: true,
format: (_, lhcPeriod) => formatLhcPeriodYear(lhcPeriod.name),
filter: ({ yearsFilterModel }) => textFilter(
yearsFilterModel,
filter: ({ filteringModel }) => textFilter(
filteringModel.get('years'),
{ class: 'w-75 mt1', placeholder: 'e.g. 2022, 2023, ...' },
),
classes: 'w-7',
Expand All @@ -104,8 +104,8 @@ export const lhcPeriodsActiveColumns = {
visible: true,
sortable: true,
format: (pdpBeamTypes) => pdpBeamTypes.length > 0 ? pdpBeamTypes.join(',') : '-',
filter: ({ pdpBeamTypesFilterModel }) => textFilter(
pdpBeamTypesFilterModel,
filter: ({ filteringModel }) => textFilter(
filteringModel.get('pdpBeamTypes'),
{ class: 'w-75 mt1', placeholder: 'e.g. pp, PbPb' },
),
classes: 'w-7',
Expand Down
79 changes: 23 additions & 56 deletions lib/public/views/lhcPeriods/Overview/LhcPeriodsOverviewModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* or submit itself to any jurisdiction.
*/

import { FilteringModel } from '../../../components/Filters/common/FilteringModel.js';
import { TextTokensFilterModel } from '../../../components/Filters/common/filters/TextTokensFilterModel.js';
import { OverviewPageModel } from '../../../models/OverviewModel.js';
import { buildUrl } from '/js/src/index.js';
Expand All @@ -27,27 +28,33 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
constructor() {
super();

this._namesFilterModel = new TextTokensFilterModel();
this._registerFilter(this._namesFilterModel);
this._yearsFilterModel = new TextTokensFilterModel();
this._registerFilter(this._yearsFilterModel);
this._pdpBeamTypesFilterModel = new TextTokensFilterModel();
this._registerFilter(this._pdpBeamTypesFilterModel);
this._filteringModel = new FilteringModel({
names: new TextTokensFilterModel(),
years: new TextTokensFilterModel(),
pdpBeamTypes: new TextTokensFilterModel(),
});

this._filteringModel.visualChange$.bubbleTo(this);
this._filteringModel.observe(() => {
this._pagination.silentlySetCurrentPage(1);
this.load();
});
}

/**
* @inheritdoc
*/
getRootEndpoint() {
const params = {
filter: {
names: this._namesFilterModel.normalized,
years: this._yearsFilterModel.normalized,
pdpBeamTypes: this._pdpBeamTypesFilterModel.normalized,
},
};
return buildUrl('/api/lhcPeriodsStatistics', { filter: this._filteringModel.normalized });
}

return buildUrl('/api/lhcPeriodsStatistics', params);
/**
* Return the model managing all filters
*
* @return {FilteringModel} the filtering model
*/
get filteringModel() {
return this._filteringModel;
}

/**
Expand All @@ -66,61 +73,21 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
});
}

/**
* Returns lhc periods names filter model
* @return {TextTokensFilterModel} lhc periods names filter model
*/
get namesFilterModel() {
return this._namesFilterModel;
}

/**
* Returns lhc periods years filter model
* @return {TextTokensFilterModel} lhc periods years filter model
*/
get yearsFilterModel() {
return this._yearsFilterModel;
}

/**
* Returns lhc periods beam type filter model
* @return {TextTokensFilterModel} lhc periods beam type filter model
*/
get pdpBeamTypesFilterModel() {
return this._pdpBeamTypesFilterModel;
}

/**
* Reset this model to its default
*
* @returns {void}
*/
reset() {
super.reset();
this._namesFilterModel.reset();
this._yearsFilterModel.reset();
this._pdpBeamTypesFilterModel.reset();
}

/**
* Register a new filter model
* @param {FilterModel} filterModel the filter model to register
* @return {void}
* @private
*/
_registerFilter(filterModel) {
filterModel.visualChange$.bubbleTo(this);
filterModel.observe(() => {
this._pagination.silentlySetCurrentPage(1);
this.load();
});
this._filteringModel.reset();
}

/**
* States whether any filter is active
* @return {boolean} true if any filter is active
*/
isAnyFilterActive() {
return !this._namesFilterModel.isEmpty || !this._yearsFilterModel.isEmpty || !this._pdpBeamTypesFilterModel.isEmpty;
return this._filteringModel.isAnyFilterActive();
}
}
Loading