-
Notifications
You must be signed in to change notification settings - Fork 10.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into refactor/lvchat-ts
- Loading branch information
Showing
32 changed files
with
892 additions
and
766 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@rocket.chat/meteor': patch | ||
| --- | ||
|
|
||
| fix: mobile ringing notification missing call id |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@rocket.chat/meteor": patch | ||
| --- | ||
|
|
||
| Forward headers when using proxy for file uploads |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
apps/meteor/client/views/hooks/roomActions/useDeleteRoom.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| import type { IRoom, RoomAdminFieldsType } from '@rocket.chat/core-typings'; | ||
| import { isRoomFederated } from '@rocket.chat/core-typings'; | ||
| import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; | ||
| import { useSetModal, useToastMessageDispatch, useRouter, usePermission, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts'; | ||
| import { useMutation } from '@tanstack/react-query'; | ||
| import React from 'react'; | ||
|
|
||
| import GenericModal from '../../../components/GenericModal'; | ||
| import DeleteTeamModal from '../../teams/contextualBar/info/DeleteTeam'; | ||
|
|
||
| export const useDeleteRoom = (room: IRoom | Pick<IRoom, RoomAdminFieldsType>, { reload }: { reload?: () => void } = {}) => { | ||
| const t = useTranslation(); | ||
| const router = useRouter(); | ||
| const setModal = useSetModal(); | ||
| const dispatchToastMessage = useToastMessageDispatch(); | ||
| const hasPermissionToDelete = usePermission(`delete-${room.t}`, room._id); | ||
| const canDeleteRoom = isRoomFederated(room) ? false : hasPermissionToDelete; | ||
|
|
||
| const isAdminRoute = router.getRouteName() === 'admin-rooms'; | ||
|
|
||
| const deleteRoomEndpoint = useEndpoint('POST', '/v1/rooms.delete'); | ||
| const deleteTeamEndpoint = useEndpoint('POST', '/v1/teams.delete'); | ||
|
|
||
| const deleteRoomMutation = useMutation({ | ||
| mutationFn: deleteRoomEndpoint, | ||
| onSuccess: () => { | ||
| dispatchToastMessage({ type: 'success', message: t('Room_has_been_deleted') }); | ||
| if (isAdminRoute) { | ||
| return router.navigate('/admin/rooms'); | ||
| } | ||
|
|
||
| return router.navigate('/home'); | ||
| }, | ||
| onError: (error) => { | ||
| dispatchToastMessage({ type: 'error', message: error }); | ||
| }, | ||
| onSettled: () => { | ||
| setModal(null); | ||
| reload?.(); | ||
| }, | ||
| }); | ||
|
|
||
| const deleteTeamMutation = useMutation({ | ||
| mutationFn: deleteTeamEndpoint, | ||
| onSuccess: () => { | ||
| dispatchToastMessage({ type: 'success', message: t('Team_has_been_deleted') }); | ||
| if (isAdminRoute) { | ||
| return router.navigate('/admin/rooms'); | ||
| } | ||
|
|
||
| return router.navigate('/home'); | ||
| }, | ||
| onError: (error) => { | ||
| dispatchToastMessage({ type: 'error', message: error }); | ||
| }, | ||
| onSettled: () => { | ||
| setModal(null); | ||
| reload?.(); | ||
| }, | ||
| }); | ||
|
|
||
| const isDeleting = deleteTeamMutation.isLoading || deleteRoomMutation.isLoading; | ||
|
|
||
| const handleDelete = useMutableCallback(() => { | ||
| const handleDeleteTeam = async (roomsToRemove: IRoom['_id'][]) => { | ||
| if (!room.teamId) { | ||
| return; | ||
| } | ||
|
|
||
| deleteTeamMutation.mutateAsync({ teamId: room.teamId, ...(roomsToRemove.length && { roomsToRemove }) }); | ||
| }; | ||
|
|
||
| if (room.teamMain && room.teamId) { | ||
| return setModal(<DeleteTeamModal onConfirm={handleDeleteTeam} onCancel={(): void => setModal(null)} teamId={room.teamId} />); | ||
| } | ||
|
|
||
| const handleDeleteRoom = async () => { | ||
| deleteRoomMutation.mutateAsync({ roomId: room._id }); | ||
| }; | ||
|
|
||
| setModal( | ||
| <GenericModal variant='danger' onConfirm={handleDeleteRoom} onCancel={(): void => setModal(null)} confirmText={t('Yes_delete_it')}> | ||
| {t('Delete_Room_Warning')} | ||
| </GenericModal>, | ||
| ); | ||
| }); | ||
|
|
||
| return { handleDelete, canDeleteRoom, isDeleting }; | ||
| }; |
Oops, something went wrong.