Skip to content

chore: add missing abacAttributes to useRoomIcon Pick type #38427

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
kodiakhq merged 8 commits into from
Feb 10, 2026
+3 −18
Merged

chore: add missing abacAttributes to useRoomIcon Pick type #38427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1556f9f
fix: add missing abacAttributes to useRoomIcon Pick type
NAME-ASHWANIYADAV Jan 29, 2026
6c47617
fix: correct IAbacAttributeDefinition type structure and add changeset
NAME-ASHWANIYADAV Jan 29, 2026
ccf7439
chore: remove unnecessary abacAttributes undefined from test fixtures
NAME-ASHWANIYADAV Feb 2, 2026
e64c7f8
Merge branch 'develop' into fix/use-room-icon-abac-type
KevLehman Feb 3, 2026
9436fe3
Delete .changeset/fix-use-room-icon-abac-type.md
NAME-ASHWANIYADAV Feb 4, 2026
27cebba
Merge branch 'develop' into fix/use-room-icon-abac-type
KevLehman Feb 4, 2026
6bf0e82
Merge branch 'develop' into fix/use-room-icon-abac-type
kodiakhq[bot] Feb 9, 2026
2dedf9a
Merge branch 'develop' into fix/use-room-icon-abac-type
kodiakhq[bot] Feb 10, 2026
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
18 changes: 2 additions & 16 deletions apps/meteor/client/hooks/useRoomIcon.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,59 +6,45 @@ const mockRooms = {
t: 'c',
name: 'public',
teamMain: false,
// @ts-expect-error TODO: Implement ABAC attributes in rooms
abacAttributes: false,
}),
private: createFakeRoom({
t: 'p',
name: 'private',
teamMain: false,
// @ts-expect-error TODO: Implement ABAC attributes in rooms
abacAttributes: false,
}),
team: createFakeRoom({
t: 'c',
name: 'team',
teamMain: true,
// @ts-expect-error TODO: Implement ABAC attributes in rooms
abacAttributes: false,
}),
direct: createFakeRoom({
t: 'd',
name: 'direct',
teamMain: false,
// @ts-expect-error TODO: Implement ABAC attributes in rooms
abacAttributes: false,
}),
directMultiple: createFakeRoom({
t: 'd',
name: 'direct-multiple',
teamMain: false,
// @ts-expect-error TODO: Implement ABAC attributes in rooms
abacAttributes: false,
uids: ['user1', 'user2', 'user3'],
}),
federated: createFakeRoom({
t: 'c',
name: 'federated',
teamMain: false,
// @ts-expect-error TODO: Implement ABAC attributes in rooms
abacAttributes: false,
federated: true,
}),
abacRoom: createFakeRoom({
t: 'c',
name: 'abac-room',
teamMain: false,
// @ts-expect-error TODO: Implement ABAC attributes in rooms
abacAttributes: true,
abacAttributes: [{ key: 'department', values: ['engineering'] }],
}),
abacTeamRoom: createFakeRoom({
t: 'c',
name: 'abac-team-room',
teamMain: true,
// @ts-expect-error TODO: Implement ABAC attributes in rooms
abacAttributes: true,
abacAttributes: [{ key: 'team', values: ['core'] }],
}),
};

Expand Down
3 changes: 1 addition & 2 deletions apps/meteor/client/hooks/useRoomIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import type { ComponentProps, ReactElement } from 'react';
import { ReactiveUserStatus } from '../components/UserStatus';

export const useRoomIcon = (
room: Pick<IRoom, 't' | 'prid' | 'teamMain' | 'uids' | 'u'>,
room: Pick<IRoom, 't' | 'prid' | 'teamMain' | 'uids' | 'u' | 'abacAttributes'>,
): ComponentProps<typeof Icon> | ReactElement | null => {
// @ts-expect-error TODO: Implement ABAC attributes in rooms
if (room.abacAttributes) {
if (room.teamMain) {
return { name: 'team-shield' };
Expand Down
Loading