@reltio/components 1.4.1997 → 1.4.1999

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

@@ -46,11 +46,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import React from 'react';
+import i18n from 'ui-i18n';
+import { mockResizeObserver } from 'jsdom-testing-mocks';
 import { render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { ActivityLog } from './ActivityLog';
 import { MdmModuleProvider } from '../../../contexts/MdmModuleContext';
-describe('ActivityLogTests', function () {
+import { ActivityLog } from './ActivityLog';
+describe('Activity log tests', function () {
+    mockResizeObserver();
     var activities = [
         {
             uri: 'activities/de19-08e1-b220b95c',
@@ -112,29 +115,68 @@ describe('ActivityLogTests', function () {
             timestamp: 1663335811251,
             items: [
                 {
-                    id: '7G4iT0Rd',
-                    user: 'vyacheslav.kovyazin',
+                    id: 'Hsj3l43',
+                    user: 'olga.silina',
                     method: 'POST',
                     url: '/reltio/api/alenat/activities',
                     clientType: 'Reltio UI',
                     timestamp: 1663335811251,
+                    objectUri: 'entities/11B3njW5',
+                    objectType: 'configuration/entityTypes/HCP',
+                    objectLabel: 'entity 1',
                     data: {
                         type: 'ENTITIES_MERGED_MANUALLY'
                     }
                 },
                 {
-                    id: '7G4iT0Rd',
-                    user: 'vyacheslav.kovyazin',
+                    id: 'fjS339S',
+                    user: 'olga.silina',
                     method: 'POST',
                     url: '/reltio/api/alenat/activities',
                     clientType: 'Reltio UI',
-                    timestamp: 1663335811251,
+                    timestamp: 1663335812359,
                     data: {
                         type: 'NOT_IMPLEMENTED_ACTIVITY'
                     }
+                },
+                {
+                    id: 'kL23s23',
+                    user: 'olga.silina',
+                    method: 'POST',
+                    url: '/reltio/api/alenat/activities',
+                    clientType: 'Reltio UI',
+                    timestamp: 1663335810156,
+                    objectUri: 'entities/8Nms3KlS',
+                    objectType: 'configuration/entityTypes/HCP',
+                    objectLabel: 'entity 2',
+                    data: {
+                        type: 'ENTITY_LOST_MERGE'
+                    }
+                }
+            ],
+            itemsTotal: 3
+        },
+        {
+            uri: 'activities/ds31343-8602-43d7-9mnb6-2127lc45d4c6',
+            user: 'alexander.kirsanov',
+            timestamp: 1663335811280,
+            items: [
+                {
+                    id: '0Ls3nm8J',
+                    user: 'alexander.kirsanov',
+                    method: 'POST',
+                    url: '/reltio/api/alenat/activities',
+                    clientType: 'Reltio UI',
+                    timestamp: 1663335811280,
+                    objectUri: 'entities/9MswQl71',
+                    objectType: 'configuration/entityTypes/HCP',
+                    objectLabel: 'entity 3',
+                    data: {
+                        type: 'ENTITIES_MERGED_MANUALLY'
+                    }
                 }
             ],
-            itemsTotal: 2
+            itemsTotal: 1
         }
     ];
     var defaultProps = {
@@ -158,19 +200,39 @@ describe('ActivityLogTests', function () {
         };
         return __assign({ user: user }, render(React.createElement(ActivityLog, __assign({}, defaultProps, props)), { wrapper: Providers }));
     };
-    it('should render correctly', function () {
+    beforeEach(function () {
         jest.spyOn(console, 'warn').mockReturnValue();
+        jest.spyOn(Date, 'now').mockReturnValue(1622625987531);
+    });
+    afterEach(function () {
+        jest.resetAllMocks();
+    });
+    it('should render correctly', function () {
         setUp();
         var activityItems = screen.getAllByTestId('activity-log-item');
-        expect(activityItems).toHaveLength(3);
-        expect(within(activityItems[0]).getByText(activities[0].user)).toBeInTheDocument();
-        expect(within(activityItems[0]).getByText('Logged in')).toBeInTheDocument();
-        expect(within(activityItems[1]).getByText(activities[1].user)).toBeInTheDocument();
-        expect(within(activityItems[1]).getByText('Searched')).toBeInTheDocument();
-        expect(within(activityItems[1]).getByText('Commenter exists')).toBeInTheDocument();
-        expect(within(activityItems[2]).getByText(activities[3].user)).toBeInTheDocument();
-        expect(within(activityItems[2]).getByText('Profile merged manually')).toBeInTheDocument();
-        expect(within(activityItems[2]).getByText('<No label>')).toBeInTheDocument();
+        var activityGroupItems = screen.getAllByTestId('activity-log-group-item');
+        expect(activityItems).toHaveLength(4);
+        expect(activityGroupItems).toHaveLength(3);
+        within(activityGroupItems[0]).getByText('Today');
+        within(activityItems[0]).getByText(activities[0].user);
+        within(activityItems[0]).getByText(i18n.date(activities[0].timestamp, 'LT'));
+        within(activityItems[0]).getByText('Logged in');
+        within(activityGroupItems[1]).getByText(i18n.date(activities[1].timestamp, 'LL'));
+        within(activityItems[1]).getByText(activities[1].user);
+        within(activityItems[1]).getByText(i18n.date(activities[1].timestamp, 'LT'));
+        within(activityItems[1]).getByText('Searched');
+        within(activityItems[1]).getByText('Commenter exists');
+        within(activityGroupItems[2]).getByText(i18n.date(activities[3].timestamp, 'LL'));
+        within(activityItems[2]).getByText(activities[3].user);
+        within(activityItems[2]).getByText(i18n.date(activities[3].timestamp, 'LT'));
+        within(activityItems[2]).getByText('Profile merged manually');
+        within(activityItems[2]).getByText('entity 1');
+        within(activityItems[2]).getByText('Profile lost merge');
+        within(activityItems[2]).getByText('entity 2');
+        within(activityItems[3]).getByText(activities[4].user);
+        within(activityItems[3]).getByText(i18n.date(activities[4].timestamp, 'LT'));
+        within(activityItems[3]).getByText('Profile merged manually');
+        within(activityItems[3]).getByText('entity 3');
         expect(console.warn).toHaveBeenCalledWith('Activities not implemented:', activities[2].items);
         expect(console.warn).toHaveBeenCalledWith('Activities not implemented:', [activities[3].items[1]]);
     });
@@ -179,18 +241,17 @@ describe('ActivityLogTests', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(console, 'warn').mockReturnValue();
                     user = setUp().user;
                     screen.getAllByTestId('collapse-button');
-                    expect(screen.getAllByTestId('activity-log-item')).toHaveLength(3);
+                    expect(screen.getAllByTestId('activity-log-item')).toHaveLength(4);
                     return [4 /*yield*/, user.click(screen.getAllByTestId('collapse-button')[0])];
                 case 1:
                     _a.sent();
-                    expect(screen.getAllByTestId('activity-log-item')).toHaveLength(2);
+                    expect(screen.getAllByTestId('activity-log-item')).toHaveLength(3);
                     return [4 /*yield*/, user.click(screen.getAllByTestId('collapse-button')[0])];
                 case 2:
                     _a.sent();
-                    expect(screen.getAllByTestId('activity-log-item')).toHaveLength(3);
+                    expect(screen.getAllByTestId('activity-log-item')).toHaveLength(4);
                     return [2 /*return*/];
             }
         });

package/esm/features/activity-log/ActivityLog/components/GroupItem/GroupItem.js

@@ -8,7 +8,7 @@ import { useStyles } from './styles';
 export var GroupItem = function (_a) {
     var _b = _a.item, index = _b.index, timestamp = _b.timestamp, collapsed = _b.collapsed, onToggle = _a.onToggle;
     var styles = useStyles();
-    return (React.createElement("div", { className: styles.groupItem },
+    return (React.createElement("div", { className: styles.groupItem, "data-reltio-id": "activity-log-group-item" },
         React.createElement("div", { className: styles.groupIcon }),
         React.createElement(Typography, { className: styles.groupTitle, variant: 'subtitle1' }, isToday(timestamp) ? i18n.text('Today') : i18n.date(timestamp, 'LL')),
         React.createElement(Spacer, null),