Merge branch 'release-7.0.0' into chore/removed-Mailer.sendMail-Maile…

…r.unsubscribe
RocketChat · Oct 15, 2024 · c95cffb · c95cffb
2 parents 1c21662 + 6d0e099
commit c95cffb
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 81 deletions.
diff --git a/.changeset/thick-waves-try.md b/.changeset/thick-waves-try.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": major
+"@rocket.chat/i18n": patch
+---
+
+Removes the ability of changing room's encryption status from the `key` icon placed on the room's header. Icon's purpose is now only informative, showing when a room uses E2EE. Use the kebab menu to enable/disable E2EE.
diff --git a/apps/meteor/client/views/room/Header/icons/Encrypted.tsx b/apps/meteor/client/views/room/Header/icons/Encrypted.tsx
@@ -1,36 +1,14 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import colors from '@rocket.chat/fuselage-tokens/colors';
-import { useSetting, usePermission, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
+import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 
 import { HeaderState } from '../../../../components/Header';
-import { dispatchToastMessage } from '../../../../lib/toast';
 
 const Encrypted = ({ room }: { room: IRoom }) => {
 	const t = useTranslation();
 	const e2eEnabled = useSetting('E2E_Enable');
-	const toggleE2E = useEndpoint('POST', '/v1/rooms.saveRoomSettings');
-	const canToggleE2E = usePermission('toggle-room-e2e-encryption');
-	const encryptedLabel = canToggleE2E ? t('Encrypted_key_title') : t('Encrypted');
-	const handleE2EClick = useMutableCallback(async () => {
-		if (!canToggleE2E) {
-			return;
-		}
-
-		const { success } = await toggleE2E({ rid: room._id, encrypted: !room.encrypted });
-		if (!success) {
-			return;
-		}
-
-		dispatchToastMessage({
-			type: 'success',
-			message: t('E2E_Encryption_disabled_for_room', { roomName: room.name }),
-		});
-	});
-	return e2eEnabled && room?.encrypted ? (
-		<HeaderState title={encryptedLabel} icon='key' onClick={handleE2EClick} color={colors.g500} tiny />
-	) : null;
+	return e2eEnabled && room?.encrypted ? <HeaderState title={t('Encrypted')} icon='key' color={colors.g500} tiny /> : null;
 };
 
 export default memo(Encrypted);
diff --git a/apps/meteor/client/views/room/HeaderV2/icons/Encrypted.tsx b/apps/meteor/client/views/room/HeaderV2/icons/Encrypted.tsx
@@ -1,36 +1,14 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import colors from '@rocket.chat/fuselage-tokens/colors';
-import { useSetting, usePermission, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
+import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 
 import { HeaderState } from '../../../../components/Header';
-import { dispatchToastMessage } from '../../../../lib/toast';
 
 const Encrypted = ({ room }: { room: IRoom }) => {
 	const t = useTranslation();
 	const e2eEnabled = useSetting('E2E_Enable');
-	const toggleE2E = useEndpoint('POST', '/v1/rooms.saveRoomSettings');
-	const canToggleE2E = usePermission('toggle-room-e2e-encryption');
-	const encryptedLabel = canToggleE2E ? t('Encrypted_key_title') : t('Encrypted');
-	const handleE2EClick = useMutableCallback(async () => {
-		if (!canToggleE2E) {
-			return;
-		}
-
-		const { success } = await toggleE2E({ rid: room._id, encrypted: !room.encrypted });
-		if (!success) {
-			return;
-		}
-
-		dispatchToastMessage({
-			type: 'success',
-			message: t('E2E_Encryption_disabled_for_room', { roomName: room.name }),
-		});
-	});
-	return e2eEnabled && room?.encrypted ? (
-		<HeaderState title={encryptedLabel} icon='key' onClick={handleE2EClick} color={colors.g500} tiny />
-	) : null;
+	return e2eEnabled && room?.encrypted ? <HeaderState title={t('Encrypted')} icon='key' color={colors.g500} tiny /> : null;
 };
 
 export default memo(Encrypted);
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
@@ -52,7 +52,7 @@ export class HomeContent {
 	}
 
 	get encryptedRoomHeaderIcon(): Locator {
-		return this.page.locator('.rcx-room-header button > i.rcx-icon--name-key');
+		return this.page.locator('.rcx-room-header i.rcx-icon--name-key');
 	}
 
 	get lastIgnoredUserMessage(): Locator {

diff --git a/packages/i18n/src/locales/ar.i18n.json b/packages/i18n/src/locales/ar.i18n.json
@@ -1602,7 +1602,6 @@
   "Enabled": "تم التمكين",
   "Encrypted": "مشفر",
   "Encrypted_channel_Description": "القناة المشفرة بين النهايات. لن يعمل البحث مع الفِرَق المشفرة وقد لا تعرض الإشعارات محتوى الرسائل.",
-  "Encrypted_key_title": "انقر هنا لتعطيل التشفير بين النهايات لهذه القناة (يتطلب إذن التشفير بين النهايات)",
   "Encrypted_message": "رسالة مشفرة",
   "Encrypted_setting_changed_successfully": "تم تغيير الإعداد المشفر بنجاح!",
   "Encrypted_not_available": "غير متاح لـ Channel العامة",
@@ -4884,4 +4883,4 @@
   "Enterprise": "مؤسسة",
   "UpgradeToGetMore_engagement-dashboard_Title": "التحليلات",
   "UpgradeToGetMore_auditing_Title": "تدقيق الرسائل"
-}
+}
diff --git a/packages/i18n/src/locales/ca.i18n.json b/packages/i18n/src/locales/ca.i18n.json
@@ -1585,7 +1585,6 @@
   "Enabled": "Activa",
   "Encrypted": "Xifrat",
   "Encrypted_channel_Description": "Canal xifrat d'extrem a extrem. La cerca no funcionarà amb canals xifrats i és possible que les notificacions no mostrin el contingut dels missatges.",
-  "Encrypted_key_title": "Feu clic aquí per desactivar el xifratge d'extrem a extrem per a aquest canal (requereix permís e2ee)",
   "Encrypted_message": "Missatge xifrat",
   "Encrypted_setting_changed_successfully": "La configuració encriptada es va canviar correctament",
   "Encrypted_not_available": "No disponible per a Channels públics",
@@ -4686,4 +4685,4 @@
   "Enterprise": "Empresa",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analítiques",
   "UpgradeToGetMore_auditing_Title": "Auditoria de missatges"
-}
+}
diff --git a/packages/i18n/src/locales/de.i18n.json b/packages/i18n/src/locales/de.i18n.json
@@ -1794,7 +1794,6 @@
   "Enabled": "Aktiviert",
   "Encrypted": "Verschlüsselt",
   "Encrypted_channel_Description": "Ende-zu-Ende verschlüsselter Kanal. Die Suche funktioniert nicht mit verschlüsselten Channels. In Benachrichtigungen wird der Inhalt der Nachricht möglicherweise nicht angezeigt.",
-  "Encrypted_key_title": "Klicken Sie hier, um die Ende-zu-Ende-Verschlüsselung für diesen Kanal zu deaktivieren (e2ee-Berechtigung erforderlich)",
   "Encrypted_message": "Verschlüsselte Nachricht",
   "Encrypted_setting_changed_successfully": "Die Verschlüsselungseinstellungen wurden gespeichert ",
   "Encrypted_not_available": "Für öffentliche Kanäle nicht verfügbar",
@@ -5521,4 +5520,4 @@
   "Enterprise": "Unternehmen",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Nachrichtenüberprüfung"
-}
+}
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
@@ -1976,7 +1976,6 @@
   "Encrypted": "Encrypted",
   "Encrypted_channel_Description": "Messages are end-to-end encrypted, search will not work and notifications may not show message content",
   "Encrypted_content_cannot_be_searched": "Encrypted content cannot be searched.",
-  "Encrypted_key_title": "Click here to disable end-to-end encryption for this channel (requires e2ee-permission)",
   "Encrypted_message": "Encrypted message",
   "Encrypted_RoomType": "Encrypted {{roomType}}",
   "Encrypted_message_preview_unavailable": "Encrypted message, preview unavailable",

diff --git a/packages/i18n/src/locales/es.i18n.json b/packages/i18n/src/locales/es.i18n.json
@@ -1607,7 +1607,6 @@
   "Enabled": "Habilitada",
   "Encrypted": "Cifrado",
   "Encrypted_channel_Description": "Canal cifrado de extremo a extremo. La búsqueda no funcionará con canales cifrados y es posible que las notificaciones no muestren el contenido de los mensajes.",
-  "Encrypted_key_title": "Haz clic aquí para deshabilitar el cifrado de extremo a extremo para este canal (requiere permiso de E2EE)",
   "Encrypted_message": "Mensaje cifrado",
   "Encrypted_setting_changed_successfully": "Configuración cifrada cambiada correctamente",
   "Encrypted_not_available": "No disponible para Channels públicos",

diff --git a/packages/i18n/src/locales/fi.i18n.json b/packages/i18n/src/locales/fi.i18n.json
@@ -1816,7 +1816,6 @@
   "Enabled": "Käytössä",
   "Encrypted": "Salattu",
   "Encrypted_channel_Description": "Täysin salattu kanava. Haku ei toimi salatuilla kanavilla, ja ilmoituksissa ei välttämättä näy viestien sisältöä.",
-  "Encrypted_key_title": "Poista käytöstä tämän kanavan täysi salaus napsauttamalla tätä (edellyttää e2ee-oikeutta)",
   "Encrypted_message": "Salattu viesti",
   "Encrypted_setting_changed_successfully": "Salausasetus on muutettu",
   "Encrypted_not_available": "Ei saatavilla ylesellä kanavalla Channel",
@@ -5737,4 +5736,4 @@
   "Theme_Appearence": "Teeman ulkoasu",
   "Enterprise": "Yritys",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
+}
diff --git a/packages/i18n/src/locales/fr.i18n.json b/packages/i18n/src/locales/fr.i18n.json
@@ -1600,7 +1600,6 @@
   "Enabled": "Activé",
   "Encrypted": "Chiffré",
   "Encrypted_channel_Description": "Canal chiffré de bout en bout. La recherche ne fonctionne pas avec les canaux chiffrés et les notifications peuvent ne pas afficher le contenu des messages.",
-  "Encrypted_key_title": "Cliquez ici pour désactiver le chiffrement de bout en bout pour ce canal (nécessite l'autorisation E2EE)",
   "Encrypted_message": "Message chiffré",
   "Encrypted_setting_changed_successfully": "Le paramètre chiffré a été modifié",
   "Encrypted_not_available": "Non disponible pour les canaux publics",
@@ -4879,4 +4878,4 @@
   "Enterprise": "Entreprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analyses",
   "UpgradeToGetMore_auditing_Title": "Audit des messages"
-}
+}
diff --git a/packages/i18n/src/locales/hi-IN.i18n.json b/packages/i18n/src/locales/hi-IN.i18n.json
@@ -1865,7 +1865,6 @@
   "Enabled": "सक्रिय",
   "Encrypted": "कूट रूप दिया गया",
   "Encrypted_channel_Description": "एंड-टू-एंड एन्क्रिप्टेड चैनल। खोज एन्क्रिप्टेड चैनलों के साथ काम नहीं करेगी और सूचनाएं संदेश सामग्री नहीं दिखा सकती हैं।",
-  "Encrypted_key_title": "इस चैनल के लिए एंड-टू-एंड एन्क्रिप्शन अक्षम करने के लिए यहां क्लिक करें (e2ee-अनुमति की आवश्यकता है)",
   "Encrypted_message": "एन्क्रिप्टेड संदेश",
   "Encrypted_setting_changed_successfully": "एन्क्रिप्टेड सेटिंग सफलतापूर्वक बदल दी गई",
   "Encrypted_not_available": "सार्वजनिक चैनलों के लिए उपलब्ध नहीं है",
@@ -6120,4 +6119,4 @@
   "Unlimited_seats": "असीमित सीटें",
   "Unlimited_MACs": "असीमित एमएसी",
   "Unlimited_seats_MACs": "असीमित सीटें और एमएसी"
-}
+}
diff --git a/packages/i18n/src/locales/hu.i18n.json b/packages/i18n/src/locales/hu.i18n.json
@@ -1760,7 +1760,6 @@
   "Enabled": "Engedélyezve",
   "Encrypted": "Titkosítva",
   "Encrypted_channel_Description": "Végpontok között titkosított csatorna. A keresés nem fog működni a titkosított csatornákkal, és az értesítések esetleg nem jelenítik meg az üzenetek tartalmát.",
-  "Encrypted_key_title": "Kattintson ide a csatorna végpontok közötti titkosításának letiltásához (végpontok közötti titkosítás jogosultságot igényel)",
   "Encrypted_message": "Titkosított üzenet",
   "Encrypted_setting_changed_successfully": "A titkosított beállítás sikeresen megváltoztatva",
   "Encrypted_not_available": "Nem érhető el nyilvános csatornáknál",
@@ -5419,4 +5418,4 @@
   "Enterprise": "Vállalati",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitika",
   "UpgradeToGetMore_auditing_Title": "Üzenet ellenőrzés"
-}
+}
diff --git a/packages/i18n/src/locales/ja.i18n.json b/packages/i18n/src/locales/ja.i18n.json
@@ -1578,7 +1578,6 @@
   "Enabled": "有効",
   "Encrypted": "暗号化済み",
   "Encrypted_channel_Description": "エンドツーエンドの暗号化チャネル。検索は暗号化されたチャネルでは機能せず、通知にメッセージの内容が表示されないことがあります。",
-  "Encrypted_key_title": "このチャネルのエンドツーエンド暗号化を無効にするには、ここをクリックしてください（e2ee-permissionが必要です）",
   "Encrypted_message": "暗号化されたメッセージ",
   "Encrypted_setting_changed_successfully": "暗号化の設定が正常に変更されました",
   "Encrypted_not_available": "パブリックChannelsには利用できません",
@@ -4822,4 +4821,4 @@
   "Enterprise": "エンタープライズ",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析",
   "UpgradeToGetMore_auditing_Title": "メッセージ監査"
-}
+}
diff --git a/packages/i18n/src/locales/nl.i18n.json b/packages/i18n/src/locales/nl.i18n.json
@@ -1592,7 +1592,6 @@
   "Enabled": "Ingeschakeld",
   "Encrypted": "Versleuteld",
   "Encrypted_channel_Description": "End-to-end gecodeerd kanaal. Zoeken werkt niet met gecodeerde kanalen en meldingen geven de inhoud van het bericht mogelijk niet weer.",
-  "Encrypted_key_title": "Klik hier om end-to-end encryptie voor dit kanaal uit te schakelen (vereist e2ee-toestemming)",
   "Encrypted_message": "Gecodeerd bericht",
   "Encrypted_setting_changed_successfully": "Versleutelde instelling is succesvol gewijzigd",
   "Encrypted_not_available": "Niet beschikbaar voor openbare kanalen",
@@ -4864,4 +4863,4 @@
   "Enterprise": "Onderneming",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Bericht auditing"
-}
+}
diff --git a/packages/i18n/src/locales/nn.i18n.json b/packages/i18n/src/locales/nn.i18n.json
@@ -1677,7 +1677,6 @@
   "Enabled": "aktivert",
   "Encrypted": "Kryptert",
   "Encrypted_channel_Description": "Ende-til-ende kryptert kanal. Søk fungerer ikke med krypterte kanaler, og varsler viser kanskje ikke meldingsinnholdet.",
-  "Encrypted_key_title": "Klikk her for å deaktivere ende-til-ende-kryptering for denne kanalen (krever e2e-tillatelse)",
   "Encrypted_message": "Kryptert melding",
   "Encrypted_not_available": "Ikke tilgjengelig for offentlige Channel",
   "Encryption_key_saved_successfully": "Krypteringsnøkkelen din ble lagret.",
@@ -4572,4 +4571,4 @@
   "free_per_month_user": "$0 per måned per bruker",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "Buy_more": "Kjøp mer"
-}
+}
diff --git a/packages/i18n/src/locales/no.i18n.json b/packages/i18n/src/locales/no.i18n.json
@@ -1677,7 +1677,6 @@
   "Enabled": "aktivert",
   "Encrypted": "Kryptert",
   "Encrypted_channel_Description": "Ende-til-ende kryptert kanal. Søk fungerer ikke med krypterte kanaler, og varsler viser kanskje ikke meldingsinnholdet.",
-  "Encrypted_key_title": "Klikk her for å deaktivere ende-til-ende-kryptering for denne kanalen (krever e2e-tillatelse)",
   "Encrypted_message": "Kryptert melding",
   "Encrypted_not_available": "Ikke tilgjengelig for offentlige Channel",
   "Encryption_key_saved_successfully": "Krypteringsnøkkelen din ble lagret.",
@@ -4574,4 +4573,4 @@
   "free_per_month_user": "$0 per måned per bruker",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "Buy_more": "Kjøp mer"
-}
+}
diff --git a/packages/i18n/src/locales/pl.i18n.json b/packages/i18n/src/locales/pl.i18n.json
@@ -1793,8 +1793,6 @@
   "Enabled": "Włączone",
   "Encrypted": "Szyfrowane",
   "Encrypted_channel_Description": "Kanał zaszyfrowany od końca do końca. Wyszukiwanie nie działa z szyfrowanymi kanałami, a powiadomienia mogą nie wyświetlać treści wiadomości.",
-  "Encrypted_key_title": "Kliknij tutaj, aby wyłączyć szyfrowanie od końca do końca dla tego kanału (wymaga uprawnień e2ee-permission)",
-  "Encrypted_message": "Zaszyfrowana wiadomość",
   "Encrypted_setting_changed_successfully": "Ustawienia szyfrowania zostały pomyślnie zmienione",
   "Encrypted_not_available": "Niedostępne dla publicznych {{roomType}}",
   "Encryption_key_saved_successfully": "Twój klucz szyfrowania został zapisany pomyślnie.",

diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -1651,7 +1651,6 @@
   "Enabled": "Ativado",
   "Encrypted": "Criptografado",
   "Encrypted_channel_Description": "Canal criptografado de ponta a ponta. A pesquisa não funcionará com canais criptografados e as notificações podem não mostrar o conteúdo das mensagens.",
-  "Encrypted_key_title": "Clique aqui para desabilitar a criptografia de ponta a ponta para esse canal (exige e2ee-permission)",
   "Encrypted_message": "Mensagem criptografada",
   "Encrypted_setting_changed_successfully": "Configuração de criptografia alterada com sucesso",
   "Encrypted_not_available": "Indisponível para canais públicos",

diff --git a/packages/i18n/src/locales/ru.i18n.json b/packages/i18n/src/locales/ru.i18n.json
@@ -1736,7 +1736,6 @@
   "Enabled": "Включено",
   "Encrypted": "Зашифрованный",
   "Encrypted_channel_Description": "Полностью зашифрованный канал. Поиск не будет работать с зашифрованными каналами, и уведомления могут не показать содержание сообщений.",
-  "Encrypted_key_title": "Нажмите здесь, чтобы отключить сквозное шифрование для этого канала (требуется разрешение E2EE)",
   "Encrypted_message": "Зашифрованное сообщение",
   "Encrypted_setting_changed_successfully": "Зашифрованный параметр успешно изменен",
   "Encrypted_not_available": "Недоступно для публичных каналов",

diff --git a/packages/i18n/src/locales/se.i18n.json b/packages/i18n/src/locales/se.i18n.json
@@ -1972,7 +1972,6 @@
   "Encrypted": "Encrypted",
   "Encrypted_channel_Description": "Messages are end-to-end encrypted, search will not work and notifications may not show message content",
   "Encrypted_content_cannot_be_searched": "Encrypted content cannot be searched.",
-  "Encrypted_key_title": "Click here to disable end-to-end encryption for this channel (requires e2ee-permission)",
   "Encrypted_message": "Encrypted message",
   "Encrypted_RoomType": "Encrypted {{roomType}}",
   "Encrypted_message_preview_unavailable": "Encrypted message, preview unavailable",
@@ -6601,4 +6600,4 @@
   "Sidepanel_navigation_description": "Display channels and/or discussions associated with teams by default. This allows team owners to customize communication methods to best meet their team’s needs. This is currently in feature preview and will be a premium capability once fully released.",
   "Show_channels_description": "Show team channels in second sidebar",
   "Show_discussions_description": "Show team discussions in second sidebar"
-}
+}
diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json
@@ -1818,7 +1818,6 @@
   "Enabled": "Aktiverad",
   "Encrypted": "Krypterad",
   "Encrypted_channel_Description": "End-to-end-krypterad kanal. Sökfunktionen fungerar inte för krypterade kanaler och meddelandeinnehållet kanske inte visas i meddelanden.",
-  "Encrypted_key_title": "Klicka här om du vill inaktivera end-to-end-kryptering för den här kanalen (e2ee-behörighet krävs)",
   "Encrypted_message": "Krypterat meddelande",
   "Encrypted_setting_changed_successfully": "Krypteringsinställningen har ändrats",
   "Encrypted_not_available": "Inte tillgängligt för offentliga kanaler",

diff --git a/packages/i18n/src/locales/zh-TW.i18n.json b/packages/i18n/src/locales/zh-TW.i18n.json
@@ -1575,7 +1575,6 @@
   "Enabled": "已啟用",
   "Encrypted": "已加密",
   "Encrypted_channel_Description": "點對點加密頻道。搜尋無法在加密頻道上工作且通知可能也不會顯示訊息內容。",
-  "Encrypted_key_title": "按一下這裡即可針對此頻道停用端對端加密 (需要 e2ee 權限)",
   "Encrypted_message": "加密訊息",
   "Encrypted_setting_changed_successfully": "加密設定已變更成功",
   "Encrypted_not_available": "不可以用在公開 Channel",