regression: Team Channels actions (RocketChat#21417)

gabriellsh · web-flow · commit ac7791a493b8 · 2021-04-20T15:57:06.000-03:00
diff --git a/client/sidebar/header/CreateChannel.js b/client/sidebar/header/CreateChannel.js
@@ -33,14 +33,8 @@ const CreateChannel = ({
 	const namesValidation = useSetting('UTF8_Names_Validation');
 	const allowSpecialNames = useSetting('UI_Allow_room_names_with_special_chars');
 	const channelNameExists = useMethod('roomNameExists');
-	const channelNameRegex = useMemo(() => {
-		if (allowSpecialNames) {
-			return '';
-		}
-		const regex = new RegExp(`^${namesValidation}$`);
 
-		return regex;
-	}, [allowSpecialNames, namesValidation]);
+	const channelNameRegex = useMemo(() => new RegExp(`^${namesValidation}$`), [namesValidation]);
 
 	const [nameError, setNameError] = useState();
 
@@ -53,7 +47,7 @@ const CreateChannel = ({
 			if (!name || name.length === 0) {
 				return setNameError(t('Field_required'));
 			}
-			if (!channelNameRegex.test(name)) {
+			if (!allowSpecialNames && !channelNameRegex.test(name)) {
 				return setNameError(t('error-invalid-name'));
 			}
 			const isNotAvailable = await channelNameExists(name);
@@ -62,7 +56,7 @@ const CreateChannel = ({
 			}
 		},
 		100,
-		[name],
+		[channelNameRegex],
 	);
 
 	useEffect(() => {
diff --git a/client/views/teams/contextualBar/channels/RoomActions.js b/client/views/teams/contextualBar/channels/RoomActions.js
@@ -4,8 +4,9 @@ import React, { useMemo } from 'react';
 
 import { roomTypes } from '../../../../../app/utils/client';
 import { useSetModal } from '../../../../contexts/ModalContext';
-import { useEndpoint } from '../../../../contexts/ServerContext';
+import { useToastMessageDispatch } from '../../../../contexts/ToastMessagesContext';
 import { useTranslation } from '../../../../contexts/TranslationContext';
+import { useEndpointActionExperimental } from '../../../../hooks/useEndpointAction';
 import ConfirmationModal from './ConfirmationModal';
 
 const useReactModal = (Component, props) => {
@@ -22,16 +23,27 @@ const useReactModal = (Component, props) => {
 
 const RoomActions = ({ room, reload }) => {
 	const t = useTranslation();
-	const updateRoomEndpoint = useEndpoint('POST', 'teams.updateRoom');
-	const removeRoomEndpoint = useEndpoint('POST', 'teams.removeRoom');
-	const deleteRoomEndpoint = useEndpoint(
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const updateRoomEndpoint = useEndpointActionExperimental('POST', 'teams.updateRoom');
+	const removeRoomEndpoint = useEndpointActionExperimental(
+		'POST',
+		'teams.removeRoom',
+		t('Success'),
+	);
+	const deleteRoomEndpoint = useEndpointActionExperimental(
 		'POST',
 		room.t === 'c' ? 'channels.delete' : 'groups.delete',
+		t('Success'),
 	);
 
 	const RemoveFromTeamAction = useReactModal(ConfirmationModal, {
-		onConfirmAction: () => {
-			removeRoomEndpoint({ teamId: room.teamId, roomId: room._id });
+		onConfirmAction: async () => {
+			try {
+				await removeRoomEndpoint({ teamId: room.teamId, roomId: room._id });
+			} catch (error) {
+				dispatchToastMessage({ type: 'error', message: error });
+			}
 			reload();
 		},
 		labelButton: t('Remove'),
@@ -46,7 +58,11 @@ const RoomActions = ({ room, reload }) => {
 
 	const DeleteChannelAction = useReactModal(ConfirmationModal, {
 		onConfirmAction: async () => {
-			await deleteRoomEndpoint({ roomId: room._id });
+			try {
+				await deleteRoomEndpoint({ roomId: room._id });
+			} catch (error) {
+				dispatchToastMessage({ type: 'error', message: error });
+			}
 			reload();
 		},
 		labelButton: t('Delete'),
@@ -64,11 +80,15 @@ const RoomActions = ({ room, reload }) => {
 	});
 
 	const menuOptions = useMemo(() => {
-		const AutoJoinAction = () => {
-			updateRoomEndpoint({
-				roomId: room._id,
-				isDefault: !room.teamDefault,
-			});
+		const AutoJoinAction = async () => {
+			try {
+				await updateRoomEndpoint({
+					roomId: room._id,
+					isDefault: !room.teamDefault,
+				});
+			} catch (error) {
+				dispatchToastMessage({ type: 'error', message: error });
+			}
 
 			reload();
 		};
@@ -105,6 +125,7 @@ const RoomActions = ({ room, reload }) => {
 		t,
 		updateRoomEndpoint,
 		reload,
+		dispatchToastMessage,
 	]);
 
 	return (
