Skip to content

feat: Remove e2ee config from edit room panel#36945

Merged
kodiakhq[bot] merged 5 commits into
developfrom
feat/e2ee-room-edit
Sep 17, 2025
Merged

feat: Remove e2ee config from edit room panel#36945
kodiakhq[bot] merged 5 commits into
developfrom
feat/e2ee-room-edit

Conversation

@dougfabris

@dougfabris dougfabris commented Sep 15, 2025

Copy link
Copy Markdown
Member

Proposed changes (including videos or screenshots)

Since we already have the option to toggle the e2ee through from the toolbox, the product team decided to remove the option from the edit room panel, avoiding duplicated actions with the same purpose.

Issue(s)

Steps to test or reproduce

Further comments

CORE-1353

Summary by CodeRabbit

  • Refactor

    • Removed the encryption option from the Edit Room Info panel and simplified Advanced settings visibility by removing encryption-related gating.
  • Tests

    • Removed end-to-end checks that asserted the encrypted field in the Edit Room flow.
  • Chores

    • Added release metadata noting the removal of the encrypted input to avoid duplicated settings.

@dionisio-bot

dionisio-bot Bot commented Sep 15, 2025

Copy link
Copy Markdown
Contributor

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

@changeset-bot

changeset-bot Bot commented Sep 15, 2025

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: acb2643

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 39 packages
Name Type
@rocket.chat/meteor Minor
@rocket.chat/core-typings Minor
@rocket.chat/rest-typings Minor
@rocket.chat/uikit-playground Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/freeswitch Patch
@rocket.chat/fuselage-ui-kit Major
@rocket.chat/gazzodown Major
@rocket.chat/http-router Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-avatar Major
@rocket.chat/ui-client Major
@rocket.chat/ui-contexts Major
@rocket.chat/web-ui-registration Major
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/models Patch
@rocket.chat/network-broker Patch
@rocket.chat/omni-core-ee Patch
@rocket.chat/mock-providers Patch
@rocket.chat/ui-video-conf Major
@rocket.chat/ui-voip Major
@rocket.chat/instance-status Patch
@rocket.chat/omni-core Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@coderabbitai

coderabbitai Bot commented Sep 15, 2025

Copy link
Copy Markdown
Contributor

Walkthrough

Removed end-to-end encryption (E2EE) UI and permission checks from the Edit Room panel and its permissions hook, removed the related E2E test and page-object locator, and added a changeset documenting the removal.

Changes

Cohort / File(s) Summary
Room edit UI cleanup
apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
Removed encrypted-field UI block and removed E2EE-related destructured flags; Advanced Settings visibility no longer depends on E2EE flags.
Permissions hook cleanup
apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomPermissions.ts
Removed E2EE imports/state checks and removed canToggleEncryption and canViewEncrypted from returned permissions; removed E2E entry from settings checks.
E2E tests & page object
apps/meteor/tests/e2e/e2e-encryption.spec.ts, apps/meteor/tests/e2e/page-objects/fragments/home-flextab-room.ts
Deleted test asserting encrypted field presence; removed checkboxEncrypted locator/getter from page object.
Release metadata
.changeset/polite-garlics-wash.md
Added changeset noting removal of encrypted input from edit room panel (minor release).

Sequence Diagram(s)

sequenceDiagram
  autonumber
  actor U as User
  participant ERI as EditRoomInfo (UI)
  participant PERM as useEditRoomPermissions
  participant S as Permission Store

  U->>ERI: Open Edit Room
  ERI->>PERM: Request permissions
  PERM->>S: Compute allowed settings (E2E excluded)
  S-->>PERM: Flags (readOnly, archived, joinCode, hideSysMsgs, ...)
  PERM-->>ERI: Permissions (no E2E flags)
  note over ERI: Render edit form without encrypted field
  U->>ERI: View/modify available settings
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20–30 minutes

Suggested reviewers

  • cardoso

Poem

I nibbled keys and chewed one thread,
Pulled out a lock, tucked it to bed.
No extra toggle, the surface is clear—
A tidy burrow, soft and near.
Thump-thump—rabbit hops, a tiny cheer.

Pre-merge checks and finishing touches

✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title Check ✅ Passed The title "feat: Remove e2ee config from edit room panel" accurately and concisely reflects the main change in this PR: removing the end-to-end encryption configuration UI and its related permission checks from the edit room panel. The provided diffs remove the encrypted field and E2EE flags from EditRoomInfo.tsx and useEditRoomPermissions.ts and also remove related e2e test and page-object references, which aligns with the title. The "feat" prefix is appropriate for this visible behavior change.
Linked Issues Check ✅ Passed The changes satisfy CORE-1353's coding objectives by removing the e2ee configuration input and its handling from the edit room panel: EditRoomInfo.tsx no longer renders the encrypted field, useEditRoomPermissions.ts drops E2EE-related flags, and the corresponding e2e test and page-object references were removed. These code removals ensure the edit room panel cannot present or modify e2ee settings as required. The PR notes consolidation to the toolbox as rationale, but toolbox-related code is not modified in the provided diffs and therefore that consolidation cannot be validated from these changes alone.
Out of Scope Changes Check ✅ Passed All modified files in the summary are directly related to removing the edit-panel e2ee configuration: EditRoomInfo.tsx, useEditRoomPermissions.ts, the e2e test, the page-object getter, and a changeset entry, and there are no unrelated feature changes listed in the provided summary. The permission and test removals are consistent with removing the UI control rather than introducing unrelated functionality. Based on the provided summaries, there are no apparent out-of-scope changes.
Docstring Coverage ✅ Passed No functions found in the changes. Docstring coverage check skipped.
✨ Finishing touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch feat/e2ee-room-edit

📜 Recent review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Jira integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 6cee067 and 057bb01.

📒 Files selected for processing (2)
  • apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx (1 hunks)
  • apps/meteor/tests/e2e/e2e-encryption.spec.ts (0 hunks)
💤 Files with no reviewable changes (1)
  • apps/meteor/tests/e2e/e2e-encryption.spec.ts
🚧 Files skipped from review as they are similar to previous changes (1)
  • apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (2)
  • GitHub Check: CodeQL-Build
  • GitHub Check: CodeQL-Build

Comment @coderabbitai help to get the list of available commands and usage tips.

@dougfabris dougfabris added this to the 7.11.0 milestone Sep 15, 2025
@codecov

codecov Bot commented Sep 15, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 67.09%. Comparing base (b0a4602) to head (acb2643).
⚠️ Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #36945      +/-   ##
===========================================
+ Coverage    66.17%   67.09%   +0.91%     
===========================================
  Files         3220     3404     +184     
  Lines       114930   117782    +2852     
  Branches     20806    21487     +681     
===========================================
+ Hits         76056    79026    +2970     
+ Misses       36413    36062     -351     
- Partials      2461     2694     +233     
Flag Coverage Δ
e2e 56.96% <0.00%> (+3.07%) ⬆️
unit 71.87% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@dougfabris dougfabris marked this pull request as ready for review September 16, 2025 22:18
@dougfabris dougfabris requested a review from a team as a code owner September 16, 2025 22:18
@scuciatto scuciatto added the stat: QA assured Means it has been tested and approved by a company insider label Sep 17, 2025
@dionisio-bot dionisio-bot Bot added the stat: ready to merge PR tested and approved waiting for merge label Sep 17, 2025
@kodiakhq kodiakhq Bot merged commit 27cc5b7 into develop Sep 17, 2025
49 checks passed
@kodiakhq kodiakhq Bot deleted the feat/e2ee-room-edit branch September 17, 2025 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants