Merge pull request #3395 from OneCommunityGlobal/revert-3294-vinay/notify-user-new-permission

Revert "Vinay: Let a user know through a popup that Permissions have been changed for them"

Author: one-community

src/components/Header/Header.jsx

@@ -61,7 +61,6 @@ import {
 import NotificationCard from '../Notification/notificationCard';
 import DarkModeButton from './DarkModeButton';
 import BellNotification from './BellNotification';
-import { getUserProfile } from '../../actions/userProfile';
 
 export function Header(props) {
   const location = useLocation();
@@ -216,27 +215,6 @@ export function Header(props) {
   const openModal = () => {
     setLogoutPopup(true);
   };
-  
-  const handlePermissionChangeAck = async() => {
-    // handle setting the ack true
-    try {
-      const {firstName: name, lastName, personalLinks, adminLinks} = props.userProfile
-      const res = await axios.put(ENDPOINTS.USER_PROFILE(userId), {
-        // req fields for updation
-        firstName: name, 
-        lastName, 
-        personalLinks,
-        adminLinks,
-        
-        isAcknowledged: true,
-      });
-      if (res.status === 200) {
-        props.getUserProfile(userId);
-      }
-    } catch (e) {
-      // console.log('update ack', e);
-    }
-  }
 
   const removeViewingUser = () => {
     setPopup(false);
@@ -325,7 +303,6 @@ export function Header(props) {
 
   if (location.pathname === '/login') return null;
 
-  const viewingUser = JSON.parse(window.sessionStorage.getItem('viewingUser'))
   return (
     <div className="header-wrapper">
       <Navbar className="py-3 navbar" color="dark" dark expand="md">
@@ -578,14 +555,8 @@ export function Header(props) {
       </Navbar>
       {!isAuthUser && (
         <PopUpBar
-          message={`You are currently viewing the header for ${viewingUser.firstName} ${viewingUser.lastName}`}
           onClickClose={() => setPopup(prevPopup => !prevPopup)}
-          />
-      )}
-      {props.auth.isAuthenticated && props.userProfile?.permissions?.isAcknowledged===false && (
-        <PopUpBar
-          message="Heads Up, there were permission changes made to this account"
-          onClickClose={handlePermissionChangeAck}
+          viewingUser={JSON.parse(window.sessionStorage.getItem('viewingUser'))}
         />
       )}
       <div>
@@ -637,5 +608,4 @@ export default connect(mapStateToProps, {
   getAllRoles,
   hasPermission,
   getWeeklySummaries,
-  getUserProfile
 })(Header);

src/components/PopUpBar/PopUpBar.jsx

@@ -2,10 +2,11 @@
 import './PopUpBar.css';
 
 function PopUpBar(props) {
-  const { message, onClickClose } = props;
+  const { viewingUser, onClickClose } = props;
+  const { firstName, lastName } = viewingUser;
   return (
     <div className="popup_container" data-testid="test-popup">
-      {message}
+      {`You are currently viewing the header for ${firstName} ${lastName}`}
       <button type="button" className="close_button" onClick={onClickClose}>
         X
       </button>

src/components/PopUpBar/__tests__/PopUpBar.test.jsx

@@ -1,9 +1,14 @@
 import { render, screen, fireEvent } from '@testing-library/react';
 import PopUpBar from '../PopUpBar';
 
+const viewingUser = {
+  firstName: 'TestUser',
+  lastName: 'LastName',
+};
+
 // render Component
 const renderComponent = (props = {}) => {
-  render(<PopUpBar message="PopUpBar text message" {...props} />);
+  render(<PopUpBar viewingUser={viewingUser} {...props} />);
 };
 
 // Test Cases
@@ -16,7 +21,7 @@ describe('Test Suite for PopUpBar', () => {
 
   it('Test Case 2: Renders with correct text', () => {
     renderComponent();
-    const expectedText = `PopUpBar text message`;
+    const expectedText = `You are currently viewing the header for ${viewingUser.firstName} ${viewingUser.lastName}`;
     const actualText = screen.getByText(expectedText);
     expect(actualText).toBeInTheDocument();
   });