Cumulus 3624

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+- **CUMULUS-3624**
+  - Added Inactivity Modal component
+  - Added unit test for component
+
 ## [v12.2.0] - 2024-09-04
 
 This version of the dashboard requires Cumulus API >= v18.4.0

app/src/js/App.js

@@ -50,6 +50,7 @@ const MainRoutes = () => (
 const App = () => {
   const [store] = useState(ourConfigureStore({}));
   const isLoggedIn = () => store.getState().api.authenticated;
+  console.log('app authenticated ', store);
 
   return (
       // <ErrorBoundary> // Add after troublshooting other errors

app/src/js/actions/index.js

@@ -159,7 +159,6 @@ export const searchCollections = (infix) => ({ type: types.SEARCH_COLLECTIONS, i
 export const clearCollectionsSearch = () => ({ type: types.CLEAR_COLLECTIONS_SEARCH });
 export const filterCollections = (param) => ({ type: types.FILTER_COLLECTIONS, param });
 export const clearCollectionsFilter = (paramKey) => ({ type: types.CLEAR_COLLECTIONS_FILTER, paramKey });
-
 export const getCumulusInstanceMetadata = () => ({
   [CALL_API]: {
     type: types.ADD_INSTANCE_META,

app/src/js/components/Header/header.js

@@ -15,6 +15,7 @@ import { window } from '../../utils/browser';
 import { strings } from '../locale';
 import linkToKibana from '../../utils/kibana';
 import { getPersistentQueryParams } from '../../utils/url-helper';
+import InactivityModal from '../Modal/InactivityModal';
 
 const paths = [
   [strings.collections, '/collections/all'],
@@ -121,6 +122,7 @@ const Header = ({
               <li>&nbsp;</li>
                 )}
           </nav>
+          <div className='inactivity'><InactivityModal /></div>
         </div>
       </div>
   );

app/src/js/components/Modal/InactivityModal.js

@@ -0,0 +1,109 @@
+import React, { useEffect, useState, useCallback } from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import get from 'lodash/get';
+import DefaultModal from './modal';
+import { logout } from '../../actions';
+
+const InactivityModal = ({
+  title = 'Session Timeout Warning',
+  children = `We have noticed that you have been inactive for a while.
+  We will close this session in 5 minutes. If you want to stay signed in, select ‘Continue Session’.`,
+  dispatch
+}) => {
+  const [lastKeyPress, setLastKeyPress] = useState(Date.now());
+  const [hasModal, setHasModal] = useState(false);
+
+  function handleConfirm() {
+    setLastKeyPress(Date.now());
+    closeModal();
+  }
+
+  const handleLogout = useCallback(() => {
+    dispatch(logout()).then(() => {
+      if (get(window, 'location.reload')) {
+        window.location.reload();
+      }
+    });
+  }, [dispatch]);
+
+  function closeModal() { // the X botton
+    setLastKeyPress(Date.now());
+    if (hasModal) {
+      setHasModal(false); // hide modal if user resumes activity
+    }
+  }
+
+  // Effect to setup event listeners for keyboard activity
+  useEffect(() => {
+    // Function to update the lastKeyPress time
+    const handleKeypress = () => {
+      setLastKeyPress(Date.now());
+      if (hasModal) {
+        setHasModal(false); // hide modal if user resumes activity
+      }
+    };
+    window.addEventListener('keydown', handleKeypress);
+
+    return () => {
+      window.removeEventListener('keydown', handleKeypress);
+    };
+  }, [hasModal]);
+
+  // Effect to handle showing the modal after 30 minutes of inactivity
+  useEffect(() => {
+    const checkInactivity = setInterval(() => {
+      if (Date.now() - lastKeyPress > 1800000 && !hasModal) { // 1800000 ms = 30 minutes
+        setHasModal(true);
+      }
+    }, 60000); // Check every minute (60000 ms)
+
+    return () => clearInterval(checkInactivity);
+  }, [hasModal, lastKeyPress]);
+
+  return (
+    <div>
+      <DefaultModal
+      title = {title}
+      className='IAModal'
+      onCancel={handleLogout}
+      onCloseModal={closeModal}
+      onConfirm={handleConfirm}
+      showModal={hasModal}
+      hasConfirmButton={true}
+      hasCancelButton={true}
+      cancelButtonText='Close Session'
+      confirmButtonText='Continue Session'
+      children = {children}
+      />
+    </div>
+  );
+};
+
+const mapStateToProps = (state) => ({
+  hasModal: state.hasModal,
+  lastKeyPress: state.lastKeyPress,
+  // logoutTimer: state.logoutTimer
+});
+
+InactivityModal.propTypes = {
+  hasModal: PropTypes.bool,
+  lastKeyPress: PropTypes.string,
+  // logoutTimer: PropTypes.object,
+  title: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+  children: PropTypes.string,
+  className: PropTypes.string,
+  cancelButtonText: PropTypes.string,
+  confirmButtonText: PropTypes.string,
+  showModal: PropTypes.bool,
+  onCloseModal: PropTypes.func,
+  onConfirm: PropTypes.func,
+  onCancel: PropTypes.func,
+  hasCancelButton: PropTypes.bool,
+  hasConfirmButton: PropTypes.bool,
+  dispatch: PropTypes.func,
+};
+
+export { InactivityModal };
+
+export default connect(mapStateToProps)(InactivityModal);

app/src/js/components/home.js

@@ -132,7 +132,6 @@ const Home = ({
             <h1 className='heading--xlarge'>{strings.dashboard}</h1>
           </div>
         </div>
-
         <div className='page__content page__content--nosidebar'>
           {pageSection(
             <>Select date and time to refine your results. <em>Time is UTC.</em></>,
@@ -180,7 +179,8 @@ Home.propTypes = {
   rules: PropTypes.object,
   stats: PropTypes.object,
   dispatch: PropTypes.func,
-  location: PropTypes.object
+  location: PropTypes.object,
+  inactivityModal: PropTypes.object
 };
 
 export { Home };

app/src/js/components/oauth.js

@@ -24,6 +24,7 @@ const OAuth = ({
   queryParams,
 }) => {
   const [token, setToken] = useState(null);
+  console.log('oauth authenticated: ', api);
 
   useEffect(() => {
     if (api.authenticated) {

app/src/js/reducers/index.js

@@ -57,7 +57,7 @@ export const reducers = {
   reconciliationReports,
   recoveryStatus,
   sorts,
-  locationQueryParams,
+  locationQueryParams
 };
 
 export const createRootReducer = (history) => combineReducers({

test/components/inactivity-modal/inactivity-modal.js

@@ -0,0 +1,27 @@
+'use strict';
+
+import test from 'ava';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
+import React from 'react';
+import { shallow, configure } from 'enzyme';
+import { InactivityModal } from '../../../app/src/js/components/Modal/InactivityModal';
+
+configure({ adapter: new Adapter() });
+
+test('Inactivity Modal should render when hasModal is true', function (t) {
+  const hasModal = true ;
+  const hasCancelButton = 'button--cancel';
+  const hasConfirmButton = 'button--submit';
+
+  // Create a shallow render of the component
+  const modal = shallow(
+      <InactivityModal
+        hasModal={hasModal}
+        hasCancelButton={hasCancelButton}
+        hasConfirmButton={hasConfirmButton}
+      />
+  );
+  t.true(modal.find('DefaultModal').exists(),'Modal should be present when hasModal is true');
+  t.is(modal.find('DefaultModal').prop('hasCancelButton'), true);
+  t.is(modal.find('DefaultModal').prop('hasConfirmButton'), true);
+});