add created filter to the filteringmodel

Author: Guust

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

@@ -15,7 +15,6 @@ import { h } from '/js/src/index.js';
 import { iconCommentSquare, iconPaperclip } from '/js/src/icons.js';
 
 import { authorFilter } from '../../../components/Filters/LogsFilter/author/authorFilter.js';
-import createdFilter from '../../../components/Filters/LogsFilter/created.js';
 import { formatTimestamp } from '../../../utilities/formatting/formatTimestamp.js';
 import { frontLink } from '../../../components/common/navigation/frontLink.js';
 import { frontLinks } from '../../../components/common/navigation/frontLinks.js';
@@ -26,6 +25,7 @@ import { textFilter } from '../../../components/Filters/common/filters/textFilte
 import { formatLhcFillsList } from '../../LhcFills/format/formatLhcFillsList.js';
 import { formatTagsList } from '../../Tags/format/formatTagsList.js';
 import { rawTextFilter } from '../../../components/Filters/common/filters/rawTextFilter.js';
+import { timeRangeFilter } from '../../../components/Filters/common/filters/timeRangeFilter.js';
 
 /**
  * A method to display a small and simple number/icon collection as a column
@@ -129,7 +129,15 @@ export const logsActiveColumns = {
         sortable: true,
         size: 'w-10',
         format: (timestamp) => formatTimestamp(timestamp, false),
-        filter: createdFilter,
+
+        /**
+         * Created filter component
+         *
+         * @param {LogsOverviewModel} logOverviewModel the logs overview model
+         * @param {FilteringModel} logOverviewModel.filteringModel filtering model
+         * @return {Component} the filter component
+         */
+        filter: ({ filteringModel }) => timeRangeFilter(filteringModel.get('created')),
         profiles: {
             embeded: {
                 format: (timestamp) => formatTimestamp(timestamp),

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

@@ -21,6 +21,7 @@ import { getRemoteDataSlice } from '../../../utilities/fetch/getRemoteDataSlice.
 import { tagsProvider } from '../../../services/tag/tagsProvider.js';
 import { FilteringModel } from '../../../components/Filters/common/FilteringModel.js';
 import { RawTextFilterModel } from '../../../components/Filters/common/filters/RawTextFilterModel.js';
+import { TimeRangeInputModel } from '../../../components/Filters/common/filters/TimeRangeInputModel.js';
 
 /**
  * Model representing handlers for log entries page
@@ -45,6 +46,7 @@ export class LogsOverviewModel extends Observable {
             run: new RawTextFilterModel(),
             environments: new RawTextFilterModel(),
             lhcFills: new RawTextFilterModel(),
+            created: new TimeRangeInputModel(),
         });
 
         this._filteringModel.observe(() => this._applyFilters());
@@ -120,8 +122,6 @@ export class LogsOverviewModel extends Observable {
      */
     reset(fetch = true) {
         this._filteringModel.reset();
-        this.createdFilterFrom = '';
-        this.createdFilterTo = '';
 
         this.runFilterOperation = 'AND';
         this.environmentFilterOperation = 'AND';
@@ -139,91 +139,7 @@ export class LogsOverviewModel extends Observable {
      * @returns {boolean} If any filter is active
      */
     isAnyFilterActive() {
-        return (
-            !this._filteringModel.isAnyFilterActive()
-            || this.createdFilterFrom !== ''
-            || this.createdFilterTo !== ''
-        );
-    }
-
-    /**
-     * Returns the current title substring filter
-     * @returns {string} The current title substring filter
-     */
-    getRunsFilterRaw() {
-        return this._runFilterRawValue;
-    }
-
-    /**
-     * Returns the raw current environment filter
-     * @returns {string} the raw current environment filter
-     */
-    getEnvFilterRaw() {
-        return this._environmentFilterRawValue;
-    }
-
-    /**
-     * Returns the current environment filter
-     * @returns {string[]} The current environment filter
-     */
-    getEnvFilter() {
-        return this.environmentFilterValues;
-    }
-
-    /**
-     * Sets the environment filter
-     * @param {string} rawEnvironments The environments to apply to the filter
-     * @returns {undefined}
-     */
-    setEnvFilter(rawEnvironments) {
-        this._environmentFilterRawValue = rawEnvironments;
-        const envs = rawEnvironments
-            .split(/[ ,]+/)
-            .filter(Boolean)
-            .map((id) => id.trim());
-
-        if (envs.length > 0 || rawEnvironments.length === 0) {
-            this.environmentFilterValues = envs;
-            this._applyFilters();
-        }
-    }
-
-    /**
-     * Returns the current title substring filter
-     * @returns {string} The current title substring filter
-     */
-    getLhcFillsFilterRaw() {
-        return this._lhcFillFilterRawValue;
-    }
-
-    /**
-     * Returns the current minimum creation datetime
-     * @returns {Integer} The current minimum creation datetime
-     */
-    getCreatedFilterFrom() {
-        return this.createdFilterFrom;
-    }
-
-    /**
-     * Returns the current maximum creation datetime
-     * @returns {Integer} The current maximum creation datetime
-     */
-    getCreatedFilterTo() {
-        return this.createdFilterTo;
-    }
-
-    /**
-     * Set a datetime for the creation datetime filter
-     * @param {string} key The filter value to apply the datetime to
-     * @param {Object} date The datetime to be applied to the creation datetime filter
-     * @param {boolean} valid Whether the inserted date passes validity check
-     * @returns {undefined}
-     */
-    setCreatedFilter(key, date, valid) {
-        if (valid) {
-            this[`createdFilter${key}`] = date;
-            this._applyFilters();
-        }
+        return !this._filteringModel.isAnyFilterActive();
     }
 
     /**
@@ -244,32 +160,6 @@ export class LogsOverviewModel extends Observable {
         return this._overviewSortModel;
     }
 
-    /**
-     * Returns the filter model for author filter
-     *
-     * @return {FilterInputModel} the filter model
-     */
-    get authorFilter() {
-        return this._authorFilter;
-    }
-
-    /**
-     * Returns the filter model for title filter
-     *
-     * @return {FilterInputModel} the filter model
-     */
-    get titleFilter() {
-        return this._titleFilter;
-    }
-
-    /**
-     * Returns the model for body filter
-     * @return {FilterInputModel} the filter model
-     */
-    get contentFilter() {
-        return this._contentFilter;
-    }
-
     /**
      * Returns the pagination model
      *
@@ -308,6 +198,7 @@ export class LogsOverviewModel extends Observable {
         const run = this._filteringModel.get('run');
         const environments = this._filteringModel.get('environments');
         const lhcFills = this._filteringModel.get('lhcFills');
+        const created = this._filteringModel.get('created');
 
         return {
             ...!titleFilter.isEmpty && {
@@ -319,13 +210,9 @@ export class LogsOverviewModel extends Observable {
             ...!authorFilter.isEmpty && {
                 'filter[author]': authorFilter.value,
             },
-            ...this.createdFilterFrom && {
-                'filter[created][from]':
-                    new Date(`${this.createdFilterFrom.replace(/\//g, '-')}T00:00:00.000`).getTime(),
-            },
-            ...this.createdFilterTo && {
-                'filter[created][to]':
-                    new Date(`${this.createdFilterTo.replace(/\//g, '-')}T23:59:59.999`).getTime(),
+            ...!created.isEmpty && {
+                'filter[created][from]': created.normalized.from,
+                'filter[created][to]': created.normalized.to,
             },
             ...!tags.isEmpty && {
                 'filter[tags][values]': tags.selected.join(),