mario-education 2.4.188-level → 2.4.189-level

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/configs/utils.d.ts

@@ -102,7 +102,7 @@ export declare const convertDataToSeriesBullderChart: (data: IReadinessToLearnin
     name: string;
     data: import("react").ReactText[][];
 }[];
-export declare const optionColumnChartAndPercents: (months: string[], activeData: boolean[], isRidgeCharts: boolean, colors: string[], maxSeries: number, dayOfWeek: string[], isCountSeries?: boolean | undefined) => ApexOptions;
+export declare const optionColumnChartAndPercents: (months: string[], activeData: boolean[], isRidgeCharts: boolean, colors: string[], dayOfWeek: string[], isCountSeries?: boolean | undefined) => ApexOptions;
 export declare const optionLineChart: (months: string[], activeData: boolean[], colors: string[], dayOfWeek: string[]) => ApexOptions;
 export declare const optionBarChartAndArea: (months: string[], activeData: boolean[], dayOfWeek: string[], newseries?: any) => ApexOptions;
 export declare const overallDonutCHartOptions: (labelNames: string[], colors: string[], isCountSeries?: boolean | undefined, textColors?: string[] | undefined) => ApexOptions;

package/dist/MarioFramework.Education/ClientApp/src/containers/OneRoster/components/ImportOneRoster.d.ts

@@ -1,6 +1,6 @@
 import { FC } from "react";
 interface Props {
-    disabledImportRest: boolean;
+    errorImportRest?: string | null;
 }
 declare const ImportOneRoster: FC<Props>;
 export default ImportOneRoster;

package/dist/MarioFramework.Education/ClientApp/src/containers/OneRoster/hooks/useImportOneRoster.d.ts

@@ -7,7 +7,9 @@ interface UploadInfo {
     rejectedFiles?: string;
     comment?: string;
 }
-declare const useImportOneRoster: () => {
+declare const useImportOneRoster: ({ errorImportRest }: {
+    errorImportRest: any;
+}) => {
     inputRef: React.RefObject<HTMLInputElement>;
     fileProgress: number;
     uploadInfo: UploadInfo | undefined;

package/dist/MarioFramework.Education/ClientApp/src/containers/OneRoster/hooks/userRosterConfigForm.d.ts

@@ -1,7 +1,7 @@
 import { ROSTER_CONFIG } from "../utils/types";
 declare const useRosterConfigForm: () => {
     rosterConfig: ROSTER_CONFIG;
-    disabledImportRest: boolean;
+    errorImportRest: string | null;
     updateData: (values: any) => Promise<void>;
 };
 export default useRosterConfigForm;

package/dist/index.js

@@ -12384,7 +12384,8 @@ var styles$1 = {"spinner":"_2r0G1","spin":"_2fufb","success-block":"_3gvpw","mid
 var CSV_FILE_NAMES = ["academicSession", "classes", "resources", "courses", "orgs", "categories", "lineItems", "results", "users", "enrollments", "demographics"];
 var INVALID_CLIENT_ROSTER_CONFIG = "Response status code does not indicate success: 403 ().";
 
-var useImportOneRoster = function useImportOneRoster() {
+var useImportOneRoster = function useImportOneRoster(_ref) {
+  var errorImportRest = _ref.errorImportRest;
   var dispatch = reactRedux.useDispatch();
   var inputRef = React.useRef(null);
 
@@ -12423,9 +12424,16 @@ var useImportOneRoster = function useImportOneRoster() {
       return Promise.reject(e);
     }
   }, [JSON.stringify(restApiInfo)]);
-
-  var handleImportFromRestfulApi = function handleImportFromRestfulApi() {
+  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(CSV_FILE_NAMES.map(function (fileName) {
@@ -12436,8 +12444,7 @@ var useImportOneRoster = function useImportOneRoster() {
     } catch (e) {
       return Promise.reject(e);
     }
-  };
-
+  }, [errorImportRest]);
   var importRosterZipFile = React.useCallback(function (file) {
     try {
       var _temp5 = function _temp5() {
@@ -12622,9 +12629,11 @@ var useImportOneRoster = function useImportOneRoster() {
 };
 
 var ImportOneRoster = function ImportOneRoster(_ref) {
-  var disabledImportRest = _ref.disabledImportRest;
+  var errorImportRest = _ref.errorImportRest;
 
-  var _useImportOneRoster = useImportOneRoster(),
+  var _useImportOneRoster = useImportOneRoster({
+    errorImportRest: errorImportRest
+  }),
       inputRef = _useImportOneRoster.inputRef,
       fileProgress = _useImportOneRoster.fileProgress,
       uploadInfo = _useImportOneRoster.uploadInfo,
@@ -12673,11 +12682,8 @@ var ImportOneRoster = function ImportOneRoster(_ref) {
   }, React__default.createElement(reactstrap.Button, {
     color: "primary",
     className: "w-100 mt-4 mb-1",
-    disabled: disabledImportRest,
     onClick: handleImportFromRestfulApi
-  }, "Import from Restful api"), disabledImportRest && React__default.createElement("span", {
-    className: "text-danger"
-  }, "Client Id and Client Secret are required"), React__default.createElement("div", {
+  }, "Import from Restful api"), React__default.createElement("div", {
     className: "mt-2"
   }, restApiProgress)));
 };
@@ -12756,15 +12762,19 @@ var useRosterConfigForm = function useRosterConfigForm() {
       return Promise.reject(e);
     }
   }, []);
-  var disabledImportRest = React.useMemo(function () {
-    return !rosterConfig.clientId.trim().length || !rosterConfig.clientSecret.trim().length;
+  var errorImportRest = React.useMemo(function () {
+    if (!rosterConfig.clientId.trim().length && !rosterConfig.clientSecret.trim().length) return "Client Id and Client Secret are required";
+    if (!rosterConfig.clientId.trim().length) return "Client Id is required";
+    if (!rosterConfig.clientSecret.trim().length) return "Client Secret is required";
+    return null;
   }, [JSON.stringify(rosterConfig)]);
   React.useEffect(function () {
+    document.title = "One Roster";
     getData();
   }, []);
   return {
     rosterConfig: rosterConfig,
-    disabledImportRest: disabledImportRest,
+    errorImportRest: errorImportRest,
     updateData: updateData
   };
 };
@@ -12772,7 +12782,7 @@ var useRosterConfigForm = function useRosterConfigForm() {
 var OneRoster = function OneRoster() {
   var _useRosterConfigForm = useRosterConfigForm(),
       rosterConfig = _useRosterConfigForm.rosterConfig,
-      disabledImportRest = _useRosterConfigForm.disabledImportRest,
+      errorImportRest = _useRosterConfigForm.errorImportRest,
       updateData = _useRosterConfigForm.updateData;
 
   return React__default.createElement("div", {
@@ -12789,7 +12799,7 @@ var OneRoster = function OneRoster() {
   }), React__default.createElement(reactstrap.Col, {
     md: 7
   }, React__default.createElement(ImportOneRoster, {
-    disabledImportRest: disabledImportRest
+    errorImportRest: errorImportRest
   }))));
 };
 
@@ -29270,7 +29280,7 @@ var convertDataToSeriesBullderChart = function convertDataToSeriesBullderChart(d
     };
   });
 };
-var optionColumnChartAndPercents = function optionColumnChartAndPercents(months, activeData, isRidgeCharts, colors, maxSeries, dayOfWeek, isCountSeries) {
+var optionColumnChartAndPercents = function optionColumnChartAndPercents(months, activeData, isRidgeCharts, colors, dayOfWeek, isCountSeries) {
   return {
     chart: {
       height: 350,
@@ -29334,7 +29344,7 @@ var optionColumnChartAndPercents = function optionColumnChartAndPercents(months,
     yaxis: {
       tickAmount: 5,
       min: 0,
-      max: maxSeries > 100 ? maxSeries + 20 : 100,
+      max: 100,
       axisBorder: {
         show: true
       },
@@ -30166,9 +30176,7 @@ var useChartDatas = function useChartDatas() {
       topLearningStrategies = _useDashboard.topLearningStrategies,
       readinessToLearning = _useDashboard.readinessToLearning,
       handleChangeFilters = _useDashboard.handleChangeFilters,
-      handleChangeAcademicYearFilters = _useDashboard.handleChangeAcademicYearFilters,
       bandScore = _useDashboard.bandScore,
-      academicYear = _useDashboard.academicYear,
       user = _useDashboard.user,
       studentDefault = _useDashboard.studentDefault,
       handleFilterStudent = _useDashboard.handleFilterStudent,
@@ -30243,21 +30251,6 @@ var useChartDatas = function useChartDatas() {
     setSelectedToPrint(updateSelectToPrint);
   };
 
-  var academicYearItem = React.useMemo(function () {
-    if ((academicYear === null || academicYear === void 0 ? void 0 : academicYear.length) > 0) {
-      return academicYear.map(function (item) {
-        return {
-          value: item.id,
-          label: moment(item.startTime).year() + " - " + moment(item.endTime).year(),
-          startTime: item.startTime,
-          endTime: item.endTime,
-          isCurrent: item.isCurrent
-        };
-      });
-    }
-
-    return [];
-  }, [academicYear]);
   var LIST_FILTERS_LEFT = [{
     name: FILTER_NAME.Calendar,
     icon: "/images/calendar.svg",
@@ -30304,13 +30297,6 @@ var useChartDatas = function useChartDatas() {
       value: -1,
       label: "All"
     }].concat(bandScore)
-  }, {
-    name: FILTER_NAME.AcademicYear,
-    icon: "/images/student-icon.svg",
-    handleChangeFilters: handleChangeAcademicYearFilters,
-    option: [].concat(academicYearItem),
-    labelBox: labelBox,
-    setLabelBox: setLabelBox
   }];
   var LIST_FILTERS_RIGHT = [{
     name: FILTER_NAME.StudentName,
@@ -31231,10 +31217,7 @@ var AreaChart = function AreaChart(_ref) {
       colors = _ref.colors,
       dayOfWeek = _ref.dayOfWeek,
       isCountSeries = _ref.isCountSeries;
-  var maxSeries = series.reduce(function (max, item) {
-    return Math.max.apply(Math, [max].concat(item.data));
-  }, -Infinity) || 0;
-  var options = optionColumnChartAndPercents(months, activeColumn, true, colors, maxSeries, dayOfWeek, isCountSeries);
+  var options = optionColumnChartAndPercents(months, activeColumn, true, colors, dayOfWeek, isCountSeries);
   options.tooltip = {
     custom: function custom(_ref2) {
       var dataPointIndex = _ref2.dataPointIndex,
@@ -31263,11 +31246,8 @@ var BarChart = function BarChart(_ref) {
       activeColumn = _ref.activeColumn,
       colors = _ref.colors,
       dayOfWeek = _ref.dayOfWeek;
-  var maxSeries = series.reduce(function (max, item) {
-    return Math.max.apply(Math, [max].concat(item.data));
-  }, -Infinity) || 0;
   return React__default.createElement(Chart, {
-    options: optionColumnChartAndPercents(months, activeColumn, false, colors, maxSeries, dayOfWeek),
+    options: optionColumnChartAndPercents(months, activeColumn, false, colors, dayOfWeek),
     type: "bar",
     series: series,
     width: "100%",