awing-library 2.1.84-beta → 2.1.85-beta
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.
|
@@ -65,6 +65,12 @@ var CreateOrEdit = function () {
|
|
|
65
65
|
return (__assign(__assign({}, prev), { group: __assign(__assign({}, prev === null || prev === void 0 ? void 0 : prev.group), obj) }));
|
|
66
66
|
});
|
|
67
67
|
}, []);
|
|
68
|
+
var handleUpdateUser = (0, react_1.useCallback)(function (userIds) {
|
|
69
|
+
setConfirmExit(true);
|
|
70
|
+
setBusinessUnitData(function (prev) {
|
|
71
|
+
return Array.isArray(userIds) ? (__assign(__assign({}, prev), { userIds: userIds })) : userIds(prev);
|
|
72
|
+
});
|
|
73
|
+
}, []);
|
|
68
74
|
var handleSubmit = (0, react_1.useCallback)(function () {
|
|
69
75
|
if (groupId) {
|
|
70
76
|
return service.groupsPut(groupId, businessUnitdata);
|
|
@@ -85,9 +91,9 @@ var CreateOrEdit = function () {
|
|
|
85
91
|
onValidate: function () { return true; },
|
|
86
92
|
},
|
|
87
93
|
], oldValue: businessUnitdata === null || businessUnitdata === void 0 ? void 0 : businessUnitdata.group, onUpdate: handleUpdate }), (0, jsx_runtime_1.jsx)(UserComponent_1.default, { rows: users.filter(function (user) { var _a; return (_a = businessUnitdata === null || businessUnitdata === void 0 ? void 0 : businessUnitdata.userIds) === null || _a === void 0 ? void 0 : _a.includes(user.userId); }), onChangeAddUser: function (userIds) {
|
|
88
|
-
|
|
94
|
+
handleUpdateUser(function (prev) { return (__assign(__assign({}, prev), { userIds: userIds })); });
|
|
89
95
|
} })] })) }), (0, jsx_runtime_1.jsx)(Router_1.Routes, { children: (0, jsx_runtime_1.jsx)(Router_1.Route, { path: Constants_1.ADD_USER_TO_GROUP, element: (0, jsx_runtime_1.jsx)(SearchUser_1.default, { onChangeAddUser: function (userIds) {
|
|
90
|
-
|
|
96
|
+
handleUpdateUser(function (prev) { return (__assign(__assign({}, prev), { userIds: __spreadArray(__spreadArray([], (prev.userIds || []), true), userIds, true) })); });
|
|
91
97
|
}, listUserId: (businessUnitdata === null || businessUnitdata === void 0 ? void 0 : businessUnitdata.userIds) || [], users: users }) }, Constants_1.ADD_USER_TO_GROUP) })] }));
|
|
92
98
|
};
|
|
93
99
|
exports.default = CreateOrEdit;
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { DataObject } from '../../../AWING';
|
|
3
|
+
import { IGroupModel } from '../Types';
|
|
3
4
|
interface UserComponentProps {
|
|
4
5
|
rows: DataObject[];
|
|
5
|
-
onChangeAddUser: (ids:
|
|
6
|
+
onChangeAddUser: (ids: IGroupModel['userIds']) => void;
|
|
6
7
|
}
|
|
7
8
|
declare const UserComponent: React.FC<UserComponentProps>;
|
|
8
9
|
export default UserComponent;
|
|
@@ -33,15 +33,14 @@ function CreateOrEdit() {
|
|
|
33
33
|
var id = (0, react_router_dom_1.useParams)().id;
|
|
34
34
|
var service = (0, Hooks_1.default)().service;
|
|
35
35
|
var _a = (0, react_1.useState)(false), confirmExit = _a[0], setConfirmExit = _a[1];
|
|
36
|
-
var _b = (0, react_1.useState)(
|
|
36
|
+
var _b = (0, react_1.useState)(true), validState = _b[0], setValidState = _b[1];
|
|
37
37
|
var _c = (0, react_1.useState)(true), loading = _c[0], setLoading = _c[1];
|
|
38
|
-
var _d = (0, react_1.useState)(
|
|
38
|
+
var _d = (0, react_1.useState)(true), loadingTable = _d[0], setLoadingTable = _d[1];
|
|
39
39
|
var _e = (0, react_1.useState)(), placeGroup = _e[0], setPlaceGroup = _e[1];
|
|
40
40
|
var _f = (0, react_1.useState)(), placeFilter = _f[0], setPlaceFilter = _f[1];
|
|
41
41
|
var _g = (0, react_1.useState)([]), places = _g[0], setPlaces = _g[1];
|
|
42
42
|
(0, react_1.useEffect)(function () {
|
|
43
43
|
if (!placeGroup && id) {
|
|
44
|
-
setLoading(true);
|
|
45
44
|
service
|
|
46
45
|
.placeGroupsGet(id)
|
|
47
46
|
.then(function (placeGroupData) {
|
|
@@ -52,10 +51,12 @@ function CreateOrEdit() {
|
|
|
52
51
|
setLoading(false);
|
|
53
52
|
});
|
|
54
53
|
}
|
|
54
|
+
else {
|
|
55
|
+
setLoading(false);
|
|
56
|
+
}
|
|
55
57
|
}, [placeGroup, service, id]);
|
|
56
58
|
(0, react_1.useEffect)(function () {
|
|
57
59
|
if (id) {
|
|
58
|
-
setLoadingTable(true);
|
|
59
60
|
service
|
|
60
61
|
.placesQuery({ groupIds: [id] })
|
|
61
62
|
.then(setPlaces)
|
|
@@ -63,7 +64,11 @@ function CreateOrEdit() {
|
|
|
63
64
|
setLoadingTable(false);
|
|
64
65
|
});
|
|
65
66
|
}
|
|
66
|
-
|
|
67
|
+
else {
|
|
68
|
+
setLoadingTable(false);
|
|
69
|
+
}
|
|
70
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
71
|
+
}, [id]);
|
|
67
72
|
var handleDetailSubmit = (0, react_1.useCallback)(function (placesSelected, placeFilter) {
|
|
68
73
|
setConfirmExit(true);
|
|
69
74
|
setPlaces(placesSelected);
|
|
@@ -87,7 +92,7 @@ function CreateOrEdit() {
|
|
|
87
92
|
};
|
|
88
93
|
return ((0, jsx_runtime_1.jsx)(ClassicDrawer_1.default, { title: id
|
|
89
94
|
? "".concat(t('PlaceGroup.TitleEdit'), ": ").concat(placeGroup ? placeGroup === null || placeGroup === void 0 ? void 0 : placeGroup.name : 'Loading...')
|
|
90
|
-
: t('PlaceGroup.TitleCreate'), onSubmit: handleSubmit, confirmExit: confirmExit, disableButtonSubmit: !validState, children: loading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(AWING_1.BasicDataForm, { caption: t('PlaceGroup.TitlePlaceGroupInfo'), fields: [
|
|
95
|
+
: t('PlaceGroup.TitleCreate'), onSubmit: handleSubmit, confirmExit: confirmExit, disableButtonSubmit: !(validState && confirmExit), children: loading ? ((0, jsx_runtime_1.jsx)(AWING_1.CircularProgress, {})) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(AWING_1.BasicDataForm, { caption: t('PlaceGroup.TitlePlaceGroupInfo'), fields: [
|
|
91
96
|
{
|
|
92
97
|
fieldName: 'name',
|
|
93
98
|
type: 'text',
|