make filter computation much more compact using filteringmodel.normalize

Author: Guust

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

@@ -48,11 +48,11 @@ export const excludeAnonymousLogAuthorToggle = (authorFilterModel) => switchInpu
  * @return {Component} the filter component
  */
 export const authorFilter = ({ filteringModel }) => h('.flex-row.items-center.g3', [
-    rawTextFilter(filteringModel.get('authorFilter'), {
+    rawTextFilter(filteringModel.get('author'), {
         classes: ['w-40'],
         id: 'authorFilterText',
-        value: filteringModel.get('authorFilter').raw,
+        value: filteringModel.get('author').raw,
     }),
-    resetAuthorFilterButton(filteringModel.get('authorFilter')),
-    excludeAnonymousLogAuthorToggle(filteringModel.get('authorFilter')),
+    resetAuthorFilterButton(filteringModel.get('author')),
+    excludeAnonymousLogAuthorToggle(filteringModel.get('author')),
 ]);

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

@@ -77,7 +77,7 @@ export const logsActiveColumns = {
          * @return {Component} the filter component
          */
         filter: ({ filteringModel }) => rawTextFilter(
-            filteringModel.get('titleFilter'),
+            filteringModel.get('title'),
             {
                 id: 'titleFilterText',
                 class: 'w-75 mt1',
@@ -106,7 +106,7 @@ export const logsActiveColumns = {
          * @return {Component} the filter component
          */
         filter: ({ filteringModel }) => rawTextFilter(
-            filteringModel.get('contentFilter'),
+            filteringModel.get('content'),
             {
                 id: 'contentFilterText',
                 classes: ['w-75', 'mt1'],

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

@@ -39,9 +39,9 @@ export class LogsOverviewModel extends Observable {
         super();
 
         this._filteringModel = new FilteringModel({
-            authorFilter: new AuthorFilterModel(),
-            titleFilter: new RawTextFilterModel(),
-            contentFilter: new RawTextFilterModel(),
+            author: new AuthorFilterModel(),
+            title: new RawTextFilterModel(),
+            content: new RawTextFilterModel(),
             tags: new TagFilterModel(tagsProvider.items$),
             runNumbers: new RawTextFilterModel(),
             environmentIds: new RawTextFilterModel(),
@@ -69,7 +69,7 @@ export class LogsOverviewModel extends Observable {
         model.appConfiguration$.observe(() => updateDebounceTime());
         updateDebounceTime();
 
-        excludeAnonymous && this._filteringModel.get('authorFilter').update('!Anonymous');
+        excludeAnonymous && this._filteringModel.get('author').update('!Anonymous');
 
         this.reset(false);
     }
@@ -92,7 +92,7 @@ export class LogsOverviewModel extends Observable {
             ...sortOn && sortDirection && {
                 [`sort[${sortOn}]`]: sortDirection,
             },
-            ...this._getFilterQueryParams(),
+            filter: this._filteringModel.normalized,
             'page[offset]': this._pagination.firstItemOffset,
             'page[limit]': this._pagination.itemsPerPage,
         };
@@ -127,9 +127,6 @@ export class LogsOverviewModel extends Observable {
      */
     reset(fetch = true) {
         this._filteringModel.reset();
-
-        this.lhcFillFilterOperation = 'AND';
-
         this._pagination.reset();
 
         if (fetch) {
@@ -183,51 +180,4 @@ export class LogsOverviewModel extends Observable {
         this._pagination.silentlySetCurrentPage(1);
         now ? this.fetchLogs() : this._debouncedFetchAllLogs();
     }
-
-    /**
-     * Returns the list of URL params corresponding to the currently applied filter
-     *
-     * @return {Object} the URL params
-     *
-     * @private
-     */
-    _getFilterQueryParams() {
-        const titleFilter = this._filteringModel.get('titleFilter');
-        const contentFilter = this._filteringModel.get('contentFilter');
-        const authorFilter = this._filteringModel.get('authorFilter');
-        const tags = this._filteringModel.get('tags');
-        const runNumbers = this._filteringModel.get('runNumbers');
-        const environmentIds = this._filteringModel.get('environmentIds');
-        const fillNumbers = this._filteringModel.get('fillNumbers');
-        const created = this._filteringModel.get('created');
-
-        return {
-            ...!titleFilter.isEmpty && {
-                'filter[title]': titleFilter.normalized,
-            },
-            ...!contentFilter.isEmpty && {
-                'filter[content]': contentFilter.normalized,
-            },
-            ...!authorFilter.isEmpty && {
-                'filter[author]': authorFilter.normalized,
-            },
-            ...!created.isEmpty && {
-                'filter[created][from]': created.normalized.from,
-                'filter[created][to]': created.normalized.to,
-            },
-            ...!tags.isEmpty && {
-                'filter[tags][values]': tags.selected.join(),
-                'filter[tags][operation]': tags.combinationOperator.toLowerCase(),
-            },
-            ...!runNumbers.isEmpty && {
-                'filter[runNumbers]': runNumbers.normalized,
-            },
-            ...!environmentIds.isEmpty && {
-                'filter[environmentIds]': environmentIds.normalized,
-            },
-            ...!fillNumbers.isEmpty && {
-                'filter[fillNumbers]': fillNumbers.normalized,
-            },
-        };
-    }
 }

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

@@ -39,7 +39,7 @@ const logOverviewScreen = ({ logs: { overviewModel: logsOverviewModel } }) => {
         h('#main-action-bar.flex-row.justify-between.header-container.pv2', [
             h('.flex-row.g3', [
                 filtersPanelPopover(logsOverviewModel, logsActiveColumns),
-                excludeAnonymousLogAuthorToggle(logsOverviewModel.filteringModel.get('authorFilter')),
+                excludeAnonymousLogAuthorToggle(logsOverviewModel.filteringModel.get('author')),
             ]),
             actionButtons(),
         ]),