add new invalidate tag User and perform router push only after employ…

…ee profile update
open-schools · Aug 29, 2024 · fe9cbeb · fe9cbeb
1 parent bcc914c
commit fe9cbeb
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 30 deletions.
diff --git a/apps/schools/domains/employee/redux/employeeApi.ts b/apps/schools/domains/employee/redux/employeeApi.ts
@@ -44,7 +44,7 @@ const employeeApi = commonApi.injectEndpoints({
                 method: 'PATCH',
                 body: data,
             }),
-            invalidatesTags: ['Employee'],
+            invalidatesTags: ['Employee', 'User'],
         }),
         deleteEmployeeById: build.mutation<{}, DeleteEmployeeByIdData>({
             query: (data) => ({

diff --git a/apps/schools/domains/user/components/auth/registerForm/index.tsx b/apps/schools/domains/user/components/auth/registerForm/index.tsx
@@ -53,8 +53,7 @@ export const RegisterForm: React.FC<IRegisterFormProps> = ({ onFinish, onError }
                 name: name,
                 email: email,
             }
-            updateProfile(updateEmail)
-            onFinish()
+            updateProfile(updateEmail).then(() => onFinish())
         }
     }, [data, updateProfile])
 

diff --git a/apps/schools/domains/user/components/profile/profileEdit/index.tsx b/apps/schools/domains/user/components/profile/profileEdit/index.tsx
@@ -13,11 +13,9 @@ import Link from 'next/link'
 import { useChangeUserProfileFormValidators } from '@domains/user/components/profile/profileEdit/hooks'
 import { useUpdateEmployeeProfileByIdMutation } from '@domains/employee/redux/employeeApi'
 import { handleSubmitForm } from '@domains/user/handlers/profile/profileEdit'
-import { EventKey, useEventBus } from '@domains/common/providers/eventBusProvider'
 import { AppRoutes, RoutePath } from '@domains/common/constants/routerEnums'
 
 export function ProfileEdit() {
-    const { emit } = useEventBus()
     const { user } = useUserProfile()
 
     const [form] = Form.useForm()
@@ -52,7 +50,6 @@ export function ProfileEdit() {
                         onFinish={() => {
                             handleSubmitForm(user.employee_profile?.id ?? '', form, mutation).then((isSuccess) => {
                                 if (isSuccess) {
-                                    emit(EventKey.RefetchProfileQuery)
                                     router.push(RoutePath[AppRoutes.USER_LIST])
                                 }
                             })

diff --git a/apps/schools/domains/user/providers/authProvider.tsx b/apps/schools/domains/user/providers/authProvider.tsx
@@ -3,7 +3,6 @@ import { useRouter } from 'next/router'
 import { useGetUserQuery } from '../redux/authenticationApi'
 import Cookies from 'universal-cookie'
 import { GetUserProfiles } from '@domains/user/redux/interfaces'
-import { EventKey, useEventBus } from '@domains/common/providers/eventBusProvider'
 import { AppRoutes, RoutePath } from '@domains/common/constants/routerEnums'
 
 export const UserProfileContext = createContext<{
@@ -24,18 +23,13 @@ export const useUserProfile = () => useContext(UserProfileContext)
 
 export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
     const router = useRouter()
-    const { on } = useEventBus()
     const [token, setToken] = useState('')
     const [user, setUser] = useState({})
 
-    const { data, error, refetch } = useGetUserQuery({})
+    const { data, error } = useGetUserQuery({})
     const cookies = new Cookies()
 
     useEffect(() => {
-        const unsubscribeOnRefetchProfileQuery = on(EventKey.RefetchProfileQuery, () => {
-            refetch()
-        })
-
         if (router.pathname === RoutePath[AppRoutes.MOBILE_RECAPTCHA]) return
 
         const jwtToken = typeof window !== 'undefined' ? cookies.get('jwtToken') : null
@@ -45,10 +39,6 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
         } else {
             router.push(RoutePath[AppRoutes.AUTH_SIGN_IN])
         }
-
-        return () => {
-            unsubscribeOnRefetchProfileQuery()
-        }
     }, [])
 
     useEffect(() => {

diff --git a/apps/schools/domains/user/redux/authenticationApi.ts b/apps/schools/domains/user/redux/authenticationApi.ts
@@ -9,27 +9,31 @@ const authenticationApi = commonApi.injectEndpoints({
                 method: 'POST',
                 body: data,
             }),
+            invalidatesTags: ['User'],
         }),
         logout: build.mutation<{}, {}>({
             query: (data) => ({
                 url: '/user-management/auth/jwt/logout',
                 method: 'POST',
                 body: data,
             }),
+            invalidatesTags: ['User'],
         }),
         getUser: build.query<{ user: GetUserProfiles }, {}>({
             query: (data) => ({
                 url: '/user-management/auth/me',
                 method: 'GET',
                 data: data,
             }),
+            providesTags: ['User'],
         }),
         updateUser: build.mutation<{ user: GetUser }, UpdateUserData>({
             query: (data) => ({
                 url: '/user-management/auth/me',
                 method: 'PATCH',
                 body: data,
             }),
+            invalidatesTags: ['User'],
         }),
         updatePassword: build.mutation<{}, UpdatePasswordData>({
             query: (data) => ({

diff --git a/apps/schools/domains/user/redux/userApi.ts b/apps/schools/domains/user/redux/userApi.ts
@@ -19,6 +19,7 @@ const userApi = commonApi.injectEndpoints({
                 method: 'POST',
                 body: data,
             }),
+            invalidatesTags: ['User'],
         }),
         resetPassword: build.mutation<{}, PasswordReset>({
             query: (data) => ({

diff --git a/apps/schools/pages/auth/register.tsx b/apps/schools/pages/auth/register.tsx
@@ -5,18 +5,15 @@ import React, { useState } from 'react'
 import { Dictionary } from '@reduxjs/toolkit'
 import { ContainerPage } from '../_app'
 import AuthLayout, { IAuthLayoutProps } from '../../domains/user/components/auth/containers/AuthLayout'
-import { FormContainer } from '../../domains/user/components/auth/formContainer'
-import { InputPhoneForm } from '../../domains/user/components/auth/sharedForms/InputPhoneForm'
-import { TabsAuthAction } from '../../domains/user/components/auth/headerActions'
-import { ValidatePhoneForm } from '../../domains/user/components/auth/sharedForms/ValidatePhoneForm'
-import { RegisterForm } from '../../domains/user/components/auth/registerForm'
-import { CENTRALIZED } from '../../domains/common/components/styles/constantStyles'
+import { FormContainer } from '@domains/user/components/auth/formContainer'
+import { InputPhoneForm } from '@domains/user/components/auth/sharedForms/InputPhoneForm'
+import { TabsAuthAction } from '@domains/user/components/auth/headerActions'
+import { ValidatePhoneForm } from '@domains/user/components/auth/sharedForms/ValidatePhoneForm'
+import { RegisterForm } from '@domains/user/components/auth/registerForm'
+import { CENTRALIZED } from '@domains/common/components/styles/constantStyles'
 import { Row } from 'antd'
-import {
-    RegistrationDisclaimer,
-    RegistrationPhoneButtonLabel,
-} from '../../domains/user/components/auth/constants/labels'
-import { FirebaseReCaptcha } from '../../domains/user/providers/firebaseReCaptchaProvider'
+import { RegistrationDisclaimer, RegistrationPhoneButtonLabel } from '@domains/user/components/auth/constants/labels'
+import { FirebaseReCaptcha } from '@domains/user/providers/firebaseReCaptchaProvider'
 import { AppRoutes, RoutePath } from '@domains/common/constants/routerEnums'
 
 const RegisterPage: ContainerPage<IAuthLayoutProps> = (props) => {
@@ -56,7 +53,7 @@ const RegisterPage: ContainerPage<IAuthLayoutProps> = (props) => {
             <>
                 <TabsAuthAction currentActiveKey={RoutePath[AppRoutes.AUTH_REGISTER]} />
                 <RegisterForm
-                    onFinish={() => (window.location.href = '/')}
+                    onFinish={() => Router.push(RoutePath[AppRoutes.USER_LIST])}
                     onError={() => {
                         setStep('inputPhone')
                         Router.push(RoutePath[AppRoutes.AUTH_REGISTER])

diff --git a/apps/schools/store/commonApi.ts b/apps/schools/store/commonApi.ts
@@ -43,6 +43,15 @@ export const commonApi = createApi({
             return headers
         },
     }) as BaseQueryFn<string | FetchArgs, unknown, ErrorType, {}>,
-    tagTypes: ['Circle', 'Student', 'StudentJoinCircleQuery', 'Organization', 'Employee', 'Ticket', 'TicketComments'],
+    tagTypes: [
+        'Circle',
+        'Student',
+        'StudentJoinCircleQuery',
+        'Organization',
+        'Employee',
+        'Ticket',
+        'TicketComments',
+        'User',
+    ],
     endpoints: (_) => ({}),
 })