remove the combination operator from runs

Author: Guust

lib/domain/dtos/GetAllLogsDto.js

@@ -19,10 +19,7 @@ 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 RunFilterDto = CustomJoi.stringArray().items(EntityIdDto).single().required();
 
 const LhcFillFilterDto = Joi.object({
     values: CustomJoi.stringArray().items(EntityIdDto).single().required(),
@@ -36,7 +33,7 @@ const FilterDto = Joi.object({
     created: FromToFilterDto,
     tags: TagsFilterDto,
     lhcFills: LhcFillFilterDto,
-    run: RunFilterDto,
+    runNumbers: RunFilterDto,
     origin: Joi.string()
         .valid('human', 'process'),
     parentLog: EntityIdDto,

lib/public/views/Logs/ActiveColumns/logsActiveColumns.js

@@ -182,7 +182,7 @@ export const logsActiveColumns = {
          * @return {Component} the filter component
          */
         filter: ({ filteringModel }) => rawTextFilter(
-            filteringModel.get('run'),
+            filteringModel.get('runNumbers'),
             {
                 id: 'runsFilterText',
                 classes: ['w-75', 'mt1'],

lib/public/views/Logs/Overview/LogsOverviewModel.js

@@ -43,7 +43,7 @@ export class LogsOverviewModel extends Observable {
             titleFilter: new RawTextFilterModel(),
             contentFilter: new RawTextFilterModel(),
             tags: new TagFilterModel(tagsProvider.items$),
-            run: new RawTextFilterModel(),
+            runNumbers: new RawTextFilterModel(),
             environments: new RawTextFilterModel(),
             lhcFills: new RawTextFilterModel(),
             created: new TimeRangeInputModel(),
@@ -198,7 +198,7 @@ export class LogsOverviewModel extends Observable {
         const contentFilter = this._filteringModel.get('contentFilter');
         const authorFilter = this._filteringModel.get('authorFilter');
         const tags = this._filteringModel.get('tags');
-        const run = this._filteringModel.get('run');
+        const runNumbers = this._filteringModel.get('runNumbers');
         const environments = this._filteringModel.get('environments');
         const lhcFills = this._filteringModel.get('lhcFills');
         const created = this._filteringModel.get('created');
@@ -221,9 +221,8 @@ export class LogsOverviewModel extends Observable {
                 'filter[tags][values]': tags.selected.join(),
                 'filter[tags][operation]': tags.combinationOperator.toLowerCase(),
             },
-            ...!run.isEmpty && {
-                'filter[run][values]': run.normalized,
-                'filter[run][operation]': this.runFilterOperation.toLowerCase(),
+            ...!runNumbers.isEmpty && {
+                'filter[runNumbers]': runNumbers.normalized,
             },
             ...!environments.isEmpty && {
                 'filter[environments][values]': environments.normalized,

lib/usecases/log/GetAllLogsUseCase.js

@@ -39,7 +39,7 @@ const { checkForFilterExclusion } = require('../common/checkForFilterExclusion.j
  * @return {Promise<void>} resolves once the filter has been applied
  */
 const applyFilter = async (dataSource, queryBuilder, filter) => {
-    const { title, content, author, created, origin, parentLog, rootLog, rootOnly } = filter;
+    const { title, content, author, created, origin, parentLog, rootLog, rootOnly, runNumbers } = filter;
 
     if (title) {
         queryBuilder.where('title').substring(title);
@@ -112,26 +112,15 @@ const applyFilter = async (dataSource, queryBuilder, filter) => {
         queryBuilder.where('id').oneOf(...logIds);
     }
 
-    if (filter.run?.values?.length > 0) {
+    if (runNumbers.length > 0) {
         const runQueryBuilder = dataSource.createQueryBuilder();
         runQueryBuilder.include({
             association: 'run',
-            where: { runNumber: { [Op.in]: filter.run.values } },
+            where: { runNumber: { [Op.in]: runNumbers } },
         }).orderBy('logId', 'asc');
 
-        let logRuns;
-        switch (filter.run.operation) {
-            case 'and':
-                logRuns = await LogRunsRepository
-                    .findAllAndGroup(runQueryBuilder);
-                logRuns = logRuns
-                    .filter((logRun) => filter.run.values.every((runNumber) => logRun.runNumbers.includes(runNumber)));
-                break;
-            case 'or':
-                logRuns = await LogRunsRepository
-                    .findAll(runQueryBuilder);
-                break;
-        }
+        let logRuns = await LogRunsRepository.findAllAndGroup(runQueryBuilder);
+        logRuns = logRuns.filter((logRun) => runNumbers.every((runNumber) => logRun.runNumbers.includes(runNumber)));
 
         const logIds = logRuns.map((logRun) => logRun.logId);
         queryBuilder.where('id').oneOf(...logIds);