@reltio/components 1.4.913 → 1.4.917

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

@@ -0,0 +1,39 @@
+import { useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { evolve, map } from 'ramda';
+import { entity as History, wrapInArrayIfNeeded } from '@reltio/mdm-sdk';
+import mdmModule, { HistoryMode, profile } from '@reltio/mdm-module';
+var defaultHistoryDiff = {
+    appearance: {},
+    attributes: {},
+    roles: [],
+    tags: []
+};
+var fixRefEntity = evolve({
+    refEntity: wrapInArrayIfNeeded,
+    refRelation: wrapInArrayIfNeeded
+});
+var prepareHistorySlice = function (historySlice) {
+    if (historySlice) {
+        return evolve({
+            attributes: map(map(fixRefEntity))
+        })(historySlice);
+    }
+    return historySlice;
+};
+export var useHistoryDiff = function () {
+    var dispatch = useDispatch();
+    var historySlice = useSelector(mdmModule.selectors.getHistorySlice);
+    var historyDiff = useSelector(mdmModule.selectors.getHistoryDiff);
+    var historyMode = useSelector(mdmModule.selectors.getHistoryMode);
+    var entity = useSelector(mdmModule.selectors.getEntity);
+    useEffect(function () {
+        if (historySlice) {
+            var aEntity = historySlice.aEntity, bEntity = historySlice.bEntity;
+            var historyManager = History.HistoryManager.createHistoryManager(History.AttributesDiff);
+            var historyDiff_1 = historyManager.computeEntityHistoryDiff(prepareHistorySlice(historyMode === HistoryMode.Current ? entity : bEntity), prepareHistorySlice(aEntity));
+            dispatch(profile.history.actions.setHistoryDiff(historyDiff_1));
+        }
+    }, [historySlice, historyMode, dispatch, entity]);
+    return historyDiff || defaultHistoryDiff;
+};

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

@@ -7,11 +7,12 @@ 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;
+    loadData: () => void;
 };
 export {};

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,11 +65,11 @@ export var useHistoryWithTotal = function (_a) {
                 setIsLoading(false);
             });
         }
-    }, [entityUri, historicUris]);
+    }, [entityUri, historicUris, filter]);
     useEffect(function () {
         if (enabled) {
             loadData();
         }
     }, [loadData, enabled]);
-    return { isLoading: isLoading, historyWithTotal: historyWithTotal, loadMore: loadMore };
+    return { isLoading: isLoading, historyWithTotal: historyWithTotal, loadMore: loadMore, loadData: loadData };
 };

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

@@ -2,6 +2,7 @@ export { useHistoricUris } from './hooks/useHistoricUris';
 export { useHistoryWithTotal } from './hooks/useHistoryWithTotal';
 export { useHistorySlice } from './hooks/useHistorySlice';
 export { useHistory } from './hooks/useHistory';
+export { useHistoryDiff } from './hooks/useHistoryDiff';
 export { default as HistoryView } from './HistoryView/HistoryView';
 export { default as HistoryHeader } from './HistoryHeader/HistoryHeader';
 export { default as ProfileBandHistory } from './ProfileBandHistory/ProfileBandHistory';

package/esm/components/history/index.js

@@ -2,6 +2,7 @@ export { useHistoricUris } from './hooks/useHistoricUris';
 export { useHistoryWithTotal } from './hooks/useHistoryWithTotal';
 export { useHistorySlice } from './hooks/useHistorySlice';
 export { useHistory } from './hooks/useHistory';
+export { useHistoryDiff } from './hooks/useHistoryDiff';
 export { default as HistoryView } from './HistoryView/HistoryView';
 export { default as HistoryHeader } from './HistoryHeader/HistoryHeader';
 export { default as ProfileBandHistory } from './ProfileBandHistory/ProfileBandHistory';

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/esm/components/index.d.ts

@@ -17,6 +17,7 @@ export { default as EditableAttribute } from './attributes/editMode/AttributesFa
 export { default as ReadOnlyAttributeValuesBlock } from './attributes/readMode/AttributeValuesBlock/AttributeValuesBlock';
 export { default as ReadOnlyAttributesList } from './attributes/readMode/AttributesList';
 export { default as ImageAttributesLine } from './attributes/readMode/ImageAttributesLine';
+export { default as EditableImageAttributesLine } from './attributes/editMode/ImageAttributesLine';
 export { default as NestedAttribute } from './attributes/readMode/NestedAttribute';
 export { default as ReferenceAttribute } from './attributes/readMode/ReferenceAttribute';
 export { default as SimpleAttribute } from './attributes/readMode/SimpleAttribute';

package/esm/components/index.js

@@ -16,6 +16,7 @@ export { default as EditableAttribute } from './attributes/editMode/AttributesFa
 export { default as ReadOnlyAttributeValuesBlock } from './attributes/readMode/AttributeValuesBlock/AttributeValuesBlock';
 export { default as ReadOnlyAttributesList } from './attributes/readMode/AttributesList';
 export { default as ImageAttributesLine } from './attributes/readMode/ImageAttributesLine';
+export { default as EditableImageAttributesLine } from './attributes/editMode/ImageAttributesLine';
 export { default as NestedAttribute } from './attributes/readMode/NestedAttribute';
 export { default as ReferenceAttribute } from './attributes/readMode/ReferenceAttribute';
 export { default as SimpleAttribute } from './attributes/readMode/SimpleAttribute';

package/esm/contexts/HistoryAppearanceContext/index.js

@@ -1,6 +1,8 @@
 import React from 'react';
 export var HistoryDiffContext = React.createContext({
     appearance: undefined,
-    attributes: undefined
+    attributes: undefined,
+    roles: undefined,
+    tags: undefined
 });
 HistoryDiffContext.displayName = 'HistoryDiffContext';

package/esm/hooks/useMergeAllRequest.d.ts

@@ -4,8 +4,9 @@ declare type Props = {
     entity: Entity;
     onFinishRequest?: () => void;
     onStartRequest?: () => void;
+    onError?: () => void;
 };
-export declare const useMergeAllRequest: ({ entities, entity, onFinishRequest, onStartRequest }: Props) => {
+export declare const useMergeAllRequest: ({ entities, entity, onFinishRequest, onStartRequest, onError }: Props) => {
     isPending: boolean;
     sendMergeAllRequest: () => void;
 };

package/esm/hooks/useMergeAllRequest.js

@@ -2,18 +2,21 @@ import { useCallback, useState } from 'react';
 import { useSelector } from 'react-redux';
 import mdmModule from '@reltio/mdm-module';
 import { isDataTenantEntity, mergeCustomerTenantEntityWithMixedEntities, mergeDataTenantEntity } from '@reltio/mdm-sdk';
+import { noop } from '../core';
 export var useMergeAllRequest = function (_a) {
-    var entities = _a.entities, entity = _a.entity, onFinishRequest = _a.onFinishRequest, onStartRequest = _a.onStartRequest;
+    var entities = _a.entities, entity = _a.entity, onFinishRequest = _a.onFinishRequest, onStartRequest = _a.onStartRequest, _b = _a.onError, onError = _b === void 0 ? noop : _b;
     var tenant = useSelector(mdmModule.selectors.getTenant);
     var dtssPath = useSelector(mdmModule.selectors.getDtssPath);
-    var _b = useState(false), isPending = _b[0], setIsPending = _b[1];
+    var _c = useState(false), isPending = _c[0], setIsPending = _c[1];
     var sendMergeAllRequest = useCallback(function () {
         onStartRequest === null || onStartRequest === void 0 ? void 0 : onStartRequest();
         setIsPending(true);
         var params = { dtssPath: dtssPath, customerTenant: tenant, entity: entity, entities: entities };
         (isDataTenantEntity(entity)
             ? mergeDataTenantEntity(params)
-            : mergeCustomerTenantEntityWithMixedEntities(params)).finally(function () {
+            : mergeCustomerTenantEntityWithMixedEntities(params))
+            .catch(onError)
+            .finally(function () {
             onFinishRequest === null || onFinishRequest === void 0 ? void 0 : onFinishRequest();
             setIsPending(false);
         });

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.913",
+  "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.913",
-    "@reltio/mdm-sdk": "^1.4.913",
+    "@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",