@newtonschool/react_proctoring_library 0.0.47 → 0.0.48

package/dist/components/permissions/index.js

@@ -13,6 +13,7 @@ require("./index.scss");
 var text = _interopRequireWildcard(require("../../constants/text"));
 var _permissionBody = require("./permission-body");
 var _breachUtils = require("../../utils/breachUtils");
+var _permission = require("../../utils/permission");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -20,10 +21,9 @@ const Permission = _ref => {
   let {
     proctorParams,
     permissions,
-    askPermission,
-    hasAllPermission
+    askPermission
   } = _ref;
-  const showPermissionModal = !hasAllPermission((0, _breachUtils.getRequiredPermissionsFromProctorParams)(proctorParams));
+  const showPermissionModal = !(0, _permission.hasAllPermissions)((0, _breachUtils.getRequiredPermissionsFromProctorParams)(proctorParams), permissions);
   return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Modal, {
     show: showPermissionModal,
     size: "lg",
@@ -53,12 +53,12 @@ const Permission = _ref => {
     showScreensharePermission: !permissions.screenshare && proctorParams.screenshareSnapshots
   })), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Modal.Footer, null, !permissions.screenshare && proctorParams.screenshareSnapshots && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
     onClick: () => {
-      askPermission(['screenshare']);
+      askPermission(["screenshare"]);
     }
   }, text.ALLOW_SCREENSHARE), !permissions.fullscreen && proctorParams.fullscreenExit && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
     variant: "primary",
     onClick: () => {
-      askPermission(['fullscreen']);
+      askPermission(["fullscreen"]);
     }
   }, text.ALLOW_FULLSCREEN)));
 };

package/dist/components/proctor-app/index.js

@@ -111,7 +111,7 @@ const ProctorApp = _ref => {
       sendScreengrab(true, breachData.breachedParam);
     }
   }, [userCount, isTabSwitched, permissions.fullscreen, lookedAwayCount, sendProctoredParamValues, sendWebcamSnapshot, sendScreengrab, proctorParams]);
-  const shouldShowProctoredComponent = (0, _breachUtils.showProctoredComponent)(proctorParams, actions.hasAllPermission);
+  const shouldShowProctoredComponent = (0, _breachUtils.showProctoredComponent)(proctorParams, permissions);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(proctorParams.copyPasteProctoring ? "disable-copy-paste fullwidth fullheight" : "fullwidth fullheight")
   }, shouldShowProctoredComponent && children, !shouldShowProctoredComponent && customPermissionView && /*#__PURE__*/_react.default.createElement(CustomPermissionView, _extends({
@@ -122,8 +122,7 @@ const ProctorApp = _ref => {
   }, permissionPassedProps)), !shouldShowProctoredComponent && !customPermissionView && /*#__PURE__*/_react.default.createElement(_permissions.Permission, {
     proctorParams: proctorParams,
     permissions: permissions,
-    askPermission: actions.askPermission,
-    hasAllPermission: actions.hasAllPermission
+    askPermission: actions.askPermission
   }), /*#__PURE__*/_react.default.createElement(_webcamActivityTracker.default, {
     proctorParams: proctorParams,
     setAudioPermission: permissionSetter.audio,

package/dist/components/proctor-context-app/index.js

@@ -40,39 +40,33 @@ const ProctoredContextApp = _ref => {
   const screenshareReference = (0, _react.useRef)(null);
   const [screenshareStream, setScreenshareStream] = (0, _react.useState)(null);
   const Context = contextProvider;
+  const permissions = (0, _react.useMemo)(() => ({
+    video: videoPermission,
+    audio: audioPermisison,
+    fullscreen: isFullscreen,
+    screenshare: screensharePermission
+  }), [videoPermission, audioPermisison, isFullscreen, screensharePermission]);
   const askPermissionAction = (0, _react.useMemo)(() => ({
     screenshare: () => {
       (0, _webcamMicrophoneUtils.setupScreensharePermission)(setScreensharePermission, screenshareReference, setScreenshareStream);
     },
     fullscreen: () => {
       setFullscreen();
+    },
+    video: () => {
+      window.location.reload();
     }
   }), [screenshareReference, setFullscreen]);
-  const getPermissionObj = (0, _react.useMemo)(() => ({
-    video: videoPermission,
-    audio: audioPermisison,
-    fullscreen: isFullscreen,
-    screenshare: screensharePermission
-  }), [videoPermission, audioPermisison, isFullscreen, screensharePermission]);
   const askPermission = (0, _react.useCallback)(requiredPermissions => {
     requiredPermissions.forEach(element => {
-      if (!getPermissionObj[element] && askPermissionAction[element]) {
+      if (!permissions[element] && askPermissionAction[element]) {
         askPermissionAction[element]();
       }
     });
-  }, [getPermissionObj, askPermissionAction]);
-  const hasAllPermission = (0, _react.useCallback)(requiredPermissions => {
-    let hasPermission = true;
-    requiredPermissions.forEach(element => {
-      if (!getPermissionObj[element]) {
-        hasPermission = hasPermission && false;
-      }
-    });
-    return hasPermission;
-  }, [getPermissionObj]);
+  }, [permissions, askPermissionAction]);
   return /*#__PURE__*/_react.default.createElement(Context.Provider, {
     value: _objectSpread(_objectSpread({}, customContext), {}, {
-      permissions: getPermissionObj,
+      permissions,
       permissionSetter: {
         audio: setAudioPermission,
         video: setVideoPermission,
@@ -80,8 +74,7 @@ const ProctoredContextApp = _ref => {
       },
       proctorParams,
       actions: {
-        askPermission: askPermission,
-        hasAllPermission: hasAllPermission
+        askPermission: askPermission
       },
       references: {
         webcamReference,

package/dist/components/webcam-activity-tracker/index.js

@@ -36,7 +36,7 @@ const WebcamActivityTracker = _ref => {
       }
     }
   }, [setVideoPermission, setAudioPermission, proctorParams]);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _breachUtils.isWebcamRequired)(proctorParams) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactWebcam.default, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _breachUtils.isWebcamRequired)(proctorParams) && /*#__PURE__*/_react.default.createElement(_reactWebcam.default, {
     audio: true,
     muted: true,
     screenshotFormat: "image/jpeg",
@@ -49,7 +49,7 @@ const WebcamActivityTracker = _ref => {
     },
     className: "captured-video-canvas hide",
     id: _dom.WEBCAM_REFERENCE_ID
-  })));
+  }));
 };
 var _default = WebcamActivityTracker;
 exports.default = _default;

package/dist/hooks/useFullScreenData.js

@@ -17,7 +17,7 @@ function useFullscreenData(isProctorParam) {
     }
     fullScreenElement.current.requestFullscreen().then(() => {
       setIsFullscreen(document[browserFullscreenElementProp] != null);
-    }).catch(() => {
+    }).catch(err => {
       setIsFullscreen(false);
     });
   };

package/dist/utils/breachUtils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.showProctoredComponent = exports.isWebcamRequired = exports.getRequiredPermissionsFromProctorParams = exports.getInitialStats = exports.getDataOnBreach = void 0;
 require("core-js/modules/es.symbol.description.js");
 var _defaults = require("../constants/defaults");
+var _permission = require("./permission");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -40,8 +41,8 @@ const getRequiredPermissionsFromProctorParams = proctorParams => {
 exports.getRequiredPermissionsFromProctorParams = getRequiredPermissionsFromProctorParams;
 const isWebcamRequired = proctorParams => proctorParams.people || proctorParams.lookedAway || proctorParams.webcamSnapshots;
 exports.isWebcamRequired = isWebcamRequired;
-const showProctoredComponent = (proctorParams, hasAllPermission) => {
-  return hasAllPermission(getRequiredPermissionsFromProctorParams(proctorParams));
+const showProctoredComponent = (proctorParams, permissions) => {
+  return (0, _permission.hasAllPermissions)(getRequiredPermissionsFromProctorParams(proctorParams), permissions);
 };
 exports.showProctoredComponent = showProctoredComponent;
 const getDataOnBreach = (statistics, currentData, proctorParams) => {

package/dist/utils/permission.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasAllPermissions = void 0;
+const hasAllPermissions = (requiredPermissions, permissions) => {
+  let hasPermission = true;
+  requiredPermissions.forEach(element => {
+    if (!permissions) {
+      hasPermission = false;
+    } else if (!permissions[element]) {
+      hasPermission = hasPermission && false;
+    }
+  });
+  return hasPermission;
+};
+exports.hasAllPermissions = hasAllPermissions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newtonschool/react_proctoring_library",
-  "version": "0.0.47",
+  "version": "0.0.48",
   "description": "Used to proctor online tests",
   "author": "ayushkagrawal,shreyachandra,weastel",
   "main": "dist/index.js",