Skip to content

chore: Permissions store #36264

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

Merged
ggazzo merged 3 commits into from
Jun 26, 2025
Merged

chore: Permissions store #36264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc52050
chore: `hasPermission` replace minimongo with zustand store
juliajforesti Jun 20, 2025
7de0991
chore: `useFilteredPermissions` replace minimongo with zustand store
juliajforesti Jun 20, 2025
c1e53d2
chore: force Permissions store type
juliajforesti Jun 26, 2025
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
4 changes: 1 addition & 3 deletions apps/meteor/app/authorization/client/hasPermission.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ const createPermissionValidator =
}
}

const permission = Models.Permissions.findOne(permissionId, {
fields: { roles: 1 },
});
const permission = Models.Permissions.state.get(permissionId);
const roles = permission?.roles ?? [];

return roles.some((roleId) => {
Expand Down
10 changes: 9 additions & 1 deletion apps/meteor/app/models/client/models/Permissions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
import type { IPermission } from '@rocket.chat/core-typings';
import type { StoreApi, UseBoundStore } from 'zustand';

import { PrivateCachedCollection } from '../../../../client/lib/cachedCollections';
import type { IDocumentMapStore } from '../../../../client/lib/cachedCollections/DocumentMapStore';

type PermissionsStore = {
use: UseBoundStore<StoreApi<IDocumentMapStore<IPermission>>>;
readonly state: IDocumentMapStore<IPermission>;
};

export const AuthzCachedCollection = new PrivateCachedCollection<IPermission>({
name: 'permissions',
eventType: 'notify-logged',
});

export const Permissions = AuthzCachedCollection.collection;
// We are restricting the type of the collection, removing Minimongo methods to avoid further usage, until full conversion to zustand store
export const Permissions = AuthzCachedCollection.collection as PermissionsStore;
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/permissions/hooks/useFilteredPermissions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const useFilteredPermissions = ({ filter }: { filter: string }) => {
const { t } = useTranslation();

const mappedPermissionKeys = useMemo(() => {
const permissions = Permissions.find().fetch();
const permissions = Array.from(Permissions.state.records.values());
return mapPermissionKeys({ t, permissions });
}, [t]);

Expand Down
Loading