@reltio/components 1.4.1428 → 1.4.1430

package/cjs/components/DropDownSelector/styles.js

@@ -18,6 +18,7 @@ exports.useStyles = (0, styles_1.makeStyles)({
         height: 'auto'
     },
     dropdownIndicator: {
+        boxSizing: 'content-box',
         transition: 'transform .15s ease',
         padding: function (props) { return "".concat((props.height - 24) / 2, "px 12px"); },
         cursor: 'pointer',

package/cjs/components/activityLog/ActivityFilterButton/ActivityFilterButton.js

@@ -41,6 +41,7 @@ var react_1 = __importStar(require("react"));
 var classnames_1 = __importDefault(require("classnames"));
 var ui_i18n_1 = __importDefault(require("ui-i18n"));
 var ramda_1 = require("ramda");
+var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var FilterList_1 = __importDefault(require("@material-ui/icons/FilterList"));
 var ActivityFilterEditor_1 = __importDefault(require("../ActivityFilterEditor/ActivityFilterEditor"));
 var SmallIconButton_1 = require("../../SmallIconButton");
@@ -53,7 +54,10 @@ var ActivityFilterButton = function (_a) {
     var _b = (0, react_1.useState)(false), isEditorOpen = _b[0], setIsEditorOpen = _b[1];
     var isApplied = !(0, ramda_1.equals)(filter, initialValue.current);
     var handleChange = function (value) {
-        onChange(value);
+        var newValue = (0, ramda_1.pipe)((0, ramda_1.mergeRight)(initialValue.current), (0, ramda_1.evolve)({
+            dateRange: (0, ramda_1.unless)(mdm_sdk_1.isDateRangeValid, (0, ramda_1.always)(initialValue.current.dateRange))
+        }))(value);
+        onChange(newValue);
         setIsEditorOpen(false);
     };
     return (react_1.default.createElement(react_1.default.Fragment, null,

package/cjs/components/activityLog/ActivityFilterButton/styles.js

@@ -7,7 +7,7 @@ exports.useStyles = (0, styles_1.makeStyles)(function (theme) { return ({
         margin: '4px',
         '&.activeIcon': {
             backgroundColor: (0, styles_1.fade)(theme.palette.primary.main, 0.12),
-            color: '#0072CE'
+            color: theme.palette.primary.main
         }
     }
 }); });

package/cjs/components/activityLog/ActivityFilterEditor/DateRangeSelector.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { DateRangeFilter } from '../../../types';
+import { DateRangeFilter } from '@reltio/mdm-sdk';
 declare type Props = {
     value: DateRangeFilter;
     onChange: (range: DateRangeFilter) => void;

package/cjs/components/activityLog/ActivityFilterEditor/DateRangeSelector.js

@@ -41,11 +41,11 @@ var react_1 = __importStar(require("react"));
 var ui_i18n_1 = __importDefault(require("ui-i18n"));
 var ramda_1 = require("ramda");
 var classnames_1 = __importDefault(require("classnames"));
+var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var FormControlLabel_1 = __importDefault(require("@material-ui/core/FormControlLabel"));
 var Radio_1 = __importDefault(require("@material-ui/core/Radio"));
 var RadioGroup_1 = __importDefault(require("@material-ui/core/RadioGroup"));
 var Typography_1 = __importDefault(require("@material-ui/core/Typography"));
-var types_1 = require("../../../types");
 var DateIntervalSelector_1 = __importDefault(require("../../DateIntervalSelector/DateIntervalSelector"));
 var utils_1 = require("../../../core/utils");
 var CustomDateRangeEditor_1 = __importDefault(require("../../editors/CustomDateRangeEditor/CustomDateRangeEditor"));
@@ -60,24 +60,24 @@ var DateRangeSelector = function (_a) {
         if ((value === null || value === void 0 ? void 0 : value.type) === type) {
             return value.period;
         }
-        else if (type === types_1.DateRangeTypes.WITHIN || type === types_1.DateRangeTypes.AGO) {
+        else if (type === mdm_sdk_1.DateRangeTypes.WITHIN || type === mdm_sdk_1.DateRangeTypes.AGO) {
             return emptyInterval;
         }
-        else if (type === types_1.DateRangeTypes.BETWEEN) {
+        else if (type === mdm_sdk_1.DateRangeTypes.BETWEEN) {
             return emptyDates;
         }
     };
-    var _b = (0, react_1.useState)(getInitPeriodByType(types_1.DateRangeTypes.BETWEEN)), datesInterval = _b[0], setDatesInterval = _b[1];
-    var _c = (0, react_1.useState)(getInitPeriodByType(types_1.DateRangeTypes.WITHIN)), withinInterval = _c[0], setWithinInterval = _c[1];
-    var _d = (0, react_1.useState)(getInitPeriodByType(types_1.DateRangeTypes.AGO)), agoInterval = _d[0], setAgoInterval = _d[1];
+    var _b = (0, react_1.useState)(getInitPeriodByType(mdm_sdk_1.DateRangeTypes.BETWEEN)), datesInterval = _b[0], setDatesInterval = _b[1];
+    var _c = (0, react_1.useState)(getInitPeriodByType(mdm_sdk_1.DateRangeTypes.WITHIN)), withinInterval = _c[0], setWithinInterval = _c[1];
+    var _d = (0, react_1.useState)(getInitPeriodByType(mdm_sdk_1.DateRangeTypes.AGO)), agoInterval = _d[0], setAgoInterval = _d[1];
     var getCurrentPeriodByType = function (type) {
-        if (type === types_1.DateRangeTypes.WITHIN) {
+        if (type === mdm_sdk_1.DateRangeTypes.WITHIN) {
             return withinInterval;
         }
-        else if (type === types_1.DateRangeTypes.AGO) {
+        else if (type === mdm_sdk_1.DateRangeTypes.AGO) {
             return agoInterval;
         }
-        else if (type === types_1.DateRangeTypes.BETWEEN) {
+        else if (type === mdm_sdk_1.DateRangeTypes.BETWEEN) {
             return datesInterval;
         }
     };
@@ -91,13 +91,13 @@ var DateRangeSelector = function (_a) {
     };
     (0, hooks_1.useDidUpdateEffect)(function () {
         if (value) {
-            if (value.type === types_1.DateRangeTypes.WITHIN) {
+            if (value.type === mdm_sdk_1.DateRangeTypes.WITHIN) {
                 setWithinInterval(value.period);
             }
-            else if (value.type === types_1.DateRangeTypes.AGO) {
+            else if (value.type === mdm_sdk_1.DateRangeTypes.AGO) {
                 setAgoInterval(value.period);
             }
-            else if (value.type === types_1.DateRangeTypes.BETWEEN) {
+            else if (value.type === mdm_sdk_1.DateRangeTypes.BETWEEN) {
                 setDatesInterval(value.period);
             }
         }
@@ -111,14 +111,14 @@ var DateRangeSelector = function (_a) {
         react_1.default.createElement(Typography_1.default, { className: (0, classnames_1.default)(styles.filterSubtitle, styles.labels), variant: 'subtitle1' }, ui_i18n_1.default.text('Date')),
         react_1.default.createElement(RadioGroup_1.default, { value: (value === null || value === void 0 ? void 0 : value.type) || null, onChange: (0, ramda_1.pipe)(utils_1.getValue, changeType) },
             react_1.default.createElement("div", { className: styles.dateOptionWithin },
-                react_1.default.createElement(FormControlLabel_1.default, { value: types_1.DateRangeTypes.WITHIN, control: react_1.default.createElement(Radio_1.default, null), label: ui_i18n_1.default.text('Within the last'), classes: { label: (0, classnames_1.default)(styles.dateOptionLabel, styles.labels) } }),
-                react_1.default.createElement(DateIntervalSelector_1.default, { interval: withinInterval, onChange: changePeriod, onFocus: function () { return changeType(types_1.DateRangeTypes.WITHIN); } })),
+                react_1.default.createElement(FormControlLabel_1.default, { value: mdm_sdk_1.DateRangeTypes.WITHIN, control: react_1.default.createElement(Radio_1.default, { color: "primary" }), label: ui_i18n_1.default.text('Within the last'), classes: { label: (0, classnames_1.default)(styles.dateOptionLabel, styles.labels) } }),
+                react_1.default.createElement(DateIntervalSelector_1.default, { interval: withinInterval, onChange: changePeriod, onFocus: function () { return changeType(mdm_sdk_1.DateRangeTypes.WITHIN); } })),
             react_1.default.createElement("div", { className: styles.dateOptionAgo },
-                react_1.default.createElement(FormControlLabel_1.default, { value: types_1.DateRangeTypes.AGO, control: react_1.default.createElement(Radio_1.default, null), label: ui_i18n_1.default.text('More than'), classes: { label: (0, classnames_1.default)(styles.dateOptionLabel, styles.labels) } }),
-                react_1.default.createElement(DateIntervalSelector_1.default, { interval: agoInterval, onChange: changePeriod, onFocus: function () { return changeType(types_1.DateRangeTypes.AGO); } }),
+                react_1.default.createElement(FormControlLabel_1.default, { value: mdm_sdk_1.DateRangeTypes.AGO, control: react_1.default.createElement(Radio_1.default, { color: "primary" }), label: ui_i18n_1.default.text('More than'), classes: { label: (0, classnames_1.default)(styles.dateOptionLabel, styles.labels) } }),
+                react_1.default.createElement(DateIntervalSelector_1.default, { interval: agoInterval, onChange: changePeriod, onFocus: function () { return changeType(mdm_sdk_1.DateRangeTypes.AGO); } }),
                 react_1.default.createElement(Typography_1.default, { className: (0, classnames_1.default)(styles.agoLabel, styles.labels), variant: 'subtitle1' }, ui_i18n_1.default.text('Ago'))),
             react_1.default.createElement("div", { className: styles.dateOption },
-                react_1.default.createElement(FormControlLabel_1.default, { value: types_1.DateRangeTypes.BETWEEN, control: react_1.default.createElement(Radio_1.default, null), label: ui_i18n_1.default.text('Date range'), classes: { label: (0, classnames_1.default)(styles.dateOptionLabel, styles.labels) } }),
-                react_1.default.createElement(CustomDateRangeEditor_1.default, { values: datesInterval, onChange: changePeriod, onFocus: function () { return changeType(types_1.DateRangeTypes.BETWEEN); } })))));
+                react_1.default.createElement(FormControlLabel_1.default, { value: mdm_sdk_1.DateRangeTypes.BETWEEN, control: react_1.default.createElement(Radio_1.default, { color: "primary" }), label: ui_i18n_1.default.text('Date range'), classes: { label: (0, classnames_1.default)(styles.dateOptionLabel, styles.labels) } }),
+                react_1.default.createElement(CustomDateRangeEditor_1.default, { values: datesInterval, onChange: changePeriod, onFocus: function () { return changeType(mdm_sdk_1.DateRangeTypes.BETWEEN); } })))));
 };
 exports.default = DateRangeSelector;

package/cjs/components/activityLog/ActivityLog/items/ActivityItem/styles.js

@@ -14,7 +14,7 @@ exports.useStyles = (0, styles_1.makeStyles)(function (theme) { return ({
         marginRight: '15px',
         width: '24px',
         height: '24px',
-        background: '#4896DF',
+        background: theme.palette.primary.main,
         borderRadius: '50%',
         border: '1px solid white',
         display: 'flex',

package/cjs/components/activityLog/ActivityLogFilter/helpers.js

@@ -7,7 +7,6 @@ exports.getFilterLabel = void 0;
 var ui_i18n_1 = __importDefault(require("ui-i18n"));
 var ramda_1 = require("ramda");
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
-var types_1 = require("../../../types");
 var activities_1 = require("../utils/activities");
 var getFilterLabel = function (filters) {
     var getLabel = (0, ramda_1.curry)(function (unit, pluralUnit, values) {
@@ -25,11 +24,11 @@ var getFilterLabel = function (filters) {
             return "".concat((0, mdm_sdk_1.formatDataTypeValue)({ dataTypeDefinition: { type: mdm_sdk_1.DataTypes.TYPE_ACTIVENESS_DATE } }, value));
         };
         switch (date.type) {
-            case types_1.DateRangeTypes.WITHIN:
+            case mdm_sdk_1.DateRangeTypes.WITHIN:
                 return ui_i18n_1.default.text('Within ${amount} ${unit}', { amount: date.period[0], unit: date.period[1] });
-            case types_1.DateRangeTypes.AGO:
+            case mdm_sdk_1.DateRangeTypes.AGO:
                 return ui_i18n_1.default.text('More than ${amount} ${unit} ago', { amount: date.period[0], unit: date.period[1] });
-            case types_1.DateRangeTypes.BETWEEN:
+            case mdm_sdk_1.DateRangeTypes.BETWEEN:
                 return ui_i18n_1.default.text('${startDate} to ${endDate}', {
                     startDate: formatDateValue(date.period[0]),
                     endDate: formatDateValue(date.period[1])

package/cjs/components/activityLog/activities/EntityObject/styles.js

@@ -6,7 +6,7 @@ exports.useStyles = (0, styles_1.makeStyles)(function (theme) { return ({
     link: {
         fontSize: 13,
         lineHeight: '15px',
-        color: '#0072CE',
+        color: theme.palette.primary.main,
         textDecoration: 'none',
         fontWeight: 400,
         '&.removed': {

package/cjs/components/activityLog/activities/RelationObject/styles.js

@@ -10,7 +10,7 @@ exports.useStyles = (0, styles_1.makeStyles)(function (theme) { return ({
         overflow: 'hidden'
     },
     link: {
-        color: '#0072CE',
+        color: theme.palette.primary.main,
         textDecoration: 'none',
         fontWeight: 400
     },

package/cjs/components/activityLog/activities/fields/commonStyles.js

@@ -15,7 +15,7 @@ exports.useCommonStyles = (0, styles_1.makeStyles)(function (theme) { return ({
         marginRight: 8
     },
     link: {
-        color: '#0072CE',
+        color: theme.palette.primary.main,
         textDecoration: 'none',
         fontWeight: 400
     }

package/cjs/components/activityLog/activities/styles.js

@@ -4,7 +4,7 @@ exports.useStyles = void 0;
 var styles_1 = require("@material-ui/core/styles");
 exports.useStyles = (0, styles_1.makeStyles)(function (theme) { return ({
     link: {
-        color: '#0072CE',
+        color: theme.palette.primary.main,
         textDecoration: 'none',
         fontWeight: 400,
         cursor: 'pointer'

package/cjs/components/activityLog/types/ActivitiesFilter.d.ts

@@ -1,6 +1,6 @@
-import { Source, TEntityType } from '@reltio/mdm-sdk';
+import { Source, TEntityType, DateRangeFilter } from '@reltio/mdm-sdk';
 import { ActivityTypes } from './ActivityTypes';
-import { AttributeOption, DateRangeFilter } from '../../../types';
+import { AttributeOption } from '../../../types';
 export declare type ActivitiesFilter = {
     users: string[];
     activities: ActivityTypes[];

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

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

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

@@ -1,27 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildActivitiesFilterString = exports.isDateRangeValid = void 0;
+exports.buildActivitiesFilterString = void 0;
 var ramda_1 = require("ramda");
-var moment_1 = __importDefault(require("moment"));
-var types_1 = require("../../../types");
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
-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 (0, ramda_1.type)(amount) === 'Number' && (0, 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;
-var wrapInBrackets = function (str) { return "(".concat(str, ")"); };
-var multiValueFilter = function (filterClauseFn) { return function (values) { return values.map(filterClauseFn).join(' or '); }; };
-var buildUserFilterClause = function (user) { return "equals(user, '".concat((0, mdm_sdk_1.escapeQueryValue)(user), "')"); };
 var buildActivityFilterClause = function (activityType) {
     if (activityType.startsWith('USER_') || activityType.startsWith('COMMENT_') || activityType.startsWith('SFDC_')) {
         return "startsWith(label, '".concat(activityType, "')");
@@ -30,58 +11,20 @@ var buildActivityFilterClause = function (activityType) {
         return "equals(items.data.type, ".concat(activityType, ")");
     }
 };
-var buildSourceFilterClause = function (source) {
-    return "equals(items.delta.sources, '".concat(source.abbreviation, "')");
-};
-var buildEntityTypeFilterClause = function (entityType) {
-    return "equals(items.objectType, '".concat(entityType.uri, "')");
-};
 var buildAttributeFilterClause = function (attribute) {
     return "equals(items.delta.attributeType, '".concat(attribute.value, "')");
 };
-var durationToTimestamp = function (period) {
-    var amount = period[0], unit = period[1];
-    return (0, moment_1.default)().subtract(amount, unit).valueOf();
-};
-var buildDateRangeFilterClause = function (dateRange) {
-    var period = dateRange.period, type = dateRange.type;
-    if (!(0, exports.isDateRangeValid)(dateRange))
-        return '';
-    switch (type) {
-        case types_1.DateRangeTypes.WITHIN: {
-            return "gte(timestamp, ".concat(durationToTimestamp(period), ")");
-        }
-        case types_1.DateRangeTypes.AGO: {
-            return "lte(timestamp, ".concat(durationToTimestamp(period), ")");
-        }
-        case types_1.DateRangeTypes.BETWEEN: {
-            var start = period[0], end = period[1];
-            return "range(timestamp, ".concat(start.valueOf(), ", ").concat((0, moment_1.default)(end).endOf('date').valueOf(), ")");
-        }
-        default: {
-            return '';
-        }
-    }
-};
-var buildEntityUriFilterClause = function (entityUri) {
-    var filters = [
-        "equals(items.objectUri, '".concat(entityUri, "')"),
-        "equals(items.startObjectUri, '".concat(entityUri, "')"),
-        "equals(items.endObjectUri, '".concat(entityUri, "')")
-    ];
-    return filters.join(' or ');
-};
 var getFilterClauseBuilder = (0, ramda_1.cond)([
-    [(0, ramda_1.equals)('users'), function () { return multiValueFilter(buildUserFilterClause); }],
-    [(0, ramda_1.equals)('activities'), function () { return multiValueFilter(buildActivityFilterClause); }],
-    [(0, ramda_1.equals)('sources'), function () { return multiValueFilter(buildSourceFilterClause); }],
-    [(0, ramda_1.equals)('attributes'), function () { return multiValueFilter(buildAttributeFilterClause); }],
-    [(0, ramda_1.equals)('entityTypes'), function () { return multiValueFilter(buildEntityTypeFilterClause); }],
-    [(0, ramda_1.equals)('dateRange'), function () { return buildDateRangeFilterClause; }],
-    [(0, ramda_1.equals)('entityUri'), function () { return buildEntityUriFilterClause; }],
+    [(0, ramda_1.equals)('users'), function () { return (0, mdm_sdk_1.multiValueFilter)(mdm_sdk_1.buildUserFilterClause); }],
+    [(0, ramda_1.equals)('activities'), function () { return (0, mdm_sdk_1.multiValueFilter)(buildActivityFilterClause); }],
+    [(0, ramda_1.equals)('sources'), function () { return (0, mdm_sdk_1.multiValueFilter)(mdm_sdk_1.buildSourceFilterClause); }],
+    [(0, ramda_1.equals)('attributes'), function () { return (0, mdm_sdk_1.multiValueFilter)(buildAttributeFilterClause); }],
+    [(0, ramda_1.equals)('entityTypes'), function () { return (0, mdm_sdk_1.multiValueFilter)(mdm_sdk_1.buildEntityTypeFilterClause); }],
+    [(0, ramda_1.equals)('dateRange'), function () { return mdm_sdk_1.buildDateRangeFilterClause; }],
+    [(0, ramda_1.equals)('entityUri'), function () { return mdm_sdk_1.buildEntityUriFilterClause; }],
     [(0, ramda_1.equals)('rawFilter'), function () { return ramda_1.identity; }]
 ]);
 exports.buildActivitiesFilterString = (0, ramda_1.pipe)((0, ramda_1.defaultTo)({}), (0, ramda_1.reject)(mdm_sdk_1.isEmptyValue), ramda_1.toPairs, (0, ramda_1.append)(['rawFilter', "not equals(user, 'collaboration-service')"]), (0, ramda_1.map)(function (_a) {
     var key = _a[0], value = _a[1];
     return getFilterClauseBuilder(key)(value);
-}), (0, ramda_1.reject)(mdm_sdk_1.isEmptyValue), (0, ramda_1.map)(wrapInBrackets), (0, ramda_1.join)(' and '));
+}), (0, ramda_1.reject)(mdm_sdk_1.isEmptyValue), (0, ramda_1.map)(mdm_sdk_1.wrapInBrackets), (0, ramda_1.join)(' and '));

package/cjs/components/history/DateRangeSelector/DateRangeSelector.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { DateRangeFilter } from '../../../types';
+import { DateRangeFilter } from '@reltio/mdm-sdk';
 declare type Props = {
     value: DateRangeFilter;
     onChange: (range: DateRangeFilter) => void;

package/cjs/components/history/DateRangeSelector/DateRangeSelector.js

@@ -29,26 +29,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importStar(require("react"));
 var ui_i18n_1 = __importDefault(require("ui-i18n"));
 var classnames_1 = __importDefault(require("classnames"));
+var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var Typography_1 = __importDefault(require("@material-ui/core/Typography"));
 var SimpleDropDownSelector_1 = __importDefault(require("../../SimpleDropDownSelector/SimpleDropDownSelector"));
 var utils_1 = require("./utils");
 var DateIntervalSelector_1 = __importDefault(require("../../DateIntervalSelector/DateIntervalSelector"));
 var hooks_1 = require("../../../hooks");
 var CustomDateRangeEditor_1 = __importDefault(require("../../editors/CustomDateRangeEditor/CustomDateRangeEditor"));
-var types_1 = require("../../../types");
 var styles_1 = require("./styles");
 var emptyDates = [null, null];
 var emptyInterval = [null, 'hours'];
 var DateRangeSelector = function (_a) {
     var value = _a.value, onChange = _a.onChange, className = _a.className;
     var styles = (0, styles_1.useStyles)();
-    var isIntervalType = function (type) { return type === types_1.DateRangeTypes.WITHIN || type === types_1.DateRangeTypes.AGO; };
-    var isBetweenType = function (type) { return type === types_1.DateRangeTypes.BETWEEN; };
+    var isIntervalType = function (type) { return type === mdm_sdk_1.DateRangeTypes.WITHIN || type === mdm_sdk_1.DateRangeTypes.AGO; };
+    var isBetweenType = function (type) { return type === mdm_sdk_1.DateRangeTypes.BETWEEN; };
     var initDatesInterval = isBetweenType(value === null || value === void 0 ? void 0 : value.type) ? value.period : emptyDates;
     var initInterval = isIntervalType(value === null || value === void 0 ? void 0 : value.type) ? value.period : emptyInterval;
     var _b = (0, react_1.useState)(initDatesInterval), datesInterval = _b[0], setDatesInterval = _b[1];
     var _c = (0, react_1.useState)(initInterval), interval = _c[0], setInterval = _c[1];
-    var selectedType = (value === null || value === void 0 ? void 0 : value.type) || types_1.DateRangeTypes.WITHIN;
+    var selectedType = (value === null || value === void 0 ? void 0 : value.type) || mdm_sdk_1.DateRangeTypes.WITHIN;
     var getCurrentPeriodByType = function (type) {
         if (isIntervalType(type)) {
             return interval;

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

@@ -1,3 +1,3 @@
-import { DateRangeTypes } from '../../../types';
+import { DateRangeTypes } from '@reltio/mdm-sdk';
 export declare const dateRangeTypeOptions: DateRangeTypes[];
 export declare const getDateRangeTypeLabel: (type: DateRangeTypes) => string;

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

@@ -5,14 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDateRangeTypeLabel = exports.dateRangeTypeOptions = void 0;
 var ui_i18n_1 = __importDefault(require("ui-i18n"));
-var types_1 = require("../../../types");
-exports.dateRangeTypeOptions = [types_1.DateRangeTypes.WITHIN, types_1.DateRangeTypes.AGO, types_1.DateRangeTypes.BETWEEN];
+var mdm_sdk_1 = require("@reltio/mdm-sdk");
+exports.dateRangeTypeOptions = [mdm_sdk_1.DateRangeTypes.WITHIN, mdm_sdk_1.DateRangeTypes.AGO, mdm_sdk_1.DateRangeTypes.BETWEEN];
 var getDateRangeTypeLabel = function (type) {
     var _a;
     var labels = (_a = {},
-        _a[types_1.DateRangeTypes.WITHIN] = ui_i18n_1.default.text('Within the last'),
-        _a[types_1.DateRangeTypes.AGO] = ui_i18n_1.default.text('More than'),
-        _a[types_1.DateRangeTypes.BETWEEN] = ui_i18n_1.default.text('Date range'),
+        _a[mdm_sdk_1.DateRangeTypes.WITHIN] = ui_i18n_1.default.text('Within the last'),
+        _a[mdm_sdk_1.DateRangeTypes.AGO] = ui_i18n_1.default.text('More than'),
+        _a[mdm_sdk_1.DateRangeTypes.BETWEEN] = ui_i18n_1.default.text('Date range'),
         _a);
     return labels[type] || '';
 };

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

@@ -44,8 +44,8 @@ var FilterList_1 = __importDefault(require("@material-ui/icons/FilterList"));
 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 mdm_sdk_1 = require("@reltio/mdm-sdk");
 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"));
@@ -75,7 +75,7 @@ var HistoryFilterButton = function (_a) {
         setIsOpen(function (open) { return !open; });
     }, []);
     var applyButtonHandler = (0, react_1.useCallback)(function () {
-        dateRange && (0, filters_1.isDateRangeValid)(dateRange)
+        dateRange && (0, mdm_sdk_1.isDateRangeValid)(dateRange)
             ? onApplyFilter(currentValue)
             : onApplyFilter((0, ramda_1.dissoc)('dateRange', currentValue));
         togglePopup();

package/cjs/components/history/types/HistoryFilter.d.ts

@@ -1,4 +1,5 @@
-import { AttributeOption, DateRangeFilter } from '../../../types';
+import { DateRangeFilter } from '@reltio/mdm-sdk';
+import { AttributeOption } from '../../../types';
 export declare enum HistoryActivityType {
     UPDATE = "UPDATE",
     MERGE = "MERGE",

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

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

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

@@ -1,21 +1,10 @@
 "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"));
+exports.buildHistoryFilterString = void 0;
 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 "(".concat(str, ")"); };
-var multiValueFilter = function (filterClauseFn) { return (0, ramda_1.pipe)((0, ramda_1.map)(filterClauseFn), (0, ramda_1.join)(' or ')); };
-var durationToTimestamp = function (period) {
-    var amount = period[0], unit = period[1];
-    return (0, moment_1.default)().subtract(amount, unit).valueOf();
-};
 var convertHistoryTypes = (0, ramda_1.chain)((0, ramda_1.cond)([
     [
         (0, ramda_1.equals)(HistoryFilter_1.HistoryActivityType.MERGE),
@@ -28,40 +17,10 @@ var convertHistoryTypes = (0, ramda_1.chain)((0, ramda_1.cond)([
     [(0, ramda_1.equals)(HistoryFilter_1.HistoryActivityType.UNMERGE), function () { return [ActivityTypes_1.ActivityTypes.ENTITIES_SPLITTED]; }],
     [(0, ramda_1.equals)(HistoryFilter_1.HistoryActivityType.UPDATE), function () { return [ActivityTypes_1.ActivityTypes.ENTITY_CHANGED]; }]
 ]));
-var buildActivityFilterClause = (0, ramda_1.pipe)((0, ramda_1.defaultTo)([]), convertHistoryTypes, (0, 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, '".concat(value, "')"); }));
-var buildUserFilterClause = function (user) { return "equals(user, '".concat((0, mdm_sdk_1.escapeQueryValue)(user), "')"); };
+var buildActivityFilterClause = (0, ramda_1.pipe)((0, ramda_1.defaultTo)([]), convertHistoryTypes, (0, ramda_1.concat)([ActivityTypes_1.ActivityTypes.ENTITY_CREATED, ActivityTypes_1.ActivityTypes.ENTITY_REMOVED, ActivityTypes_1.ActivityTypes.ENTITY_LOST_MERGE]), (0, mdm_sdk_1.multiValueFilter)(function (value) { return "equals(type, '".concat(value, "')"); }));
 var buildAttributeFilterClause = function (attribute) { return "changes(".concat((0, 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, ".concat(durationToTimestamp(period), ")");
-        }
-        case types_1.DateRangeTypes.AGO: {
-            return "lte(timestamp, ".concat(durationToTimestamp(period), ")");
-        }
-        case types_1.DateRangeTypes.BETWEEN: {
-            var start = period[0], end = period[1];
-            return "gte(timestamp, ".concat(start.valueOf(), ") and lte(timestamp, ").concat((0, moment_1.default)(end).endOf('date').valueOf(), ")");
-        }
-        default: {
-            return '';
-        }
-    }
-};
 exports.buildHistoryFilterString = (0, ramda_1.pipe)((0, ramda_1.defaultTo)({}), (0, ramda_1.reject)(mdm_sdk_1.isEmptyValue), (0, ramda_1.evolve)({
-    users: multiValueFilter(buildUserFilterClause),
-    attributes: multiValueFilter(buildAttributeFilterClause),
-    dateRange: buildDateRangeFilterClause
-}), (0, ramda_1.over)((0, ramda_1.lensProp)('activities'), buildActivityFilterClause), ramda_1.values, (0, ramda_1.reject)(mdm_sdk_1.isEmptyValue), (0, ramda_1.append)("not equals(user, 'collaboration-service')"), (0, ramda_1.map)(wrapInBrackets), (0, 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 (0, ramda_1.type)(amount) === 'Number' && (0, 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;
+    users: (0, mdm_sdk_1.multiValueFilter)(mdm_sdk_1.buildUserFilterClause),
+    attributes: (0, mdm_sdk_1.multiValueFilter)(buildAttributeFilterClause),
+    dateRange: mdm_sdk_1.buildDateRangeFilterClause
+}), (0, ramda_1.over)((0, ramda_1.lensProp)('activities'), buildActivityFilterClause), ramda_1.values, (0, ramda_1.reject)(mdm_sdk_1.isEmptyValue), (0, ramda_1.append)("not equals(user, 'collaboration-service')"), (0, ramda_1.map)(mdm_sdk_1.wrapInBrackets), (0, ramda_1.join)(' and '));

package/cjs/types/index.d.ts

@@ -18,15 +18,6 @@ export declare type AttributeOption = {
     chipLabel: string;
     level: number;
 };
-export declare enum DateRangeTypes {
-    WITHIN = "within",
-    AGO = "ago",
-    BETWEEN = "between"
-}
-export declare type DateRangeFilter = {
-    type: DateRangeTypes;
-    period: [number, string] | [Date, Date];
-};
 export declare type QueryBuilderAttributeData = {
     title: string;
     pathToTitle: Array<string>;

package/cjs/types/index.js

@@ -1,12 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequestStates = exports.DateRangeTypes = void 0;
-var DateRangeTypes;
-(function (DateRangeTypes) {
-    DateRangeTypes["WITHIN"] = "within";
-    DateRangeTypes["AGO"] = "ago";
-    DateRangeTypes["BETWEEN"] = "between";
-})(DateRangeTypes = exports.DateRangeTypes || (exports.DateRangeTypes = {}));
+exports.RequestStates = void 0;
 var RequestStates;
 (function (RequestStates) {
     RequestStates["INIT"] = "init";

package/esm/components/DropDownSelector/styles.js

@@ -15,6 +15,7 @@ export var useStyles = makeStyles({
         height: 'auto'
     },
     dropdownIndicator: {
+        boxSizing: 'content-box',
         transition: 'transform .15s ease',
         padding: function (props) { return "".concat((props.height - 24) / 2, "px 12px"); },
         cursor: 'pointer',

package/esm/components/activityLog/ActivityFilterButton/ActivityFilterButton.js

@@ -12,7 +12,8 @@ var __assign = (this && this.__assign) || function () {
 import React, { useState, useRef } from 'react';
 import classnames from 'classnames';
 import i18n from 'ui-i18n';
-import { equals } from 'ramda';
+import { always, equals, evolve, pipe, mergeRight, unless } from 'ramda';
+import { isDateRangeValid } from '@reltio/mdm-sdk';
 import FilterListIcon from '@material-ui/icons/FilterList';
 import ActivityFilterEditor from '../ActivityFilterEditor/ActivityFilterEditor';
 import { SmallIconButtonWithTooltip } from '../../SmallIconButton';
@@ -25,7 +26,10 @@ var ActivityFilterButton = function (_a) {
     var _b = useState(false), isEditorOpen = _b[0], setIsEditorOpen = _b[1];
     var isApplied = !equals(filter, initialValue.current);
     var handleChange = function (value) {
-        onChange(value);
+        var newValue = pipe(mergeRight(initialValue.current), evolve({
+            dateRange: unless(isDateRangeValid, always(initialValue.current.dateRange))
+        }))(value);
+        onChange(newValue);
         setIsEditorOpen(false);
     };
     return (React.createElement(React.Fragment, null,

package/esm/components/activityLog/ActivityFilterButton/styles.js

@@ -4,7 +4,7 @@ export var useStyles = makeStyles(function (theme) { return ({
         margin: '4px',
         '&.activeIcon': {
             backgroundColor: fade(theme.palette.primary.main, 0.12),
-            color: '#0072CE'
+            color: theme.palette.primary.main
         }
     }
 }); });

package/esm/components/activityLog/ActivityFilterEditor/DateRangeSelector.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { DateRangeFilter } from '../../../types';
+import { DateRangeFilter } from '@reltio/mdm-sdk';
 declare type Props = {
     value: DateRangeFilter;
     onChange: (range: DateRangeFilter) => void;

package/esm/components/activityLog/ActivityFilterEditor/DateRangeSelector.js

@@ -13,11 +13,11 @@ import React, { useState } from 'react';
 import i18n from 'ui-i18n';
 import { pipe } from 'ramda';
 import classnames from 'classnames';
+import { DateRangeTypes } from '@reltio/mdm-sdk';
 import FormControlLabel from '@material-ui/core/FormControlLabel';
 import Radio from '@material-ui/core/Radio';
 import RadioGroup from '@material-ui/core/RadioGroup';
 import Typography from '@material-ui/core/Typography';
-import { DateRangeTypes } from '../../../types';
 import DateIntervalSelector from '../../DateIntervalSelector/DateIntervalSelector';
 import { getValue } from '../../../core/utils';
 import CustomDateRangeEditor from '../../editors/CustomDateRangeEditor/CustomDateRangeEditor';
@@ -83,14 +83,14 @@ var DateRangeSelector = function (_a) {
         React.createElement(Typography, { className: classnames(styles.filterSubtitle, styles.labels), variant: 'subtitle1' }, i18n.text('Date')),
         React.createElement(RadioGroup, { value: (value === null || value === void 0 ? void 0 : value.type) || null, onChange: pipe(getValue, changeType) },
             React.createElement("div", { className: styles.dateOptionWithin },
-                React.createElement(FormControlLabel, { value: DateRangeTypes.WITHIN, control: React.createElement(Radio, null), label: i18n.text('Within the last'), classes: { label: classnames(styles.dateOptionLabel, styles.labels) } }),
+                React.createElement(FormControlLabel, { value: DateRangeTypes.WITHIN, control: React.createElement(Radio, { color: "primary" }), label: i18n.text('Within the last'), classes: { label: classnames(styles.dateOptionLabel, styles.labels) } }),
                 React.createElement(DateIntervalSelector, { interval: withinInterval, onChange: changePeriod, onFocus: function () { return changeType(DateRangeTypes.WITHIN); } })),
             React.createElement("div", { className: styles.dateOptionAgo },
-                React.createElement(FormControlLabel, { value: DateRangeTypes.AGO, control: React.createElement(Radio, null), label: i18n.text('More than'), classes: { label: classnames(styles.dateOptionLabel, styles.labels) } }),
+                React.createElement(FormControlLabel, { value: DateRangeTypes.AGO, control: React.createElement(Radio, { color: "primary" }), label: i18n.text('More than'), classes: { label: classnames(styles.dateOptionLabel, styles.labels) } }),
                 React.createElement(DateIntervalSelector, { interval: agoInterval, onChange: changePeriod, onFocus: function () { return changeType(DateRangeTypes.AGO); } }),
                 React.createElement(Typography, { className: classnames(styles.agoLabel, styles.labels), variant: 'subtitle1' }, i18n.text('Ago'))),
             React.createElement("div", { className: styles.dateOption },
-                React.createElement(FormControlLabel, { value: DateRangeTypes.BETWEEN, control: React.createElement(Radio, null), label: i18n.text('Date range'), classes: { label: classnames(styles.dateOptionLabel, styles.labels) } }),
+                React.createElement(FormControlLabel, { value: DateRangeTypes.BETWEEN, control: React.createElement(Radio, { color: "primary" }), label: i18n.text('Date range'), classes: { label: classnames(styles.dateOptionLabel, styles.labels) } }),
                 React.createElement(CustomDateRangeEditor, { values: datesInterval, onChange: changePeriod, onFocus: function () { return changeType(DateRangeTypes.BETWEEN); } })))));
 };
 export default DateRangeSelector;

package/esm/components/activityLog/ActivityLog/items/ActivityItem/styles.js

@@ -11,7 +11,7 @@ export var useStyles = makeStyles(function (theme) { return ({
         marginRight: '15px',
         width: '24px',
         height: '24px',
-        background: '#4896DF',
+        background: theme.palette.primary.main,
         borderRadius: '50%',
         border: '1px solid white',
         display: 'flex',

package/esm/components/activityLog/ActivityLogFilter/helpers.js

@@ -1,7 +1,6 @@
 import i18n from 'ui-i18n';
 import { curry, join, identity, isNil, map, pipe, reject, sortBy, defaultTo, pluck } from 'ramda';
-import { DataTypes, formatDataTypeValue } from '@reltio/mdm-sdk';
-import { DateRangeTypes } from '../../../types';
+import { DataTypes, formatDataTypeValue, DateRangeTypes } from '@reltio/mdm-sdk';
 import { getActivityLabel } from '../utils/activities';
 export var getFilterLabel = function (filters) {
     var getLabel = curry(function (unit, pluralUnit, values) {

package/esm/components/activityLog/activities/EntityObject/styles.js

@@ -3,7 +3,7 @@ export var useStyles = makeStyles(function (theme) { return ({
     link: {
         fontSize: 13,
         lineHeight: '15px',
-        color: '#0072CE',
+        color: theme.palette.primary.main,
         textDecoration: 'none',
         fontWeight: 400,
         '&.removed': {

package/esm/components/activityLog/activities/RelationObject/styles.js

@@ -7,7 +7,7 @@ export var useStyles = makeStyles(function (theme) { return ({
         overflow: 'hidden'
     },
     link: {
-        color: '#0072CE',
+        color: theme.palette.primary.main,
         textDecoration: 'none',
         fontWeight: 400
     },

package/esm/components/activityLog/activities/fields/commonStyles.js

@@ -12,7 +12,7 @@ export var useCommonStyles = makeStyles(function (theme) { return ({
         marginRight: 8
     },
     link: {
-        color: '#0072CE',
+        color: theme.palette.primary.main,
         textDecoration: 'none',
         fontWeight: 400
     }

package/esm/components/activityLog/activities/styles.js

@@ -1,7 +1,7 @@
 import { makeStyles } from '@material-ui/core/styles';
 export var useStyles = makeStyles(function (theme) { return ({
     link: {
-        color: '#0072CE',
+        color: theme.palette.primary.main,
         textDecoration: 'none',
         fontWeight: 400,
         cursor: 'pointer'

package/esm/components/activityLog/types/ActivitiesFilter.d.ts

@@ -1,6 +1,6 @@
-import { Source, TEntityType } from '@reltio/mdm-sdk';
+import { Source, TEntityType, DateRangeFilter } from '@reltio/mdm-sdk';
 import { ActivityTypes } from './ActivityTypes';
-import { AttributeOption, DateRangeFilter } from '../../../types';
+import { AttributeOption } from '../../../types';
 export declare type ActivitiesFilter = {
     users: string[];
     activities: ActivityTypes[];

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

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

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

@@ -1,20 +1,5 @@
-import { append, cond, defaultTo, equals, identity, join, map, pipe, reject, toPairs, type } from 'ramda';
-import moment from 'moment';
-import { DateRangeTypes } from '../../../types';
-import { escapeQueryValue, isEmptyValue } from '@reltio/mdm-sdk';
-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;
-    }
-};
-var wrapInBrackets = function (str) { return "(".concat(str, ")"); };
-var multiValueFilter = function (filterClauseFn) { return function (values) { return values.map(filterClauseFn).join(' or '); }; };
-var buildUserFilterClause = function (user) { return "equals(user, '".concat(escapeQueryValue(user), "')"); };
+import { append, cond, defaultTo, equals, identity, join, map, pipe, reject, toPairs } from 'ramda';
+import { isEmptyValue, wrapInBrackets, multiValueFilter, buildUserFilterClause, buildSourceFilterClause, buildEntityTypeFilterClause, buildDateRangeFilterClause, buildEntityUriFilterClause } from '@reltio/mdm-sdk';
 var buildActivityFilterClause = function (activityType) {
     if (activityType.startsWith('USER_') || activityType.startsWith('COMMENT_') || activityType.startsWith('SFDC_')) {
         return "startsWith(label, '".concat(activityType, "')");
@@ -23,47 +8,9 @@ var buildActivityFilterClause = function (activityType) {
         return "equals(items.data.type, ".concat(activityType, ")");
     }
 };
-var buildSourceFilterClause = function (source) {
-    return "equals(items.delta.sources, '".concat(source.abbreviation, "')");
-};
-var buildEntityTypeFilterClause = function (entityType) {
-    return "equals(items.objectType, '".concat(entityType.uri, "')");
-};
 var buildAttributeFilterClause = function (attribute) {
     return "equals(items.delta.attributeType, '".concat(attribute.value, "')");
 };
-var durationToTimestamp = function (period) {
-    var amount = period[0], unit = period[1];
-    return moment().subtract(amount, unit).valueOf();
-};
-var buildDateRangeFilterClause = function (dateRange) {
-    var period = dateRange.period, type = dateRange.type;
-    if (!isDateRangeValid(dateRange))
-        return '';
-    switch (type) {
-        case DateRangeTypes.WITHIN: {
-            return "gte(timestamp, ".concat(durationToTimestamp(period), ")");
-        }
-        case DateRangeTypes.AGO: {
-            return "lte(timestamp, ".concat(durationToTimestamp(period), ")");
-        }
-        case DateRangeTypes.BETWEEN: {
-            var start = period[0], end = period[1];
-            return "range(timestamp, ".concat(start.valueOf(), ", ").concat(moment(end).endOf('date').valueOf(), ")");
-        }
-        default: {
-            return '';
-        }
-    }
-};
-var buildEntityUriFilterClause = function (entityUri) {
-    var filters = [
-        "equals(items.objectUri, '".concat(entityUri, "')"),
-        "equals(items.startObjectUri, '".concat(entityUri, "')"),
-        "equals(items.endObjectUri, '".concat(entityUri, "')")
-    ];
-    return filters.join(' or ');
-};
 var getFilterClauseBuilder = cond([
     [equals('users'), function () { return multiValueFilter(buildUserFilterClause); }],
     [equals('activities'), function () { return multiValueFilter(buildActivityFilterClause); }],

package/esm/components/history/DateRangeSelector/DateRangeSelector.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { DateRangeFilter } from '../../../types';
+import { DateRangeFilter } from '@reltio/mdm-sdk';
 declare type Props = {
     value: DateRangeFilter;
     onChange: (range: DateRangeFilter) => void;

package/esm/components/history/DateRangeSelector/DateRangeSelector.js

@@ -1,13 +1,13 @@
 import React, { useState } from 'react';
 import i18n from 'ui-i18n';
 import classnames from 'classnames';
+import { DateRangeTypes } from '@reltio/mdm-sdk';
 import Typography from '@material-ui/core/Typography';
 import SimpleDropDownSelector from '../../SimpleDropDownSelector/SimpleDropDownSelector';
 import { dateRangeTypeOptions, getDateRangeTypeLabel } from './utils';
 import DateIntervalSelector from '../../DateIntervalSelector/DateIntervalSelector';
 import { useDidUpdateEffect } from '../../../hooks';
 import CustomDateRangeEditor from '../../editors/CustomDateRangeEditor/CustomDateRangeEditor';
-import { DateRangeTypes } from '../../../types';
 import { useStyles } from './styles';
 var emptyDates = [null, null];
 var emptyInterval = [null, 'hours'];

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

@@ -1,3 +1,3 @@
-import { DateRangeTypes } from '../../../types';
+import { DateRangeTypes } from '@reltio/mdm-sdk';
 export declare const dateRangeTypeOptions: DateRangeTypes[];
 export declare const getDateRangeTypeLabel: (type: DateRangeTypes) => string;

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

@@ -1,5 +1,5 @@
 import i18n from 'ui-i18n';
-import { DateRangeTypes } from '../../../types';
+import { DateRangeTypes } from '@reltio/mdm-sdk';
 export var dateRangeTypeOptions = [DateRangeTypes.WITHIN, DateRangeTypes.AGO, DateRangeTypes.BETWEEN];
 export var getDateRangeTypeLabel = function (type) {
     var _a;

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

@@ -16,8 +16,8 @@ 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 { isDateRangeValid } from '@reltio/mdm-sdk';
 import { SmallIconButton } from '../../SmallIconButton';
-import { isDateRangeValid } from '../utils/filters';
 import UserSelector from '../../UserSelector/UserSelector';
 import AttributeSelector from '../../AttributeSelector/AttributeSelector';
 import DateRangeSelector from '../DateRangeSelector/DateRangeSelector';

package/esm/components/history/types/HistoryFilter.d.ts

@@ -1,4 +1,5 @@
-import { AttributeOption, DateRangeFilter } from '../../../types';
+import { DateRangeFilter } from '@reltio/mdm-sdk';
+import { AttributeOption } from '../../../types';
 export declare enum HistoryActivityType {
     UPDATE = "UPDATE",
     MERGE = "MERGE",

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

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

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

@@ -1,15 +1,7 @@
-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 { pipe, defaultTo, reject, map, join, cond, equals, append, concat, chain, evolve, values, over, lensProp } from 'ramda';
+import { isEmptyValue, escapeQueryValue, wrapInBrackets, multiValueFilter, buildUserFilterClause, buildDateRangeFilterClause } from '@reltio/mdm-sdk';
 import { HistoryActivityType } from '../types/HistoryFilter';
 import { ActivityTypes } from '../../activityLog/types/ActivityTypes';
-import { DateRangeTypes } from '../../../types';
-var wrapInBrackets = function (str) { return "(".concat(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),
@@ -23,38 +15,9 @@ var convertHistoryTypes = chain(cond([
     [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, '".concat(value, "')"); }));
-var buildUserFilterClause = function (user) { return "equals(user, '".concat(escapeQueryValue(user), "')"); };
 var buildAttributeFilterClause = function (attribute) { return "changes(".concat(escapeQueryValue(attribute.value), ")"); };
-var buildDateRangeFilterClause = function (_a) {
-    var type = _a.type, period = _a.period;
-    switch (type) {
-        case DateRangeTypes.WITHIN: {
-            return "gte(timestamp, ".concat(durationToTimestamp(period), ")");
-        }
-        case DateRangeTypes.AGO: {
-            return "lte(timestamp, ".concat(durationToTimestamp(period), ")");
-        }
-        case DateRangeTypes.BETWEEN: {
-            var start = period[0], end = period[1];
-            return "gte(timestamp, ".concat(start.valueOf(), ") and lte(timestamp, ").concat(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/esm/types/index.d.ts

@@ -18,15 +18,6 @@ export declare type AttributeOption = {
     chipLabel: string;
     level: number;
 };
-export declare enum DateRangeTypes {
-    WITHIN = "within",
-    AGO = "ago",
-    BETWEEN = "between"
-}
-export declare type DateRangeFilter = {
-    type: DateRangeTypes;
-    period: [number, string] | [Date, Date];
-};
 export declare type QueryBuilderAttributeData = {
     title: string;
     pathToTitle: Array<string>;

package/esm/types/index.js

@@ -1,9 +1,3 @@
-export var DateRangeTypes;
-(function (DateRangeTypes) {
-    DateRangeTypes["WITHIN"] = "within";
-    DateRangeTypes["AGO"] = "ago";
-    DateRangeTypes["BETWEEN"] = "between";
-})(DateRangeTypes || (DateRangeTypes = {}));
 export var RequestStates;
 (function (RequestStates) {
     RequestStates["INIT"] = "init";

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.1428",
+  "version": "1.4.1430",
   "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.1428",
-    "@reltio/mdm-sdk": "^1.4.1428",
+    "@reltio/mdm-module": "^1.4.1430",
+    "@reltio/mdm-sdk": "^1.4.1430",
     "classnames": "^2.2.5",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",