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