remove the combination operator from envirionments

Author: Guust

lib/domain/dtos/GetAllLogsDto.js

@@ -17,9 +17,9 @@ 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 = CustomJoi.stringArray().items(EntityIdDto).single().required();
+const RunFilterDto = CustomJoi.stringArray().items(EntityIdDto).single();
+const EnvironmentsFilterDto = CustomJoi.stringArray().items(Joi.string()).single();
 
 const LhcFillFilterDto = Joi.object({
     values: CustomJoi.stringArray().items(EntityIdDto).single().required(),
@@ -39,7 +39,7 @@ const FilterDto = Joi.object({
     parentLog: EntityIdDto,
     rootLog: EntityIdDto,
     rootOnly: Joi.boolean(),
-    environments: EnvironmentsFilterDto,
+    environmentIds: EnvironmentsFilterDto,
 });
 
 const SortDto = Joi.object({

lib/domain/dtos/filters/EnvironmentsFilterDto.js

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

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

@@ -44,7 +44,7 @@ export class LogsOverviewModel extends Observable {
             contentFilter: new RawTextFilterModel(),
             tags: new TagFilterModel(tagsProvider.items$),
             runNumbers: new RawTextFilterModel(),
-            environments: new RawTextFilterModel(),
+            environmentIds: new RawTextFilterModel(),
             lhcFills: new RawTextFilterModel(),
             created: new TimeRangeInputModel(),
         });
@@ -128,8 +128,6 @@ export class LogsOverviewModel extends Observable {
     reset(fetch = true) {
         this._filteringModel.reset();
 
-        this.runFilterOperation = 'AND';
-        this.environmentFilterOperation = 'AND';
         this.lhcFillFilterOperation = 'AND';
 
         this._pagination.reset();
@@ -199,7 +197,7 @@ export class LogsOverviewModel extends Observable {
         const authorFilter = this._filteringModel.get('authorFilter');
         const tags = this._filteringModel.get('tags');
         const runNumbers = this._filteringModel.get('runNumbers');
-        const environments = this._filteringModel.get('environments');
+        const environmentIds = this._filteringModel.get('environmentIds');
         const lhcFills = this._filteringModel.get('lhcFills');
         const created = this._filteringModel.get('created');
 
@@ -224,9 +222,8 @@ export class LogsOverviewModel extends Observable {
             ...!runNumbers.isEmpty && {
                 'filter[runNumbers]': runNumbers.normalized,
             },
-            ...!environments.isEmpty && {
-                'filter[environments][values]': environments.normalized,
-                'filter[environments][operation]': this.environmentFilterOperation.toLowerCase(),
+            ...!environmentIds.isEmpty && {
+                'filter[environmentIds]': environmentIds.normalized,
             },
             ...!lhcFills.isEmpty && {
                 'filter[lhcFills][values]': lhcFills.normalized,

lib/public/views/Logs/Overview/LogsOverviewModel.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, runNumbers } = filter;
+    const { title, content, author, created, origin, parentLog, rootLog, rootOnly, runNumbers, environmentIds } = filter;
 
     if (title) {
         queryBuilder.where('title').substring(title);
@@ -112,7 +112,7 @@ const applyFilter = async (dataSource, queryBuilder, filter) => {
         queryBuilder.where('id').oneOf(...logIds);
     }
 
-    if (runNumbers.length > 0) {
+    if (runNumbers?.length > 0) {
         const runQueryBuilder = dataSource.createQueryBuilder();
         runQueryBuilder.include({
             association: 'run',
@@ -150,25 +150,17 @@ const applyFilter = async (dataSource, queryBuilder, filter) => {
         queryBuilder.where('id').oneOf(...logIds);
     }
 
-    if (filter.environments?.values?.length > 0) {
-        const validEnvironments = await EnvironmentRepository.findAll({ where: { id: { [Op.in]: filter.environments.values } } });
+    if (environmentIds?.length > 0) {
+        const validEnvironments = await EnvironmentRepository.findAll({ where: { id: { [Op.in]: environmentIds} } });
 
         const logEnvironmentQueryBuilder = dataSource.createQueryBuilder()
             .where('environmentId')
             .oneOf(...validEnvironments.map(({ id }) => id))
             .orderBy('logId', 'asc');
 
-        let logIds;
-        switch (filter.environments.operation) {
-            case 'and':
-                logIds = groupByProperty(await LogEnvironmentsRepository.findAll(logEnvironmentQueryBuilder), 'logId')
-                    .filter(({ values }) => validEnvironments.every((env) => values.some((item) => item.environmentId === env.id)))
-                    .map(({ index }) => index);
-                break;
-            case 'or':
-                logIds = (await LogEnvironmentsRepository.findAll(logEnvironmentQueryBuilder)).map(({ logId }) => logId);
-                break;
-        }
+        const logIds = groupByProperty(await LogEnvironmentsRepository.findAll(logEnvironmentQueryBuilder), 'logId')
+            .filter(({ values }) => validEnvironments.every((env) => values.some((item) => item.environmentId === env.id)))
+            .map(({ index }) => index);
 
         queryBuilder.where('id').oneOf(...logIds);
     }