chore: move the pageIdentifier definitions to the entity models

NarrowsProjects · NarrowsProjects · commit de9af6ffe3c6 · 2026-04-27T09:16:11.000+02:00
diff --git a/lib/public/views/DataPasses/DataPassesModel.js b/lib/public/views/DataPasses/DataPassesModel.js
@@ -26,10 +26,10 @@ export class DataPassesModel extends Observable {
     constructor(router) {
         super();
 
-        this._perLhcPeriodOverviewModel = new DataPassesPerLhcPeriodOverviewModel(router);
+        this._perLhcPeriodOverviewModel = new DataPassesPerLhcPeriodOverviewModel(router, ['data-passes-per-lhc-period-overview']);
         this._perLhcPeriodOverviewModel.bubbleTo(this);
 
-        this._perSimulationPassOverviewModel = new DataPassesPerSimulationPassOverviewModel(router);
+        this._perSimulationPassOverviewModel = new DataPassesPerSimulationPassOverviewModel(router, ['data-passes-per-simulation-pass-overview']);
         this._perSimulationPassOverviewModel.bubbleTo(this);
     }
 
diff --git a/lib/public/views/DataPasses/DataPassesOverviewModel.js b/lib/public/views/DataPasses/DataPassesOverviewModel.js
@@ -24,7 +24,7 @@ export class DataPassesOverviewModel extends OverviewPageModel {
      * Constructor
      * @param {QueryRouter} router router that controls the application's page navigation
      */
-    constructor(router) {
+    constructor(router, pageIdentifiers) {
         super();
         this._filteringModel = new FilteringModel(
             router,
@@ -36,6 +36,7 @@ export class DataPassesOverviewModel extends OverviewPageModel {
             },
         );
 
+        this._filteringModel.pageIdentifiers = pageIdentifiers;
         this._filteringModel.visualChange$.bubbleTo(this);
         this._filteringModel.observe(() => {
             this._pagination.currentPage = 1;
diff --git a/lib/public/views/DataPasses/PerLhcPeriodOverview/DataPassesPerLhcPeriodOverviewModel.js b/lib/public/views/DataPasses/PerLhcPeriodOverview/DataPassesPerLhcPeriodOverviewModel.js
@@ -21,10 +21,9 @@ export class DataPassesPerLhcPeriodOverviewModel extends DataPassesOverviewModel
      * Constructor
      * @param {QueryRouter} router router that controls the application's page navigation
      */
-    constructor(router) {
-        super(router);
+    constructor(router, pageIdentifiers) {
+        super(router, pageIdentifiers);
         this._lhcPeriodId = null;
-        this._filteringModel.pageIdentifiers = ['data-passes-per-lhc-period-overview'];
     }
 
     /**
diff --git a/lib/public/views/DataPasses/PerSimulationPassOverview/DataPassesPerSimulationPassOverviewModel.js b/lib/public/views/DataPasses/PerSimulationPassOverview/DataPassesPerSimulationPassOverviewModel.js
@@ -23,11 +23,10 @@ export class DataPassesPerSimulationPassOverviewModel extends DataPassesOverview
      * Constructor
      * @param {QueryRouter} router router that controls the application's page navigation
      */
-    constructor(router) {
-        super(router);
+    constructor(router, pageIdentifiers) {
+        super(router, pageIdentifiers);
         this._simulationPass = new ObservableData(RemoteData.notAsked());
         this._simulationPass.bubbleTo(this);
-        this._filteringModel.pageIdentifiers = ['data-passes-per-simulation-pass-overview'];
     }
 
     /**
diff --git a/lib/public/views/Environments/EnvironmentModel.js b/lib/public/views/Environments/EnvironmentModel.js
@@ -29,7 +29,7 @@ export class EnvironmentModel extends Observable {
         super();
 
         // Sub-models
-        this._overviewModel = new EnvironmentOverviewModel(model);
+        this._overviewModel = new EnvironmentOverviewModel(model, ['env-overview']);
         this._overviewModel.bubbleTo(this);
 
         this._detailsModel = new EnvironmentDetailsModel();
diff --git a/lib/public/views/Environments/Overview/EnvironmentOverviewModel.js b/lib/public/views/Environments/Overview/EnvironmentOverviewModel.js
@@ -29,7 +29,7 @@ export class EnvironmentOverviewModel extends OverviewPageModel {
      * Constructor
      * @param {Model} model global model
      */
-    constructor(model) {
+    constructor(model, pageIdentifiers) {
         super();
 
         this._filteringModel = new FilteringModel(
@@ -49,6 +49,7 @@ export class EnvironmentOverviewModel extends OverviewPageModel {
             },
         );
 
+        this._filteringModel.pageIdentifiers = pageIdentifiers;
         this._filteringModel.observe(() => this._applyFilters(true));
         this._filteringModel.visualChange$?.bubbleTo(this);
 
@@ -59,7 +60,6 @@ export class EnvironmentOverviewModel extends OverviewPageModel {
 
         model.appConfiguration$.observe(() => updateDebounceTime());
         updateDebounceTime();
-        this._filteringModel.pageIdentifiers = ['env-overview'];
     }
 
     /**
diff --git a/lib/public/views/Home/Overview/HomePageModel.js b/lib/public/views/Home/Overview/HomePageModel.js
@@ -26,13 +26,13 @@ export class HomePageModel extends Observable {
      */
     constructor(model) {
         super();
-        this._runsOverviewModel = new RunsOverviewModel(model);
+        this._runsOverviewModel = new RunsOverviewModel(model, ['home']);
         this._runsOverviewModel.bubbleTo(this);
 
-        this._logsOverviewModel = new LogsOverviewModel(model, true);
+        this._logsOverviewModel = new LogsOverviewModel(model, true, ['home']);
         this._logsOverviewModel.bubbleTo(this);
 
-        this._lhcFillsOverviewModel = new LhcFillsOverviewModel(model.router, true);
+        this._lhcFillsOverviewModel = new LhcFillsOverviewModel(model.router, true, ['home']);
         this._lhcFillsOverviewModel.bubbleTo(this);
     }
 
diff --git a/lib/public/views/LhcFills/LhcFills.js b/lib/public/views/LhcFills/LhcFills.js
@@ -29,7 +29,7 @@ export default class LhcFills extends Observable {
         this.model = model;
 
         // Sub-models
-        this._overviewModel = new LhcFillsOverviewModel(model.router, true);
+        this._overviewModel = new LhcFillsOverviewModel(model.router, true, ['lhc-fill-overview']);
         this._overviewModel.bubbleTo(this);
 
         this._detailsModel = new LhcFillDetailsModel();
diff --git a/lib/public/views/LhcFills/Overview/LhcFillsOverviewModel.js b/lib/public/views/LhcFills/Overview/LhcFillsOverviewModel.js
@@ -33,7 +33,7 @@ export class LhcFillsOverviewModel extends OverviewPageModel {
      * @param {QueryRouter} router router that controls the application's page navigation
      * @param {boolean} [stableBeamsOnly=false] if true, overview will load stable beam only
      */
-    constructor(router, stableBeamsOnly = false) {
+    constructor(router, stableBeamsOnly = false, pageIdentifiers) {
         super();
 
         this._filteringModel = new FilteringModel(
@@ -50,11 +50,11 @@ export class LhcFillsOverviewModel extends OverviewPageModel {
             },
         );
 
+        this._filteringModel.pageIdentifiers = pageIdentifiers;
         this._filteringModel.observe(() => this._applyFilters());
         this._filteringModel.visualChange$.bubbleTo(this);
 
         this.reset(false);
-        this._filteringModel.pageIdentifiers = ['lhc-fill-overview'];
     }
 
     /**
diff --git a/lib/public/views/Logs/LogsModel.js b/lib/public/views/Logs/LogsModel.js
@@ -30,7 +30,7 @@ export class LogsModel extends Observable {
         super();
         this.model = model;
 
-        this._overviewModel = new LogsOverviewModel(model);
+        this._overviewModel = new LogsOverviewModel(model, false, 'log-overview');
         this._overviewModel.bubbleTo(this);
 
         this._treeViewModel = new LogTreeViewModel();
diff --git a/lib/public/views/Logs/Overview/LogsOverviewModel.js b/lib/public/views/Logs/Overview/LogsOverviewModel.js
@@ -35,7 +35,7 @@ export class LogsOverviewModel extends Observable {
      * @param {Model} model global model
      * @param {boolean} excludeAnonymous Whether to exclude anonymous logs
      */
-    constructor(model, excludeAnonymous = false) {
+    constructor(model, excludeAnonymous = false, pageIdentifiers) {
         super();
 
         this._filteringModel = new FilteringModel(
@@ -52,6 +52,7 @@ export class LogsOverviewModel extends Observable {
             },
         );
 
+        this._filteringModel.pageIdentifiers = pageIdentifiers;
         this._filteringModel.observe(() => this._applyFilters());
         this._filteringModel.visualChange$.bubbleTo(this);
 
@@ -75,7 +76,6 @@ export class LogsOverviewModel extends Observable {
         excludeAnonymous && this._filteringModel.get('author').update('!Anonymous');
 
         this.reset(false);
-        this._filteringModel.pageIdentifiers = ['log-overview'];
     }
 
     /**
diff --git a/lib/public/views/QcFlagTypes/Overview/QcFlagTypesOverviewModel.js b/lib/public/views/QcFlagTypes/Overview/QcFlagTypesOverviewModel.js
@@ -25,7 +25,7 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
      * Constructor
      * @param {QueryRouter} router router that controls the application's page navigation
      */
-    constructor(router) {
+    constructor(router, pageIdentifiers) {
         super();
 
         this._filteringModel = new FilteringModel(
@@ -37,13 +37,13 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
             },
         );
 
+        this._filteringModel.pageIdentifiers = pageIdentifiers;
         this._filteringModel.observe(() => {
             this._pagination.silentlySetCurrentPage(1);
             this.load();
         });
 
         this._filteringModel.visualChange$.bubbleTo(this);
-        this._filteringModel.pageIdentifiers = ['qc-flag-types-overview'];
     }
 
     /**
diff --git a/lib/public/views/QcFlagTypes/QcFlagTypesModel.js b/lib/public/views/QcFlagTypes/QcFlagTypesModel.js
@@ -29,7 +29,7 @@ export class QcFlagTypesModel extends Observable {
         this.model = model;
 
         // Overview
-        this._overviewModel = new QcFlagTypesOverviewModel(model.router);
+        this._overviewModel = new QcFlagTypesOverviewModel(model.router, ['qc-flag-types-overview']);
         this._overviewModel.bubbleTo(this);
     }
 
diff --git a/lib/public/views/Runs/Overview/FixedPdpBeamTypeRunsOverviewModel.js b/lib/public/views/Runs/Overview/FixedPdpBeamTypeRunsOverviewModel.js
@@ -24,8 +24,8 @@ export class FixedPdpBeamTypeRunsOverviewModel extends RunsWithQcModel {
      * Constructor
      * @param {Model} model global model
      */
-    constructor(model) {
-        super(model);
+    constructor(model, pageIdentifiers) {
+        super(model, pageIdentifiers);
         this._pdpBeamTypes = [];
     }
 
diff --git a/lib/public/views/Runs/Overview/RunsOverviewModel.js b/lib/public/views/Runs/Overview/RunsOverviewModel.js
@@ -50,7 +50,7 @@ export class RunsOverviewModel extends OverviewPageModel {
      * The constructor of the Overview model object
      * @param {Model} model global model
      */
-    constructor(model) {
+    constructor(model, pageIdentifiers) {
         super();
 
         this._filteringModel = new FilteringModel(
@@ -102,6 +102,7 @@ export class RunsOverviewModel extends OverviewPageModel {
             },
         );
 
+        this._filteringModel.pageIdentifiers = pageIdentifiers;
         this._filteringModel.observe(() => this._applyFilters(true));
         this._filteringModel.visualChange$.bubbleTo(this);
 
@@ -119,7 +120,6 @@ export class RunsOverviewModel extends OverviewPageModel {
 
         model.appConfiguration$.observe(() => updateDebounceTime());
         updateDebounceTime();
-        this._filteringModel.pageIdentifiers = ['run-overview'];
     }
 
     /**
diff --git a/lib/public/views/Runs/Overview/RunsWithQcModel.js b/lib/public/views/Runs/Overview/RunsWithQcModel.js
@@ -69,8 +69,8 @@ export class RunsWithQcModel extends RunsOverviewModel {
      * Constructor
      * @param {Model} model global model
      */
-    constructor(model) {
-        super(model);
+    constructor(model, pageIdentifiers) {
+        super(model, pageIdentifiers);
 
         this._observablesQcFlagsSummaryDependsOn$ = null;
         // This filter instance will be added as a sub-filter for a MultiCompositionFilter and a GaqFilter later.
diff --git a/lib/public/views/Runs/RunPerDataPass/RunsPerDataPassOverviewModel.js b/lib/public/views/Runs/RunPerDataPass/RunsPerDataPassOverviewModel.js
@@ -36,8 +36,8 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
      * Constructor
      * @param {Model} model global model
      */
-    constructor(model) {
-        super(model);
+    constructor(model, pageIdentifiers) {
+        super(model, pageIdentifiers);
         this._dataPass$ = new ObservableData(RemoteData.notAsked());
         this._dataPass$.bubbleTo(this);
 
@@ -74,7 +74,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
         this._discardAllQcFlagsActionState$.bubbleTo(this);
 
         this._item$.observe(() => this._fetchGaqSummaryForCurrentRuns());
-        this._filteringModel.pageIdentifiers = ['runs-per-data-pass'];
     }
 
     /**
diff --git a/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js b/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js
@@ -32,8 +32,8 @@ export class RunsPerLhcPeriodOverviewModel extends FixedPdpBeamTypeRunsOverviewM
      *
      * @param {Model} model global model
      */
-    constructor(model) {
-        super(model);
+    constructor(model, pageIdentifiers) {
+        super(model, pageIdentifiers);
 
         this._lhcPeriodId = null;
         this._lhcPeriodStatistics$ = new ObservableData(RemoteData.notAsked());
@@ -55,7 +55,6 @@ export class RunsPerLhcPeriodOverviewModel extends FixedPdpBeamTypeRunsOverviewM
 
         this._tabbedPanelModel = new RunsPerLhcPeriodTabbedPanelModel(this._qcSummary$);
         this._tabbedPanelModel.bubbleTo(this);
-        this._filteringModel.pageIdentifiers = ['runs-per-lhc-period'];
     }
 
     /**
diff --git a/lib/public/views/Runs/RunsModel.js b/lib/public/views/Runs/RunsModel.js
@@ -32,13 +32,13 @@ export class RunsModel extends Observable {
         super();
         this._detailsModel = new RunDetailsModel();
         this._detailsModel.bubbleTo(this);
-        this._overviewModel = new RunsOverviewModel(model);
+        this._overviewModel = new RunsOverviewModel(model, ['run-overview']);
         this._overviewModel.bubbleTo(this);
-        this._perLhcPeriodOverviewModel = new RunsPerLhcPeriodOverviewModel(model);
+        this._perLhcPeriodOverviewModel = new RunsPerLhcPeriodOverviewModel(model, ['runs-per-lhc-period']);
         this._perLhcPeriodOverviewModel.bubbleTo(this);
-        this._perDataPassOverviewModel = new RunsPerDataPassOverviewModel(model);
+        this._perDataPassOverviewModel = new RunsPerDataPassOverviewModel(model, ['runs-per-data-pass']);
         this._perDataPassOverviewModel.bubbleTo(this);
-        this._perSimulationPassOverviewModel = new RunsPerSimulationPassOverviewModel(model);
+        this._perSimulationPassOverviewModel = new RunsPerSimulationPassOverviewModel(model, ['runs-per-simulation-pass']);
         this._perSimulationPassOverviewModel.bubbleTo(this);
     }
 
diff --git a/lib/public/views/Runs/RunsPerSimulationPass/RunsPerSimulationPassOverviewModel.js b/lib/public/views/Runs/RunsPerSimulationPass/RunsPerSimulationPassOverviewModel.js
@@ -24,16 +24,15 @@ export class RunsPerSimulationPassOverviewModel extends FixedPdpBeamTypeRunsOver
      * Constructor
      * @param {Model} model global model
      */
-    constructor(model) {
-        super(model);
+    constructor(model, pageIdentifiers) {
+        super(model, pageIdentifiers);
 
         this._simulationPass$ = new ObservableData(RemoteData.notAsked());
 
         this._detectors$ = rctDetectorsProvider.qc$;
 
         this._detectors$.bubbleTo(this);
         this._simulationPass$.bubbleTo(this);
-        this._filteringModel.pageIdentifiers = ['runs-per-simulation-pass'];
     }
 
     /**
diff --git a/lib/public/views/SimulationPasses/AnchoredOverview/AnchoredSimulationPassesOverviewModel.js b/lib/public/views/SimulationPasses/AnchoredOverview/AnchoredSimulationPassesOverviewModel.js
@@ -25,11 +25,12 @@ export class AnchoredSimulationPassesOverviewModel extends OverviewPageModel {
      * Constructor
      * @param {QueryRouter} router router that controls the application's page navigation
      */
-    constructor(router) {
+    constructor(router, pageIdentifiers) {
         super();
 
         this._filteringModel = new FilteringModel(router, { names: new TextTokensFilterModel() });
 
+        this._filteringModel.pageIdentifiers = pageIdentifiers;
         this._filteringModel.observe(() => {
             this._pagination.silentlySetCurrentPage(1);
             this.load();
@@ -38,7 +39,6 @@ export class AnchoredSimulationPassesOverviewModel extends OverviewPageModel {
         this._filteringModel.visualChange$.bubbleTo(this);
 
         this._dataPass = new ObservableData(RemoteData.notAsked());
-        this._filteringModel.pageIdentifiers = ['anchored-simulation-passes-overview'];
     }
 
     /**
diff --git a/lib/public/views/SimulationPasses/PerLhcPeriodOverview/SimulationPassesPerLhcPeriodOverviewModel.js b/lib/public/views/SimulationPasses/PerLhcPeriodOverview/SimulationPassesPerLhcPeriodOverviewModel.js
@@ -25,10 +25,12 @@ export class SimulationPassesPerLhcPeriodOverviewModel extends OverviewPageModel
      * Constructor
      * @param {QueryRouter} router router that controls the application's page navigation
      */
-    constructor(router) {
+    constructor(router, pageIdentifiers) {
         super();
 
         this._filteringModel = new FilteringModel(router, { names: new TextTokensFilterModel() });
+
+        this._filteringModel.pageIdentifiers = pageIdentifiers;
         this._filteringModel.visualChange$.bubbleTo(this);
         this._filteringModel.observe(() => {
             this._pagination.silentlySetCurrentPage(1);
@@ -39,7 +41,6 @@ export class SimulationPassesPerLhcPeriodOverviewModel extends OverviewPageModel
         this._lhcPeriod.bubbleTo(this);
 
         this._lhcPeriodId = null;
-        this._filteringModel.pageIdentifiers = ['simulation-passes-per-lhc-period-overview'];
     }
 
     /**
diff --git a/lib/public/views/SimulationPasses/SimulationPassesModel.js b/lib/public/views/SimulationPasses/SimulationPassesModel.js
@@ -26,10 +26,10 @@ export class SimulationPassesModel extends Observable {
     constructor(router) {
         super();
 
-        this._perLhcPeriodOverviewModel = new SimulationPassesPerLhcPeriodOverviewModel(router);
+        this._perLhcPeriodOverviewModel = new SimulationPassesPerLhcPeriodOverviewModel(router, ['simulation-passes-per-lhc-period-overview']);
         this._perLhcPeriodOverviewModel.bubbleTo(this);
 
-        this._anchoredOverviewModel = new AnchoredSimulationPassesOverviewModel(router);
+        this._anchoredOverviewModel = new AnchoredSimulationPassesOverviewModel(router, ['anchored-simulation-passes-overview']);
         this._anchoredOverviewModel.bubbleTo(this);
     }
 
diff --git a/lib/public/views/lhcPeriods/LhcPeriodsModel.js b/lib/public/views/lhcPeriods/LhcPeriodsModel.js
@@ -25,7 +25,7 @@ export class LhcPeriodsModel extends Observable {
     constructor(router) {
         super();
 
-        this._overviewModel = new LhcPeriodsOverviewModel(router);
+        this._overviewModel = new LhcPeriodsOverviewModel(router, ['lhc-period-overview']);
         this._overviewModel.bubbleTo(this);
     }
 
diff --git a/lib/public/views/lhcPeriods/Overview/LhcPeriodsOverviewModel.js b/lib/public/views/lhcPeriods/Overview/LhcPeriodsOverviewModel.js
