Skip to content
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

[FIX] "Match error" when converting a team to a channel #24629

Merged
merged 3 commits into from
Mar 11, 2022
Merged

[FIX] "Match error" when converting a team to a channel #24629

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
7e0d6c3
Fix teams.listRoomsOfUser error when the canUserDelete param is sent
matheusbsilva137 Feb 25, 2022
fc2f13a
Fix client
matheusbsilva137 Feb 25, 2022
d32f6c1
Create boolean const to improve legibility
matheusbsilva137 Mar 10, 2022
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
5 changes: 3 additions & 2 deletions app/api/server/v1/teams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ API.v1.addRoute(
this.queryParams,
Match.ObjectIncluding({
userId: String,
canUserDelete: Match.Maybe(Boolean),
canUserDelete: Match.Maybe(String),
}),
);

Expand All @@ -356,7 +356,8 @@ API.v1.addRoute(
return API.v1.unauthorized();
}

const { records, total } = await Team.listRoomsOfUser(this.userId, team._id, userId, allowPrivateTeam, canUserDelete ?? false, {
const booleanCanUserDelete = canUserDelete === 'true';
const { records, total } = await Team.listRoomsOfUser(this.userId, team._id, userId, allowPrivateTeam, booleanCanUserDelete, {
offset,
count,
});
Expand Down
2 changes: 1 addition & 1 deletion client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const ConvertToChannelModal: FC<ConvertToChannelModalProps> = ({ onClose, onCanc

const { value, phase } = useEndpointData(
'teams.listRoomsOfUser',
useMemo(() => ({ teamId, userId, canUserDelete: true }), [teamId, userId]),
useMemo(() => ({ teamId, userId, canUserDelete: 'true' }), [teamId, userId]),
);

if (phase === AsyncStatePhase.LOADING) {
Expand Down
4 changes: 2 additions & 2 deletions definition/rest/v1/teams/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ export type TeamsEndpoints = {
| {
teamId: ITeam['_id'];
userId: IUser['_id'];
canUserDelete?: boolean;
canUserDelete?: string;
}
| {
teamName: ITeam['name'];
userId: IUser['_id'];
canUserDelete?: boolean;
canUserDelete?: string;
},
) => PaginatedResult & { rooms: IRoom[] };
};
Expand Down