chore: rename pageIdentifiers to pageIdentifier

NarrowsProjects · NarrowsProjects · commit ae6c2877479b · 2026-04-27T09:16:59.000+02:00
diff --git a/lib/public/components/Filters/common/FilteringModel.js b/lib/public/components/Filters/common/FilteringModel.js
@@ -29,7 +29,7 @@ export class FilteringModel extends Observable {
     constructor(router, filters) {
         super();
         this._visualChange$ = new Observable();
-        this._pageIdentifiers = [];
+        this._pageIdentifier = null;
 
         this._router = router;
         this._filters = {};
@@ -40,12 +40,12 @@ export class FilteringModel extends Observable {
     /**
      * Sets the page identifiers
      *
-     * @param {string[]} identifiers Strings that identify the pages as shown in the router params.
+     * @param {string} identifier a string identifies a page from the router params.
      * Used to prevent unneeded reads/writes from/to the url
      * @returns {void}
      */
-    set pageIdentifiers(identifiers) {
-        this._pageIdentifiers = identifiers;
+    set pageIdentifier(identifier) {
+        this._pageIdentifier = identifier;
     }
 
     /**
@@ -133,7 +133,7 @@ export class FilteringModel extends Observable {
         const newParams = { ...params };
         newParams.filter = this.normalized;
 
-        if (this._pageIdentifiers.includes(params.page)) {
+        if (this._pageIdentifier === params.page) {
             this._router.go(buildUrl('?', newParams), false, true);
         }
 
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, ['data-passes-per-lhc-period-overview']);
+        this._perLhcPeriodOverviewModel = new DataPassesPerLhcPeriodOverviewModel(router, 'data-passes-per-lhc-period-overview');
         this._perLhcPeriodOverviewModel.bubbleTo(this);
 
-        this._perSimulationPassOverviewModel = new DataPassesPerSimulationPassOverviewModel(router, ['data-passes-per-simulation-pass-overview']);
+        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
@@ -23,8 +23,9 @@ export class DataPassesOverviewModel extends OverviewPageModel {
     /**
      * Constructor
      * @param {QueryRouter} router router that controls the application's page navigation
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(router, pageIdentifiers) {
+    constructor(router, pageIdentifier) {
         super();
         this._filteringModel = new FilteringModel(
             router,
@@ -36,7 +37,7 @@ export class DataPassesOverviewModel extends OverviewPageModel {
             },
         );
 
-        this._filteringModel.pageIdentifiers = pageIdentifiers;
+        this._filteringModel.pageIdentifier = pageIdentifier;
         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
@@ -20,9 +20,10 @@ export class DataPassesPerLhcPeriodOverviewModel extends DataPassesOverviewModel
     /**
      * Constructor
      * @param {QueryRouter} router router that controls the application's page navigation
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(router, pageIdentifiers) {
-        super(router, pageIdentifiers);
+    constructor(router, pageIdentifier) {
+        super(router, pageIdentifier);
         this._lhcPeriodId = null;
     }
 
diff --git a/lib/public/views/DataPasses/PerSimulationPassOverview/DataPassesPerSimulationPassOverviewModel.js b/lib/public/views/DataPasses/PerSimulationPassOverview/DataPassesPerSimulationPassOverviewModel.js
@@ -22,9 +22,10 @@ export class DataPassesPerSimulationPassOverviewModel extends DataPassesOverview
     /**
      * Constructor
      * @param {QueryRouter} router router that controls the application's page navigation
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(router, pageIdentifiers) {
-        super(router, pageIdentifiers);
+    constructor(router, pageIdentifier) {
+        super(router, pageIdentifier);
         this._simulationPass = new ObservableData(RemoteData.notAsked());
         this._simulationPass.bubbleTo(this);
     }
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, ['env-overview']);
+        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
@@ -28,8 +28,9 @@ export class EnvironmentOverviewModel extends OverviewPageModel {
     /**
      * Constructor
      * @param {Model} model global model
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(model, pageIdentifiers) {
+    constructor(model, pageIdentifier) {
         super();
 
         this._filteringModel = new FilteringModel(
@@ -49,7 +50,7 @@ export class EnvironmentOverviewModel extends OverviewPageModel {
             },
         );
 
-        this._filteringModel.pageIdentifiers = pageIdentifiers;
+        this._filteringModel.pageIdentifier = pageIdentifier;
         this._filteringModel.observe(() => this._applyFilters(true));
         this._filteringModel.visualChange$?.bubbleTo(this);
 
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, ['home']);
+        this._runsOverviewModel = new RunsOverviewModel(model, 'home');
         this._runsOverviewModel.bubbleTo(this);
 
-        this._logsOverviewModel = new LogsOverviewModel(model, true, ['home']);
+        this._logsOverviewModel = new LogsOverviewModel(model, true, 'home');
         this._logsOverviewModel.bubbleTo(this);
 
-        this._lhcFillsOverviewModel = new LhcFillsOverviewModel(model.router, true, ['home']);
+        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, ['lhc-fill-overview']);
+        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
@@ -32,8 +32,9 @@ 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
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(router, stableBeamsOnly = false, pageIdentifiers) {
+    constructor(router, stableBeamsOnly = false, pageIdentifier) {
         super();
 
         this._filteringModel = new FilteringModel(
@@ -50,7 +51,7 @@ export class LhcFillsOverviewModel extends OverviewPageModel {
             },
         );
 
-        this._filteringModel.pageIdentifiers = pageIdentifiers;
+        this._filteringModel.pageIdentifier = pageIdentifier;
         this._filteringModel.observe(() => this._applyFilters());
         this._filteringModel.visualChange$.bubbleTo(this);
 
diff --git a/lib/public/views/Logs/Overview/LogsOverviewModel.js b/lib/public/views/Logs/Overview/LogsOverviewModel.js
@@ -34,8 +34,9 @@ export class LogsOverviewModel extends Observable {
      *
      * @param {Model} model global model
      * @param {boolean} excludeAnonymous Whether to exclude anonymous logs
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(model, excludeAnonymous = false, pageIdentifiers) {
+    constructor(model, excludeAnonymous = false, pageIdentifier) {
         super();
 
         this._filteringModel = new FilteringModel(
@@ -52,7 +53,7 @@ export class LogsOverviewModel extends Observable {
             },
         );
 
-        this._filteringModel.pageIdentifiers = pageIdentifiers;
+        this._filteringModel.pageIdentifier = pageIdentifier;
         this._filteringModel.observe(() => this._applyFilters());
         this._filteringModel.visualChange$.bubbleTo(this);
 
diff --git a/lib/public/views/QcFlagTypes/Overview/QcFlagTypesOverviewModel.js b/lib/public/views/QcFlagTypes/Overview/QcFlagTypesOverviewModel.js
@@ -24,8 +24,9 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
     /**
      * Constructor
      * @param {QueryRouter} router router that controls the application's page navigation
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(router, pageIdentifiers) {
+    constructor(router, pageIdentifier) {
         super();
 
         this._filteringModel = new FilteringModel(
@@ -37,7 +38,7 @@ export class QcFlagTypesOverviewModel extends OverviewPageModel {
             },
         );
 
-        this._filteringModel.pageIdentifiers = pageIdentifiers;
+        this._filteringModel.pageIdentifier = pageIdentifier;
         this._filteringModel.observe(() => {
             this._pagination.silentlySetCurrentPage(1);
             this.load();
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, ['qc-flag-types-overview']);
+        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
@@ -23,9 +23,10 @@ export class FixedPdpBeamTypeRunsOverviewModel extends RunsWithQcModel {
     /**
      * Constructor
      * @param {Model} model global model
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(model, pageIdentifiers) {
-        super(model, pageIdentifiers);
+    constructor(model, pageIdentifier) {
+        super(model, pageIdentifier);
         this._pdpBeamTypes = [];
     }
 
diff --git a/lib/public/views/Runs/Overview/RunsOverviewModel.js b/lib/public/views/Runs/Overview/RunsOverviewModel.js
@@ -49,8 +49,9 @@ export class RunsOverviewModel extends OverviewPageModel {
     /**
      * The constructor of the Overview model object
      * @param {Model} model global model
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(model, pageIdentifiers) {
+    constructor(model, pageIdentifier) {
         super();
 
         this._filteringModel = new FilteringModel(
@@ -102,7 +103,7 @@ export class RunsOverviewModel extends OverviewPageModel {
             },
         );
 
-        this._filteringModel.pageIdentifiers = pageIdentifiers;
+        this._filteringModel.pageIdentifier = pageIdentifier;
         this._filteringModel.observe(() => this._applyFilters(true));
         this._filteringModel.visualChange$.bubbleTo(this);
 
diff --git a/lib/public/views/Runs/Overview/RunsWithQcModel.js b/lib/public/views/Runs/Overview/RunsWithQcModel.js
@@ -68,9 +68,10 @@ export class RunsWithQcModel extends RunsOverviewModel {
     /**
      * Constructor
      * @param {Model} model global model
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(model, pageIdentifiers) {
-        super(model, pageIdentifiers);
+    constructor(model, pageIdentifier) {
+        super(model, pageIdentifier);
 
         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
@@ -35,9 +35,10 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
     /**
      * Constructor
      * @param {Model} model global model
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(model, pageIdentifiers) {
-        super(model, pageIdentifiers);
+    constructor(model, pageIdentifier) {
+        super(model, pageIdentifier);
         this._dataPass$ = new ObservableData(RemoteData.notAsked());
         this._dataPass$.bubbleTo(this);
 
diff --git a/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js b/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js
@@ -31,9 +31,10 @@ export class RunsPerLhcPeriodOverviewModel extends FixedPdpBeamTypeRunsOverviewM
      * Constructor
      *
      * @param {Model} model global model
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(model, pageIdentifiers) {
-        super(model, pageIdentifiers);
+    constructor(model, pageIdentifier) {
+        super(model, pageIdentifier);
 
         this._lhcPeriodId = null;
         this._lhcPeriodStatistics$ = new ObservableData(RemoteData.notAsked());
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, ['run-overview']);
+        this._overviewModel = new RunsOverviewModel(model, 'run-overview');
         this._overviewModel.bubbleTo(this);
-        this._perLhcPeriodOverviewModel = new RunsPerLhcPeriodOverviewModel(model, ['runs-per-lhc-period']);
+        this._perLhcPeriodOverviewModel = new RunsPerLhcPeriodOverviewModel(model, 'runs-per-lhc-period');
         this._perLhcPeriodOverviewModel.bubbleTo(this);
-        this._perDataPassOverviewModel = new RunsPerDataPassOverviewModel(model, ['runs-per-data-pass']);
+        this._perDataPassOverviewModel = new RunsPerDataPassOverviewModel(model, 'runs-per-data-pass');
         this._perDataPassOverviewModel.bubbleTo(this);
-        this._perSimulationPassOverviewModel = new RunsPerSimulationPassOverviewModel(model, ['runs-per-simulation-pass']);
+        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
@@ -23,9 +23,10 @@ export class RunsPerSimulationPassOverviewModel extends FixedPdpBeamTypeRunsOver
     /**
      * Constructor
      * @param {Model} model global model
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(model, pageIdentifiers) {
-        super(model, pageIdentifiers);
+    constructor(model, pageIdentifier) {
+        super(model, pageIdentifier);
 
         this._simulationPass$ = new ObservableData(RemoteData.notAsked());
 
diff --git a/lib/public/views/SimulationPasses/AnchoredOverview/AnchoredSimulationPassesOverviewModel.js b/lib/public/views/SimulationPasses/AnchoredOverview/AnchoredSimulationPassesOverviewModel.js
@@ -24,13 +24,14 @@ export class AnchoredSimulationPassesOverviewModel extends OverviewPageModel {
     /**
      * Constructor
      * @param {QueryRouter} router router that controls the application's page navigation
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(router, pageIdentifiers) {
+    constructor(router, pageIdentifier) {
         super();
 
         this._filteringModel = new FilteringModel(router, { names: new TextTokensFilterModel() });
 
-        this._filteringModel.pageIdentifiers = pageIdentifiers;
+        this._filteringModel.pageIdentifier = pageIdentifier;
         this._filteringModel.observe(() => {
             this._pagination.silentlySetCurrentPage(1);
             this.load();
diff --git a/lib/public/views/SimulationPasses/PerLhcPeriodOverview/SimulationPassesPerLhcPeriodOverviewModel.js b/lib/public/views/SimulationPasses/PerLhcPeriodOverview/SimulationPassesPerLhcPeriodOverviewModel.js
@@ -24,13 +24,14 @@ export class SimulationPassesPerLhcPeriodOverviewModel extends OverviewPageModel
     /**
      * Constructor
      * @param {QueryRouter} router router that controls the application's page navigation
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(router, pageIdentifiers) {
+    constructor(router, pageIdentifier) {
         super();
 
         this._filteringModel = new FilteringModel(router, { names: new TextTokensFilterModel() });
 
-        this._filteringModel.pageIdentifiers = pageIdentifiers;
+        this._filteringModel.pageIdentifier = pageIdentifier;
         this._filteringModel.visualChange$.bubbleTo(this);
         this._filteringModel.observe(() => {
             this._pagination.silentlySetCurrentPage(1);
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, ['simulation-passes-per-lhc-period-overview']);
+        this._perLhcPeriodOverviewModel = new SimulationPassesPerLhcPeriodOverviewModel(router, 'simulation-passes-per-lhc-period-overview');
         this._perLhcPeriodOverviewModel.bubbleTo(this);
 
-        this._anchoredOverviewModel = new AnchoredSimulationPassesOverviewModel(router, ['anchored-simulation-passes-overview']);
+        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, ['lhc-period-overview']);
+        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
@@ -25,8 +25,9 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
     /**
      * The constructor of the Overview model object
      * @param {QueryRouter} router router that controls the application's page navigation
+     * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(router, pageIdentifiers) {
+    constructor(router, pageIdentifier) {
         super();
 
         this._filteringModel = new FilteringModel(
@@ -38,7 +39,7 @@ export class LhcPeriodsOverviewModel extends OverviewPageModel {
             },
         );
 
-        this._filteringModel.pageIdentifiers = pageIdentifiers;
+        this._filteringModel.pageIdentifier = pageIdentifier;
         this._filteringModel.visualChange$.bubbleTo(this);
         this._filteringModel.observe(() => {
             this._pagination.silentlySetCurrentPage(1);
