mario-core 2.9.380-feedback → 2.9.381-feedback
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/containers/User/hooks/useUserDetail.d.ts +8 -0
- package/dist/index.js +87 -38
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +87 -38
- package/dist/index.modern.js.map +1 -1
- package/dist/services/userService.d.ts +1 -0
- package/dist/services/weeklyQuestService.d.ts +1 -0
- package/dist/types/WeeklyQuest.d.ts +37 -0
- package/package.json +1 -1
|
@@ -12,6 +12,13 @@ declare type UserDetail = {
|
|
|
12
12
|
sourcedId?: string;
|
|
13
13
|
teacherUserId?: string[];
|
|
14
14
|
};
|
|
15
|
+
declare type IUerRoleDataCheck = {
|
|
16
|
+
isHasTeacherData: boolean;
|
|
17
|
+
isHasEduTeacherData: boolean;
|
|
18
|
+
isHasAssistantData: boolean;
|
|
19
|
+
isHasCounselorData: boolean;
|
|
20
|
+
isHasSecondaryTeacherData: boolean;
|
|
21
|
+
};
|
|
15
22
|
declare const useUserDetail: (id?: string | undefined) => {
|
|
16
23
|
userDetail: UserDetail;
|
|
17
24
|
backToList: (user?: string | undefined) => void;
|
|
@@ -29,5 +36,6 @@ declare const useUserDetail: (id?: string | undefined) => {
|
|
|
29
36
|
teacherOptions: IOptions[];
|
|
30
37
|
openModel: boolean;
|
|
31
38
|
handleToggleModel: () => void;
|
|
39
|
+
userHasData: IUerRoleDataCheck;
|
|
32
40
|
};
|
|
33
41
|
export default useUserDetail;
|
package/dist/index.js
CHANGED
|
@@ -43119,6 +43119,9 @@ var getTeachers = function getTeachers(filters) {
|
|
|
43119
43119
|
var assignStudentsApi = function assignStudentsApi(data) {
|
|
43120
43120
|
return api.post(USER_URL$1 + "/student-assign", data);
|
|
43121
43121
|
};
|
|
43122
|
+
var userRoleHasData = function userRoleHasData(userId) {
|
|
43123
|
+
return api.get(BASE_URL + "/api/user/check-role-data/" + userId);
|
|
43124
|
+
};
|
|
43122
43125
|
|
|
43123
43126
|
var UserOrder;
|
|
43124
43127
|
|
|
@@ -45757,6 +45760,16 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45757
45760
|
edited = _useState5[0],
|
|
45758
45761
|
setEdited = _useState5[1];
|
|
45759
45762
|
|
|
45763
|
+
var _useState6 = React.useState({
|
|
45764
|
+
isHasAssistantData: false,
|
|
45765
|
+
isHasCounselorData: false,
|
|
45766
|
+
isHasEduTeacherData: false,
|
|
45767
|
+
isHasSecondaryTeacherData: false,
|
|
45768
|
+
isHasTeacherData: false
|
|
45769
|
+
}),
|
|
45770
|
+
userHasData = _useState6[0],
|
|
45771
|
+
setUserHasData = _useState6[1];
|
|
45772
|
+
|
|
45760
45773
|
var setEditedTrue = function setEditedTrue() {
|
|
45761
45774
|
try {
|
|
45762
45775
|
localStorage.setItem(window.location.href, "true");
|
|
@@ -45767,9 +45780,9 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45767
45780
|
}
|
|
45768
45781
|
};
|
|
45769
45782
|
|
|
45770
|
-
var
|
|
45771
|
-
currentRoles =
|
|
45772
|
-
setCurrentRoles =
|
|
45783
|
+
var _useState7 = React.useState([]),
|
|
45784
|
+
currentRoles = _useState7[0],
|
|
45785
|
+
setCurrentRoles = _useState7[1];
|
|
45773
45786
|
|
|
45774
45787
|
var handleToggleModel = function handleToggleModel() {
|
|
45775
45788
|
setOpenModel(!openModel);
|
|
@@ -45781,10 +45794,14 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45781
45794
|
if (!!localStorage.getItem(window.location.href)) localStorage.removeItem(window.location.href);
|
|
45782
45795
|
}, []);
|
|
45783
45796
|
React.useEffect(function () {
|
|
45784
|
-
!!id
|
|
45797
|
+
if (!!id) {
|
|
45798
|
+
getUserRoleHasData();
|
|
45799
|
+
getData();
|
|
45800
|
+
}
|
|
45801
|
+
|
|
45785
45802
|
!id && getDataTeachers();
|
|
45786
45803
|
}, [id]);
|
|
45787
|
-
var
|
|
45804
|
+
var getUserRoleHasData = React.useCallback(function () {
|
|
45788
45805
|
try {
|
|
45789
45806
|
var _temp3 = function _temp3() {
|
|
45790
45807
|
dispatch(setLoading(false));
|
|
@@ -45793,6 +45810,32 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45793
45810
|
dispatch(setLoading(true));
|
|
45794
45811
|
|
|
45795
45812
|
var _temp4 = _catch(function () {
|
|
45813
|
+
return Promise.resolve(userRoleHasData(id)).then(function (res) {
|
|
45814
|
+
setUserHasData(res.data);
|
|
45815
|
+
});
|
|
45816
|
+
}, function (err) {
|
|
45817
|
+
var _err$response, _err$response$data;
|
|
45818
|
+
|
|
45819
|
+
dispatch(setAlert({
|
|
45820
|
+
type: "danger",
|
|
45821
|
+
message: ((_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.title) || err.message
|
|
45822
|
+
}));
|
|
45823
|
+
});
|
|
45824
|
+
|
|
45825
|
+
return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
|
|
45826
|
+
} catch (e) {
|
|
45827
|
+
return Promise.reject(e);
|
|
45828
|
+
}
|
|
45829
|
+
}, [id]);
|
|
45830
|
+
var getData = React.useCallback(function () {
|
|
45831
|
+
try {
|
|
45832
|
+
var _temp7 = function _temp7() {
|
|
45833
|
+
dispatch(setLoading(false));
|
|
45834
|
+
};
|
|
45835
|
+
|
|
45836
|
+
dispatch(setLoading(true));
|
|
45837
|
+
|
|
45838
|
+
var _temp8 = _catch(function () {
|
|
45796
45839
|
return Promise.resolve(getById$3(id)).then(function (res) {
|
|
45797
45840
|
var _res$data$roles, _res$data, _res$data2;
|
|
45798
45841
|
|
|
@@ -45804,15 +45847,15 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45804
45847
|
document.title = (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.fullName;
|
|
45805
45848
|
});
|
|
45806
45849
|
}, function (err) {
|
|
45807
|
-
var _err$
|
|
45850
|
+
var _err$response2, _err$response2$data;
|
|
45808
45851
|
|
|
45809
45852
|
dispatch(setAlert({
|
|
45810
45853
|
type: "danger",
|
|
45811
|
-
message: ((_err$
|
|
45854
|
+
message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || err.message
|
|
45812
45855
|
}));
|
|
45813
45856
|
});
|
|
45814
45857
|
|
|
45815
|
-
return Promise.resolve(
|
|
45858
|
+
return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
|
|
45816
45859
|
} catch (e) {
|
|
45817
45860
|
return Promise.reject(e);
|
|
45818
45861
|
}
|
|
@@ -45820,7 +45863,7 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45820
45863
|
|
|
45821
45864
|
var getDataTeachers = function getDataTeachers() {
|
|
45822
45865
|
try {
|
|
45823
|
-
var
|
|
45866
|
+
var _temp10 = _catch(function () {
|
|
45824
45867
|
return Promise.resolve(getTeachers({
|
|
45825
45868
|
sortBy: "Email"
|
|
45826
45869
|
})).then(function (res) {
|
|
@@ -45834,15 +45877,15 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45834
45877
|
})) || []);
|
|
45835
45878
|
});
|
|
45836
45879
|
}, function (err) {
|
|
45837
|
-
var _err$
|
|
45880
|
+
var _err$response3, _err$response3$data;
|
|
45838
45881
|
|
|
45839
45882
|
dispatch(setAlert({
|
|
45840
45883
|
type: "danger",
|
|
45841
|
-
message: ((_err$
|
|
45884
|
+
message: ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.title) || err.message
|
|
45842
45885
|
}));
|
|
45843
45886
|
});
|
|
45844
45887
|
|
|
45845
|
-
return Promise.resolve(
|
|
45888
|
+
return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(function () {}) : void 0);
|
|
45846
45889
|
} catch (e) {
|
|
45847
45890
|
return Promise.reject(e);
|
|
45848
45891
|
}
|
|
@@ -45853,14 +45896,14 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45853
45896
|
}, []);
|
|
45854
45897
|
var confirmData = React.useCallback(function (data) {
|
|
45855
45898
|
try {
|
|
45856
|
-
var
|
|
45899
|
+
var _temp15 = function _temp15() {
|
|
45857
45900
|
dispatch(setLoading(false));
|
|
45858
45901
|
};
|
|
45859
45902
|
|
|
45860
45903
|
dispatch(setLoading(true));
|
|
45861
45904
|
|
|
45862
|
-
var
|
|
45863
|
-
function
|
|
45905
|
+
var _temp16 = _catch(function () {
|
|
45906
|
+
function _temp12() {
|
|
45864
45907
|
var next = !!id ? update$8 : create$8;
|
|
45865
45908
|
!id && delete data.id;
|
|
45866
45909
|
return Promise.resolve(next(data)).then(function (result) {
|
|
@@ -45881,7 +45924,7 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45881
45924
|
});
|
|
45882
45925
|
}
|
|
45883
45926
|
|
|
45884
|
-
var
|
|
45927
|
+
var _temp11 = function () {
|
|
45885
45928
|
if (!!file) {
|
|
45886
45929
|
var formData = new FormData();
|
|
45887
45930
|
var name = file.name;
|
|
@@ -45895,17 +45938,17 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45895
45938
|
}
|
|
45896
45939
|
}();
|
|
45897
45940
|
|
|
45898
|
-
return
|
|
45941
|
+
return _temp11 && _temp11.then ? _temp11.then(_temp12) : _temp12(_temp11);
|
|
45899
45942
|
}, function (err) {
|
|
45900
|
-
var _err$
|
|
45943
|
+
var _err$response4, _err$response4$data;
|
|
45901
45944
|
|
|
45902
45945
|
dispatch(setAlert({
|
|
45903
45946
|
type: "danger",
|
|
45904
|
-
message: ((_err$
|
|
45947
|
+
message: ((_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.title) || err.message
|
|
45905
45948
|
}));
|
|
45906
45949
|
});
|
|
45907
45950
|
|
|
45908
|
-
return Promise.resolve(
|
|
45951
|
+
return Promise.resolve(_temp16 && _temp16.then ? _temp16.then(_temp15) : _temp15(_temp16));
|
|
45909
45952
|
} catch (e) {
|
|
45910
45953
|
return Promise.reject(e);
|
|
45911
45954
|
}
|
|
@@ -45917,13 +45960,13 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45917
45960
|
|
|
45918
45961
|
var confirmChangePassword = function confirmChangePassword(data) {
|
|
45919
45962
|
try {
|
|
45920
|
-
var
|
|
45963
|
+
var _temp19 = function _temp19() {
|
|
45921
45964
|
dispatch(setLoading(false));
|
|
45922
45965
|
};
|
|
45923
45966
|
|
|
45924
45967
|
dispatch(setLoading(true));
|
|
45925
45968
|
|
|
45926
|
-
var
|
|
45969
|
+
var _temp20 = _catch(function () {
|
|
45927
45970
|
return Promise.resolve(changePassword(data)).then(function () {
|
|
45928
45971
|
dispatch(setAlert({
|
|
45929
45972
|
type: "success",
|
|
@@ -45939,7 +45982,7 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45939
45982
|
}));
|
|
45940
45983
|
});
|
|
45941
45984
|
|
|
45942
|
-
return Promise.resolve(
|
|
45985
|
+
return Promise.resolve(_temp20 && _temp20.then ? _temp20.then(_temp19) : _temp19(_temp20));
|
|
45943
45986
|
} catch (e) {
|
|
45944
45987
|
return Promise.reject(e);
|
|
45945
45988
|
}
|
|
@@ -45947,13 +45990,13 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45947
45990
|
|
|
45948
45991
|
var forgotPasswordRequest = React.useCallback(function (data) {
|
|
45949
45992
|
try {
|
|
45950
|
-
var
|
|
45993
|
+
var _temp23 = function _temp23() {
|
|
45951
45994
|
dispatch(setLoading(false));
|
|
45952
45995
|
};
|
|
45953
45996
|
|
|
45954
45997
|
dispatch(setLoading(true));
|
|
45955
45998
|
|
|
45956
|
-
var
|
|
45999
|
+
var _temp24 = _catch(function () {
|
|
45957
46000
|
return Promise.resolve(forgotChangePassword(data)).then(function () {
|
|
45958
46001
|
dispatch(setAlert({
|
|
45959
46002
|
type: "success",
|
|
@@ -45961,28 +46004,28 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45961
46004
|
}));
|
|
45962
46005
|
});
|
|
45963
46006
|
}, function (err) {
|
|
45964
|
-
var _err$
|
|
46007
|
+
var _err$response5, _err$response5$data;
|
|
45965
46008
|
|
|
45966
46009
|
dispatch(setAlert({
|
|
45967
46010
|
type: "danger",
|
|
45968
|
-
message: ((_err$
|
|
46011
|
+
message: ((_err$response5 = err.response) === null || _err$response5 === void 0 ? void 0 : (_err$response5$data = _err$response5.data) === null || _err$response5$data === void 0 ? void 0 : _err$response5$data.title) || err.message || "Error occured"
|
|
45969
46012
|
}));
|
|
45970
46013
|
});
|
|
45971
46014
|
|
|
45972
|
-
return Promise.resolve(
|
|
46015
|
+
return Promise.resolve(_temp24 && _temp24.then ? _temp24.then(_temp23) : _temp23(_temp24));
|
|
45973
46016
|
} catch (e) {
|
|
45974
46017
|
return Promise.reject(e);
|
|
45975
46018
|
}
|
|
45976
46019
|
}, []);
|
|
45977
46020
|
var handleResetPassword = React.useCallback(function (userId) {
|
|
45978
46021
|
try {
|
|
45979
|
-
var
|
|
46022
|
+
var _temp27 = function _temp27() {
|
|
45980
46023
|
dispatch(setLoading(false));
|
|
45981
46024
|
};
|
|
45982
46025
|
|
|
45983
46026
|
dispatch(setLoading(true));
|
|
45984
46027
|
|
|
45985
|
-
var
|
|
46028
|
+
var _temp28 = _catch(function () {
|
|
45986
46029
|
var form = {
|
|
45987
46030
|
userId: userId
|
|
45988
46031
|
};
|
|
@@ -45997,15 +46040,15 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
45997
46040
|
}
|
|
45998
46041
|
});
|
|
45999
46042
|
}, function (err) {
|
|
46000
|
-
var _err$
|
|
46043
|
+
var _err$response6, _err$response6$data;
|
|
46001
46044
|
|
|
46002
46045
|
dispatch(setAlert({
|
|
46003
46046
|
type: "danger",
|
|
46004
|
-
message: ((_err$
|
|
46047
|
+
message: ((_err$response6 = err.response) === null || _err$response6 === void 0 ? void 0 : (_err$response6$data = _err$response6.data) === null || _err$response6$data === void 0 ? void 0 : _err$response6$data.title) || err.message
|
|
46005
46048
|
}));
|
|
46006
46049
|
});
|
|
46007
46050
|
|
|
46008
|
-
return Promise.resolve(
|
|
46051
|
+
return Promise.resolve(_temp28 && _temp28.then ? _temp28.then(_temp27) : _temp27(_temp28));
|
|
46009
46052
|
} catch (e) {
|
|
46010
46053
|
return Promise.reject(e);
|
|
46011
46054
|
}
|
|
@@ -46026,7 +46069,8 @@ var useUserDetail = function useUserDetail(id) {
|
|
|
46026
46069
|
handleResetPassword: handleResetPassword,
|
|
46027
46070
|
teacherOptions: teacherOptions,
|
|
46028
46071
|
openModel: openModel,
|
|
46029
|
-
handleToggleModel: handleToggleModel
|
|
46072
|
+
handleToggleModel: handleToggleModel,
|
|
46073
|
+
userHasData: userHasData
|
|
46030
46074
|
};
|
|
46031
46075
|
};
|
|
46032
46076
|
|
|
@@ -46239,7 +46283,8 @@ var UserDetail = function UserDetail() {
|
|
|
46239
46283
|
handleResetPassword = _useUserDetail.handleResetPassword,
|
|
46240
46284
|
teacherOptions = _useUserDetail.teacherOptions,
|
|
46241
46285
|
openModel = _useUserDetail.openModel,
|
|
46242
|
-
handleToggleModel = _useUserDetail.handleToggleModel
|
|
46286
|
+
handleToggleModel = _useUserDetail.handleToggleModel,
|
|
46287
|
+
userHasData = _useUserDetail.userHasData;
|
|
46243
46288
|
|
|
46244
46289
|
var initialValueForm = {
|
|
46245
46290
|
oldPassword: "",
|
|
@@ -46396,10 +46441,14 @@ var UserDetail = function UserDetail() {
|
|
|
46396
46441
|
label: role === "SecondaryTeacher" ? "SupportTeacher" : "" + role,
|
|
46397
46442
|
checked: values.roles.includes(role),
|
|
46398
46443
|
onChange: function onChange() {
|
|
46399
|
-
|
|
46400
|
-
|
|
46444
|
+
if (!!id && (userHasData.isHasTeacherData && role === "Teacher" || userHasData.isHasAssistantData && role === "Assistant" || userHasData.isHasCounselorData && role === "Counselor" || userHasData.isHasSecondaryTeacherData && role === "SecondaryTeacher" || (role == "Student" || role == "General ED teacher") && (userHasData.isHasAssistantData || userHasData.isHasCounselorData || userHasData.isHasSecondaryTeacherData || userHasData.isHasTeacherData))) {
|
|
46445
|
+
alert("Please switch data before removing the role");
|
|
46446
|
+
} else {
|
|
46447
|
+
toggleRoles(role);
|
|
46448
|
+
setEditedTrue();
|
|
46449
|
+
}
|
|
46401
46450
|
},
|
|
46402
|
-
disabled: !!id ? currentRoles.concat(["Student", "Parent", "General ED teacher"]).includes(role) || currentRoles.every(handleDisableRoles) : ["Parent"].includes(role)
|
|
46451
|
+
disabled: currentRoles.includes("Parent") || currentRoles.includes("Student") && !!id ? currentRoles.concat(["Student", "Parent", "General ED teacher"]).includes(role) || currentRoles.every(handleDisableRoles) : ["Parent"].includes(role)
|
|
46403
46452
|
}));
|
|
46404
46453
|
}))), touched.roles && errors.roles && React__default.createElement(ErrorHandler, {
|
|
46405
46454
|
text: errors.roles
|