mario-education 2.4.538-feedback → 2.4.539-feedback

package/dist/containers/OneRosterSystem/components/RestApiProgress.d.ts

@@ -1,6 +1,7 @@
 import React from "react";
 interface RestApiProgressProps {
     restApiInfo?: object;
+    importInfo: string[];
 }
 declare const RestApiProgress: React.FC<RestApiProgressProps>;
 export default RestApiProgress;

package/dist/containers/OneRosterSystem/components/VeraCrossConfigForm.d.ts

@@ -3,6 +3,7 @@ import { VERA_CROSS_CONFIG } from "../configs/types";
 interface Props {
     veraCrossConfig: VERA_CROSS_CONFIG;
     updateData: Function;
+    labelTime?: string;
 }
 declare const VeraCrossConfigForm: FC<Props>;
 export default VeraCrossConfigForm;

package/dist/containers/OneRosterSystem/configs/constants.d.ts

@@ -11,3 +11,4 @@ export declare const DEFAULT_PAGE_SIZE: {
 };
 export declare const DEFAULT_FILTER: UserRosterFilter;
 export declare const IMPORT_VERA_CROSS_NAME: string[];
+export declare const IMPORT_OPEN_APPLY_NAME: string[];

package/dist/containers/OneRosterSystem/hooks/userOpenApply.d.ts

@@ -0,0 +1,9 @@
+import { VERA_CROSS_CONFIG } from "../configs/types";
+declare const userOpenApply: () => {
+    openApplyConfig: VERA_CROSS_CONFIG;
+    errorImportRest: string | null;
+    updateData: (values: any) => Promise<void>;
+    restApiInfo: object | undefined;
+    handleImportFromRestfulApi: () => Promise<void>;
+};
+export default userOpenApply;

package/dist/containers/OneRosterSystem/views/OpenApplyImport.d.ts

@@ -0,0 +1,2 @@
+declare const OpenApplyImport: () => JSX.Element;
+export default OpenApplyImport;

package/dist/index.js

@@ -42046,6 +42046,8 @@ var ONE_ROSTER_USER_URL = marioCore.BASE_URL + "/api/usersOneRoster";
 var EDU_ROSTER_USER_URL = marioCore.BASE_URL + "/api/User/roster-users";
 var VERA_CROSS_URL = marioCore.BASE_URL + "/api/veraCross";
 var IMPORT_RESTFUL_API_VERA_CROSS_URL = marioCore.BASE_URL + "/api/ImportRestApiVeraCross/rest";
+var OPEN_APPLY_URL = marioCore.BASE_URL + "/api/openApply";
+var IMPORT_RESTFUL_API_OPEN_APPLY_URL = marioCore.BASE_URL + "/api/ImportRestApiOpenApply/rest";
 var getRosterConfig = function getRosterConfig() {
   return marioCore.api.get(ROSTER_URL);
 };
@@ -42058,6 +42060,15 @@ var updateVeraCrossConfig = function updateVeraCrossConfig(data) {
 var updateRosterConfig = function updateRosterConfig(data) {
   return marioCore.api.put("" + ROSTER_URL, data);
 };
+var getOpenApplyConfig = function getOpenApplyConfig() {
+  return marioCore.api.get(OPEN_APPLY_URL);
+};
+var updateOpenApplyConfig = function updateOpenApplyConfig(data) {
+  return marioCore.api.put("" + OPEN_APPLY_URL, data);
+};
+var importOpenApplyFromRestfulApi = function importOpenApplyFromRestfulApi(fileName) {
+  return marioCore.api.post(IMPORT_RESTFUL_API_OPEN_APPLY_URL + "?name=" + fileName);
+};
 var importVeraCrossFromRestfulApi = function importVeraCrossFromRestfulApi(fileName) {
   return marioCore.api.post(IMPORT_RESTFUL_API_VERA_CROSS_URL + "?name=" + fileName);
 };
@@ -42093,6 +42104,7 @@ var DEFAULT_FILTER$1 = {
   isCreated: false
 };
 var IMPORT_VERA_CROSS_NAME = ["students", "faculties"];
+var IMPORT_OPEN_APPLY_NAME = ["students", "parents"];
 
 var useImportOneRoster = function useImportOneRoster(_ref) {
   var errorImportRest = _ref.errorImportRest;
@@ -50444,7 +50456,9 @@ var OneRosterUserList = function OneRosterUserList() {
 
 var VeraCrossConfigForm = function VeraCrossConfigForm(_ref) {
   var veraCrossConfig = _ref.veraCrossConfig,
-      updateData = _ref.updateData;
+      updateData = _ref.updateData,
+      _ref$labelTime = _ref.labelTime,
+      labelTime = _ref$labelTime === void 0 ? "time_vera_cross_sync_hh" : _ref$labelTime;
 
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
@@ -50469,9 +50483,9 @@ var VeraCrossConfigForm = function VeraCrossConfigForm(_ref) {
       className: "my-4 mt-2"
     }, React__default.createElement(reactstrap.Label, {
       className: "font-weight-bold"
-    }, t("time_vera_cross_sync_hh")), React__default.createElement(reactstrap.Input, {
+    }, t(labelTime)), React__default.createElement(reactstrap.Input, {
       name: "cronjobTime",
-      placeholder: t("time_vera_cross_sync_hh"),
+      placeholder: t(labelTime),
       value: values.cronjobTime,
       onChange: function onChange(e) {
         handleChange(e);
@@ -50676,9 +50690,10 @@ var userVeraCross = function userVeraCross() {
 };
 
 var RestApiProgress = function RestApiProgress(_ref) {
-  var restApiInfo = _ref.restApiInfo;
+  var restApiInfo = _ref.restApiInfo,
+      importInfo = _ref.importInfo;
   if (!restApiInfo) return null;
-  var info = IMPORT_VERA_CROSS_NAME.map(function (fileName) {
+  var info = importInfo.map(function (fileName) {
     return {
       name: fileName,
       status: restApiInfo[fileName]
@@ -50743,7 +50758,200 @@ var VeracrossImport = function VeracrossImport() {
   }, t("import_from_restful_api")), React__default.createElement("div", {
     className: "mt-2"
   }, React__default.createElement(RestApiProgress, {
-    restApiInfo: restApiInfo
+    restApiInfo: restApiInfo,
+    importInfo: IMPORT_VERA_CROSS_NAME
+  })))))));
+};
+
+var initValue$t = {
+  cronjobTime: "",
+  clientId: "",
+  clientSecret: "",
+  endPointUrl: ""
+};
+
+var userOpenApply = function userOpenApply() {
+  var dispatch = reactRedux.useDispatch();
+
+  var _useState = React.useState(),
+      restApiInfo = _useState[0],
+      setRestApiInfo = _useState[1];
+
+  var _useState2 = React.useState(initValue$t),
+      openApplyConfig = _useState2[0],
+      setOpenApplyConfig = _useState2[1];
+
+  var getData = React.useCallback(function (loading) {
+    if (loading === void 0) {
+      loading = true;
+    }
+
+    try {
+      var _temp3 = function _temp3() {
+        if (loading) dispatch(marioCore.setLoading(false));
+      };
+
+      if (loading) dispatch(marioCore.setLoading(true));
+
+      var _temp4 = _catch(function () {
+        return Promise.resolve(getOpenApplyConfig()).then(function (res) {
+          setOpenApplyConfig(res.data);
+        });
+      }, function (err) {
+        var _err$response, _err$response$data;
+
+        if (loading) dispatch(marioCore.setAlert({
+          type: "danger",
+          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
+        }));
+      });
+
+      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, []);
+  var updateData = React.useCallback(function (values) {
+    try {
+      var _temp7 = function _temp7() {
+        dispatch(marioCore.setLoading(false));
+      };
+
+      dispatch(marioCore.setLoading(true));
+
+      var _temp8 = _catch(function () {
+        return Promise.resolve(updateOpenApplyConfig(values)).then(function (res) {
+          setOpenApplyConfig(res.data);
+          return Promise.resolve(getData(false)).then(function () {
+            dispatch(marioCore.setAlert({
+              type: "success",
+              message: "Update vera cross config successfully"
+            }));
+          });
+        });
+      }, function (err) {
+        var _err$response2, _err$response2$data;
+
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          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
+        }));
+      });
+
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, []);
+  var errorImportRest = React.useMemo(function () {
+    if (!openApplyConfig.clientId.trim().length && !openApplyConfig.clientSecret.trim().length && !openApplyConfig.endPointUrl.trim().length) return "Client Id and Client Secret are required";
+    if (!openApplyConfig.endPointUrl.trim().length) return "End Point URL is required";
+    if (!openApplyConfig.clientId.trim().length) return "Client Id is required";
+    if (!openApplyConfig.clientSecret.trim().length) return "Client Secret is required";
+    return null;
+  }, [JSON.stringify(openApplyConfig)]);
+  var importRosterRestApi = React.useCallback(function (fileName) {
+    try {
+      var _temp10 = _catch(function () {
+        return Promise.resolve(importOpenApplyFromRestfulApi(fileName)).then(function () {
+          setRestApiInfo(function (state) {
+            var _extends2;
+
+            return _extends({}, state, (_extends2 = {}, _extends2[fileName] = true, _extends2));
+          });
+        });
+      }, function (err) {
+        var _err$response3, _err$response3$data, _err$response3$data$t, _err$response3$data$t2;
+
+        var title = (_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$t = _err$response3$data.title) === null || _err$response3$data$t === void 0 ? void 0 : (_err$response3$data$t2 = _err$response3$data$t.replaceAll) === null || _err$response3$data$t2 === void 0 ? void 0 : _err$response3$data$t2.call(_err$response3$data$t, '"', "");
+        setRestApiInfo(function (state) {
+          var _extends3;
+
+          return _extends({}, state, (_extends3 = {}, _extends3[fileName] = title || err.message, _extends3));
+        });
+      });
+
+      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, [JSON.stringify(restApiInfo)]);
+  var handleImportFromRestfulApi = React.useCallback(function () {
+    try {
+      if (errorImportRest) {
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          message: errorImportRest + " (Please make sure your changes are saved)"
+        }));
+        return Promise.resolve();
+      }
+
+      setRestApiInfo({});
+      dispatch(marioCore.setLoading(true));
+      return Promise.resolve(Promise.all(IMPORT_OPEN_APPLY_NAME.map(function (fileName) {
+        return importRosterRestApi(fileName);
+      }))).then(function () {
+        dispatch(marioCore.setLoading(false));
+      });
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, [errorImportRest]);
+  React.useEffect(function () {
+    document.title = "Open Apply | Settings";
+    getData();
+  }, []);
+  return {
+    openApplyConfig: openApplyConfig,
+    errorImportRest: errorImportRest,
+    updateData: updateData,
+    restApiInfo: restApiInfo,
+    handleImportFromRestfulApi: handleImportFromRestfulApi
+  };
+};
+
+var OpenApplyImport = function OpenApplyImport() {
+  var _userOpenApply = userOpenApply(),
+      openApplyConfig = _userOpenApply.openApplyConfig,
+      updateData = _userOpenApply.updateData,
+      restApiInfo = _userOpenApply.restApiInfo,
+      handleImportFromRestfulApi = _userOpenApply.handleImportFromRestfulApi;
+
+  var _useTranslation = marioCore.useTranslation(),
+      t = _useTranslation.t;
+
+  return React__default.createElement("div", {
+    className: "fadeIn animated"
+  }, React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
+    md: 7
+  }, React__default.createElement(VeraCrossConfigForm, {
+    veraCrossConfig: openApplyConfig,
+    updateData: updateData,
+    labelTime: "time_open_apply_sync_hh"
+  })), React__default.createElement(reactstrap.Col, {
+    md: 5
+  }), React__default.createElement(reactstrap.Col, {
+    md: 7
+  }, React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
+    md: 12
+  }, React__default.createElement("h5", {
+    className: "mt-4",
+    style: {
+      fontWeight: 700
+    }
+  }, t("import_open_apply"))), React__default.createElement(reactstrap.Col, {
+    md: 6
+  }), React__default.createElement(reactstrap.Col, {
+    md: 6
+  }, React__default.createElement(reactstrap.Button, {
+    color: "primary",
+    className: "w-100 mt-4 mb-1",
+    onClick: handleImportFromRestfulApi
+  }, t("import_from_restful_api")), React__default.createElement("div", {
+    className: "mt-2"
+  }, React__default.createElement(RestApiProgress, {
+    restApiInfo: restApiInfo,
+    importInfo: IMPORT_OPEN_APPLY_NAME
   })))))));
 };
 
@@ -50755,6 +50963,10 @@ var tabs$9 = [{
   path: "/admin/one-rosters/veracross-settings",
   title: "veracross_setting",
   component: VeracrossImport
+}, {
+  path: "/admin/one-rosters/open-apply",
+  title: "open_apply_setting",
+  component: OpenApplyImport
 }, {
   path: "/admin/one-rosters/users",
   title: "users",
@@ -74803,7 +75015,7 @@ var WeeklyQuest = function WeeklyQuest() {
   }))));
 };
 
-var initValue$t = {
+var initValue$u = {
   challenge: "",
   id: 0,
   order: 0,
@@ -74817,7 +75029,7 @@ var useWeeklyQuestDetail = function useWeeklyQuestDetail(id) {
   var dispatch = reactRedux.useDispatch();
   var history = reactRouterDom.useHistory();
 
-  var _useState = React.useState(initValue$t),
+  var _useState = React.useState(initValue$u),
       dataDetail = _useState[0],
       setDataDetail = _useState[1];
 
@@ -74839,7 +75051,7 @@ var useWeeklyQuestDetail = function useWeeklyQuestDetail(id) {
   }, [dataDetail]);
   React.useEffect(function () {
     id && getData();
-    return setDataDetail(initValue$t);
+    return setDataDetail(initValue$u);
   }, [id]);
   var getData = React.useCallback(function () {
     try {