@newtonschool/react_proctoring_library 0.0.89 → 0.0.91

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

@@ -20,6 +20,7 @@ var _fullscreen = _interopRequireDefault(require("../fullscreen"));
 var _ElectronContext = require("../../contexts/ElectronContext");
 var _useGenericWakeUpLock = _interopRequireDefault(require("../../hooks/useGenericWakeUpLock"));
 var _breachParameters = _interopRequireDefault(require("../breach-parameters"));
+var _permission = require("../../utils/permission");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -75,6 +76,12 @@ const ProctorApp = _ref => {
     });
     await Promise.all(allPromises);
   }, [permissions, askPermissionAction]);
+  (0, _react.useEffect)(() => {
+    const allPermissionGranted = (0, _permission.hasAllPermissions)((0, _breachUtils.getRequiredPermissionsFromProctorParams)(proctorParams), permissions);
+    if (allPermissionGranted && allPermissionGrantedOnce) {
+      allPermissionGrantedOnce.current = true;
+    }
+  }, [allPermissionGrantedOnce, permissions, proctorParams]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "".concat(proctorParams.copyPasteProctoring ? 'disable-copy-paste fullwidth fullheight' : 'fullwidth fullheight'),
     children: [shouldShowProctoredComponent && children, !shouldShowProctoredComponent && customPermissionView && /*#__PURE__*/(0, _jsxRuntime.jsx)(CustomPermissionView, _objectSpread({

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

@@ -62,11 +62,6 @@ const ProctoredContextApp = _ref => {
   const forceUpdate = () => {
     setUpdateId(oldId => oldId + 1);
   };
-  (0, _react.useEffect)(() => {
-    if (videoPermission && screensharePermission && isFullscreen) {
-      allPermissionGrantedOnce.current = true;
-    }
-  }, [videoPermission, isFullscreen, screensharePermission]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Context.Provider, {
     value: _objectSpread(_objectSpread({}, customContext), {}, {
       permissions,

package/dist/components/screenshare-activity-tracker/electron.js

@@ -79,19 +79,16 @@ function ElectronScreenShare(_ref) {
       streamId: newStreamId
     });
   };
-  const isRecurring = config === null || config === void 0 ? void 0 : config.recurring;
   const screenShareConfig = config === null || config === void 0 ? void 0 : (_config$fileUploadCon = config.fileUploadConfig) === null || _config$fileUploadCon === void 0 ? void 0 : _config$fileUploadCon.screenShare;
   (0, _react.useEffect)(() => {
-    console.log('streamDeviceId, isRecurring, screenShareConfig', streamDeviceId, isRecurring, screenShareConfig);
-    if (streamDeviceId && screenShareConfig && isRecurring) {
+    if (streamDeviceId && screenShareConfig) {
       const snapshotIntervalID = startScreenShareSnapshot(streamDeviceId);
       return () => {
         endScreenShareSnapshot(snapshotIntervalID);
       };
     }
-  }, [streamDeviceId, isRecurring, screenShareConfig]);
+  }, [streamDeviceId, screenShareConfig]);
   (0, _react.useEffect)(() => {
-    console.log('streamDeviceId', streamDeviceId);
     const permissionSetter = permission => {
       setScreensharePermission(permission);
     };
@@ -103,6 +100,5 @@ function ElectronScreenShare(_ref) {
       window.electron.listener.removeListener(id, permissionSetter);
     };
   }, [streamDeviceId]);
-  console.log('streamDeviceId', isRecurring, screenShareConfig, streamDeviceId);
   return null;
 }

package/dist/components/screenshare-activity-tracker/web.js

@@ -36,7 +36,7 @@ function WebScreenShare(_ref) {
     streamSetter,
     permissions
   } = (0, _react.useContext)(proctoredContext);
-  const recurringFetchIntervalRef = (0, _react.useRef)();
+  const recurringFetchIntervalRef = (0, _react.useRef)(null);
   const {
     recurring = false,
     recurringFetchInterval = 0
@@ -74,7 +74,9 @@ function WebScreenShare(_ref) {
       }, randomStartDelay);
     }
     return () => {
-      clearInterval(recurringFetchIntervalRef.current);
+      if (recurringFetchIntervalRef.current) {
+        clearInterval(recurringFetchIntervalRef.current);
+      }
       clearTimeout(timeoutId);
     };
   }, [recurring, recurringFetchInterval, sendScreengrab]);

package/dist/hooks/electron/useKioskMode.js

@@ -7,10 +7,7 @@ exports.default = useKioskMode;
 require("core-js/modules/web.dom-collections.iterator.js");
 var _react = require("react");
 var _breachUtils = require("../../utils/breachUtils");
-var _useGenericFullScreenData = _interopRequireDefault(require("../useGenericFullScreenData"));
 var _ElectronContext = require("../../contexts/ElectronContext");
-var _useIsPageFocussed = _interopRequireDefault(require("./useIsPageFocussed"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function useKioskMode(_ref) {
   let {
     proctoredContext,
@@ -21,11 +18,7 @@ function useKioskMode(_ref) {
   } = (0, _react.useContext)(proctoredContext);
   const [connectedToInternet, setConnectedToInternet] = (0, _react.useState)(true);
   const isElectronApp = (0, _react.useContext)(_ElectronContext.ElectronContext);
-  const {
-    isFullscreen
-  } = (0, _useGenericFullScreenData.default)(isElectronApp);
   const shouldShowProctoredComponent = (0, _breachUtils.showProctoredComponent)(proctorParams, permissions);
-  const isDocumentFocused = (0, _useIsPageFocussed.default)(isElectronApp);
   (0, _react.useEffect)(() => {
     const updateOnlineStatus = () => {
       setConnectedToInternet(window.navigator.onLine);
@@ -39,11 +32,11 @@ function useKioskMode(_ref) {
     };
   }, []);
   (0, _react.useEffect)(() => {
-    if (shouldShowProctoredComponent && isFullscreen && isElectronApp && connectedToInternet && isDocumentFocused) {
+    if (shouldShowProctoredComponent && isElectronApp && connectedToInternet) {
       window.electron.actions.enableKioskMode();
     } else {
       var _window$electron, _window$electron$acti;
       (_window$electron = window.electron) === null || _window$electron === void 0 ? void 0 : (_window$electron$acti = _window$electron.actions) === null || _window$electron$acti === void 0 ? void 0 : _window$electron$acti.disableKioskMode();
     }
-  }, [isFullscreen, shouldShowProctoredComponent, isElectronApp, connectedToInternet, isDocumentFocused]);
+  }, [shouldShowProctoredComponent, isElectronApp, connectedToInternet]);
 }

package/package.json

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