regression: error when archiving rooms through the admin panel (Rocke…

…tChat#31503)

Co-authored-by: Henrique Guimarães Ribeiro <[email protected]>
Co-authored-by: Douglas Fabris <[email protected]>

apps/meteor/client/views/admin/rooms/EditRoom.tsx

@@ -14,7 +14,7 @@ import {
 	FieldError,
 } from '@rocket.chat/fuselage';
 import { useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useRouter, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
@@ -64,6 +64,7 @@ const getInitialValues = (room: Pick<IRoom, RoomAdminFieldsType>): EditRoomFormV
 
 const EditRoom = ({ room, onChange, onDelete }: EditRoomProps) => {
 	const t = useTranslation();
+	const router = useRouter();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const {
@@ -97,6 +98,7 @@ const EditRoom = ({ room, onChange, onDelete }: EditRoomProps) => {
 
 	const handleUpdateRoomData = useMutableCallback(async ({ isDefault, roomName, favorite, ...formData }) => {
 		const data = getDirtyFields(formData, dirtyFields);
+		delete data.archived;
 
 		try {
 			await saveAction({
@@ -109,6 +111,7 @@ const EditRoom = ({ room, onChange, onDelete }: EditRoomProps) => {
 
 			dispatchToastMessage({ type: 'success', message: t('Room_updated_successfully') });
 			onChange();
+			router.navigate('/admin/rooms');
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}

apps/meteor/tests/e2e/administration.spec.ts

@@ -65,7 +65,7 @@ test.describe.parallel('administration', () => {
 			await page.goto('/admin/rooms');
 		});
 
-		test('expect find "general" channel', async ({ page }) => {
+		test('should find "general" channel', async ({ page }) => {
 			await poAdmin.inputSearchRooms.type('general');
 			await page.waitForSelector('[qa-room-id="GENERAL"]');
 		});
@@ -77,7 +77,16 @@ test.describe.parallel('administration', () => {
 			await poAdmin.btnSave.click();
 			await expect(poAdmin.getRoomRow(targetChannel)).toContainText('Private Channel');
 		});
-
+
+		test('should archive target channel', async () => {
+			await poAdmin.inputSearchRooms.type(targetChannel);
+			await poAdmin.getRoomRow(targetChannel).click();
+			await poAdmin.archivedLabel.click();
+			await poAdmin.btnSave.click();
+
+			await poAdmin.getRoomRow(targetChannel).click();
+			await expect(poAdmin.archivedInput).toBeChecked();
+		});
 	});
 
 	test.describe('Permissions', () => {

apps/meteor/tests/e2e/page-objects/admin.ts

@@ -28,6 +28,14 @@ export class Admin {
 		return this.page.locator(`label >> text=Private`);
 	}
 
+	get archivedLabel(): Locator {
+		return this.page.locator('label >> text=Archived');
+	}
+
+	get archivedInput(): Locator {
+		return this.page.locator('input[name="archived"]');
+	}
+
 	get inputSearchUsers(): Locator {
 		return this.page.locator('input[placeholder="Search Users"]');
 	}