Skip to content
Snippets Groups Projects
Unverified Commit 37cb8bb5 authored by Douglas Fabris's avatar Douglas Fabris Committed by Diego Sampaio
Browse files

fix: Admin can't change room name (#31713)

parent f473c580
No related branches found
No related tags found
No related merge requests found
---
'@rocket.chat/meteor': patch
---
Fixes an issue not allowing admin users to edit the room name
...@@ -96,7 +96,7 @@ const EditRoom = ({ room, onChange, onDelete }: EditRoomProps) => { ...@@ -96,7 +96,7 @@ const EditRoom = ({ room, onChange, onDelete }: EditRoomProps) => {
const handleArchive = useArchiveRoom(room); const handleArchive = useArchiveRoom(room);
const handleUpdateRoomData = useEffectEvent(async ({ isDefault, roomName, favorite, ...formData }) => { const handleUpdateRoomData = useEffectEvent(async ({ isDefault, favorite, ...formData }) => {
const data = getDirtyFields(formData, dirtyFields); const data = getDirtyFields(formData, dirtyFields);
delete data.archived; delete data.archived;
delete data.favorite; delete data.favorite;
...@@ -104,7 +104,6 @@ const EditRoom = ({ room, onChange, onDelete }: EditRoomProps) => { ...@@ -104,7 +104,6 @@ const EditRoom = ({ room, onChange, onDelete }: EditRoomProps) => {
try { try {
await saveAction({ await saveAction({
rid: room._id, rid: room._id,
roomName: roomType === 'd' ? undefined : roomName,
default: isDefault, default: isDefault,
favorite: { defaultValue: isDefault, favorite }, favorite: { defaultValue: isDefault, favorite },
...data, ...data,
......
...@@ -70,7 +70,18 @@ test.describe.parallel('administration', () => { ...@@ -70,7 +70,18 @@ test.describe.parallel('administration', () => {
await page.waitForSelector('[qa-room-id="GENERAL"]'); await page.waitForSelector('[qa-room-id="GENERAL"]');
}); });
test('should edit target channel', async () => { test('should edit target channel name', async () => {
await poAdmin.inputSearchRooms.fill(targetChannel);
await poAdmin.getRoomRow(targetChannel).click();
await poAdmin.roomNameInput.fill(`${targetChannel}-edited`);
await poAdmin.btnSave.click();
await expect(poAdmin.getRoomRow(targetChannel)).toContainText(`${targetChannel}-edited`);
targetChannel = `${targetChannel}-edited`;
});
test('should edit target channel type', async () => {
await poAdmin.inputSearchRooms.type(targetChannel); await poAdmin.inputSearchRooms.type(targetChannel);
await poAdmin.getRoomRow(targetChannel).click(); await poAdmin.getRoomRow(targetChannel).click();
await poAdmin.privateLabel.click(); await poAdmin.privateLabel.click();
...@@ -89,7 +100,7 @@ test.describe.parallel('administration', () => { ...@@ -89,7 +100,7 @@ test.describe.parallel('administration', () => {
}); });
test.describe.serial('Default rooms', () => { test.describe.serial('Default rooms', () => {
test('expect target channell to be default', async () => { test('expect target channel to be default', async () => {
await poAdmin.inputSearchRooms.type(targetChannel); await poAdmin.inputSearchRooms.type(targetChannel);
await poAdmin.getRoomRow(targetChannel).click(); await poAdmin.getRoomRow(targetChannel).click();
await poAdmin.defaultLabel.click(); await poAdmin.defaultLabel.click();
......
...@@ -28,6 +28,10 @@ export class Admin { ...@@ -28,6 +28,10 @@ export class Admin {
return this.page.locator(`label >> text=Private`); return this.page.locator(`label >> text=Private`);
} }
get roomNameInput(): Locator {
return this.page.locator('input[name="roomName"]');
}
get archivedLabel(): Locator { get archivedLabel(): Locator {
return this.page.locator('label >> text=Archived'); return this.page.locator('label >> text=Archived');
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment