Merge pull request #31 from SailingSteve/steveStaffClientFeb15-9am

Added PermissionsAdministration.
wevote · Feb 18, 2025 · 20ae397 · 20ae397
2 parents 4f957e7 + d3f746d
commit 20ae397
Show file tree

Hide file tree

Showing 16 changed files with 953 additions and 585 deletions.
diff --git a/src/js/actions/VoterActions.js b/src/js/actions/VoterActions.js
diff --git a/src/js/actions/VoterSessionActions.js b/src/js/actions/VoterSessionActions.js
@@ -1,41 +1,41 @@
-import Dispatcher from '../common/dispatcher/Dispatcher';
-// eslint-disable-next-line import/no-cycle
-import AppObservableStore from '../stores/AppObservableStore';
-import Cookies from '../common/utils/js-cookie/Cookies';
-import stringContains from '../common/utils/stringContains';
-
-export default {
-  voterSignOut (signOutAllDevices = false) {
-    AppObservableStore.setShowSignInModal(false);
-    AppObservableStore.unsetStoreSignInStartFullUrl();
-    Dispatcher.loadEndpoint('voterSignOut', { sign_out_all_devices: signOutAllDevices });
-    const names = [
-      'voter_device_id',
-      'ballot_has_been_visited',
-      'location_guess_closed',
-      'number_of_ballot_choices_made',
-      'number_of_topic_choices_made',
-      'show_full_navigation',
-      'sign_in_opened_from_issue_follow',
-      'sign_in_start_full_url',
-    ];
-    for (let i = 0; i < names.length; i++) {
-      const name = names[i];
-      Cookies.remove(name);
-      Cookies.remove(name, { path: '/' });
-      Cookies.remove(name, { path: '/', domain: 'wevote.us' });
-    }
-  },
-
-  setVoterDeviceIdCookie (id) {
-    let { hostname } = window.location;
-    hostname = hostname || '';
-    console.log('VoterSessionActions setVoterDeviceIdCookie hostname:', hostname);
-    if (hostname && stringContains('wevote.us', hostname)) {
-      // If hanging off WeVote subdomain, store the cookie with top level domain
-      Cookies.set('voter_device_id', id, { expires: 10000, path: '/', domain: 'wevote.us' });
-    } else {
-      Cookies.set('voter_device_id', id, { expires: 10000, path: '/' });
-    }
-  },
-};
+// import Dispatcher from '../common/dispatcher/Dispatcher';
+// // eslint-disable-next-line import/no-cycle
+// import AppObservableStore from '../stores/AppObservableStore';
+// import Cookies from '../common/utils/js-cookie/Cookies';
+// import stringContains from '../common/utils/stringContains';
+//
+// export default {
+//   voterSignOut (signOutAllDevices = false) {
+//     AppObservableStore.setShowSignInModal(false);
+//     AppObservableStore.unsetStoreSignInStartFullUrl();
+//     Dispatcher.loadEndpoint('voterSignOut', { sign_out_all_devices: signOutAllDevices });
+//     const names = [
+//       'voter_device_id',
+//       'ballot_has_been_visited',
+//       'location_guess_closed',
+//       'number_of_ballot_choices_made',
+//       'number_of_topic_choices_made',
+//       'show_full_navigation',
+//       'sign_in_opened_from_issue_follow',
+//       'sign_in_start_full_url',
+//     ];
+//     for (let i = 0; i < names.length; i++) {
+//       const name = names[i];
+//       Cookies.remove(name);
+//       Cookies.remove(name, { path: '/' });
+//       Cookies.remove(name, { path: '/', domain: 'wevote.us' });
+//     }
+//   },
+//
+//   setVoterDeviceIdCookie (id) {
+//     let { hostname } = window.location;
+//     hostname = hostname || '';
+//     console.log('VoterSessionActions setVoterDeviceIdCookie hostname:', hostname);
+//     if (hostname && stringContains('wevote.us', hostname)) {
+//       // If hanging off WeVote subdomain, store the cookie with top level domain
+//       Cookies.set('voter_device_id', id, { expires: 10000, path: '/', domain: 'wevote.us' });
+//     } else {
+//       Cookies.set('voter_device_id', id, { expires: 10000, path: '/' });
+//     }
+//   },
+// };
diff --git a/src/js/components/Navigation/HeaderBar.jsx b/src/js/components/Navigation/HeaderBar.jsx
@@ -9,6 +9,7 @@ import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
 import { normalizedHrefPage } from '../../common/utils/hrefUtils';
 import { renderLog } from '../../common/utils/logging';
 import { useConnectAppContext } from '../../contexts/ConnectAppContext';
+import { clearSignedInGlobals } from '../../contexts/contextFunctions';
 import { useLogoutMutation } from '../../react-query/mutations';
 import weConnectQueryFn, { METHOD } from '../../react-query/WeConnectQuery';
 import { displayTopMenuShadow } from '../../utils/applicationUtils';
@@ -20,7 +21,7 @@ import HeaderBarLogo from './HeaderBarLogo';
 const HeaderBar = ({ hideTabs }) => {
   renderLog('HeaderBar');
   const navigate = useNavigate();
-  const { setAppContextValue, getAppContextValue } = useConnectAppContext();
+  const { getAppContextValue, setAppContextValue } = useConnectAppContext();
   const { mutate: mutateLogout } = useLogoutMutation();
 
   const [scrolledDown] = useState(false);
@@ -39,7 +40,7 @@ const HeaderBar = ({ hideTabs }) => {
   const logoutApi = async () => {
     const data = await weConnectQueryFn('logout', {}, METHOD.POST);
     console.log(`/logout response in HeaderBar -- status: '${'status'}',  data: ${JSON.stringify(data)}`);
-    setAppContextValue('isAuthenticated', false);
+    clearSignedInGlobals(setAppContextValue);
     navigate('/login');
     mutateLogout();
   };

diff --git a/src/js/components/Person/AddPersonDrawerMainContent.jsx b/src/js/components/Person/AddPersonDrawerMainContent.jsx
@@ -8,6 +8,7 @@ import { getTeamMembersListByTeamId } from '../../models/TeamModel';
 import makeRequestParams from '../../react-query/makeRequestParams';
 import { useAddPersonToTeamMutation } from '../../react-query/mutations';
 import { SpanWithLinkStyle } from '../Style/linkStyles';
+import { SearchBarWrapper, MatchingPerson } from '../Style/sharedStyles';
 import AddPersonForm from './AddPersonForm';
 
 
@@ -116,6 +117,7 @@ const AddPersonDrawerMainContent = () => {
     };
     mutate(makeRequestParams(plainParams, {}));
     // Remove this person from the All People less Adds list (since they were added to the team)
+
     const updatedRemainingPeopleToAdd = remainingPeopleToAdd.filter((person) => person.personId !== incomingPerson.personId);
     setRemainingPeopleToAdd(updatedRemainingPeopleToAdd);
     if (searchResultsList && searchResultsList.length >= 0) {
@@ -177,10 +179,7 @@ const AddPersonDrawerMainContentWrapper = styled('div')`
 const AddPersonWrapper = styled('div')`
   margin-top: 32px;
 `;
-const MatchingPerson = styled('div')`
-  margin: 10px 0 0 10px;
-  font-style: italic;
-`;
+
 
 // const PersonDirectoryWrapper = styled('div')`
 //   margin-top: 16px;
@@ -200,8 +199,4 @@ const PersonSearchResultsWrapper = styled('div')`
   margin-top: 16px;
 `;
 
-const SearchBarWrapper = styled('div')`
-  margin-bottom: 16px;
-`;
-
 export default AddPersonDrawerMainContent;
diff --git a/src/js/components/Person/EditPersonForm.jsx b/src/js/components/Person/EditPersonForm.jsx
@@ -42,7 +42,6 @@ const EditPersonForm = ({ classes }) => {
     // console.log('savePerson data:', JSON.stringify(activePerson));
 
     const data = {};
-    // for (const key in activePerson) {
     Object.keys(activePerson).forEach((key) => {
       const initialValue = initialPerson[key] || '';
       const activeValue = activePerson[key] || '';
@@ -55,7 +54,6 @@ const EditPersonForm = ({ classes }) => {
     };
 
     mutate(makeRequestParams(plainParams, data));
-    // personSave(makeRequestParams(plainParams, data));
     setSaveButtonActive(false);
   };
 

diff --git a/src/js/components/PrivateRoute.jsx b/src/js/components/PrivateRoute.jsx
@@ -6,7 +6,7 @@ import { METHOD, useFetchData } from '../react-query/WeConnectQuery';
 
 const PrivateRoute = () => {
   const location = useLocation();
-  const { getAppContextValue } = useConnectAppContext();
+  const { getAppContextValue, setAppContextValue } = useConnectAppContext();
 
   const [isAuthenticated, setIsAuthenticated] = useState(null);
 
@@ -15,6 +15,7 @@ const PrivateRoute = () => {
     if (isSuccessAuth) {
       console.log('useFetchData in PrivateRoute useEffect dataAuth good:', dataAuth, isSuccessAuth);
       setIsAuthenticated(dataAuth.isAuthenticated);
+      setAppContextValue('loggedInPersonIsAdmin', dataAuth.loggedInPersonIsAdmin);
       authLog('========= PrivateRoute =========== INNER isAuthenticated: ', dataAuth.isAuthenticated);
     }
   }, [dataAuth, isSuccessAuth]);

diff --git a/src/js/components/Style/sharedStyles.js b/src/js/components/Style/sharedStyles.js
@@ -0,0 +1,11 @@
+import styled from 'styled-components';
+
+export const SearchBarWrapper = styled('div')`
+  margin-bottom: 16px;
+  display: flex;
+`;
+
+export const MatchingPerson = styled('div')`
+  margin: 10px 0 0 10px;
+  font-style: italic;
+`;
diff --git a/src/js/components/Team/AddTeamDrawerMainContent.jsx b/src/js/components/Team/AddTeamDrawerMainContent.jsx
@@ -4,8 +4,9 @@ import React, { useState } from 'react';
 import styled from 'styled-components';
 import SearchBar2024 from '../../common/components/Search/SearchBar2024';
 import { renderLog } from '../../common/utils/logging';
-import AddTeamForm from './AddTeamForm';
 import { useConnectAppContext } from '../../contexts/ConnectAppContext';
+import { SearchBarWrapper } from '../Style/sharedStyles';
+import AddTeamForm from './AddTeamForm';
 
 
 // eslint-disable-next-line no-unused-vars
@@ -82,9 +83,6 @@ const AddTeamWrapper = styled('div')`
   margin-top: 32px;
 `;
 
-const SearchBarWrapper = styled('div')`
-  margin-bottom: 16px;
-`;
 
 const TeamItem = styled('div')`
 `;

diff --git a/src/js/contexts/ConnectAppContext.jsx b/src/js/contexts/ConnectAppContext.jsx
@@ -105,9 +105,10 @@ export const ConnectAppContextProvider = ({ children }) => {
     if (isSuccessAuth) {
       console.log('useFetchData in ConnectAppContext useEffect dataAuth good:', dataAuth, isSuccessAuth, isFetchingAuth);
       const { isAuthenticated } = dataAuth;
-      setAppContextValue('isAuthenticated', isAuthenticated);
-      setAppContextValue('authenticatedPersonId', dataAuth.personId);
       setAppContextValue('authenticatedPerson', dataAuth.person);
+      setAppContextValue('authenticatedPersonId', dataAuth.personId);
+      setAppContextValue('isAuthenticated', isAuthenticated);
+      setAppContextValue('loggedInPersonIsAdmin', dataAuth.loggedInPersonIsAdmin);
 
       console.log('=============== ConnectAppContextProvider ======= isAuthenticated: ', isAuthenticated, ' ===========');
     }

diff --git a/src/js/contexts/contextFunctions.jsx b/src/js/contexts/contextFunctions.jsx
@@ -0,0 +1,8 @@
+
+export const clearSignedInGlobals = (setAppContextValue) => {
+  setAppContextValue('authenticatedPerson', undefined);
+  setAppContextValue('authenticatedPersonId', -1);
+  setAppContextValue('isAuthenticated', false);
+  setAppContextValue('loggedInPersonIsAdmin', false);
+  setAppContextValue('personIsSignedIn', false);
+};
diff --git a/src/js/pages/Login.jsx b/src/js/pages/Login.jsx
@@ -1,5 +1,6 @@
 import { Button, TextField } from '@mui/material';
 import { withStyles } from '@mui/styles';
+import { useQueryClient } from '@tanstack/react-query';
 import PropTypes from 'prop-types';
 import React, { useEffect, useRef, useState } from 'react';
 import { Helmet } from 'react-helmet-async';
@@ -12,18 +13,19 @@ import { PageContentContainer } from '../components/Style/pageLayoutStyles';
 import VerifySecretCodeModal from '../components/VerifySecretCodeModal';
 import webAppConfig from '../config';
 import { useConnectAppContext } from '../contexts/ConnectAppContext';
+import { clearSignedInGlobals } from '../contexts/contextFunctions';
 import { getFullNamePreferredPerson } from '../models/PersonModel';
-import { useGetAuthMutation, useLogoutMutation } from '../react-query/mutations';
+import { useLogoutMutation } from '../react-query/mutations';
 import weConnectQueryFn, { METHOD, useFetchData } from '../react-query/WeConnectQuery';
 import ReactQuerySaveReadTest from '../test/ReactQuerySaveReadTest';
 
 
 const Login = ({ classes }) => {
-  renderLog('Login');  // Set LOG_RENDER_EVENTS to log all renders
+  renderLog('Login');
   const navigate = useNavigate();
+  const queryClient = useQueryClient();
   const { setAppContextValue } = useConnectAppContext();
   const { mutate: mutateLogout } = useLogoutMutation();
-  const { mutate: mutateAuth } = useGetAuthMutation();
 
   const firstNameFldRef = useRef('');
   const lastNameFldRef = useRef('');
@@ -35,30 +37,29 @@ const Login = ({ classes }) => {
   const passwordFldRef = useRef('');
   const confirmPasswordFldRef = useRef('');
 
-  const [showCreateStuff, setShowCreateStuff] = useState(false);
-  const [warningLine, setWarningLine] = useState('');
-  const [successLine, setSuccessLine] = useState('');
   const [authPerson, setAuthPerson] = useState({});
-  // eslint-disable-next-line no-unused-vars
-  const [isAuth, setIsAuth] = useState(false);
   const [openVerifyModalDialog, setOpenVerifyModalDialog] = useState(false);
+  const [returnFromLogin, setReturnFromLogin] = useState(false);
+  const [showCreateStuff, setShowCreateStuff] = useState(false);
+  const [successLine, setSuccessLine] = useState('');
+  const [warningLine, setWarningLine] = useState('');
 
   const { data: dataAuth, isSuccess: isSuccessAuth, isFetching: isFetchingAuth } = useFetchData(['get-auth'], {}, METHOD.POST);
   useEffect(() => {
     if (isSuccessAuth) {
       console.log('useFetchData in Login useEffect dataAuth good:', dataAuth, isSuccessAuth, isFetchingAuth);
 
       const { isAuthenticated } = dataAuth;
-      setIsAuth(isAuthenticated);
       const authenticatedPerson = dataAuth.person;
       setAuthPerson(authenticatedPerson);
       const success = isAuthenticated && authenticatedPerson ? `Signed in as ${getFullNamePreferredPerson(authenticatedPerson)}` : 'Please sign in';
       setSuccessLine(success);
-      // if (isAuthenticated) {
-      //   setTimeout(() => {
-      //     navigate('/tasks');
-      //   }, 2000);
-      // }
+      setAppContextValue('loggedInPersonIsAdmin', dataAuth.loggedInPersonIsAdmin);
+      if (isAuthenticated && returnFromLogin) {
+        setTimeout(() => {
+          navigate('/tasks');
+        }, 2000);
+      }
     }
   }, [dataAuth, isSuccessAuth]);
 
@@ -79,10 +80,11 @@ const Login = ({ classes }) => {
       setSuccessLine(`Cheers person #${data.personId}!  You are signed in!`);
       setAppContextValue('isAuthenticated', true);
       setAppContextValue('authenticatedPersonId', data.personId);
+      setReturnFromLogin(true);
       if (!data.emailVerified) {
         setOpenVerifyModalDialog(true);
       }
-      mutateAuth();  // to propagate the invalidation to HeaderBar (might be a better way to do this)
+      await queryClient.invalidateQueries('get-auth');
     } else {
       setWarningLine(data.error.msg);
       setSuccessLine('');
@@ -152,8 +154,8 @@ const Login = ({ classes }) => {
     }
   };
 
-  const signOutPressed = () => {
-    setAppContextValue('personIsSignedIn', false);
+  const useSignOutPressed = () => {
+    clearSignedInGlobals(setAppContextValue);
     logoutApi().then();
   };
 
@@ -303,7 +305,7 @@ const Login = ({ classes }) => {
             classes={{ root: classes.buttonDesktop }}
             color="primary"
             variant="contained"
-            onClick={signOutPressed}
+            onClick={useSignOutPressed}
           >
             Sign Out
           </Button>