Tria/emaui
1
0
Fork 0
mirror of https://github.com/Tria-plc/emaui.git synced 2026-08-30 12:18:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: move the me endpoint to generic useApiQuery

Browse Source
This commit is contained in:
mengstabketemaw
2026-07-08 14:15:13 +03:00
parent c106ac68d4
commit de37c6940e
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/backoffice/src/app/features/profile/pages/ProfilePage.tsx
View File

@@ -43,7 +43,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
import { z } from 'zod'; import { z } from 'zod';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { notify, PageHeader } from '@ema-platform/ui'; import { notify, PageHeader } from '@ema-platform/ui';
import { useApiMutation, useGetMeQuery, baseApi } from '@ema-platform/api'; import { useApiMutation, useApiQuery } from '@ema-platform/api';
import type { AuthUser } from '@ema-platform/auth'; import type { AuthUser } from '@ema-platform/auth';
import { SUPPORTED_LANGUAGES, type AppLanguage } from '../../../i18n/config'; import { SUPPORTED_LANGUAGES, type AppLanguage } from '../../../i18n/config';
import { useAppDispatch, useAppSelector } from '../../../store/hooks'; import { useAppDispatch, useAppSelector } from '../../../store/hooks';
@@ -76,9 +76,9 @@ export function ProfilePage() {
const { colorScheme, setColorScheme } = useMantineColorScheme(); const { colorScheme, setColorScheme } = useMantineColorScheme();
const layoutMode = useAppSelector((state) => state.preferences.layoutMode); const layoutMode = useAppSelector((state) => state.preferences.layoutMode);
const { data: me } = useGetMeQuery(); const { data: me, refetch: refetchMe } = useApiQuery<AuthUser>({ url: '/auth/me', method: 'GET' });
const storeUser = useAppSelector((state) => state.auth.user); const storeUser = useAppSelector((state) => state.auth.user);
const user = (me as AuthUser | undefined) ?? storeUser; const user = me ?? storeUser;
const [updateTrigger] = useApiMutation<AuthUser>(); const [updateTrigger] = useApiMutation<AuthUser>();
const [passwordTrigger] = useApiMutation<unknown>(); const [passwordTrigger] = useApiMutation<unknown>();
@@ -133,7 +133,7 @@ export function ProfilePage() {
}, },
}).unwrap(); }).unwrap();
dispatch(baseApi.util.invalidateTags(['Me'])); refetchMe();
notify.success(t('profile.profileUpdated')); notify.success(t('profile.profileUpdated'));
} catch { } catch {
notify.error(t('profile.updateFailed')); notify.error(t('profile.updateFailed'));

8
apps/portal/src/app/features/profile/pages/ProfilePage.tsx
View File

@@ -44,7 +44,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
import { z } from 'zod'; import { z } from 'zod';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { notify, PageHeader } from '@ema-platform/ui'; import { notify, PageHeader } from '@ema-platform/ui';
import { useApiMutation, useGetMeQuery, baseApi } from '@ema-platform/api'; import { useApiMutation, useApiQuery } from '@ema-platform/api';
import { authStorage, setCurrentProfile } from '@ema-platform/auth'; import { authStorage, setCurrentProfile } from '@ema-platform/auth';
import type { CurrentProfile } from '@ema-platform/auth'; import type { CurrentProfile } from '@ema-platform/auth';
import { SUPPORTED_LANGUAGES, type AppLanguage } from '../../../i18n/config'; import { SUPPORTED_LANGUAGES, type AppLanguage } from '../../../i18n/config';
@@ -86,9 +86,9 @@ export function ProfilePage() {
const currentProfile = useAppSelector((state) => state.auth.currentProfile); const currentProfile = useAppSelector((state) => state.auth.currentProfile);
const { colorScheme, setColorScheme } = useMantineColorScheme(); const { colorScheme, setColorScheme } = useMantineColorScheme();
const { data: me } = useGetMeQuery(); const { data: me, refetch: refetchMe } = useApiQuery<AuthUser>({ url: '/auth/me', method: 'GET' });
const storeUser = useAppSelector((state) => state.auth.user); const storeUser = useAppSelector((state) => state.auth.user);
const user = (me as AuthUser | undefined) ?? storeUser; const user = me ?? storeUser;
const [updateTrigger] = useApiMutation<AuthUser>(); const [updateTrigger] = useApiMutation<AuthUser>();
const [passwordTrigger] = useApiMutation<unknown>(); const [passwordTrigger] = useApiMutation<unknown>();
const [fetchProfessions] = useApiMutation<{ count: number; items: Array<{ id: string; name: { en: string } }> }>(); const [fetchProfessions] = useApiMutation<{ count: number; items: Array<{ id: string; name: { en: string } }> }>();
@@ -239,7 +239,7 @@ export function ProfilePage() {
}, },
}).unwrap(); }).unwrap();
dispatch(baseApi.util.invalidateTags(['Me'])); refetchMe();
notify.success(t('profile.profileUpdated')); notify.success(t('profile.profileUpdated'));
} catch { } catch {
notify.error(t('profile.updateFailed')); notify.error(t('profile.updateFailed'));

2
libs/api/src/lib/base-api/index.ts
View File

@@ -4,6 +4,6 @@ import { baseQueryWithReauth } from './base-query-with-reauth';
export const baseApi = createApi({ export const baseApi = createApi({
reducerPath: 'baseApi', reducerPath: 'baseApi',
baseQuery: baseQueryWithReauth, baseQuery: baseQueryWithReauth,
tagTypes: ['Api', 'Me'], tagTypes: ['Api'],
endpoints: () => ({}), endpoints: () => ({}),
}); });

6
libs/api/src/lib/query-and-mutation/index.ts
View File

@@ -22,15 +22,11 @@ const queryApi = baseApi.injectEndpoints({
headers, headers,
}), }),
}), }),
getMe: builder.query<unknown, void>({
query: () => '/auth/me',
providesTags: ['Me'],
}),
}), }),
overrideExisting: false, overrideExisting: false,
}); });
export const { useApiQueryQuery, useApiMutationMutation, useGetMeQuery } = queryApi; export const { useApiQueryQuery, useApiMutationMutation } = queryApi;
export function useApiQuery<TData = unknown>( export function useApiQuery<TData = unknown>(
args: ApiQueryArgs, args: ApiQueryArgs,