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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/build/@types/form.d.ts +1 -1
  2. package/build/features/app/entity/entityStore.js +7 -4
  3. package/build/features/entity/screens/EntityCapital/ActivityList.js +50 -19
  4. package/build/features/entity/screens/EntityCapital/validation.d.ts +183 -3
  5. package/build/features/entity/screens/EntityCapital/validation.js +10 -1
  6. package/build/utils/array.d.ts +2 -1
  7. package/build/utils/array.js +72 -0
  8. package/package.json +1 -1
package/build/@types/form.d.ts CHANGED
@@ -129,7 +129,7 @@ export declare type EntityNameFormValues = {
129
129
  articleId?: string;
130
130
  };
131
131
  export declare type EntityCapitalFormValues = {
132
- activities: Array<string>;
132
+ activities: Array<Activity>;
133
133
  capitalPaid: string;
134
134
  capitalShareCount: string;
135
135
  capitalShareValue: string;
package/build/features/app/entity/entityStore.js CHANGED
@@ -350,7 +350,7 @@ export var updateEntityCapital = createAsyncThunk('entityUpdateEntityCapital', f
350
350
  hasCapitalShares = capitalShareCount || capitalShareValue;
351
351
  isCapitalNonEditable = (isCapitalPaidNonEditable && isCapitalShareCountNonEditable && isCapitalShareValueNonEditable) || (!capitalPaid && !hasCapitalShares);
352
352
  removedActivities = (activities === null || activities === void 0 ? void 0 : activities.length) > 0 &&
353
- (entityActivities || []).filter(function (entityActivity) { return !(activities || []).some(function (activityId) { return activityId === entityActivity.id; }); });
353
+ (entityActivities || []).filter(function (entityActivity) { return !(activities || []).some(function (activity) { return activity.id === entityActivity.id; }); });
354
354
  if (!(!isActivitiesNonEditable && (removedActivities === null || removedActivities === void 0 ? void 0 : removedActivities.length) > 0)) return [3, 2];
355
355
  payload_1 = {
356
356
  id: id,
@@ -361,7 +361,10 @@ export var updateEntityCapital = createAsyncThunk('entityUpdateEntityCapital', f
361
361
  _g.sent();
362
362
  _g.label = 2;
363
363
  case 2:
364
- activityIds = (activities || []).map(function (id) { return ({ id: id, action: 'add' }); });
364
+ activityIds = (activities || []).map(function (_a) {
365
+ var id = _a.id;
366
+ return ({ id: id, action: 'add' });
367
+ });
365
368
  payload = __assign({ id: id, activities: isActivitiesNonEditable || (activityIds === null || activityIds === void 0 ? void 0 : activityIds.length) === 0 ? undefined : activityIds }, (!isCapitalNonEditable && {
366
369
  capital: __assign({ paid: isCapitalPaidNonEditable ? undefined : capitalPaid }, (!((isCapitalShareCountNonEditable && isCapitalShareValueNonEditable) || !hasCapitalShares) && {
367
370
  shares: {
@@ -518,7 +521,7 @@ export var entitySlice = createSlice({
518
521
  state.data.entityNameData.issuingDate = issuingDate || moment(new Date()).format('YYYY-MM-DD');
519
522
  state.data.entityNameData.expiryDate = expiryDate || moment(new Date()).format('YYYY-MM-DD');
520
523
  if ((activities === null || activities === void 0 ? void 0 : activities.length) > 0)
521
- state.data.entityCapitalData.activities = activities.map(function (a) { return a.id; });
524
+ state.data.entityCapitalData.activities = activities;
522
525
  if (paid)
523
526
  state.data.entityCapitalData.capitalPaid = paid;
524
527
  if (shares === null || shares === void 0 ? void 0 : shares.count)
@@ -599,7 +602,7 @@ export var entitySlice = createSlice({
599
602
  state.data.entityNameData.issuingDate = issuingDate || moment(new Date()).format('YYYY-MM-DD');
600
603
  state.data.entityNameData.expiryDate = expiryDate || moment(new Date()).format('YYYY-MM-DD');
601
604
  if ((activities === null || activities === void 0 ? void 0 : activities.length) > 0)
602
- state.data.entityCapitalData.activities = activities.map(function (a) { return a.id; });
605
+ state.data.entityCapitalData.activities = activities;
603
606
  if (paid)
604
607
  state.data.entityCapitalData.capitalPaid = paid;
605
608
  if (shares === null || shares === void 0 ? void 0 : shares.count)
package/build/features/entity/screens/EntityCapital/ActivityList.js CHANGED
@@ -31,7 +31,7 @@ import Collapse from '../../../../components/Collapse';
31
31
  import ExpandIcon from '../../../../components/ExpandIcon';
32
32
  import CheckIcon from '@mui/icons-material/Check';
33
33
  import Text from '../../../../components/Text';
34
- import { findCurrencyByIso2, isExist } from '../../../../utils';
34
+ import { findCurrencyByIso2, isExist, groupSectionWithSelectedActivitiesAtBeginning } from '../../../../utils';
35
35
  import { ScreenContainer } from '../../../shared/Containers';
36
36
  import Search from '../../../shared/Search';
37
37
  import Input from '../../../shared/Input';
@@ -105,6 +105,10 @@ var ActivityList = function (_a) {
105
105
  var handleOpenMainMenu = function (event) {
106
106
  if (readOnly)
107
107
  return;
108
+ var list = groupSectionWithSelectedActivitiesAtBeginning(activityList, controlValue);
109
+ if ((list === null || list === void 0 ? void 0 : list.length) > 0) {
110
+ setActivities(list);
111
+ }
108
112
  setAnchorEl(event.currentTarget);
109
113
  onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
110
114
  };
@@ -140,16 +144,16 @@ var ActivityList = function (_a) {
140
144
  setActivities(activityList);
141
145
  }
142
146
  }, [activityList]);
143
- var onSelectItem = function (id) {
144
- var isActivityExists = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (activityId) { return activityId === id; });
147
+ var onSelectItem = function (activity) {
148
+ var isActivityExists = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (ac) { return ac.id === activity.id; });
145
149
  if (isActivityExists) {
146
- var updatedIdList = controlValue === null || controlValue === void 0 ? void 0 : controlValue.filter(function (activityId) { return activityId !== id; });
150
+ var updatedIdList = controlValue === null || controlValue === void 0 ? void 0 : controlValue.filter(function (ac) { return ac.id !== activity.id; });
147
151
  if (updatedIdList.length >= 1)
148
152
  activitiesControl.field.onChange(updatedIdList);
149
153
  return;
150
154
  }
151
- var ids = controlValue ? __spreadArray(__spreadArray([], controlValue, true), [id], false) : [id];
152
- activitiesControl.field.onChange(ids);
155
+ var activities = controlValue ? __spreadArray(__spreadArray([], controlValue, true), [activity], false) : [activity];
156
+ activitiesControl.field.onChange(activities);
153
157
  };
154
158
  var getSelectedActivities = function () {
155
159
  var _a, _b, _c;
@@ -164,27 +168,54 @@ var ActivityList = function (_a) {
164
168
  return isAr ? ((_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar) || ((_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en) : (_c = item === null || item === void 0 ? void 0 : item.name) === null || _c === void 0 ? void 0 : _c.en;
165
169
  };
166
170
  var getSelectedActivitySectionFlag = function (section) {
167
- var findSection = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (id) { return id === section.id; });
168
- var findDivision = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (id) { var _a; return (_a = section.divisions) === null || _a === void 0 ? void 0 : _a.find(function (division) { return division.id === id; }); });
169
- var findActivity = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (id) { var _a; return (_a = section.divisions) === null || _a === void 0 ? void 0 : _a.find(function (division) { var _a; return (_a = division === null || division === void 0 ? void 0 : division.activities) === null || _a === void 0 ? void 0 : _a.find(function (activity) { return activity.id === id; }); }); });
171
+ var findSection = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (_a) {
172
+ var id = _a.id;
173
+ return id === section.id;
174
+ });
175
+ var findDivision = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (_a) {
176
+ var _b;
177
+ var id = _a.id;
178
+ return (_b = section.divisions) === null || _b === void 0 ? void 0 : _b.find(function (division) { return division.id === id; });
179
+ });
180
+ var findActivity = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (_a) {
181
+ var _b;
182
+ var id = _a.id;
183
+ return (_b = section.divisions) === null || _b === void 0 ? void 0 : _b.find(function (division) { var _a; return (_a = division === null || division === void 0 ? void 0 : division.activities) === null || _a === void 0 ? void 0 : _a.find(function (activity) { return activity.id === id; }); });
184
+ });
170
185
  if (findSection || findDivision || findActivity)
171
186
  return section.id;
172
187
  return '';
173
188
  };
174
189
  var getSelectedActivityDivisionFlag = function (division) {
175
- var findDivision = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (id) { var _a; return (_a = division.activities) === null || _a === void 0 ? void 0 : _a.find(function (activity) { return activity.id === id; }); });
176
- if (findDivision)
190
+ var findDivision = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (_a) {
191
+ var id = _a.id;
192
+ return division.id === id;
193
+ });
194
+ var findActivity = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (_a) {
195
+ var _b;
196
+ var id = _a.id;
197
+ return (_b = division.activities) === null || _b === void 0 ? void 0 : _b.find(function (activity) { return activity.id === id; });
198
+ });
199
+ if (findDivision || findActivity)
177
200
  return division.id;
178
201
  return '';
179
202
  };
180
203
  var getSelectedActivityFlag = function (activity) {
181
- var findActivity = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (id) { return id === activity.id; });
204
+ var findActivity = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (_a) {
205
+ var id = _a.id;
206
+ return id === activity.id;
207
+ });
182
208
  if (findActivity)
183
209
  return activity.id;
184
210
  return '';
185
211
  };
186
212
  var handleSearch = function (value) {
187
213
  if (!value) {
214
+ var list = groupSectionWithSelectedActivitiesAtBeginning(activityList, controlValue);
215
+ if ((list === null || list === void 0 ? void 0 : list.length) > 0) {
216
+ setActivities(list);
217
+ return;
218
+ }
188
219
  setActivities(activityList);
189
220
  return;
190
221
  }
@@ -207,27 +238,27 @@ var ActivityList = function (_a) {
207
238
  }) }), _jsx(InputStyled, { readOnly: readOnly, value: getSelectedActivities() || '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: activities, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (section) {
208
239
  var isDivisionNotAvailable = !section.divisions || section.divisions.length === 0;
209
240
  if (isDivisionNotAvailable)
210
- onSelectItem(section.id);
241
+ onSelectItem(section);
211
242
  else
212
243
  handleOpenSubMenu(section.id);
213
244
  }, renderItem: function (section) {
214
245
  var _a;
215
246
  var isDivisionNotAvailable = !section.divisions || ((_a = section.divisions) === null || _a === void 0 ? void 0 : _a.length) === 0;
216
247
  var showCheck = section.id === getSelectedActivitySectionFlag(section) && isDivisionNotAvailable;
217
- return (_jsxs(ListItemContainer, { children: [_jsxs(ListItem, __assign({ sx: __assign({ bgcolor: 'rgb(196 184 184 / 8%)', borderBottom: '1px solid rgba(227, 232, 238, 0.8)' }, (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) {
248
+ 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) {
218
249
  e.stopPropagation();
219
- var isOnlyOneItem = !division.activities || division.activities.length === 1;
250
+ var isOnlyOneItem = !division.activities || division.activities.length <= 1;
220
251
  if (isOnlyOneItem)
221
- onSelectItem(division.id);
252
+ onSelectItem(division);
222
253
  else
223
254
  handleOpenSubItem(division.id);
224
255
  }, listItemProps: { sx: { padding: 0, '&:last-child': { paddingBottom: 0 } } }, renderItem: function (division, idx) {
225
256
  var _a;
226
- var isOnlyOneItem = !division.activities || ((_a = division.activities) === null || _a === void 0 ? void 0 : _a.length) === 1;
257
+ var isOnlyOneItem = !division.activities || ((_a = division.activities) === null || _a === void 0 ? void 0 : _a.length) <= 1;
227
258
  var showCheck = division.id === getSelectedActivityDivisionFlag(division) && isOnlyOneItem;
228
- return (_jsxs(ListItemContainer, { children: [_jsxs(ListItem, __assign({ sx: __assign({ bgcolor: 'rgb(196 184 184 / 4%)', borderBottom: '1px solid rgba(227, 232, 238, 0.4)' }, (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) {
259
+ 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) {
229
260
  e.stopPropagation();
230
- onSelectItem(activity.id);
261
+ onSelectItem(activity);
231
262
  }, listItemProps: { sx: { padding: 0, '&:last-child': { paddingBottom: 0 } } }, renderItem: function (activity, idx) {
232
263
  return (_jsxs(ListItem, __assign({ sx: { mt: idx === 0 ? 1 : 0 } }, { children: [_jsx(NameContainer, __assign({ isAr: isAr, isSelected: activity.id === getSelectedActivityFlag(activity) }, { children: getSelectedActivityName(activity) })), activity.id === getSelectedActivityFlag(activity) && _jsx(CheckIconStyled, {})] })));
233
264
  } }) }))] }, idx));
package/build/features/entity/screens/EntityCapital/validation.d.ts CHANGED
@@ -1,16 +1,196 @@
1
1
  import * as yup from 'yup';
2
2
  export declare const EntityCapitalValidationSchema: () => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
3
- activities: yup.ArraySchema<yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>, import("yup/lib/types").AnyObject, (string | undefined)[] | undefined, (string | undefined)[] | undefined>;
3
+ activities: yup.ArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
4
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
5
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
6
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
7
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
8
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
9
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
10
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
11
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
12
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
13
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
14
+ }>>>;
15
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
16
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
17
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
18
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
19
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
20
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
21
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
22
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
23
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
24
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
25
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
26
+ }>>>;
27
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
28
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
29
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
30
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
31
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
32
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
33
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
34
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
35
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
36
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
37
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
38
+ }>>>;
39
+ }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
40
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
41
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
42
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
43
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
44
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
45
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
46
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
47
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
48
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
49
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
50
+ }>>>;
51
+ }>>[] | undefined, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
52
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
53
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
54
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
55
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
56
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
57
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
58
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
59
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
60
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
61
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
62
+ }>>>;
63
+ }>>[] | undefined>;
4
64
  capitalPaid: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
5
65
  capitalShareCount: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
6
66
  capitalShareValue: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
7
67
  }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
8
- activities: yup.ArraySchema<yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>, import("yup/lib/types").AnyObject, (string | undefined)[] | undefined, (string | undefined)[] | undefined>;
68
+ activities: yup.ArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
69
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
70
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
71
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
72
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
73
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
74
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
75
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
76
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
77
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
78
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
79
+ }>>>;
80
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
81
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
82
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
83
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
84
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
85
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
86
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
87
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
88
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
89
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
90
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
91
+ }>>>;
92
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
93
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
94
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
95
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
96
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
97
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
98
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
99
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
100
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
101
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
102
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
103
+ }>>>;
104
+ }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
105
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
106
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
107
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
108
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
109
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
110
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
111
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
112
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
113
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
114
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
115
+ }>>>;
116
+ }>>[] | undefined, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
117
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
118
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
119
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
120
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
121
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
122
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
123
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
124
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
125
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
126
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
127
+ }>>>;
128
+ }>>[] | undefined>;
9
129
  capitalPaid: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
10
130
  capitalShareCount: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
11
131
  capitalShareValue: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
12
132
  }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
13
- activities: yup.ArraySchema<yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>, import("yup/lib/types").AnyObject, (string | undefined)[] | undefined, (string | undefined)[] | undefined>;
133
+ activities: yup.ArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
134
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
135
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
136
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
137
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
138
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
139
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
140
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
141
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
142
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
143
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
144
+ }>>>;
145
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
146
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
147
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
148
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
149
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
150
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
151
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
152
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
153
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
154
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
155
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
156
+ }>>>;
157
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
158
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
159
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
160
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
161
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
162
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
163
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
164
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
165
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
166
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
167
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
168
+ }>>>;
169
+ }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
170
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
171
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
172
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
173
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
174
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
175
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
176
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
177
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
178
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
179
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
180
+ }>>>;
181
+ }>>[] | undefined, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
182
+ id: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
183
+ name: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
184
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
185
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
186
+ }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
187
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
188
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
189
+ }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
190
+ ar: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
191
+ en: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
192
+ }>>>;
193
+ }>>[] | undefined>;
14
194
  capitalPaid: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
15
195
  capitalShareCount: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
16
196
  capitalShareValue: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
package/build/features/entity/screens/EntityCapital/validation.js CHANGED
@@ -1,7 +1,16 @@
1
1
  import * as yup from 'yup';
2
2
  export var EntityCapitalValidationSchema = function () {
3
3
  return yup.object().shape({
4
- activities: yup.array().min(1, 'activities_list_alert').of(yup.string()),
4
+ activities: yup
5
+ .array()
6
+ .min(1, 'activities_list_alert')
7
+ .of(yup.object().shape({
8
+ id: yup.string(),
9
+ name: yup.object().shape({
10
+ ar: yup.string(),
11
+ en: yup.string()
12
+ })
13
+ })),
5
14
  capitalPaid: yup.string().required('capital_paid_required'),
6
15
  capitalShareCount: yup.string().required('capital_share_count_required'),
7
16
  capitalShareValue: yup.string().required('capital_share_value_required')
package/build/utils/array.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Activity, CountryCode, SaleChannel } from '../@types';
1
+ import { ActivitiesIsIc, Activity, CountryCode, SaleChannel } from '../@types';
2
2
  export declare const isArray: (value: any) => value is any[];
3
3
  export declare const joinArray: (items: Array<any>, joiner?: string) => string;
4
4
  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
65
65
  export declare const getFileDetailsFromDocument: (documents: Array<any>, purpose: string) => any;
66
66
  export declare const getRecentDocumentBasedOnPurpose: (documents: Array<any>, purpose: string) => any;
67
67
  export declare const findInArrayOrSubArray: (items: Array<any>, value: string | number) => null;
68
+ export declare const groupSectionWithSelectedActivitiesAtBeginning: (sections: Array<ActivitiesIsIc>, selectedActivities: Array<Activity>) => ActivitiesIsIc[];
package/build/utils/array.js CHANGED
@@ -9,6 +9,15 @@ var __assign = (this && this.__assign) || function () {
9
9
  };
10
10
  return __assign.apply(this, arguments);
11
11
  };
12
+ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
13
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
14
+ if (ar || !(i in from)) {
15
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
16
+ ar[i] = from[i];
17
+ }
18
+ }
19
+ return to.concat(ar || Array.prototype.slice.call(from));
20
+ };
12
21
  import get from 'lodash-es/get';
13
22
  export var isArray = function (value) { return Array.isArray(value); };
14
23
  export var joinArray = function (items, joiner) {
@@ -179,3 +188,66 @@ export var findInArrayOrSubArray = function (items, value) {
179
188
  });
180
189
  return found;
181
190
  };
191
+ export var groupSectionWithSelectedActivitiesAtBeginning = function (sections, selectedActivities) {
192
+ if ((selectedActivities === null || selectedActivities === void 0 ? void 0 : selectedActivities.length) === 0)
193
+ return sections || [];
194
+ if ((sections === null || sections === void 0 ? void 0 : sections.length) === 0)
195
+ return [];
196
+ var filteredSections = sections.filter(function (section) {
197
+ var _a;
198
+ return (selectedActivities.find(function (_a) {
199
+ var id = _a.id;
200
+ return id === section.id;
201
+ }) ||
202
+ ((_a = section.divisions) === null || _a === void 0 ? void 0 : _a.some(function (division) {
203
+ var _a;
204
+ return (selectedActivities.find(function (_a) {
205
+ var id = _a.id;
206
+ return id === division.id;
207
+ }) ||
208
+ ((_a = division === null || division === void 0 ? void 0 : division.activities) === null || _a === void 0 ? void 0 : _a.some(function (activity) {
209
+ return selectedActivities.find(function (_a) {
210
+ var id = _a.id;
211
+ return id === activity.id;
212
+ });
213
+ })));
214
+ })));
215
+ });
216
+ var mapSelectedDivisionBeginning = filteredSections.map(function (section) {
217
+ var _a, _b;
218
+ var selectedDivision = ((_a = section.divisions) === null || _a === void 0 ? void 0 : _a.filter(function (division) {
219
+ var _a;
220
+ return (selectedActivities.find(function (_a) {
221
+ var id = _a.id;
222
+ return id === division.id;
223
+ }) ||
224
+ ((_a = division === null || division === void 0 ? void 0 : division.activities) === null || _a === void 0 ? void 0 : _a.some(function (activity) {
225
+ return selectedActivities.find(function (_a) {
226
+ var id = _a.id;
227
+ return id === activity.id;
228
+ });
229
+ })));
230
+ })) || [];
231
+ var remainingDivision = ((_b = section.divisions) === null || _b === void 0 ? void 0 : _b.filter(function (division) { return !selectedDivision.includes(division); })) || [];
232
+ var divisions = __spreadArray(__spreadArray([], selectedDivision, true), remainingDivision, true);
233
+ return __assign(__assign({}, section), { divisions: divisions });
234
+ });
235
+ var mapSelectedActivitiesBeginning = mapSelectedDivisionBeginning.map(function (section) {
236
+ var _a;
237
+ var divisions = (_a = section.divisions) === null || _a === void 0 ? void 0 : _a.map(function (division) {
238
+ var _a, _b;
239
+ var filterSelectedActivities = ((_a = division === null || division === void 0 ? void 0 : division.activities) === null || _a === void 0 ? void 0 : _a.filter(function (activity) {
240
+ return selectedActivities.find(function (_a) {
241
+ var id = _a.id;
242
+ return id === activity.id;
243
+ });
244
+ })) || [];
245
+ var remainingActivities = ((_b = division.activities) === null || _b === void 0 ? void 0 : _b.filter(function (activity) { return !filterSelectedActivities.includes(activity); })) || [];
246
+ var activities = __spreadArray(__spreadArray([], filterSelectedActivities, true), remainingActivities, true);
247
+ return __assign(__assign({}, division), { activities: activities });
248
+ });
249
+ return __assign(__assign({}, section), { divisions: divisions });
250
+ });
251
+ var remainingSections = sections.filter(function (section) { return !filteredSections.includes(section); });
252
+ return __spreadArray(__spreadArray([], mapSelectedActivitiesBeginning, true), remainingSections, true);
253
+ };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tap-payments/auth-jsconnect",
3
- "version": "2.3.87-test",
3
+ "version": "2.3.90-test",
4
4
  "description": "connect library, auth",
5
5
  "private": false,
6
6
  "main": "build/index.js",