@tap-payments/auth-jsconnect 2.3.88-test → 2.3.90-test

package/build/features/entity/screens/EntityCapital/ActivityList.js

@@ -31,7 +31,7 @@ import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import CheckIcon from '@mui/icons-material/Check';
 import Text from '../../../../components/Text';
-import { findCurrencyByIso2, isExist } from '../../../../utils';
+import { findCurrencyByIso2, isExist, groupSectionWithSelectedActivitiesAtBeginning } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Search from '../../../shared/Search';
 import Input from '../../../shared/Input';
@@ -105,6 +105,10 @@ var ActivityList = function (_a) {
     var handleOpenMainMenu = function (event) {
         if (readOnly)
             return;
+        var list = groupSectionWithSelectedActivitiesAtBeginning(activityList, controlValue);
+        if ((list === null || list === void 0 ? void 0 : list.length) > 0) {
+            setActivities(list);
+        }
         setAnchorEl(event.currentTarget);
         onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
     };
@@ -207,6 +211,11 @@ var ActivityList = function (_a) {
     };
     var handleSearch = function (value) {
         if (!value) {
+            var list = groupSectionWithSelectedActivitiesAtBeginning(activityList, controlValue);
+            if ((list === null || list === void 0 ? void 0 : list.length) > 0) {
+                setActivities(list);
+                return;
+            }
             setActivities(activityList);
             return;
         }
@@ -238,14 +247,14 @@ var ActivityList = function (_a) {
                             var showCheck = section.id === getSelectedActivitySectionFlag(section) && isDivisionNotAvailable;
                             return (_jsxs(ListItemContainer, { children: [_jsxs(ListItem, __assign({ sx: __assign({ bgcolor: 'rgb(196 184 184 / 20%)', borderBottom: '1px solid rgba(227, 232, 238, 1)' }, (isDivisionNotAvailable && { bgcolor: 'inherit', borderBottom: 'none' })) }, { children: [_jsx(NameContainer, __assign({ isAr: isAr, isSelected: section.id === getSelectedActivitySectionFlag(section), sx: __assign({}, (isDivisionNotAvailable && { paddingInlineStart: '5px' })) }, { children: getSelectedActivityName(section) })), showCheck ? _jsx(CheckIconStyled, {}) : !isDivisionNotAvailable && _jsx(ExpandIcon, { anchorEl: subIndex === section.id })] })), _jsx(Collapse, __assign({ in: section.id === subIndex && !isDivisionNotAvailable }, { children: _jsx(DivisionListStyled, { sx: { pt: 0, pb: 0 }, list: (!isDivisionNotAvailable && section.divisions) || [], onSelectItem: function (division, e) {
                                                 e.stopPropagation();
-                                                var isOnlyOneItem = !division.activities || division.activities.length === 1;
+                                                var isOnlyOneItem = !division.activities || division.activities.length <= 1;
                                                 if (isOnlyOneItem)
                                                     onSelectItem(division);
                                                 else
                                                     handleOpenSubItem(division.id);
                                             }, listItemProps: { sx: { padding: 0, '&:last-child': { paddingBottom: 0 } } }, renderItem: function (division, idx) {
                                                 var _a;
-                                                var isOnlyOneItem = !division.activities || ((_a = division.activities) === null || _a === void 0 ? void 0 : _a.length) === 1;
+                                                var isOnlyOneItem = !division.activities || ((_a = division.activities) === null || _a === void 0 ? void 0 : _a.length) <= 1;
                                                 var showCheck = division.id === getSelectedActivityDivisionFlag(division) && isOnlyOneItem;
                                                 return (_jsxs(ListItemContainer, { children: [_jsxs(ListItem, __assign({ sx: __assign({ bgcolor: 'rgb(196 184 184 / 6%)', borderBottom: '1px solid rgba(227, 232, 238, 0.6)' }, (isOnlyOneItem && { bgcolor: 'inherit', borderBottom: 'none' })) }, { children: [_jsx(NameContainer, __assign({ isAr: isAr, isSelected: division.id === getSelectedActivityDivisionFlag(division), sx: __assign({}, (isOnlyOneItem && { paddingInlineStart: '5px' })) }, { children: getSelectedActivityName(division) })), showCheck ? _jsx(CheckIconStyled, {}) : !isOnlyOneItem && _jsx(ExpandIcon, { anchorEl: subItemIndex === division.id })] })), _jsx(Collapse, __assign({ in: division.id === subItemIndex && !isOnlyOneItem }, { children: _jsx(ActivityListStyled, { sx: { pt: 0, pb: 0 }, list: (!isOnlyOneItem && division.activities) || [], onSelectItem: function (activity, e) {
                                                                     e.stopPropagation();

package/build/utils/array.d.ts

@@ -1,4 +1,4 @@
-import { Activity, CountryCode, SaleChannel } from '../@types';
+import { ActivitiesIsIc, Activity, CountryCode, SaleChannel } from '../@types';
 export declare const isArray: (value: any) => value is any[];
 export declare const joinArray: (items: Array<any>, joiner?: string) => string;
 export declare const replaceStringArrayItems: (items: Array<string>, include: string, withThis: string) => string[];
@@ -65,3 +65,4 @@ export declare const sortActivitiesByName: (items: Array<Activity>, path: string
 export declare const getFileDetailsFromDocument: (documents: Array<any>, purpose: string) => any;
 export declare const getRecentDocumentBasedOnPurpose: (documents: Array<any>, purpose: string) => any;
 export declare const findInArrayOrSubArray: (items: Array<any>, value: string | number) => null;
+export declare const groupSectionWithSelectedActivitiesAtBeginning: (sections: Array<ActivitiesIsIc>, selectedActivities: Array<Activity>) => ActivitiesIsIc[];

package/build/utils/array.js

@@ -9,6 +9,15 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import get from 'lodash-es/get';
 export var isArray = function (value) { return Array.isArray(value); };
 export var joinArray = function (items, joiner) {
@@ -179,3 +188,66 @@ export var findInArrayOrSubArray = function (items, value) {
     });
     return found;
 };
+export var groupSectionWithSelectedActivitiesAtBeginning = function (sections, selectedActivities) {
+    if ((selectedActivities === null || selectedActivities === void 0 ? void 0 : selectedActivities.length) === 0)
+        return sections || [];
+    if ((sections === null || sections === void 0 ? void 0 : sections.length) === 0)
+        return [];
+    var filteredSections = sections.filter(function (section) {
+        var _a;
+        return (selectedActivities.find(function (_a) {
+            var id = _a.id;
+            return id === section.id;
+        }) ||
+            ((_a = section.divisions) === null || _a === void 0 ? void 0 : _a.some(function (division) {
+                var _a;
+                return (selectedActivities.find(function (_a) {
+                    var id = _a.id;
+                    return id === division.id;
+                }) ||
+                    ((_a = division === null || division === void 0 ? void 0 : division.activities) === null || _a === void 0 ? void 0 : _a.some(function (activity) {
+                        return selectedActivities.find(function (_a) {
+                            var id = _a.id;
+                            return id === activity.id;
+                        });
+                    })));
+            })));
+    });
+    var mapSelectedDivisionBeginning = filteredSections.map(function (section) {
+        var _a, _b;
+        var selectedDivision = ((_a = section.divisions) === null || _a === void 0 ? void 0 : _a.filter(function (division) {
+            var _a;
+            return (selectedActivities.find(function (_a) {
+                var id = _a.id;
+                return id === division.id;
+            }) ||
+                ((_a = division === null || division === void 0 ? void 0 : division.activities) === null || _a === void 0 ? void 0 : _a.some(function (activity) {
+                    return selectedActivities.find(function (_a) {
+                        var id = _a.id;
+                        return id === activity.id;
+                    });
+                })));
+        })) || [];
+        var remainingDivision = ((_b = section.divisions) === null || _b === void 0 ? void 0 : _b.filter(function (division) { return !selectedDivision.includes(division); })) || [];
+        var divisions = __spreadArray(__spreadArray([], selectedDivision, true), remainingDivision, true);
+        return __assign(__assign({}, section), { divisions: divisions });
+    });
+    var mapSelectedActivitiesBeginning = mapSelectedDivisionBeginning.map(function (section) {
+        var _a;
+        var divisions = (_a = section.divisions) === null || _a === void 0 ? void 0 : _a.map(function (division) {
+            var _a, _b;
+            var filterSelectedActivities = ((_a = division === null || division === void 0 ? void 0 : division.activities) === null || _a === void 0 ? void 0 : _a.filter(function (activity) {
+                return selectedActivities.find(function (_a) {
+                    var id = _a.id;
+                    return id === activity.id;
+                });
+            })) || [];
+            var remainingActivities = ((_b = division.activities) === null || _b === void 0 ? void 0 : _b.filter(function (activity) { return !filterSelectedActivities.includes(activity); })) || [];
+            var activities = __spreadArray(__spreadArray([], filterSelectedActivities, true), remainingActivities, true);
+            return __assign(__assign({}, division), { activities: activities });
+        });
+        return __assign(__assign({}, section), { divisions: divisions });
+    });
+    var remainingSections = sections.filter(function (section) { return !filteredSections.includes(section); });
+    return __spreadArray(__spreadArray([], mapSelectedActivitiesBeginning, true), remainingSections, true);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.3.88-test",
+	"version": "2.3.90-test",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",