@reltio/components 1.4.1911 → 1.4.1913

package/cjs/MergeButton/MergeButton.d.ts

@@ -9,6 +9,7 @@ type Props = {
     size?: string;
     onMenuClose?: () => void;
     disabled?: boolean;
+    confirmMessage?: string;
     onStartRequest?: () => void;
     onFinishRequest?: () => void;
     onSuccess?: () => void;

package/cjs/MergeButton/MergeButton.js

@@ -57,7 +57,7 @@ var ActionButton_1 = require("../ActionButton");
 var types_1 = require("../types");
 var useMergeAllRequest_1 = require("../hooks/useMergeAllRequest");
 exports.MergeButton = (0, react_1.forwardRef)(function (_a, ref) {
-    var className = _a.className, _b = _a.mode, mode = _b === void 0 ? types_1.ActionButtonMode.iconButton : _b, _c = _a.onMenuClose, onMenuClose = _c === void 0 ? ramda_1.identity : _c, _d = _a.disabled, disabled = _d === void 0 ? false : _d, entity = _a.entity, entities = _a.entities, onStartRequest = _a.onStartRequest, onFinishRequest = _a.onFinishRequest, onSuccess = _a.onSuccess, onError = _a.onError, otherProps = __rest(_a, ["className", "mode", "onMenuClose", "disabled", "entity", "entities", "onStartRequest", "onFinishRequest", "onSuccess", "onError"]);
+    var className = _a.className, _b = _a.mode, mode = _b === void 0 ? types_1.ActionButtonMode.iconButton : _b, _c = _a.onMenuClose, onMenuClose = _c === void 0 ? ramda_1.identity : _c, _d = _a.disabled, disabled = _d === void 0 ? false : _d, entity = _a.entity, entities = _a.entities, onStartRequest = _a.onStartRequest, onFinishRequest = _a.onFinishRequest, onSuccess = _a.onSuccess, onError = _a.onError, confirmMessage = _a.confirmMessage, otherProps = __rest(_a, ["className", "mode", "onMenuClose", "disabled", "entity", "entities", "onStartRequest", "onFinishRequest", "onSuccess", "onError", "confirmMessage"]);
     var sendMergeAllRequest = (0, useMergeAllRequest_1.useMergeAllRequest)({
         entity: entity,
         entities: entities,
@@ -66,6 +66,11 @@ exports.MergeButton = (0, react_1.forwardRef)(function (_a, ref) {
         onError: onError,
         onSuccess: onSuccess
     }).sendMergeAllRequest;
-    return (react_1.default.createElement(ActionButton_1.ActionButton, __assign({ className: className, disabled: disabled, mode: mode, label: ui_i18n_1.default.text('Merge'), icon: MergeDark_1.default, onClick: sendMergeAllRequest, onMenuClose: onMenuClose, ref: ref }, otherProps)));
+    var handleClick = (0, react_1.useCallback)(function () {
+        if (confirmMessage && !confirm(confirmMessage))
+            return;
+        sendMergeAllRequest();
+    }, [sendMergeAllRequest, confirmMessage]);
+    return (react_1.default.createElement(ActionButton_1.ActionButton, __assign({ className: className, disabled: disabled, mode: mode, label: ui_i18n_1.default.text('Merge'), icon: MergeDark_1.default, onClick: handleClick, onMenuClose: onMenuClose, ref: ref }, otherProps)));
 });
 exports.MergeButton.displayName = 'mergeButton';

package/cjs/features/activity-log/EntityRecord/EntityRecord.js

@@ -36,7 +36,7 @@ var EntityRecord = function (_a) {
         })
             .catch(function (err) { return console.warn(err); });
     };
-    return (react_1.default.createElement(Record_1.Record, null,
+    return (react_1.default.createElement(Record_1.Record, { className: styles.record },
         react_1.default.createElement(RecordLabel_1.RecordLabel, { description: deltaArray ? '' : ui_i18n_1.default.text('Profile changed') },
             react_1.default.createElement(EntityObject_1.EntityObject, { item: item })),
         isEntityChanged && (react_1.default.createElement(Restore_1.default, { "data-reltio-id": "reltio-entity-record-restore-icon", className: styles.restoreIcon, onClick: handleOpenHistoryEvent })),

package/cjs/features/activity-log/EntityRecord/EntityRecord.test.js

@@ -54,10 +54,12 @@ var react_1 = __importDefault(require("react"));
 var react_2 = require("@testing-library/react");
 var user_event_1 = __importDefault(require("@testing-library/user-event"));
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
-var EntityRecord_1 = require("./EntityRecord");
 var types_1 = require("../types");
 var MdmModuleContext_1 = require("../../../contexts/MdmModuleContext");
 var CollapsibleItemsContext_1 = require("../contexts/CollapsibleItemsContext");
+var TestStylesProvider_1 = require("../../../test-utils/TestStylesProvider");
+var EntityRecord_1 = require("./EntityRecord");
+jest.unmock('@mui/styles');
 jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { getEntityPreviousChange: jest.fn() })); });
 var defaultDeltaCollection = {
     ovChanged: true,
@@ -153,7 +155,8 @@ var setUp = function (_a) {
     var Providers = function (_a) {
         var children = _a.children;
         return (react_1.default.createElement(CollapsibleItemsContext_1.CollapsibleItemsProvider, null,
-            react_1.default.createElement(MdmModuleContext_1.MdmModuleProvider, { actions: mdmActions, values: mdmValues }, children)));
+            react_1.default.createElement(TestStylesProvider_1.TestStylesProvider, null,
+                react_1.default.createElement(MdmModuleContext_1.MdmModuleProvider, { actions: mdmActions, values: mdmValues }, children))));
     };
     return __assign(__assign({}, (0, react_2.render)(react_1.default.createElement(EntityRecord_1.EntityRecord, __assign({}, props)), { wrapper: Providers })), { user: user });
 };
@@ -244,4 +247,13 @@ describe('Entity record tests', function () {
         setUp({ props: { item: item } });
         expect(react_2.screen.queryByTestId('reltio-entity-record-restore-icon')).not.toBeInTheDocument();
     });
+    it('should hide RestoreIcon if record is not hovered', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var icon;
+        return __generator(this, function (_a) {
+            setUp();
+            icon = react_2.screen.getByTestId('reltio-entity-record-restore-icon');
+            expect(icon).not.toBeVisible();
+            return [2 /*return*/];
+        });
+    }); });
 });

package/cjs/features/activity-log/EntityRecord/styles.d.ts

@@ -1 +1 @@
-export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"restoreIcon">;
+export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"record" | "restoreIcon">;

package/cjs/features/activity-log/EntityRecord/styles.js

@@ -3,6 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useStyles = void 0;
 var styles_1 = require("@mui/styles");
 exports.useStyles = (0, styles_1.makeStyles)(function (theme) { return ({
+    record: {
+        '&:hover $restoreIcon': {
+            visibility: 'visible'
+        }
+    },
     restoreIcon: {
         visibility: 'hidden',
         color: theme.palette.text.secondary,

package/cjs/features/activity-log/Record/Record.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 type Props = {
     children: React.ReactNode;
+    className?: string;
 };
-export declare const Record: ({ children }: Props) => JSX.Element;
+export declare const Record: ({ children, className }: Props) => JSX.Element;
 export {};

package/cjs/features/activity-log/Record/Record.js

@@ -5,10 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Record = void 0;
 var react_1 = __importDefault(require("react"));
+var classnames_1 = __importDefault(require("classnames"));
 var styles_1 = require("./styles");
 var Record = function (_a) {
-    var children = _a.children;
+    var children = _a.children, className = _a.className;
     var styles = (0, styles_1.useStyles)();
-    return react_1.default.createElement("div", { className: styles.record }, children);
+    return (react_1.default.createElement("div", { "data-reltio-id": "reltio-activity-log-record", className: (0, classnames_1.default)(styles.record, className) }, children));
 };
 exports.Record = Record;

package/cjs/features/activity-log/Record/Record.test.d.ts

@@ -0,0 +1 @@
+export {};

package/cjs/features/activity-log/Record/Record.test.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importDefault(require("react"));
+var react_2 = require("@testing-library/react");
+var Record_1 = require("./Record");
+describe('Record tests', function () {
+    it('should render children', function () {
+        (0, react_2.render)(react_1.default.createElement(Record_1.Record, null, "children"));
+        expect(react_2.screen.getByText('children')).toBeInTheDocument();
+    });
+    it('should use className', function () {
+        (0, react_2.render)(react_1.default.createElement(Record_1.Record, { className: "test-class" }, "children"));
+        expect(react_2.screen.getByTestId('reltio-activity-log-record')).toHaveClass('test-class');
+    });
+});

package/cjs/features/activity-log/Record/styles.js

@@ -10,9 +10,6 @@ exports.useStyles = (0, styles_1.makeStyles)({
         borderRadius: '3px',
         padding: '7px 14px',
         marginBottom: 8,
-        position: 'relative',
-        '&:hover $restoreIcon': {
-            visibility: 'visible'
-        }
+        position: 'relative'
     }
 });

package/esm/MergeButton/MergeButton.d.ts

@@ -9,6 +9,7 @@ type Props = {
     size?: string;
     onMenuClose?: () => void;
     disabled?: boolean;
+    confirmMessage?: string;
     onStartRequest?: () => void;
     onFinishRequest?: () => void;
     onSuccess?: () => void;

package/esm/MergeButton/MergeButton.js

@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useCallback } from 'react';
 import i18n from 'ui-i18n';
 import { identity } from 'ramda';
 import MergeIcon from '../icons/MergeDark';
@@ -28,7 +28,7 @@ import { ActionButton } from '../ActionButton';
 import { ActionButtonMode } from '../types';
 import { useMergeAllRequest } from '../hooks/useMergeAllRequest';
 export var MergeButton = forwardRef(function (_a, ref) {
-    var className = _a.className, _b = _a.mode, mode = _b === void 0 ? ActionButtonMode.iconButton : _b, _c = _a.onMenuClose, onMenuClose = _c === void 0 ? identity : _c, _d = _a.disabled, disabled = _d === void 0 ? false : _d, entity = _a.entity, entities = _a.entities, onStartRequest = _a.onStartRequest, onFinishRequest = _a.onFinishRequest, onSuccess = _a.onSuccess, onError = _a.onError, otherProps = __rest(_a, ["className", "mode", "onMenuClose", "disabled", "entity", "entities", "onStartRequest", "onFinishRequest", "onSuccess", "onError"]);
+    var className = _a.className, _b = _a.mode, mode = _b === void 0 ? ActionButtonMode.iconButton : _b, _c = _a.onMenuClose, onMenuClose = _c === void 0 ? identity : _c, _d = _a.disabled, disabled = _d === void 0 ? false : _d, entity = _a.entity, entities = _a.entities, onStartRequest = _a.onStartRequest, onFinishRequest = _a.onFinishRequest, onSuccess = _a.onSuccess, onError = _a.onError, confirmMessage = _a.confirmMessage, otherProps = __rest(_a, ["className", "mode", "onMenuClose", "disabled", "entity", "entities", "onStartRequest", "onFinishRequest", "onSuccess", "onError", "confirmMessage"]);
     var sendMergeAllRequest = useMergeAllRequest({
         entity: entity,
         entities: entities,
@@ -37,6 +37,11 @@ export var MergeButton = forwardRef(function (_a, ref) {
         onError: onError,
         onSuccess: onSuccess
     }).sendMergeAllRequest;
-    return (React.createElement(ActionButton, __assign({ className: className, disabled: disabled, mode: mode, label: i18n.text('Merge'), icon: MergeIcon, onClick: sendMergeAllRequest, onMenuClose: onMenuClose, ref: ref }, otherProps)));
+    var handleClick = useCallback(function () {
+        if (confirmMessage && !confirm(confirmMessage))
+            return;
+        sendMergeAllRequest();
+    }, [sendMergeAllRequest, confirmMessage]);
+    return (React.createElement(ActionButton, __assign({ className: className, disabled: disabled, mode: mode, label: i18n.text('Merge'), icon: MergeIcon, onClick: handleClick, onMenuClose: onMenuClose, ref: ref }, otherProps)));
 });
 MergeButton.displayName = 'mergeButton';

package/esm/features/activity-log/EntityRecord/EntityRecord.js

@@ -30,7 +30,7 @@ export var EntityRecord = function (_a) {
         })
             .catch(function (err) { return console.warn(err); });
     };
-    return (React.createElement(Record, null,
+    return (React.createElement(Record, { className: styles.record },
         React.createElement(RecordLabel, { description: deltaArray ? '' : i18n.text('Profile changed') },
             React.createElement(EntityObject, { item: item })),
         isEntityChanged && (React.createElement(RestoreIcon, { "data-reltio-id": "reltio-entity-record-restore-icon", className: styles.restoreIcon, onClick: handleOpenHistoryEvent })),

package/esm/features/activity-log/EntityRecord/EntityRecord.test.js

@@ -49,10 +49,12 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { getEntityPreviousChange } from '@reltio/mdm-sdk';
-import { EntityRecord } from './EntityRecord';
 import { ActivityTypes } from '../types';
 import { MdmModuleProvider } from '../../../contexts/MdmModuleContext';
 import { CollapsibleItemsProvider } from '../contexts/CollapsibleItemsContext';
+import { TestStylesProvider } from '../../../test-utils/TestStylesProvider';
+import { EntityRecord } from './EntityRecord';
+jest.unmock('@mui/styles');
 jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { getEntityPreviousChange: jest.fn() })); });
 var defaultDeltaCollection = {
     ovChanged: true,
@@ -148,7 +150,8 @@ var setUp = function (_a) {
     var Providers = function (_a) {
         var children = _a.children;
         return (React.createElement(CollapsibleItemsProvider, null,
-            React.createElement(MdmModuleProvider, { actions: mdmActions, values: mdmValues }, children)));
+            React.createElement(TestStylesProvider, null,
+                React.createElement(MdmModuleProvider, { actions: mdmActions, values: mdmValues }, children))));
     };
     return __assign(__assign({}, render(React.createElement(EntityRecord, __assign({}, props)), { wrapper: Providers })), { user: user });
 };
@@ -239,4 +242,13 @@ describe('Entity record tests', function () {
         setUp({ props: { item: item } });
         expect(screen.queryByTestId('reltio-entity-record-restore-icon')).not.toBeInTheDocument();
     });
+    it('should hide RestoreIcon if record is not hovered', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var icon;
+        return __generator(this, function (_a) {
+            setUp();
+            icon = screen.getByTestId('reltio-entity-record-restore-icon');
+            expect(icon).not.toBeVisible();
+            return [2 /*return*/];
+        });
+    }); });
 });

package/esm/features/activity-log/EntityRecord/styles.d.ts

@@ -1 +1 @@
-export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"restoreIcon">;
+export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"record" | "restoreIcon">;

package/esm/features/activity-log/EntityRecord/styles.js

@@ -1,5 +1,10 @@
 import { makeStyles } from '@mui/styles';
 export var useStyles = makeStyles(function (theme) { return ({
+    record: {
+        '&:hover $restoreIcon': {
+            visibility: 'visible'
+        }
+    },
     restoreIcon: {
         visibility: 'hidden',
         color: theme.palette.text.secondary,

package/esm/features/activity-log/Record/Record.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 type Props = {
     children: React.ReactNode;
+    className?: string;
 };
-export declare const Record: ({ children }: Props) => JSX.Element;
+export declare const Record: ({ children, className }: Props) => JSX.Element;
 export {};

package/esm/features/activity-log/Record/Record.js

@@ -1,7 +1,8 @@
 import React from 'react';
+import classnames from 'classnames';
 import { useStyles } from './styles';
 export var Record = function (_a) {
-    var children = _a.children;
+    var children = _a.children, className = _a.className;
     var styles = useStyles();
-    return React.createElement("div", { className: styles.record }, children);
+    return (React.createElement("div", { "data-reltio-id": "reltio-activity-log-record", className: classnames(styles.record, className) }, children));
 };

package/esm/features/activity-log/Record/Record.test.d.ts

@@ -0,0 +1 @@
+export {};

package/esm/features/activity-log/Record/Record.test.js

@@ -0,0 +1,13 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { Record } from './Record';
+describe('Record tests', function () {
+    it('should render children', function () {
+        render(React.createElement(Record, null, "children"));
+        expect(screen.getByText('children')).toBeInTheDocument();
+    });
+    it('should use className', function () {
+        render(React.createElement(Record, { className: "test-class" }, "children"));
+        expect(screen.getByTestId('reltio-activity-log-record')).toHaveClass('test-class');
+    });
+});

package/esm/features/activity-log/Record/styles.js

@@ -7,9 +7,6 @@ export var useStyles = makeStyles({
         borderRadius: '3px',
         padding: '7px 14px',
         marginBottom: 8,
-        position: 'relative',
-        '&:hover $restoreIcon': {
-            visibility: 'visible'
-        }
+        position: 'relative'
     }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.1911",
+  "version": "1.4.1913",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",