mario-core 2.9.159-level → 2.9.160-level
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/index.js +15 -14
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +15 -14
- package/dist/index.modern.js.map +1 -1
- package/dist/services/userService.d.ts +0 -3
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -7295,30 +7295,31 @@ var SkillList = function SkillList() {
|
|
|
7295
7295
|
var setUserList = toolkit.createAction("users/setUserList");
|
|
7296
7296
|
var setStudentList = toolkit.createAction("users/setStudentList");
|
|
7297
7297
|
|
|
7298
|
+
var USER_URL$1 = BASE_URL + "/api/user";
|
|
7298
7299
|
var STUDENT_URL = BASE_URL + "/api/student";
|
|
7299
7300
|
var CHANGE_PASSWORD = BASE_URL + "/api/Account/changePassword";
|
|
7300
7301
|
var ACCOUNT_URL$1 = BASE_URL + "/api/account";
|
|
7301
7302
|
var EDU_USER_URL = BASE_URL + "/api/User";
|
|
7302
7303
|
var ONE_ROSTER_USER_URL = BASE_URL + "/api/usersOneRoster";
|
|
7303
|
-
var
|
|
7304
|
+
var MAPPING_ROSTER_USER_URL = BASE_URL + "/api/mappingRosterUsers";
|
|
7304
7305
|
var getRosterUser = function getRosterUser(filter) {
|
|
7305
|
-
return api.get("" +
|
|
7306
|
+
return api.get("" + MAPPING_ROSTER_USER_URL, {
|
|
7306
7307
|
params: filter
|
|
7307
7308
|
});
|
|
7308
7309
|
};
|
|
7309
7310
|
var getRosterUserExport = function getRosterUserExport(filter) {
|
|
7310
|
-
return api.get(
|
|
7311
|
+
return api.get(MAPPING_ROSTER_USER_URL + "/export-csv", {
|
|
7311
7312
|
params: filter
|
|
7312
7313
|
});
|
|
7313
7314
|
};
|
|
7314
|
-
var
|
|
7315
|
-
return api.get(
|
|
7315
|
+
var getById$3 = function getById(id) {
|
|
7316
|
+
return api.get(USER_URL$1 + "/" + id);
|
|
7316
7317
|
};
|
|
7317
|
-
var
|
|
7318
|
-
return api.post("" +
|
|
7318
|
+
var create$5 = function create(data) {
|
|
7319
|
+
return api.post("" + USER_URL$1, data);
|
|
7319
7320
|
};
|
|
7320
|
-
var
|
|
7321
|
-
return api.put(
|
|
7321
|
+
var update$5 = function update(data) {
|
|
7322
|
+
return api.put(USER_URL$1 + "/" + data.id, data);
|
|
7322
7323
|
};
|
|
7323
7324
|
var remove$3 = function remove(id) {
|
|
7324
7325
|
return api["delete"](EDU_USER_URL + "/delete-item-user/" + id);
|
|
@@ -7511,7 +7512,7 @@ var useFilters$1 = function useFilters() {
|
|
|
7511
7512
|
};
|
|
7512
7513
|
};
|
|
7513
7514
|
|
|
7514
|
-
var USER_URL$
|
|
7515
|
+
var USER_URL$2 = "/admin/user";
|
|
7515
7516
|
var CREATE_USER_URL = "/admin/create-user";
|
|
7516
7517
|
var TITLE$7 = "User list";
|
|
7517
7518
|
var HOMEPAGE_TEACHER$1 = "/home";
|
|
@@ -7782,7 +7783,7 @@ var useUserList = function useUserList() {
|
|
|
7782
7783
|
}, [filters]);
|
|
7783
7784
|
|
|
7784
7785
|
var reDirectDetailPage = function reDirectDetailPage(id) {
|
|
7785
|
-
var url = !!id ? USER_URL$
|
|
7786
|
+
var url = !!id ? USER_URL$2 + "/" + id : CREATE_USER_URL;
|
|
7786
7787
|
history.push(url);
|
|
7787
7788
|
};
|
|
7788
7789
|
|
|
@@ -8682,7 +8683,7 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
8682
8683
|
dispatch(setLoading(true));
|
|
8683
8684
|
|
|
8684
8685
|
var _temp4 = _catch(function () {
|
|
8685
|
-
return Promise.resolve(
|
|
8686
|
+
return Promise.resolve(getById$3(id)).then(function (res) {
|
|
8686
8687
|
var _res$data$roles, _res$data, _res$data2;
|
|
8687
8688
|
|
|
8688
8689
|
setUserDetail(_extends({}, res.data, {
|
|
@@ -8719,11 +8720,11 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
8719
8720
|
|
|
8720
8721
|
var _temp10 = _catch(function () {
|
|
8721
8722
|
function _temp6() {
|
|
8722
|
-
var next = !!id ?
|
|
8723
|
+
var next = !!id ? update$5 : create$5;
|
|
8723
8724
|
!id && delete data.id;
|
|
8724
8725
|
return Promise.resolve(next(data)).then(function (result) {
|
|
8725
8726
|
if (!!result) {
|
|
8726
|
-
|
|
8727
|
+
getById$3(result.data.id).then(function (e) {
|
|
8727
8728
|
backToList(e.data.fullName);
|
|
8728
8729
|
});
|
|
8729
8730
|
}
|