feat: Remove e2ee config from edit room panel (RocketChat#36945)

Author: dougfabris

.changeset/polite-garlics-wash.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+It removes the encrypted input from the edit room panel in order to avoid duplicated configurations with the same purpose

apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx

@@ -131,7 +131,6 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 		canSetReactWhenReadOnly,
 		canEditRoomRetentionPolicy,
 		canArchiveOrUnarchive,
-		canToggleEncryption,
 		canViewName,
 		canViewTopic,
 		canViewAnnouncement,
@@ -141,7 +140,6 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 		canViewReadOnly,
 		canViewHideSysMes,
 		canViewJoinCode,
-		canViewEncrypted,
 	} = useEditRoomPermissions(room);
 
 	const changeArchiving = archived !== !!room.archived;
@@ -223,15 +221,14 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 	const archivedField = useId();
 	const joinCodeRequiredField = useId();
 	const hideSysMesField = useId();
-	const encryptedField = useId();
 	const retentionEnabledField = useId();
 	const retentionOverrideGlobalField = useId();
 	const retentionMaxAgeField = useId();
 	const retentionExcludePinnedField = useId();
 	const retentionFilesOnlyField = useId();
 	const retentionIgnoreThreads = useId();
 
-	const showAdvancedSettings = canViewEncrypted || canViewReadOnly || readOnly || canViewArchived || canViewJoinCode || canViewHideSysMes;
+	const showAdvancedSettings = canViewReadOnly || readOnly || canViewArchived || canViewJoinCode || canViewHideSysMes;
 	const showRetentionPolicy = canEditRoomRetentionPolicy && retentionPolicy?.enabled;
 
 	const showAccordion = showAdvancedSettings || showRetentionPolicy;
@@ -365,29 +362,6 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 										<Box is='h5' fontScale='h5' color='titles-labels'>
 											{t('Security_and_permissions')}
 										</Box>
-										{canViewEncrypted && (
-											<Field>
-												<FieldRow>
-													<FieldLabel htmlFor={encryptedField}>{t('Encrypted')}</FieldLabel>
-													<Controller
-														control={control}
-														name='encrypted'
-														render={({ field: { value, ...field } }) => (
-															<ToggleSwitch
-																id={encryptedField}
-																aria-describedby={`${encryptedField}-hint`}
-																{...field}
-																disabled={!canToggleEncryption || isFederated}
-																checked={value}
-															/>
-														)}
-													/>
-												</FieldRow>
-												<FieldRow>
-													<FieldHint id={`${encryptedField}-hint`}>{t('Encrypted_field_hint')}</FieldHint>
-												</FieldRow>
-											</Field>
-										)}
 										{canViewReadOnly && (
 											<Field>
 												<FieldRow>

apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomPermissions.ts

@@ -4,17 +4,13 @@ import { useMemo } from 'react';
 
 import { RoomSettingsEnum } from '../../../../../../definition/IRoomTypeConfig';
 import { useTeamInfoQuery } from '../../../../../hooks/useTeamInfoQuery';
-import { E2EEState } from '../../../../../lib/e2ee/E2EEState';
 import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
-import { useE2EEState } from '../../../hooks/useE2EEState';
 
 const getCanChangeType = (room: IRoom | IRoomWithRetentionPolicy, canCreateChannel: boolean, canCreateGroup: boolean, isAdmin: boolean) =>
 	(!room.default || isAdmin) && ((room.t === 'p' && canCreateChannel) || (room.t === 'c' && canCreateGroup));
 
 export const useEditRoomPermissions = (room: IRoom | IRoomWithRetentionPolicy) => {
 	const isAdmin = useRole('admin');
-	const e2eeState = useE2EEState();
-	const isE2EEReady = e2eeState === E2EEState.READY || e2eeState === E2EEState.SAVE_PASSWORD;
 	const canCreateChannel = usePermission('create-c');
 	const canCreateGroup = usePermission('create-p');
 
@@ -37,7 +33,6 @@ export const useEditRoomPermissions = (room: IRoom | IRoomWithRetentionPolicy) =
 		useMemo(() => ['archive-room', 'unarchive-room'], []),
 		room._id,
 	);
-	const canToggleEncryption = usePermission('toggle-room-e2e-encryption', room._id) && (room.encrypted || isE2EEReady);
 
 	const [
 		canViewName,
@@ -50,7 +45,6 @@ export const useEditRoomPermissions = (room: IRoom | IRoomWithRetentionPolicy) =
 		canViewHideSysMes,
 		canViewJoinCode,
 		canViewReactWhenReadOnly,
-		canViewEncrypted,
 	] = useMemo(() => {
 		const isAllowed =
 			roomCoordinator.getRoomDirectives(room.t)?.allowRoomSettingChange ||
@@ -68,7 +62,6 @@ export const useEditRoomPermissions = (room: IRoom | IRoomWithRetentionPolicy) =
 			isAllowed(room, RoomSettingsEnum.SYSTEM_MESSAGES),
 			isAllowed(room, RoomSettingsEnum.JOIN_CODE),
 			isAllowed(room, RoomSettingsEnum.REACT_WHEN_READ_ONLY),
-			isAllowed(room, RoomSettingsEnum.E2E),
 		];
 	}, [room]);
 
@@ -78,7 +71,6 @@ export const useEditRoomPermissions = (room: IRoom | IRoomWithRetentionPolicy) =
 		canSetReactWhenReadOnly,
 		canEditRoomRetentionPolicy,
 		canArchiveOrUnarchive,
-		canToggleEncryption,
 		canViewName,
 		canViewTopic,
 		canViewAnnouncement,
@@ -89,6 +81,5 @@ export const useEditRoomPermissions = (room: IRoom | IRoomWithRetentionPolicy) =
 		canViewHideSysMes,
 		canViewJoinCode,
 		canViewReactWhenReadOnly,
-		canViewEncrypted,
 	};
 };

apps/meteor/tests/e2e/e2e-encryption.spec.ts

@@ -545,26 +545,6 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(channelMention).toBeVisible();
 	});
 
-	test('should encrypted field be available on edit room', async ({ page }) => {
-		const channelName = faker.string.uuid();
-
-		await poHomeChannel.sidenav.openNewByLabel('Channel');
-		await poHomeChannel.sidenav.inputChannelName.fill(channelName);
-		await poHomeChannel.sidenav.btnCreate.click();
-
-		await expect(page).toHaveURL(`/group/${channelName}`);
-
-		await expect(poHomeChannel.toastSuccess).toBeVisible();
-
-		await poHomeChannel.dismissToast();
-
-		await poHomeChannel.tabs.btnRoomInfo.click();
-		await poHomeChannel.tabs.room.btnEdit.click();
-		await poHomeChannel.tabs.room.advancedSettingsAccordion.click();
-
-		await expect(poHomeChannel.tabs.room.checkboxEncrypted).toBeVisible();
-	});
-
 	test('expect create a Direct message, encrypt it and attempt to enable OTR', async ({ page }) => {
 		await poHomeChannel.sidenav.openNewByLabel('Direct message');
 		await poHomeChannel.sidenav.inputDirectUsername.click();

apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts

@@ -79,10 +79,6 @@ export class HomeFlextabRoom {
 		return this.page.locator('label', { has: this.page.getByRole('checkbox', { name: 'Read-only' }) });
 	}
 
-	get checkboxEncrypted(): Locator {
-		return this.page.locator('label', { has: this.page.getByRole('checkbox', { name: 'Encrypted' }) });
-	}
-
 	get btnSave(): Locator {
 		return this.page.locator('role=button[name="Save"]');
 	}