Skip to content

refactor(client): inline UserProvider.queryPreference subscribe/getSnapshot #40491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ggazzo wants to merge 1 commit into
base: develop
Choose a base branch
from
+20 −5
Open

refactor(client): inline UserProvider.queryPreference subscribe/getSnapshot #40491

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions apps/meteor/client/providers/UserProvider/UserProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { FindOptions, SubscriptionWithRoom } from '@rocket.chat/ui-contexts
import { UserContext, useRouteParameter, useSearchParameter } from '@rocket.chat/ui-contexts';
import { useQueryClient } from '@tanstack/react-query';
import { Meteor } from 'meteor/meteor';
import type { Filter } from 'mongodb';
import type { Filter, ObjectId } from 'mongodb';
import type { ContextType, ReactElement, ReactNode } from 'react';
import { useEffect, useMemo, useRef } from 'react';
import type { StoreApi, UseBoundStore } from 'zustand';
Expand All @@ -21,8 +21,8 @@ import { sdk } from '../../../app/utils/client/lib/SDKClient';
import { useIdleConnection } from '../../hooks/useIdleConnection';
import type { IDocumentMapStore } from '../../lib/cachedStores/DocumentMapStore';
import { applyQueryOptions } from '../../lib/cachedStores/applyQueryOptions';
import { createReactiveSubscriptionFactory } from '../../lib/createReactiveSubscriptionFactory';
import { getDdpSdk } from '../../lib/sdk/ddpSdk';
import { settings } from '../../lib/settings';
import { userIdStore } from '../../lib/user';
import { Users, Rooms, Subscriptions } from '../../stores';
import { useSamlInviteToken } from '../../views/invite/hooks/useSamlInviteToken';
Expand Down Expand Up @@ -138,9 +138,24 @@ const UserProvider = ({ children }: UserProviderProps): ReactElement => {
(): ContextType<typeof UserContext> => ({
userId,
user,
queryPreference: createReactiveSubscriptionFactory(
<T,>(key: string, defaultValue?: T) => getUserPreference(userId, key, defaultValue) as T,
),
queryPreference: <T,>(
key: string | ObjectId,
defaultValue?: T,
): [subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => T | undefined] => {
const subscribe = (onStoreChange: () => void): (() => void) => {
const unsubUsers = Users.use.subscribe(onStoreChange);
// getUserPreference falls back to settings.watch(`Accounts_Default_User_Preferences_${key}`)
// when the user record has no override. Subscribe to that specific
// setting key so admin-side default changes still propagate.
const unsubSettings = settings.observe(`Accounts_Default_User_Preferences_${String(key)}`, onStoreChange);
return () => {
unsubUsers();
unsubSettings();
};
};
const getSnapshot = (): T | undefined => getUserPreference(userId, String(key), defaultValue);
return [subscribe, getSnapshot];
},
querySubscription,
queryRoom,
querySubscriptions,
Expand Down
Loading