chore: move the warning state to top-level model

Author: NarrowsProjects

lib/public/Model.js

@@ -101,21 +101,24 @@ export default class Model extends Observable {
         this.router.bubbleTo(this);
         registerFrontLinkListener((e) => this.router.handleLinkEvent(e));
 
+        // Setup warnings
+        this._warnings = new Map();
+
         // Models
 
         this.home = new HomePageModel(this);
         this.home.bubbleTo(this);
 
-        this.lhcPeriods = new LhcPeriodsModel(this.router);
+        this.lhcPeriods = new LhcPeriodsModel(this.router, this.warnings);
         this.lhcPeriods.bubbleTo(this);
 
-        this.dataPasses = new DataPassesModel(this.router);
+        this.dataPasses = new DataPassesModel(this.router, this.warnings);
         this.dataPasses.bubbleTo(this);
 
         this.qcFlags = new QcFlagsModel(this);
         this.qcFlags.bubbleTo(this);
 
-        this.simulationPasses = new SimulationPassesModel(this.router);
+        this.simulationPasses = new SimulationPassesModel(this.router, this.warnings);
         this.simulationPasses.bubbleTo(this);
 
         this.qcFlagTypes = new QcFlagTypesModel(this);
@@ -192,6 +195,14 @@ export default class Model extends Observable {
         this.dropdownMenu = false;
     }
 
+    /**
+     * Returns warnings map
+     * @returns {Map<string, string>} warnings map
+     */
+    get warnings() {
+        return this._warnings;
+    }
+
     /**
      * Delegates sub-model actions depending on new location of the page
      * @returns {vnode} The page to be loaded

lib/public/components/Filters/common/FilteringModel.js

@@ -150,14 +150,12 @@ export class FilteringModel extends Observable {
             const unknownFilters = [];
             const setFilterErrors = [];
 
-            for (const entry of Object.entries(filter)) {
-                const [key, value] = entry;
-
+            for (const [key, value] of Object.entries(filter)) {
                 if (key in this._filters) {
                     try {
                         this._filters[key].normalized = value;
                     } catch {
-                        setFilterErrors.push(`${buildUrl('', entry).slice(1)}`);
+                        setFilterErrors.push(`${buildUrl('', { [key]: value }).slice(1)}`);
                     }
                 } else {
                     unknownFilters.push(`'${key}'`);

lib/public/models/OverviewModel.js

@@ -35,10 +35,11 @@ import { SortModel } from '../components/common/table/SortModel.js';
 export class OverviewPageModel extends Observable {
     /**
      * Constructor
+     * @param {Map<string, string>} warnings a map storing warnings to show to the user
      */
-    constructor() {
+    constructor(warnings) {
         super();
-        this._warnings = new Map();
+        this._warnings = warnings;
         this._sortModel = new SortModel();
         this._sortModel.observe(() => {
             this._pagination.silentlySetCurrentPage(1);

lib/public/views/DataPasses/DataPassesModel.js

@@ -22,14 +22,16 @@ export class DataPassesModel extends Observable {
     /**
      * The constructor of the model
      * @param {QueryRouter} router router that controls the application's page navigation
+     * @param {Map<string, string>} warnings a map storing warnings to show to the user
      */
-    constructor(router) {
+    constructor(router, warnings) {
         super();
 
-        this._perLhcPeriodOverviewModel = new DataPassesPerLhcPeriodOverviewModel(router, 'data-passes-per-lhc-period-overview');
+        this._perLhcPeriodOverviewModel = new DataPassesPerLhcPeriodOverviewModel(router, 'data-passes-per-lhc-period-overview', warnings);
         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', warnings);
         this._perSimulationPassOverviewModel.bubbleTo(this);
     }
 

lib/public/views/DataPasses/DataPassesOverviewModel.js

@@ -25,8 +25,8 @@ export class DataPassesOverviewModel extends OverviewPageModel {
      * @param {QueryRouter} router router that controls the application's page navigation
      * @param {string} pageIdentifier string that indicates what page this model represents
      */
-    constructor(router, pageIdentifier) {
-        super();
+    constructor(router, pageIdentifier, warnings) {
+        super(warnings);
         this._filteringModel = new FilteringModel(
             router,
             {

lib/public/views/DataPasses/PerLhcPeriodOverview/DataPassesPerLhcPeriodOverviewModel.js

@@ -21,9 +21,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
+     * @param {Map<string, string>} warnings a map storing warnings to show to the user
      */
-    constructor(router, pageIdentifier) {
-        super(router, pageIdentifier);
+    constructor(router, pageIdentifier, warnings) {
+        super(router, pageIdentifier, warnings);
         this._lhcPeriodId = null;
     }
 

lib/public/views/DataPasses/PerSimulationPassOverview/DataPassesPerSimulationPassOverviewModel.js

@@ -23,9 +23,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
+     * @param {Map<string, string>} warnings a map storing warnings to show to the user
      */
-    constructor(router, pageIdentifier) {
-        super(router, pageIdentifier);
+    constructor(router, pageIdentifier, warnings) {
+        super(router, pageIdentifier, warnings);
         this._simulationPass = new ObservableData(RemoteData.notAsked());
         this._simulationPass.bubbleTo(this);
     }

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', model.warnings);
         this._overviewModel.bubbleTo(this);
 
         this._detailsModel = new EnvironmentDetailsModel();

lib/public/views/Environments/Overview/EnvironmentOverviewModel.js

@@ -29,9 +29,10 @@ export class EnvironmentOverviewModel extends OverviewPageModel {
      * Constructor
      * @param {Model} model global model
      * @param {string} pageIdentifier string that indicates what page this model represents
+     * @param {Map<string, string>} warnings a map storing warnings to show to the user
      */
-    constructor(model, pageIdentifier) {
-        super();
+    constructor(model, pageIdentifier, warnings) {
+        super(warnings);
 
         this._filteringModel = new FilteringModel(
             model.router,

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', model.warnings);
         this._overviewModel.bubbleTo(this);
 
         this._detailsModel = new LhcFillDetailsModel();