w

Author: xsalonx

lib/public/views/DataPasses/DataPassesOverviewModel.js

@@ -15,7 +15,6 @@ import { SelectionFilterModel } from '../../../components/Filters/common/filters
 import { TextTokensFilterModel } from '../../../components/Filters/common/filters/TextTokensFilterModel.js';
 import { NON_PHYSICS_PRODUCTIONS_NAMES_WORDS, NonPhysicsProductionsNamesWords } from '../../../domain/enums/NonPhysicsProductionsNamesWords.js';
 import { OverviewPageModel } from '../../../models/OverviewModel.js';
-import { SortModel } from '../../components/common/table/SortModel.js';
 
 /**
  * Data Passes Per LHC Period overview model
@@ -26,14 +25,6 @@ export class DataPassesOverviewModel extends OverviewPageModel {
      */
     constructor() {
         super();
-        this._sortModel = new SortModel();
-        this._sortModel.observe(() => {
-            this._pagination.silentlySetCurrentPage(1);
-            this.load();
-        });
-
-        this._sortModel.visualChange$.bubbleTo(this);
-
         this._filteringModel = new FilteringModel({
             names: new TextTokensFilterModel(),
             nonPhysics: new SelectionFilterModel({
@@ -49,25 +40,19 @@ export class DataPassesOverviewModel extends OverviewPageModel {
     }
 
     /**
-     * Return filters and sort params of base model
+     * Return filter params of base model
      *
-     * @return {{ filter: object, sort: object }} filters and sort params
+     * @return {object} filter
      */
-    getBaseParams() {
+    getFilterParams() {
         const nonPhysicsSelectionModel = this._filteringModel.get('nonPhysics').selectionModel;
         const filter = {
             names: this._filteringModel.get('names').normalized,
             includeTest: nonPhysicsSelectionModel.selected.includes(NonPhysicsProductionsNamesWords.TEST),
             includeDebug: nonPhysicsSelectionModel.selected.includes(NonPhysicsProductionsNamesWords.DEBUG),
         };
 
-        const { appliedOn: sortOn, appliedDirection: sortDirection } = this._sortModel;
-        const sortParams = {};
-        if (sortOn && sortDirection) {
-            sortParams[`sort[${sortOn}]`] = sortDirection;
-        }
-
-        return { filter, sort: sortParams };
+        return filter;
     }
 
     /**

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

@@ -36,14 +36,12 @@ export class DataPassesPerLhcPeriodOverviewModel extends DataPassesOverviewModel
      * @inheritdoc
      */
     getRootEndpoint() {
-        const { filter, sort } = this.getBaseParams();
-        console.log(sort)
+        const filter = this.getFilterParams();
         const params = {
             filter: {
                 lhcPeriodIds: [this._lhcPeriodId],
                 ...filter,
             },
-            ...sort,
         };
 
         return buildUrl('/api/dataPasses', params);

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

@@ -54,13 +54,12 @@ export class DataPassesPerSimulationPassOverviewModel extends DataPassesOverview
      * @inheritdoc
      */
     getRootEndpoint() {
-        const { filter, sort } = this.getBaseParams();
+        const filter = this.getFilterParams();
         const params = {
             filter: {
                 simulationPassIds: [this._simulationPassId],
                 ...filter,
             },
-            ...sort,
         };
 
         return buildUrl('/api/dataPasses', params);