datastake-daf 0.6.848 → 0.6.849
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.
package/dist/pages/index.js
CHANGED
|
@@ -61423,25 +61423,13 @@ const getColumns$1 = ({
|
|
|
61423
61423
|
|
|
61424
61424
|
const checkboxConfig = {
|
|
61425
61425
|
name: 'Name',
|
|
61426
|
-
datastakeId: 'ID'
|
|
61426
|
+
datastakeId: 'ID',
|
|
61427
|
+
email: 'Email'
|
|
61427
61428
|
};
|
|
61428
61429
|
const getFiltersConfig = ({
|
|
61429
61430
|
t
|
|
61430
61431
|
}) => {
|
|
61431
61432
|
return {
|
|
61432
|
-
email: {
|
|
61433
|
-
type: 'text',
|
|
61434
|
-
label: 'Email',
|
|
61435
|
-
placeholder: t => `${t('Filter by')} ${t('Email').toLowerCase()}`,
|
|
61436
|
-
style: {
|
|
61437
|
-
flex: 1
|
|
61438
|
-
},
|
|
61439
|
-
labelStyle: {
|
|
61440
|
-
flex: 1
|
|
61441
|
-
},
|
|
61442
|
-
getLabel: option => option.label,
|
|
61443
|
-
getValue: option => option.value
|
|
61444
|
-
},
|
|
61445
61433
|
status: {
|
|
61446
61434
|
type: "select",
|
|
61447
61435
|
label: "Status",
|
|
@@ -61481,7 +61469,8 @@ const getFiltersConfig = ({
|
|
|
61481
61469
|
};
|
|
61482
61470
|
const filtersConfig = {
|
|
61483
61471
|
name: '',
|
|
61484
|
-
datastakeId: ''
|
|
61472
|
+
datastakeId: '',
|
|
61473
|
+
email: ''
|
|
61485
61474
|
};
|
|
61486
61475
|
const getFilterOptions = (options, t) => {
|
|
61487
61476
|
const {
|
|
@@ -61493,7 +61482,6 @@ const getFilterOptions = (options, t) => {
|
|
|
61493
61482
|
const _default = {
|
|
61494
61483
|
timeframe: timeframeOptions,
|
|
61495
61484
|
email: emailOptions,
|
|
61496
|
-
status: statusOptions,
|
|
61497
61485
|
userRole: userRoleOptions,
|
|
61498
61486
|
status: [{
|
|
61499
61487
|
value: "active",
|
|
@@ -61653,7 +61641,6 @@ const UsersCreate = ({
|
|
|
61653
61641
|
}
|
|
61654
61642
|
}
|
|
61655
61643
|
});
|
|
61656
|
-
onCancel();
|
|
61657
61644
|
}
|
|
61658
61645
|
})
|
|
61659
61646
|
});
|
|
@@ -61683,7 +61670,7 @@ const UsersTable = ({
|
|
|
61683
61670
|
changeAjaxOptions = () => {},
|
|
61684
61671
|
extendingFilters = {},
|
|
61685
61672
|
userRoles = [],
|
|
61686
|
-
|
|
61673
|
+
breadcrumbs = []
|
|
61687
61674
|
}) => {
|
|
61688
61675
|
const [selectOptions, setSelectOptions] = React.useState();
|
|
61689
61676
|
const params = new URLSearchParams(location?.search);
|
|
@@ -61723,10 +61710,11 @@ const UsersTable = ({
|
|
|
61723
61710
|
onSubmitted: payload => {
|
|
61724
61711
|
if (userToEdit) {
|
|
61725
61712
|
onEditUser(payload);
|
|
61713
|
+
onDrawerClose();
|
|
61726
61714
|
} else {
|
|
61727
61715
|
onInviteUser(payload);
|
|
61716
|
+
onDrawerClose();
|
|
61728
61717
|
}
|
|
61729
|
-
onDrawerClose();
|
|
61730
61718
|
},
|
|
61731
61719
|
onCancel: () => {
|
|
61732
61720
|
onDrawerClose();
|
|
@@ -61757,7 +61745,7 @@ const UsersTable = ({
|
|
|
61757
61745
|
getAppHeader: getAppHeader,
|
|
61758
61746
|
extendingFilters: extendingFilters,
|
|
61759
61747
|
subject: "users",
|
|
61760
|
-
breadcrumbs:
|
|
61748
|
+
breadcrumbs: breadcrumbs,
|
|
61761
61749
|
headerInfo: {
|
|
61762
61750
|
title: "users",
|
|
61763
61751
|
createTitle: "New User"
|
|
@@ -64567,7 +64555,7 @@ function ConflictManagement({
|
|
|
64567
64555
|
// }, [t, APP, goTo]);
|
|
64568
64556
|
|
|
64569
64557
|
const sourceOptions = React.useMemo(() => {
|
|
64570
|
-
return partners
|
|
64558
|
+
return partners?.map(partner => {
|
|
64571
64559
|
const isOwnData = partner.id === user?.company?.id;
|
|
64572
64560
|
return {
|
|
64573
64561
|
label: partner.nickName,
|
|
@@ -64598,7 +64586,7 @@ function ConflictManagement({
|
|
|
64598
64586
|
}),
|
|
64599
64587
|
addedHeader: /*#__PURE__*/jsxRuntime.jsx("div", {
|
|
64600
64588
|
children: /*#__PURE__*/jsxRuntime.jsx(Multiselect, {
|
|
64601
|
-
options: [...sourceOptions],
|
|
64589
|
+
options: [...(Array.isArray(sourceOptions) ? sourceOptions : [])],
|
|
64602
64590
|
isAvatarGroup: true,
|
|
64603
64591
|
canUnselectLast: false,
|
|
64604
64592
|
onChange: selected => {
|
|
@@ -64610,7 +64598,7 @@ function ConflictManagement({
|
|
|
64610
64598
|
},
|
|
64611
64599
|
dropDownWidth: 200,
|
|
64612
64600
|
selectionType: "checkbox",
|
|
64613
|
-
defaultSelected: partners
|
|
64601
|
+
defaultSelected: partners?.map(p => p.id) || []
|
|
64614
64602
|
}, partners?.length)
|
|
64615
64603
|
})
|
|
64616
64604
|
}),
|
package/package.json
CHANGED
|
@@ -33,7 +33,7 @@ export default function ConflictManagement({
|
|
|
33
33
|
// }, [t, APP, goTo]);
|
|
34
34
|
|
|
35
35
|
const sourceOptions = useMemo(() => {
|
|
36
|
-
return partners
|
|
36
|
+
return partners?.map((partner) => {
|
|
37
37
|
const isOwnData = partner.id === user?.company?.id;
|
|
38
38
|
|
|
39
39
|
return {
|
|
@@ -69,7 +69,7 @@ export default function ConflictManagement({
|
|
|
69
69
|
addedHeader={
|
|
70
70
|
<div>
|
|
71
71
|
<Multiselect
|
|
72
|
-
options={[...sourceOptions]}
|
|
72
|
+
options={[...(Array.isArray(sourceOptions) ? sourceOptions : [])]}
|
|
73
73
|
isAvatarGroup
|
|
74
74
|
canUnselectLast={false}
|
|
75
75
|
key={partners?.length}
|
|
@@ -82,7 +82,7 @@ export default function ConflictManagement({
|
|
|
82
82
|
}}
|
|
83
83
|
dropDownWidth={200}
|
|
84
84
|
selectionType="checkbox"
|
|
85
|
-
defaultSelected={partners
|
|
85
|
+
defaultSelected={partners?.map((p) => p.id) || []}
|
|
86
86
|
/>
|
|
87
87
|
</div>
|
|
88
88
|
}
|
|
@@ -1,21 +1,11 @@
|
|
|
1
1
|
export const checkboxConfig = {
|
|
2
2
|
name: 'Name',
|
|
3
|
-
datastakeId: 'ID'
|
|
3
|
+
datastakeId: 'ID',
|
|
4
|
+
email: 'Email',
|
|
4
5
|
}
|
|
5
6
|
|
|
6
7
|
export const getFiltersConfig = ({t}) => {
|
|
7
8
|
return {
|
|
8
|
-
email: {
|
|
9
|
-
type: 'text',
|
|
10
|
-
label: 'Email',
|
|
11
|
-
placeholder: (t) => `${t('Filter by')} ${t('Email').toLowerCase()}`,
|
|
12
|
-
style: { flex: 1 },
|
|
13
|
-
labelStyle: { flex: 1 },
|
|
14
|
-
getLabel: (option) => option.label,
|
|
15
|
-
getValue: (option) => option.value,
|
|
16
|
-
},
|
|
17
|
-
|
|
18
|
-
|
|
19
9
|
status: {
|
|
20
10
|
type: "select",
|
|
21
11
|
label: "Status",
|
|
@@ -45,6 +35,7 @@ export const getFiltersConfig = ({t}) => {
|
|
|
45
35
|
export const filtersConfig = {
|
|
46
36
|
name: '',
|
|
47
37
|
datastakeId: '',
|
|
38
|
+
email: ''
|
|
48
39
|
};
|
|
49
40
|
|
|
50
41
|
export const getFilterOptions = (options, t) => {
|
|
@@ -56,10 +47,9 @@ export const getFilterOptions = (options, t) => {
|
|
|
56
47
|
} = options || {};
|
|
57
48
|
|
|
58
49
|
const _default = {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
userRole: userRoleOptions,
|
|
50
|
+
timeframe: timeframeOptions,
|
|
51
|
+
email: emailOptions,
|
|
52
|
+
userRole: userRoleOptions,
|
|
63
53
|
status: [
|
|
64
54
|
{
|
|
65
55
|
value: "active",
|
|
@@ -31,7 +31,7 @@ const UsersTable = ({
|
|
|
31
31
|
changeAjaxOptions = () => {},
|
|
32
32
|
extendingFilters = {},
|
|
33
33
|
userRoles = [],
|
|
34
|
-
|
|
34
|
+
breadcrumbs = []
|
|
35
35
|
}) => {
|
|
36
36
|
const [selectOptions, setSelectOptions] = useState();
|
|
37
37
|
const params = new URLSearchParams(location?.search);
|
|
@@ -72,10 +72,11 @@ const UsersTable = ({
|
|
|
72
72
|
onSubmitted={(payload) => {
|
|
73
73
|
if (userToEdit) {
|
|
74
74
|
onEditUser(payload);
|
|
75
|
+
onDrawerClose()
|
|
75
76
|
} else {
|
|
76
77
|
onInviteUser(payload);
|
|
78
|
+
onDrawerClose()
|
|
77
79
|
}
|
|
78
|
-
onDrawerClose()
|
|
79
80
|
}}
|
|
80
81
|
onCancel={() => {
|
|
81
82
|
onDrawerClose()
|
|
@@ -109,7 +110,7 @@ const UsersTable = ({
|
|
|
109
110
|
getAppHeader={getAppHeader}
|
|
110
111
|
extendingFilters={extendingFilters}
|
|
111
112
|
subject="users"
|
|
112
|
-
breadcrumbs={
|
|
113
|
+
breadcrumbs={breadcrumbs}
|
|
113
114
|
headerInfo={{
|
|
114
115
|
title: "users",
|
|
115
116
|
createTitle: "New User"
|