Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NEW] Matrix Federation UX improvements #25847

Merged
merged 45 commits into from
Jul 2, 2022
Merged

[NEW] Matrix Federation UX improvements #25847

merged 45 commits into from
Jul 2, 2022

Conversation

alansikora
Copy link
Contributor

@alansikora alansikora commented Jun 13, 2022

This PR introduces the following improvements:

  • Stabilization of the Matrix integration
  • Rename the slash command from /bridge to /federation (only able to create DMs at this moment)
  • Better UX experience in general
  • Ability to create a federated channel from the UI (EE edition)
  • Ability to invite external users through the UI (EE edition)
  • Ability to create DMs from the UI (EE edition)

* feat: refactor slash commands (WIP)

* chore: prepare federation for EE

* fix: fix and move tests

* chore: add more test cases
@alansikora alansikora self-assigned this Jun 13, 2022
@alansikora alansikora requested review from a team as code owners June 13, 2022 15:58
@MarcosSpessatto MarcosSpessatto changed the title Federation: ce/ee and initial UX [NEW] CE/EE and UX improvements Jun 13, 2022
MarcosSpessatto and others added 22 commits June 13, 2022 15:00
* fix: bridge port

* feat: leave matrix room when user leaves rocket room

* refactor: leave room method

* refactor: setup callbacks

* fix: add after leave room callback

* fix: fix lint and revert hardcoded port

* fix: remove dead code

* chore: fix lint

Co-authored-by: Marcos Defendi <marcos.defendi@rocket.chat>
* feat: hide msg actions when the room is federated

* chore: remove log

* fix: remove extra object

* WIP review

* WIP - Disabled actions example

* fix: update based on code review from the FE team

* fix: adjust according to the latest develop changes

* [NEW] Hide channel actions + message box when the room is federated (#25822)

* feat: hide and disable some channels action when federated

* feat: hide message box actions + upload when room is federated

Co-authored-by: Guilherme Gazzo <guilherme@gazzo.xyz>
* feat: invite users on channel creation server (WIP)

* feat: backend of federation channels

* chore: add more test cases

* fix: lgtm warning

* fix: remove listeners when license is invalid

* feat: add validation when add users

* fix: fix tests

* fix: fix on add users (WIP)

* fix: more tweaks (WIP)

* fix: wrong condition

* fix: fix invites

* fix: trying stuff until it works

* fix: resolve promise

* fix: more tweaks

* fix: fixes to support latest develop changes

* [NEW] Add federated users on channel creation (#25986)

* convert useHasLicense to TS

* Make federation setting public

* Allow creation of federated channels

* Create new autocomplete

* Fix state

* Fix broken types

* Icons

* Change Federated hint

* fix: fix errors due to the models migration

* fix: fix lint

Co-authored-by: Marcos Defendi <marcos.defendi@rocket.chat>

* fix: invite local users as well

* fix: try to fix DMs

* fix: trying again (WIP)

* fix: removing logs and fixing lint

* fix: useless condition

* fix: fix broken tests

* fix: fix lint

Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
@ggazzo ggazzo added the stat: ready to merge PR tested and approved waiting for merge label Jul 1, 2022
tassoevan
tassoevan previously approved these changes Jul 1, 2022
Copy link
Contributor

@tassoevan tassoevan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I've had requested @gabriellsh to add some comments in code posteriorly.

@ggazzo
Copy link
Member

ggazzo commented Jul 1, 2022

all the actions disabled by federation rooms, are we not missing some tooltip explaining why the functionality is disabled?

@MarcosSpessatto
Copy link
Contributor

all the actions disabled by federation rooms, are we not missing some tooltip explaining why the functionality is disabled?

I have added the tooltips for every action that was disabled. :)

Thanks.

@kodiakhq kodiakhq bot removed the stat: ready to merge PR tested and approved waiting for merge label Jul 1, 2022
@kodiakhq
Copy link
Contributor

kodiakhq bot commented Jul 1, 2022

This PR currently has a merge conflict. Please resolve this and then re-add the ['stat: ready to merge', 'automerge'] label.

@ggazzo ggazzo added the stat: ready to merge PR tested and approved waiting for merge label Jul 1, 2022
sampaiodiego
sampaiodiego previously approved these changes Jul 1, 2022
@kodiakhq kodiakhq bot merged commit f1a3ab6 into develop Jul 2, 2022
@kodiakhq kodiakhq bot deleted the feat/federation-ux branch July 2, 2022 01:32
gabriellsh added a commit that referenced this pull request Jul 4, 2022
* 'develop' of github.com:RocketChat/Rocket.Chat: (29 commits)
  Chore: move fork of cas module to the monorepo (#26107)
  Chore: Add Agenda fork to the monorepo (#25681)
  Chore: Bump deps (#25624)
  [NEW][ENTERPRISE] Device Management (#25791)
  Chore: `refactor/tsc-perf` (#26040)
  [BREAK] Upgrade to version 5.0 can be done only from version 4.x (#26100)
  [BREAK] Remove support to old MongoDB versions (#26098)
  [NEW] Matrix Federation UX improvements (#25847)
  Regression: en.i18n.json spaces
  [NEW][ENTERPRISE] Introducing dial pad component into sidebar, calls table, contextual bar (#26081)
  Chore: Settings UI issue (#26053)
  Chore: Adding default message parser template (#26064)
  Regression: [VideoConference] If the caller loses connection, direct calls are never canceled (#26099)
  Chore: Handle errors on index creation (#26094)
  Chore: fix watermark condition (#26095)
  [FIX] Validate room access (#24534)
  [BREAK] VideoConference (#25570)
  [FIX] Undefined headers on API Client (#26083)
  Regression: Add Error boundary to katex render component (#26067)
  Chore: Allow endpoints to optionally require authentication (#26084)
  ...
@murtaza98 murtaza98 mentioned this pull request Jul 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants