[O2B-1552] Move ad hoc filters inside runs overviews model to filtering model

lib/domain/dtos/GetAllLogsDto.js

@@ -17,32 +17,25 @@ const PaginationDto = require('./PaginationDto');
 const { CustomJoi } = require('./CustomJoi.js');
 const { TagsFilterDto } = require('./filters/TagsFilterDto.js');
 const { FromToFilterDto } = require('./filters/FromToFilterDto.js');
-const { EnvironmentsFilterDto } = require('./filters/EnvironmentsFilterDto');
 
-const RunFilterDto = Joi.object({
-    values: CustomJoi.stringArray().items(EntityIdDto).single().required(),
-    operation: Joi.string().valid('and', 'or').required(),
-});
-
-const LhcFillFilterDto = Joi.object({
-    values: CustomJoi.stringArray().items(EntityIdDto).single().required(),
-    operation: Joi.string().valid('and', 'or').required(),
-});
+const RunFilterDto = CustomJoi.stringArray().items(EntityIdDto).single();
+const EnvironmentsFilterDto = CustomJoi.stringArray().items(Joi.string()).single();
+const LhcFillFilterDto = CustomJoi.stringArray().items(EntityIdDto).single();
 
 const FilterDto = Joi.object({
     title: Joi.string().trim(),
     content: Joi.string().trim(),
     author: Joi.string().trim(),
     created: FromToFilterDto,
     tags: TagsFilterDto,
-    lhcFills: LhcFillFilterDto,
-    run: RunFilterDto,
+    fillNumbers: LhcFillFilterDto,
+    runNumbers: RunFilterDto,
     origin: Joi.string()
         .valid('human', 'process'),
     parentLog: EntityIdDto,
     rootLog: EntityIdDto,
     rootOnly: Joi.boolean(),
-    environments: EnvironmentsFilterDto,
+    environmentIds: EnvironmentsFilterDto,
 });
 
 const SortDto = Joi.object({

lib/public/components/Filters/LogsFilter/author/AuthorFilterModel.js

@@ -11,12 +11,12 @@
  * or submit itself to any jurisdiction.
  */
 
-import { FilterInputModel } from '../../common/filters/FilterInputModel.js';
+import { RawTextFilterModel } from '../../common/filters/RawTextFilterModel.js';
 
 /**
  * Model to handle the state of the Author Filter
  */
-export class AuthorFilterModel extends FilterInputModel {
+export class AuthorFilterModel extends RawTextFilterModel {
     /**
      * Constructor
      *
@@ -32,7 +32,7 @@ export class AuthorFilterModel extends FilterInputModel {
      * @return {boolean} true if '!Anonymous' is included in the raw filter string, false otherwise.
      */
     isAnonymousExcluded() {
-        return this._raw.includes('!Anonymous');
+        return this._value.includes('!Anonymous');
     }
 
     /**
@@ -42,28 +42,13 @@ export class AuthorFilterModel extends FilterInputModel {
      */
     toggleAnonymousFilter() {
         if (this.isAnonymousExcluded()) {
-            this._raw = this._raw.split(',')
+            this._value = this._value.split(',')
                 .filter((author) => author.trim() !== '!Anonymous')
                 .join(',');
         } else {
-            this._raw += super.isEmpty ? '!Anonymous' : ', !Anonymous';
+            this._value += super.isEmpty ? '!Anonymous' : ', !Anonymous';
         }
 
-        this._value = this.valueFromRaw(this._raw);
-        this.notify();
-    }
-
-    /**
-     * Reset the filter to its default value and notify the observers.
-     *
-     * @return {void}
-     */
-    clear() {
-        if (this.isEmpty) {
-            return;
-        }
-
-        super.reset();
         this.notify();
     }
 }

lib/public/components/Filters/LogsFilter/author/authorFilter.js

@@ -14,19 +14,7 @@
 import { h } from '/js/src/index.js';
 import { iconX } from '/js/src/icons.js';
 import { switchInput } from '../../../common/form/switchInput.js';
-
-/**
- * Returns a text input field that can be used to filter logs by author
- *
- * @param {AuthorFilterModel} authorFilterModel The author filter model object
- * @returns {Component} A text box that allows the user to enter an author substring to match against all logs
- */
-const authorFilterTextInput = (authorFilterModel) => h('input.w-40', {
-    type: 'text',
-    id: 'authorFilterText',
-    value: authorFilterModel.raw,
-    oninput: (e) => authorFilterModel.update(e.target.value),
-});
+import { rawTextFilter } from '../../common/filters/rawTextFilter.js';
 
 /**
  * Returns a button that can be used to reset the author filter.
@@ -36,7 +24,7 @@ const authorFilterTextInput = (authorFilterModel) => h('input.w-40', {
  */
 const resetAuthorFilterButton = (authorFilterModel) => h(
     '.btn.btn-pill.f7',
-    { disabled: authorFilterModel.isEmpty, onclick: () => authorFilterModel.clear() },
+    { disabled: authorFilterModel.isEmpty, onclick: () => authorFilterModel.reset() },
     iconX(),
 );
 
@@ -55,11 +43,16 @@ export const excludeAnonymousLogAuthorToggle = (authorFilterModel) => switchInpu
 /**
  * Returns a authorFilter component with text input, reset button, and anonymous exclusion button.
  *
- * @param {LogModel} logModel the log model object
- * @returns {Component} the author filter component
+ * @param {LogsOverviewModel} logsOverviewModel the log overview model
+ * @param {FilteringModel} logsOverviewModel.filteringModel the runs overview model
+ * @return {Component} the filter component
  */
-export const authorFilter = ({ authorFilter }) => h('.flex-row.items-center.g3', [
-    authorFilterTextInput(authorFilter),
-    resetAuthorFilterButton(authorFilter),
-    excludeAnonymousLogAuthorToggle(authorFilter),
+export const authorFilter = ({ filteringModel }) => h('.flex-row.items-center.g3', [
+    rawTextFilter(filteringModel.get('author'), {
+        classes: ['w-40'],
+        id: 'authorFilterText',
+        value: filteringModel.get('author').raw,
+    }),
+    resetAuthorFilterButton(filteringModel.get('author')),
+    excludeAnonymousLogAuthorToggle(filteringModel.get('author')),
 ]);

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

@@ -0,0 +1,34 @@
+/**
+ * @license
+ * Copyright CERN and copyright holders of ALICE O2. This software is
+ * distributed under the terms of the GNU General Public License v3 (GPL
+ * Version 3), copied verbatim in the file "COPYING".
+ *
+ * See http://alice-o2.web.cern.ch/license for full licensing information.
+ *
+ * In applying this license CERN does not waive the privileges and immunities
+ * granted to it by virtue of its status as an Intergovernmental Organization
+ * or submit itself to any jurisdiction.
+ */
+
+import { SelectionModel } from '../../common/selection/SelectionModel.js';
+
+/**
+ * Model for managing a radiobutton view and state
+ */
+export class RadioButtonFilterModel extends SelectionModel {
+    /**
+     * Constructor
+     *
+     * @param {SelectionOption[]} [availableOptions] the list of possible operators
+     * @param {function} [setDefault] function that selects the default from the list of available options. Selects first entry by default
+     */
+    constructor(availableOptions, setDefault = (options) => [options[0]]) {
+        super({
+            availableOptions,
+            defaultSelection: setDefault(availableOptions),
+            multiple: false,
+            allowEmpty: false,
+        });
+    }
+}