Merge pull request #805 from BinaryStudioAcademy/fix/bt-791-render-wa…

…iting-approval-label bt-791: [BUG] "Waiting for approval" doesn't disappear/change when user is approved (using db)
BinaryStudioAcademy · Sep 29, 2023 · 5e35585 · 5e35585
2 parents 5283f87 + 6562401
commit 5e35585
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 21 deletions.
diff --git a/frontend/src/bundles/candidate-details/components/candidate-profile/candidate-profile.tsx b/frontend/src/bundles/candidate-details/components/candidate-profile/candidate-profile.tsx
@@ -68,7 +68,7 @@ const CandidateProfile: React.FC<Properties> = ({
         email: state.auth.currentUser?.email,
         lmsProject: state.lms.lmsData?.project,
     }));
-    const { publishedAt } = useAppSelector(
+    const { publishedAt, isApproved } = useAppSelector(
         (state: RootReducer) => state.talentOnBoarding,
     );
 
@@ -148,7 +148,7 @@ const CandidateProfile: React.FC<Properties> = ({
             {isFifthStep && (
                 <Button
                     label={
-                        publishedAt
+                        publishedAt && !isApproved
                             ? 'Your account is waiting for the approval'
                             : 'Your account is ready!'
                     }

diff --git a/frontend/src/bundles/common/components/sidebar/sidebar-item/sidebar-item.tsx b/frontend/src/bundles/common/components/sidebar/sidebar-item/sidebar-item.tsx
@@ -21,15 +21,21 @@ type Properties = {
 const SidebarItem: React.FC<Properties> = ({ link, icon, name }) => {
     const [isNotificationVisible, setNotificationVisible] = useState(false);
 
-    const { isApproved } = useAppSelector(
-        (state: RootReducer) => state.talentOnBoarding,
+    const { talentOnBoarding, employerOnBoarding } = useAppSelector(
+        (state: RootReducer) => state,
     );
 
+    const isApproved =
+        (typeof talentOnBoarding.isApproved === 'boolean' &&
+            talentOnBoarding.isApproved) ||
+        (typeof employerOnBoarding.isApproved === 'boolean' &&
+            employerOnBoarding.isApproved);
+
     const handleToggleNotification = useCallback(() => {
         if (!isApproved) {
             setNotificationVisible(!isNotificationVisible);
         }
-    }, [isNotificationVisible, isApproved]);
+    }, [isApproved, isNotificationVisible]);
 
     return (
         <li className={isApproved ? '' : styles.listItem}>

diff --git a/frontend/src/bundles/common/pages/home.tsx b/frontend/src/bundles/common/pages/home.tsx
@@ -37,7 +37,7 @@ const Home: React.FC = () => {
             );
         }
         case UserRole.EMPLOYER: {
-            return <Navigate to={AppRoute.EMPLOYER_ONBOARDING} />;
+            return <Navigate to={AppRoute.MY_PROFILE_EMPLOYER} />;
         }
         default: {
             return <Navigate to={AppRoute.SIGN_IN} />;

diff --git a/frontend/src/bundles/employer-onboarding/store/slice.ts b/frontend/src/bundles/employer-onboarding/store/slice.ts
@@ -17,6 +17,7 @@ const initialState: UserDetailsGeneralCustom = {
     cvUrl: null,
     photoUrl: null,
     companyLogoUrl: null,
+    publishedAt: '',
 };
 
 const { reducer, actions, name } = createSlice({

diff --git a/frontend/src/bundles/profile-cabinet/pages/profile-cabinet.tsx b/frontend/src/bundles/profile-cabinet/pages/profile-cabinet.tsx
@@ -99,15 +99,6 @@ const ProfileCabinet: React.FC = () => {
         ) {
             setIsWaitingForApproval(true);
         }
-        if (talentOnBoarding.isApproved ?? employerOnBoarding.isApproved) {
-            setIsWaitingForApproval(false);
-            void dispatch(
-                storeActions.notify({
-                    type: NotificationType.SUCCESS,
-                    message: 'Profile was approved',
-                }),
-            );
-        }
     }, [
         dispatch,
         employerOnBoarding.isApproved,
@@ -116,6 +107,12 @@ const ProfileCabinet: React.FC = () => {
         talentOnBoarding.publishedAt,
     ]);
 
+    useEffect(() => {
+        if (talentOnBoarding.isApproved ?? employerOnBoarding.isApproved) {
+            setIsWaitingForApproval(false);
+        }
+    }, [dispatch, employerOnBoarding.isApproved, talentOnBoarding.isApproved]);
+
     const handlePublish = useCallback(() => {
         if (currentUser) {
             void dispatch(

diff --git a/frontend/src/bundles/talent-onboarding/pages/onboarding/onboarding.tsx b/frontend/src/bundles/talent-onboarding/pages/onboarding/onboarding.tsx
@@ -7,7 +7,6 @@ import {
 import { FormSubmitProvider } from '~/bundles/common/context/context.js';
 import { AppRoute } from '~/bundles/common/enums/enums.js';
 import {
-    useAppDispatch,
     useAppSelector,
     useCallback,
     useEffect,
@@ -45,9 +44,7 @@ const Onboarding: React.FC = () => {
     const [isWaitingForApproval, setIsWaitingForApproval] =
         useState<boolean>(false);
 
-    const dispatch = useAppDispatch();
-    const { currentUser } = useAppSelector((state: RootReducer) => state.auth);
-    const { publishedAt } = useAppSelector(
+    const { publishedAt, isApproved } = useAppSelector(
         (state: RootReducer) => state.talentOnBoarding,
     );
     const handleNextStep = useCallback((): void => {
@@ -96,10 +93,16 @@ const Onboarding: React.FC = () => {
     }, [location.pathname]);
 
     useEffect(() => {
-        if (publishedAt) {
+        if (publishedAt && !isApproved) {
             setIsWaitingForApproval(true);
         }
-    }, [currentUser?.id, dispatch, publishedAt]);
+    }, [isApproved, publishedAt]);
+
+    useEffect(() => {
+        if (isApproved) {
+            setIsWaitingForApproval(false);
+        }
+    }, [isApproved]);
     return (
         <PageLayout
             avatarUrl=""