@reltio/components 1.4.916 → 1.4.917

package/cjs/components/history/HistoryFilterButton/HistoryFilterButton.js

@@ -41,6 +41,7 @@ var Button_1 = __importDefault(require("@material-ui/core/Button"));
 var Popover_1 = __importDefault(require("@material-ui/core/Popover"));
 var Typography_1 = __importDefault(require("@material-ui/core/Typography"));
 var SmallIconButton_1 = require("../../SmallIconButton");
+var filters_1 = require("../utils/filters");
 var UserSelector_1 = __importDefault(require("../../UserSelector/UserSelector"));
 var AttributeSelector_1 = __importDefault(require("../../AttributeSelector/AttributeSelector"));
 var DateRangeSelector_1 = __importDefault(require("../DateRangeSelector/DateRangeSelector"));
@@ -80,7 +81,12 @@ var HistoryFilterButton = function (_a) {
                 react_1.default.createElement(Button_1.default, { onClick: clearCurrentValue, className: styles.clearButton }, ui_i18n_1.default.text('Clear all')),
                 react_1.default.createElement(Button_1.default, { onClick: closePopup }, ui_i18n_1.default.text('Cancel')),
                 react_1.default.createElement(Button_1.default, { color: "primary", onClick: function () {
-                        onApplyFilter(currentValue);
+                        if (dateRange && filters_1.isDateRangeValid(dateRange)) {
+                            onApplyFilter(currentValue);
+                        }
+                        else {
+                            onApplyFilter(ramda_1.dissoc('dateRange', currentValue));
+                        }
                         closePopup();
                     } }, ui_i18n_1.default.text('Apply'))))));
 };

package/cjs/components/history/hooks/useHistory.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { HistoryFilter } from '../types';
 declare type Props = {
     entityUri: string;
@@ -8,10 +7,10 @@ export declare const useHistory: ({ entityUri, enabled }: Props) => {
     isLoading: boolean;
     canLoadMore: boolean;
     onLoadMore: () => void;
+    onApplyFilter: (filter: HistoryFilter) => void;
     historicUris: string[];
     historyWithTotal: import("@reltio/mdm-sdk").HistoryWithTotal;
     historyFilter: HistoryFilter;
-    setHistoryFilter: import("react").Dispatch<import("react").SetStateAction<HistoryFilter>>;
     reloadHistory: () => void;
 };
 export {};

package/cjs/components/history/hooks/useHistory.js

@@ -4,11 +4,16 @@ exports.useHistory = void 0;
 var react_1 = require("react");
 var useHistoricUris_1 = require("./useHistoricUris");
 var useHistoryWithTotal_1 = require("./useHistoryWithTotal");
+var types_1 = require("../types");
+var filters_1 = require("../utils/filters");
 var MAX_HISTORY_ROWS = 32;
 var useHistory = function (_a) {
     var entityUri = _a.entityUri, enabled = _a.enabled;
-    var _b = react_1.useState(null), historyFilter = _b[0], setHistoryFilter = _b[1];
+    var _b = react_1.useState({
+        activities: [types_1.HistoryActivityType.MERGE, types_1.HistoryActivityType.UNMERGE, types_1.HistoryActivityType.UPDATE]
+    }), historyFilter = _b[0], setHistoryFilter = _b[1];
     var _c = react_1.useState(0), historyPage = _c[0], setHistoryPage = _c[1];
+    var historyFilterString = react_1.useMemo(function () { return filters_1.buildHistoryFilterString(historyFilter); }, [historyFilter]);
     var _d = useHistoricUris_1.useHistoricUris({
         entityUri: entityUri,
         enabled: enabled
@@ -16,16 +21,20 @@ var useHistory = function (_a) {
     var _e = useHistoryWithTotal_1.useHistoryWithTotal({
         entityUri: entityUri,
         enabled: enabled && !!historicUris,
+        filter: historyFilterString,
         historicUris: historicUris,
         max: MAX_HISTORY_ROWS,
         offset: historyPage * MAX_HISTORY_ROWS,
-        order: 'desc',
-        showAll: true
+        order: 'desc'
     }), isHistoryLoading = _e.isLoading, historyWithTotal = _e.historyWithTotal, loadMore = _e.loadMore, loadData = _e.loadData;
-    var canLoadMore = react_1.useMemo(function () { return (historyPage + 1) * MAX_HISTORY_ROWS <= (historyWithTotal === null || historyWithTotal === void 0 ? void 0 : historyWithTotal.total); }, [
+    var canLoadMore = react_1.useMemo(function () { return (historyPage + 1) * MAX_HISTORY_ROWS < (historyWithTotal === null || historyWithTotal === void 0 ? void 0 : historyWithTotal.total); }, [
         historyWithTotal,
         historyPage
     ]);
+    var onApplyFilter = react_1.useCallback(function (filter) {
+        setHistoryPage(0);
+        setHistoryFilter(filter);
+    }, []);
     var onLoadMore = react_1.useCallback(function () {
         if (!canLoadMore)
             return;
@@ -40,10 +49,10 @@ var useHistory = function (_a) {
         isLoading: isHistoryLoading || isHistoricUrisLoading,
         canLoadMore: canLoadMore,
         onLoadMore: onLoadMore,
+        onApplyFilter: onApplyFilter,
         historicUris: historicUris,
         historyWithTotal: historyWithTotal,
         historyFilter: historyFilter,
-        setHistoryFilter: setHistoryFilter,
         reloadHistory: reloadHistory
     };
 };

package/cjs/components/history/hooks/useHistoryWithTotal.d.ts

@@ -7,9 +7,9 @@ declare type Props = {
     max?: number;
     offset?: number;
     order?: string;
-    filter?: any;
+    filter?: string;
 };
-export declare const useHistoryWithTotal: ({ entityUri, enabled, historicUris, ...options }: Props) => {
+export declare const useHistoryWithTotal: ({ entityUri, enabled, historicUris, filter, ...options }: Props) => {
     isLoading: boolean;
     historyWithTotal: HistoryWithTotal;
     loadMore: (offset: number) => void;

package/cjs/components/history/hooks/useHistoryWithTotal.js

@@ -32,7 +32,7 @@ var react_1 = require("react");
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var hooks_1 = require("../../../hooks");
 var useHistoryWithTotal = function (_a) {
-    var entityUri = _a.entityUri, _b = _a.enabled, enabled = _b === void 0 ? true : _b, historicUris = _a.historicUris, options = __rest(_a, ["entityUri", "enabled", "historicUris"]);
+    var entityUri = _a.entityUri, _b = _a.enabled, enabled = _b === void 0 ? true : _b, historicUris = _a.historicUris, filter = _a.filter, options = __rest(_a, ["entityUri", "enabled", "historicUris", "filter"]);
     var _c = react_1.useState(null), historyWithTotal = _c[0], setHistoryWithTotal = _c[1];
     var _d = react_1.useState(false), isLoading = _d[0], setIsLoading = _d[1];
     var safePromise = hooks_1.useSafePromise();
@@ -43,7 +43,7 @@ var useHistoryWithTotal = function (_a) {
     var loadData = react_1.useCallback(function () {
         if (entityUri && historicUris) {
             setIsLoading(true);
-            safePromise(mdm_sdk_1.getHistoryWithTotal(__assign({ entityUri: entityUri, historicUris: historicUris }, options)))
+            safePromise(mdm_sdk_1.getHistoryWithTotal(__assign({ entityUri: entityUri, historicUris: historicUris, filter: filter }, options)))
                 .then(function (results) {
                 setHistoryWithTotal(results);
             })
@@ -55,11 +55,11 @@ var useHistoryWithTotal = function (_a) {
         else {
             setHistoryWithTotal(null);
         }
-    }, [entityUri, historicUris]);
+    }, [entityUri, historicUris, filter]);
     var loadMore = react_1.useCallback(function (offset) {
         if (entityUri && historicUris) {
             setIsLoading(true);
-            safePromise(mdm_sdk_1.getHistoryWithTotal(__assign(__assign({ entityUri: entityUri, historicUris: historicUris }, options), { offset: offset })))
+            safePromise(mdm_sdk_1.getHistoryWithTotal(__assign(__assign({ entityUri: entityUri, historicUris: historicUris, filter: filter }, options), { offset: offset })))
                 .then(function (results) {
                 setHistoryWithTotal(function (prev) { return (__assign(__assign({}, prev), { changes: __spreadArray(__spreadArray([], prev === null || prev === void 0 ? void 0 : prev.changes), results.changes) })); });
             })
@@ -68,7 +68,7 @@ var useHistoryWithTotal = function (_a) {
                 setIsLoading(false);
             });
         }
-    }, [entityUri, historicUris]);
+    }, [entityUri, historicUris, filter]);
     react_1.useEffect(function () {
         if (enabled) {
             loadData();

package/cjs/components/history/utils/filters.d.ts

@@ -0,0 +1,3 @@
+import { DateRangeFilter } from '../../../types';
+export declare const buildHistoryFilterString: any;
+export declare const isDateRangeValid: (value: DateRangeFilter) => boolean;

package/cjs/components/history/utils/filters.js

@@ -0,0 +1,67 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDateRangeValid = exports.buildHistoryFilterString = void 0;
+var moment_1 = __importDefault(require("moment"));
+var ramda_1 = require("ramda");
+var mdm_sdk_1 = require("@reltio/mdm-sdk");
+var HistoryFilter_1 = require("../types/HistoryFilter");
+var ActivityTypes_1 = require("../../activityLog/types/ActivityTypes");
+var types_1 = require("../../../types");
+var wrapInBrackets = function (str) { return "(" + str + ")"; };
+var multiValueFilter = function (filterClauseFn) { return ramda_1.pipe(ramda_1.map(filterClauseFn), ramda_1.join(' or ')); };
+var durationToTimestamp = function (period) {
+    var amount = period[0], unit = period[1];
+    return moment_1.default().subtract(amount, unit).valueOf();
+};
+var convertHistoryTypes = ramda_1.chain(ramda_1.cond([
+    [
+        ramda_1.equals(HistoryFilter_1.HistoryActivityType.MERGE),
+        function () { return [
+            ActivityTypes_1.ActivityTypes.ENTITIES_MERGED,
+            ActivityTypes_1.ActivityTypes.ENTITIES_MERGED_MANUALLY,
+            ActivityTypes_1.ActivityTypes.ENTITIES_MERGED_ON_THE_FLY
+        ]; }
+    ],
+    [ramda_1.equals(HistoryFilter_1.HistoryActivityType.UNMERGE), function () { return [ActivityTypes_1.ActivityTypes.ENTITIES_SPLITTED]; }],
+    [ramda_1.equals(HistoryFilter_1.HistoryActivityType.UPDATE), function () { return [ActivityTypes_1.ActivityTypes.ENTITY_CHANGED]; }]
+]));
+var buildActivityFilterClause = ramda_1.pipe(ramda_1.defaultTo([]), convertHistoryTypes, ramda_1.concat([ActivityTypes_1.ActivityTypes.ENTITY_CREATED, ActivityTypes_1.ActivityTypes.ENTITY_REMOVED, ActivityTypes_1.ActivityTypes.ENTITY_LOST_MERGE]), multiValueFilter(function (value) { return "equals(type, '" + value + "')"; }));
+var buildUserFilterClause = function (user) { return "equals(user, '" + mdm_sdk_1.escapeQueryValue(user) + "')"; };
+var buildAttributeFilterClause = function (attribute) { return "changes(" + mdm_sdk_1.escapeQueryValue(attribute.value) + ")"; };
+var buildDateRangeFilterClause = function (_a) {
+    var type = _a.type, period = _a.period;
+    switch (type) {
+        case types_1.DateRangeTypes.WITHIN: {
+            return "gte(timestamp, " + durationToTimestamp(period) + ")";
+        }
+        case types_1.DateRangeTypes.AGO: {
+            return "lte(timestamp, " + durationToTimestamp(period) + ")";
+        }
+        case types_1.DateRangeTypes.BETWEEN: {
+            var start = period[0], end = period[1];
+            return "gte(timestamp, " + start.valueOf() + ") and lte(timestamp, " + moment_1.default(end).endOf('date').valueOf() + ")";
+        }
+        default: {
+            return '';
+        }
+    }
+};
+exports.buildHistoryFilterString = ramda_1.pipe(ramda_1.defaultTo({}), ramda_1.reject(mdm_sdk_1.isEmptyValue), ramda_1.evolve({
+    users: multiValueFilter(buildUserFilterClause),
+    attributes: multiValueFilter(buildAttributeFilterClause),
+    dateRange: buildDateRangeFilterClause
+}), ramda_1.over(ramda_1.lensProp('activities'), buildActivityFilterClause), ramda_1.values, ramda_1.reject(mdm_sdk_1.isEmptyValue), ramda_1.append("not equals(user, 'collaboration-service')"), ramda_1.map(wrapInBrackets), ramda_1.join(' and '));
+var isDateRangeValid = function (value) {
+    if (value.type === types_1.DateRangeTypes.AGO || value.type === types_1.DateRangeTypes.WITHIN) {
+        var _a = value.period, amount = _a[0], unit = _a[1];
+        return ramda_1.type(amount) === 'Number' && ramda_1.type(unit) === 'String' && amount > 0;
+    }
+    else if (value.type === types_1.DateRangeTypes.BETWEEN) {
+        var _b = value.period, startDate = _b[0], endDate = _b[1];
+        return startDate instanceof Date && endDate instanceof Date;
+    }
+};
+exports.isDateRangeValid = isDateRangeValid;

package/esm/components/history/HistoryFilterButton/HistoryFilterButton.js

@@ -11,12 +11,13 @@ var __assign = (this && this.__assign) || function () {
 };
 import React, { useState } from 'react';
 import i18n from 'ui-i18n';
-import { curry } from 'ramda';
+import { curry, dissoc } from 'ramda';
 import FilterListIcon from '@material-ui/icons/FilterList';
 import Button from '@material-ui/core/Button';
 import Popover from '@material-ui/core/Popover';
 import Typography from '@material-ui/core/Typography';
 import { SmallIconButton } from '../../SmallIconButton';
+import { isDateRangeValid } from '../utils/filters';
 import UserSelector from '../../UserSelector/UserSelector';
 import AttributeSelector from '../../AttributeSelector/AttributeSelector';
 import DateRangeSelector from '../DateRangeSelector/DateRangeSelector';
@@ -56,7 +57,12 @@ var HistoryFilterButton = function (_a) {
                 React.createElement(Button, { onClick: clearCurrentValue, className: styles.clearButton }, i18n.text('Clear all')),
                 React.createElement(Button, { onClick: closePopup }, i18n.text('Cancel')),
                 React.createElement(Button, { color: "primary", onClick: function () {
-                        onApplyFilter(currentValue);
+                        if (dateRange && isDateRangeValid(dateRange)) {
+                            onApplyFilter(currentValue);
+                        }
+                        else {
+                            onApplyFilter(dissoc('dateRange', currentValue));
+                        }
                         closePopup();
                     } }, i18n.text('Apply'))))));
 };

package/esm/components/history/hooks/useHistory.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { HistoryFilter } from '../types';
 declare type Props = {
     entityUri: string;
@@ -8,10 +7,10 @@ export declare const useHistory: ({ entityUri, enabled }: Props) => {
     isLoading: boolean;
     canLoadMore: boolean;
     onLoadMore: () => void;
+    onApplyFilter: (filter: HistoryFilter) => void;
     historicUris: string[];
     historyWithTotal: import("@reltio/mdm-sdk").HistoryWithTotal;
     historyFilter: HistoryFilter;
-    setHistoryFilter: import("react").Dispatch<import("react").SetStateAction<HistoryFilter>>;
     reloadHistory: () => void;
 };
 export {};

package/esm/components/history/hooks/useHistory.js

@@ -1,11 +1,16 @@
 import { useState, useMemo, useCallback } from 'react';
 import { useHistoricUris } from './useHistoricUris';
 import { useHistoryWithTotal } from './useHistoryWithTotal';
+import { HistoryActivityType } from '../types';
+import { buildHistoryFilterString } from '../utils/filters';
 var MAX_HISTORY_ROWS = 32;
 export var useHistory = function (_a) {
     var entityUri = _a.entityUri, enabled = _a.enabled;
-    var _b = useState(null), historyFilter = _b[0], setHistoryFilter = _b[1];
+    var _b = useState({
+        activities: [HistoryActivityType.MERGE, HistoryActivityType.UNMERGE, HistoryActivityType.UPDATE]
+    }), historyFilter = _b[0], setHistoryFilter = _b[1];
     var _c = useState(0), historyPage = _c[0], setHistoryPage = _c[1];
+    var historyFilterString = useMemo(function () { return buildHistoryFilterString(historyFilter); }, [historyFilter]);
     var _d = useHistoricUris({
         entityUri: entityUri,
         enabled: enabled
@@ -13,16 +18,20 @@ export var useHistory = function (_a) {
     var _e = useHistoryWithTotal({
         entityUri: entityUri,
         enabled: enabled && !!historicUris,
+        filter: historyFilterString,
         historicUris: historicUris,
         max: MAX_HISTORY_ROWS,
         offset: historyPage * MAX_HISTORY_ROWS,
-        order: 'desc',
-        showAll: true
+        order: 'desc'
     }), isHistoryLoading = _e.isLoading, historyWithTotal = _e.historyWithTotal, loadMore = _e.loadMore, loadData = _e.loadData;
-    var canLoadMore = useMemo(function () { return (historyPage + 1) * MAX_HISTORY_ROWS <= (historyWithTotal === null || historyWithTotal === void 0 ? void 0 : historyWithTotal.total); }, [
+    var canLoadMore = useMemo(function () { return (historyPage + 1) * MAX_HISTORY_ROWS < (historyWithTotal === null || historyWithTotal === void 0 ? void 0 : historyWithTotal.total); }, [
         historyWithTotal,
         historyPage
     ]);
+    var onApplyFilter = useCallback(function (filter) {
+        setHistoryPage(0);
+        setHistoryFilter(filter);
+    }, []);
     var onLoadMore = useCallback(function () {
         if (!canLoadMore)
             return;
@@ -37,10 +46,10 @@ export var useHistory = function (_a) {
         isLoading: isHistoryLoading || isHistoricUrisLoading,
         canLoadMore: canLoadMore,
         onLoadMore: onLoadMore,
+        onApplyFilter: onApplyFilter,
         historicUris: historicUris,
         historyWithTotal: historyWithTotal,
         historyFilter: historyFilter,
-        setHistoryFilter: setHistoryFilter,
         reloadHistory: reloadHistory
     };
 };

package/esm/components/history/hooks/useHistoryWithTotal.d.ts

@@ -7,9 +7,9 @@ declare type Props = {
     max?: number;
     offset?: number;
     order?: string;
-    filter?: any;
+    filter?: string;
 };
-export declare const useHistoryWithTotal: ({ entityUri, enabled, historicUris, ...options }: Props) => {
+export declare const useHistoryWithTotal: ({ entityUri, enabled, historicUris, filter, ...options }: Props) => {
     isLoading: boolean;
     historyWithTotal: HistoryWithTotal;
     loadMore: (offset: number) => void;

package/esm/components/history/hooks/useHistoryWithTotal.js

@@ -29,7 +29,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { getHistoryWithTotal } from '@reltio/mdm-sdk';
 import { useSafePromise } from '../../../hooks';
 export var useHistoryWithTotal = function (_a) {
-    var entityUri = _a.entityUri, _b = _a.enabled, enabled = _b === void 0 ? true : _b, historicUris = _a.historicUris, options = __rest(_a, ["entityUri", "enabled", "historicUris"]);
+    var entityUri = _a.entityUri, _b = _a.enabled, enabled = _b === void 0 ? true : _b, historicUris = _a.historicUris, filter = _a.filter, options = __rest(_a, ["entityUri", "enabled", "historicUris", "filter"]);
     var _c = useState(null), historyWithTotal = _c[0], setHistoryWithTotal = _c[1];
     var _d = useState(false), isLoading = _d[0], setIsLoading = _d[1];
     var safePromise = useSafePromise();
@@ -40,7 +40,7 @@ export var useHistoryWithTotal = function (_a) {
     var loadData = useCallback(function () {
         if (entityUri && historicUris) {
             setIsLoading(true);
-            safePromise(getHistoryWithTotal(__assign({ entityUri: entityUri, historicUris: historicUris }, options)))
+            safePromise(getHistoryWithTotal(__assign({ entityUri: entityUri, historicUris: historicUris, filter: filter }, options)))
                 .then(function (results) {
                 setHistoryWithTotal(results);
             })
@@ -52,11 +52,11 @@ export var useHistoryWithTotal = function (_a) {
         else {
             setHistoryWithTotal(null);
         }
-    }, [entityUri, historicUris]);
+    }, [entityUri, historicUris, filter]);
     var loadMore = useCallback(function (offset) {
         if (entityUri && historicUris) {
             setIsLoading(true);
-            safePromise(getHistoryWithTotal(__assign(__assign({ entityUri: entityUri, historicUris: historicUris }, options), { offset: offset })))
+            safePromise(getHistoryWithTotal(__assign(__assign({ entityUri: entityUri, historicUris: historicUris, filter: filter }, options), { offset: offset })))
                 .then(function (results) {
                 setHistoryWithTotal(function (prev) { return (__assign(__assign({}, prev), { changes: __spreadArray(__spreadArray([], prev === null || prev === void 0 ? void 0 : prev.changes), results.changes) })); });
             })
@@ -65,7 +65,7 @@ export var useHistoryWithTotal = function (_a) {
                 setIsLoading(false);
             });
         }
-    }, [entityUri, historicUris]);
+    }, [entityUri, historicUris, filter]);
     useEffect(function () {
         if (enabled) {
             loadData();

package/esm/components/history/utils/filters.d.ts

@@ -0,0 +1,3 @@
+import { DateRangeFilter } from '../../../types';
+export declare const buildHistoryFilterString: any;
+export declare const isDateRangeValid: (value: DateRangeFilter) => boolean;

package/esm/components/history/utils/filters.js

@@ -0,0 +1,60 @@
+import moment from 'moment';
+import { type, pipe, defaultTo, reject, map, join, cond, equals, append, concat, chain, evolve, values, over, lensProp } from 'ramda';
+import { isEmptyValue, escapeQueryValue } from '@reltio/mdm-sdk';
+import { HistoryActivityType } from '../types/HistoryFilter';
+import { ActivityTypes } from '../../activityLog/types/ActivityTypes';
+import { DateRangeTypes } from '../../../types';
+var wrapInBrackets = function (str) { return "(" + str + ")"; };
+var multiValueFilter = function (filterClauseFn) { return pipe(map(filterClauseFn), join(' or ')); };
+var durationToTimestamp = function (period) {
+    var amount = period[0], unit = period[1];
+    return moment().subtract(amount, unit).valueOf();
+};
+var convertHistoryTypes = chain(cond([
+    [
+        equals(HistoryActivityType.MERGE),
+        function () { return [
+            ActivityTypes.ENTITIES_MERGED,
+            ActivityTypes.ENTITIES_MERGED_MANUALLY,
+            ActivityTypes.ENTITIES_MERGED_ON_THE_FLY
+        ]; }
+    ],
+    [equals(HistoryActivityType.UNMERGE), function () { return [ActivityTypes.ENTITIES_SPLITTED]; }],
+    [equals(HistoryActivityType.UPDATE), function () { return [ActivityTypes.ENTITY_CHANGED]; }]
+]));
+var buildActivityFilterClause = pipe(defaultTo([]), convertHistoryTypes, concat([ActivityTypes.ENTITY_CREATED, ActivityTypes.ENTITY_REMOVED, ActivityTypes.ENTITY_LOST_MERGE]), multiValueFilter(function (value) { return "equals(type, '" + value + "')"; }));
+var buildUserFilterClause = function (user) { return "equals(user, '" + escapeQueryValue(user) + "')"; };
+var buildAttributeFilterClause = function (attribute) { return "changes(" + escapeQueryValue(attribute.value) + ")"; };
+var buildDateRangeFilterClause = function (_a) {
+    var type = _a.type, period = _a.period;
+    switch (type) {
+        case DateRangeTypes.WITHIN: {
+            return "gte(timestamp, " + durationToTimestamp(period) + ")";
+        }
+        case DateRangeTypes.AGO: {
+            return "lte(timestamp, " + durationToTimestamp(period) + ")";
+        }
+        case DateRangeTypes.BETWEEN: {
+            var start = period[0], end = period[1];
+            return "gte(timestamp, " + start.valueOf() + ") and lte(timestamp, " + moment(end).endOf('date').valueOf() + ")";
+        }
+        default: {
+            return '';
+        }
+    }
+};
+export var buildHistoryFilterString = pipe(defaultTo({}), reject(isEmptyValue), evolve({
+    users: multiValueFilter(buildUserFilterClause),
+    attributes: multiValueFilter(buildAttributeFilterClause),
+    dateRange: buildDateRangeFilterClause
+}), over(lensProp('activities'), buildActivityFilterClause), values, reject(isEmptyValue), append("not equals(user, 'collaboration-service')"), map(wrapInBrackets), join(' and '));
+export var isDateRangeValid = function (value) {
+    if (value.type === DateRangeTypes.AGO || value.type === DateRangeTypes.WITHIN) {
+        var _a = value.period, amount = _a[0], unit = _a[1];
+        return type(amount) === 'Number' && type(unit) === 'String' && amount > 0;
+    }
+    else if (value.type === DateRangeTypes.BETWEEN) {
+        var _b = value.period, startDate = _b[0], endDate = _b[1];
+        return startDate instanceof Date && endDate instanceof Date;
+    }
+};

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.916",
+  "version": "1.4.917",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
   "dependencies": {
     "@date-io/moment": "^1.3.5",
     "@react-google-maps/api": "^2.7.0",
-    "@reltio/mdm-module": "^1.4.916",
-    "@reltio/mdm-sdk": "^1.4.916",
+    "@reltio/mdm-module": "^1.4.917",
+    "@reltio/mdm-sdk": "^1.4.917",
     "classnames": "^2.2.5",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",