mario-education 2.4.533-feedback → 2.4.535-feedback

package/dist/containers/ExternalApi/configs/types.d.ts

@@ -4,6 +4,7 @@ export interface IPermission {
     classReflections: string[];
     surveys: string[];
     students: string[];
+    staffs: string[];
 }
 export interface IAccessToken {
     permission: IPermission;

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

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

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

@@ -0,0 +1,8 @@
+import { FC } from "react";
+import { VERA_CROSS_CONFIG } from "../configs/types";
+interface Props {
+    veraCrossConfig: VERA_CROSS_CONFIG;
+    updateData: Function;
+}
+declare const VeraCrossConfigForm: FC<Props>;
+export default VeraCrossConfigForm;

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

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

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

@@ -23,3 +23,9 @@ export declare enum UserRosterSortBy {
     EMAIL = "Email",
     ROLE = "Role"
 }
+export declare type VERA_CROSS_CONFIG = {
+    cronjobTime: string;
+    clientId: string;
+    clientSecret: string;
+    endPointUrl: string;
+};

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

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

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

@@ -0,0 +1,7 @@
+import { VERA_CROSS_CONFIG } from "../configs/types";
+declare const userVeraCrossConfigForm: () => {
+    veraCrossConfig: VERA_CROSS_CONFIG;
+    errorImportRest: string | null;
+    updateData: (values: any) => Promise<void>;
+};
+export default userVeraCrossConfigForm;

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

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

package/dist/index.js

@@ -40901,12 +40901,23 @@ var IMPORT_ZIP_ROSTER_URL = marioCore.BASE_URL + "/api/ImportOneRoster/file";
 var IMPORT_RESTFUL_API_ROSTER_URL = marioCore.BASE_URL + "/api/ImportRestApiRoster/rest";
 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 getRosterConfig = function getRosterConfig() {
   return marioCore.api.get(ROSTER_URL);
 };
+var getVeraCrossConfig = function getVeraCrossConfig() {
+  return marioCore.api.get(VERA_CROSS_URL);
+};
+var updateVeraCrossConfig = function updateVeraCrossConfig(data) {
+  return marioCore.api.put("" + VERA_CROSS_URL, data);
+};
 var updateRosterConfig = function updateRosterConfig(data) {
   return marioCore.api.put("" + ROSTER_URL, data);
 };
+var importVeraCrossFromRestfulApi = function importVeraCrossFromRestfulApi(fileName) {
+  return marioCore.api.post(IMPORT_RESTFUL_API_VERA_CROSS_URL + "?name=" + fileName);
+};
 var importRosterFromFile = function importRosterFromFile(body, cb) {
   return marioCore.api.post(IMPORT_ZIP_ROSTER_URL, body, {
     onUploadProgress: cb
@@ -40938,6 +40949,7 @@ var DEFAULT_FILTER$1 = {
   pageSize: DEFAULT_PAGE_SIZE$1.value,
   isCreated: false
 };
+var IMPORT_VERA_CROSS_NAME = ["users"];
 
 var useImportOneRoster = function useImportOneRoster(_ref) {
   var errorImportRest = _ref.errorImportRest;
@@ -49287,10 +49299,319 @@ var OneRosterUserList = function OneRosterUserList() {
   }))));
 };
 
+var VeraCrossConfigForm = function VeraCrossConfigForm(_ref) {
+  var veraCrossConfig = _ref.veraCrossConfig,
+      updateData = _ref.updateData;
+
+  var _useTranslation = marioCore.useTranslation(),
+      t = _useTranslation.t;
+
+  return React__default.createElement(formik.Formik, {
+    initialValues: veraCrossConfig,
+    enableReinitialize: true,
+    onSubmit: function onSubmit(values) {
+      updateData(values);
+    }
+  }, function (formikProps) {
+    var values = formikProps.values,
+        handleChange = formikProps.handleChange,
+        handleBlur = formikProps.handleBlur,
+        handleSubmit = formikProps.handleSubmit;
+    return React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
+      md: 12
+    }, React__default.createElement("h5", {
+      className: "mt-4 font-weight-bold"
+    }, t("one_roster_config"))), React__default.createElement(reactstrap.Col, {
+      md: 12,
+      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, {
+      name: "cronjobTime",
+      placeholder: t("time_vera_cross_sync_hh"),
+      value: values.cronjobTime,
+      onChange: function onChange(e) {
+        handleChange(e);
+      },
+      onBlur: handleBlur("cronjobTime")
+    })), React__default.createElement(reactstrap.Col, {
+      md: 12,
+      className: "my-4 mt-2"
+    }, React__default.createElement(reactstrap.Label, {
+      className: "font-weight-bold"
+    }, t("end_point_url"), ":"), React__default.createElement(reactstrap.Input, {
+      name: "endPointUrl",
+      placeholder: t("end_point_url"),
+      value: values.endPointUrl,
+      onChange: function onChange(e) {
+        handleChange(e);
+      },
+      onBlur: handleBlur("endPointUrl")
+    })), React__default.createElement(reactstrap.Col, {
+      md: 12,
+      className: "mb-4 mt-2"
+    }, React__default.createElement(reactstrap.Label, {
+      className: "font-weight-bold"
+    }, t("client_id"), ":"), React__default.createElement(reactstrap.Input, {
+      name: "clientId",
+      placeholder: t("client_id"),
+      value: values.clientId,
+      onChange: function onChange(e) {
+        handleChange(e);
+      },
+      onBlur: handleBlur("clientId")
+    })), React__default.createElement(reactstrap.Col, {
+      md: 12,
+      className: "mb-4"
+    }, React__default.createElement(reactstrap.Label, {
+      className: "font-weight-bold"
+    }, t("client_secret"), ":"), React__default.createElement(reactstrap.Input, {
+      name: "clientSecret",
+      placeholder: t("client_secret"),
+      value: values.clientSecret,
+      onChange: function onChange(e) {
+        handleChange(e);
+      },
+      onBlur: handleBlur("clientSecret")
+    })), React__default.createElement(reactstrap.Col, {
+      md: 12,
+      className: "d-flex justify-content-end"
+    }, React__default.createElement(reactstrap.Button, {
+      onClick: function onClick() {
+        return handleSubmit();
+      },
+      color: "success"
+    }, t("save"))));
+  });
+};
+
+var initValue$s = {
+  cronjobTime: "",
+  clientId: "",
+  clientSecret: "",
+  endPointUrl: ""
+};
+
+var userVeraCross = function userVeraCross() {
+  var dispatch = reactRedux.useDispatch();
+
+  var _useState = React.useState(),
+      restApiInfo = _useState[0],
+      setRestApiInfo = _useState[1];
+
+  var _useState2 = React.useState(initValue$s),
+      veraCrossConfig = _useState2[0],
+      setVeraCrossConfig = _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(getVeraCrossConfig()).then(function (res) {
+          setVeraCrossConfig(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(updateVeraCrossConfig(values)).then(function (res) {
+          setVeraCrossConfig(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 (!veraCrossConfig.clientId.trim().length && !veraCrossConfig.clientSecret.trim().length && !veraCrossConfig.endPointUrl.trim().length) return "Client Id and Client Secret are required";
+    if (!veraCrossConfig.endPointUrl.trim().length) return "End Point URL is required";
+    if (!veraCrossConfig.clientId.trim().length) return "Client Id is required";
+    if (!veraCrossConfig.clientSecret.trim().length) return "Client Secret is required";
+    return null;
+  }, [JSON.stringify(veraCrossConfig)]);
+  var importRosterRestApi = React.useCallback(function (fileName) {
+    try {
+      var _temp10 = _catch(function () {
+        return Promise.resolve(importVeraCrossFromRestfulApi(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_VERA_CROSS_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 = "Veracross | Settings";
+    getData();
+  }, []);
+  return {
+    veraCrossConfig: veraCrossConfig,
+    errorImportRest: errorImportRest,
+    updateData: updateData,
+    restApiInfo: restApiInfo,
+    handleImportFromRestfulApi: handleImportFromRestfulApi
+  };
+};
+
+var RestApiProgress = function RestApiProgress(_ref) {
+  var restApiInfo = _ref.restApiInfo;
+  if (!restApiInfo) return null;
+  var info = IMPORT_VERA_CROSS_NAME.map(function (fileName) {
+    return {
+      name: fileName,
+      status: restApiInfo[fileName]
+    };
+  });
+  var filteredInfo = info.filter(function (i) {
+    return i.status !== "ResourceNotFound";
+  });
+  return React__default.createElement("div", null, filteredInfo.map(function (i) {
+    return React__default.createElement("div", {
+      key: i.name,
+      className: "flex items-center mb-2"
+    }, !i.status ? React__default.createElement(fa.FaSpinner, {
+      color: "#999999",
+      className: "mr-2 " + styles$5.spinner
+    }) : i.status === true ? React__default.createElement(fa.FaCheckCircle, {
+      color: "#28a745",
+      className: "mr-2"
+    }) : React__default.createElement(fa.FaTimesCircle, {
+      color: "#dc3545",
+      className: "mr-2"
+    }), React__default.createElement("b", null, i.name + ": "), "\xA0", !i.status ? "Importing..." : i.status === true ? "Import successful" : React__default.createElement("span", null, i.status === INVALID_CLIENT_ROSTER_CONFIG ? "Invalid Client Id and Client Secret" : i.status));
+  }));
+};
+
+var VeracrossImport = function VeracrossImport() {
+  var _userVeraCross = userVeraCross(),
+      veraCrossConfig = _userVeraCross.veraCrossConfig,
+      updateData = _userVeraCross.updateData,
+      restApiInfo = _userVeraCross.restApiInfo,
+      handleImportFromRestfulApi = _userVeraCross.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: veraCrossConfig,
+    updateData: updateData
+  })), 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_vera_cross"))), 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
+  })))))));
+};
+
 var tabs$9 = [{
   path: "/admin/one-rosters/settings",
   title: "one_roster_setting",
   component: OneRosterImport
+}, {
+  path: "/admin/one-rosters/veracross-settings",
+  title: "veracross_setting",
+  component: VeracrossImport
 }, {
   path: "/admin/one-rosters/users",
   title: "users",
@@ -72737,7 +73058,8 @@ var useExternalApi = function useExternalApi() {
               createDate: r.createDate,
               token: r.token,
               permission: _extends({}, permission, {
-                students: permission.students || []
+                students: permission.students || [],
+                staffs: permission.staffs || []
               })
             };
           }));
@@ -72851,7 +73173,9 @@ var initToken = {
     checkIns: ["GET"],
     classReflections: ["GET"],
     conferences: ["GET"],
-    surveys: ["GET"]
+    surveys: ["GET"],
+    staffs: ["GET"],
+    students: ["GET"]
   }
 };
 
@@ -72914,7 +73238,7 @@ var PermissionSelected = function PermissionSelected(_ref) {
 };
 
 var ExternalApi = function ExternalApi() {
-  var _tokenDetail$permissi, _tokenDetail$permissi2, _tokenDetail$permissi3, _tokenDetail$permissi4, _tokenDetail$permissi5;
+  var _tokenDetail$permissi, _tokenDetail$permissi2, _tokenDetail$permissi3, _tokenDetail$permissi4, _tokenDetail$permissi5, _tokenDetail$permissi6;
 
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
@@ -72962,10 +73286,12 @@ var ExternalApi = function ExternalApi() {
     className: "align-top"
   }, t("students")), React__default.createElement("th", {
     className: "align-top"
+  }, t("staffs")), React__default.createElement("th", {
+    className: "align-top"
   }, t("created_date")), React__default.createElement("th", {
     className: "text-center"
   }, t("action")))), React__default.createElement("tbody", null, tokens.map(function (record) {
-    var _record$permission, _record$permission$ch, _record$permission2, _record$permission2$c, _record$permission3, _record$permission3$c, _record$permission4, _record$permission4$s, _record$permission5, _record$permission5$s;
+    var _record$permission, _record$permission$ch, _record$permission2, _record$permission2$c, _record$permission3, _record$permission3$c, _record$permission4, _record$permission4$s, _record$permission5, _record$permission5$s, _record$permission6, _record$permission6$s;
 
     return React__default.createElement("tr", {
       key: record.id
@@ -72988,6 +73314,8 @@ var ExternalApi = function ExternalApi() {
       className: "align-middle"
     }, (_record$permission5 = record.permission) === null || _record$permission5 === void 0 ? void 0 : (_record$permission5$s = _record$permission5.students) === null || _record$permission5$s === void 0 ? void 0 : _record$permission5$s.toString()), React__default.createElement("td", {
       className: "align-middle"
+    }, (_record$permission6 = record.permission) === null || _record$permission6 === void 0 ? void 0 : (_record$permission6$s = _record$permission6.staffs) === null || _record$permission6$s === void 0 ? void 0 : _record$permission6$s.toString()), React__default.createElement("td", {
+      className: "align-middle"
     }, dateFns.format(new Date(record.createDate), DATE_RESULT)), React__default.createElement("td", {
       className: "text-center align-middle"
     }, React__default.createElement(marioCore.DeleteButtonIcon, {
@@ -73067,6 +73395,14 @@ var ExternalApi = function ExternalApi() {
     name: "students",
     onChange: handleChangePermission,
     permission: (tokenDetail === null || tokenDetail === void 0 ? void 0 : (_tokenDetail$permissi5 = tokenDetail.permission) === null || _tokenDetail$permissi5 === void 0 ? void 0 : _tokenDetail$permissi5.students) || []
+  })), React__default.createElement("div", {
+    className: "d-flex align-items-center mt-4"
+  }, React__default.createElement("h6", {
+    className: "mr-5 mb-0"
+  }, "Staffs:"), React__default.createElement(PermissionSelected, {
+    name: "staffs",
+    onChange: handleChangePermission,
+    permission: (tokenDetail === null || tokenDetail === void 0 ? void 0 : (_tokenDetail$permissi6 = tokenDetail.permission) === null || _tokenDetail$permissi6 === void 0 ? void 0 : _tokenDetail$permissi6.staffs) || []
   })))));
 };
 
@@ -73491,7 +73827,7 @@ var WeeklyQuest = function WeeklyQuest() {
   }))));
 };
 
-var initValue$s = {
+var initValue$t = {
   challenge: "",
   id: 0,
   order: 0,
@@ -73505,7 +73841,7 @@ var useWeeklyQuestDetail = function useWeeklyQuestDetail(id) {
   var dispatch = reactRedux.useDispatch();
   var history = reactRouterDom.useHistory();
 
-  var _useState = React.useState(initValue$s),
+  var _useState = React.useState(initValue$t),
       dataDetail = _useState[0],
       setDataDetail = _useState[1];
 
@@ -73527,7 +73863,7 @@ var useWeeklyQuestDetail = function useWeeklyQuestDetail(id) {
   }, [dataDetail]);
   React.useEffect(function () {
     id && getData();
-    return setDataDetail(initValue$s);
+    return setDataDetail(initValue$t);
   }, [id]);
   var getData = React.useCallback(function () {
     try {