Notify users about denied access on ask-to-join rooms #11480

nurjinjafar · 2023-08-29T12:50:53Z

We https://github.com/nordeck are currently implementing the knock rooms behind the feature flag feature_ask_to_join (introduced in #11182).

This pull request introduces the deny mask for requests.

Epic: element-hq/element-web#18655

Relates to
#11404
matrix-org/matrix-js-sdk#3673
#11353
matrix-org/matrix-js-sdk#3647
#11248
#11182
element-hq/element-web#25923

Screens

Checklist

Tests written for new code (and old code if feasible)
Linter and other CI checks pass
Sign-off given on the changes (see CONTRIBUTING.md)

Here's what your changelog entry will look like:
Type: enhancement

✨ Features
Introduce Deny access request mask on Ask-to-join rooms (#11480). Contributed by @nurjinjafar.

Here's what your changelog entry will look like:

✨ Features

Notify users about denied access on ask-to-join rooms (#11480). Contributed by @nurjinjafar.

Signed-off-by: AHMAD KADRI <52747422+ahmadkadri@users.noreply.github.com>

…d-access

Signed-off-by: AHMAD KADRI <52747422+ahmadkadri@users.noreply.github.com>

…about-denied-access

Signed-off-by: nurjinn jafar <nurjin.jafar@nordeck.net>

…ess-on-knocked-rooms

Signed-off-by: nurjinn jafar <nurjin.jafar@nordeck.net>

charlynguyen · 2023-08-31T09:27:29Z

Fixes element-hq/element-web#26084

…ess-on-knocked-rooms

nurjinjafar · 2023-09-04T08:06:39Z

Hello @dbkr , Hi @kerryarchibald, could you please give us an update regarding the pull request in case any exist?

…ess-on-knocked-rooms

kerryarchibald

Code looks good! I have left a couple of small nitpicks.

kerryarchibald · 2023-09-05T00:04:03Z

src/components/views/rooms/RoomPreviewBar.tsx

@@ -188,7 +189,11 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
        const myMember = this.getMyMember();

        if (myMember) {
+            const previousMembership = myMember.events.member?.event?.unsigned?.prev_content?.membership;


myMember.events.member?.getPrevContent().membership

kerryarchibald · 2023-09-05T00:07:58Z

test/components/views/rooms/RoomPreviewBar-test.tsx

    content?: Partial<IContent>;
    memberContent?: Partial<IContent>;
+    oldMembership?: "Join" | "knock";


should be lowercase "join"

kerryarchibald · 2023-09-05T00:14:03Z

src/components/views/rooms/RoomPreviewBar.tsx

+                title = _t("You have been denied access");
+
+                subTitle = _t(
+                    "As you have been denied access, please wait for an invitation from a room admin or moderator.",


The designs on the linked ticket use different copy - is there a reason this is different?

you are right! the ticket on our side had different text! but i added the text from the design!

Signed-off-by: nurjinn jafar <nurjin.jafar@nordeck.net>

* Prevent event propagation when clicking icon buttons * Inhibit view user on click behaviour for room header face pile * Update snapshot

…sts (matrix-org#11501) * Add a 'm.relates_to' to edits in receipt tests * Disable a test that fails with real edits * Wait for the room to be read after we mark it as read * Skip tests that are failing because of inconsistencies between local and CI behaviour

* Allow creating public knock rooms Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net> * Apply PR feedback Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net> * Apply PR feedback Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net> --------- Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net>

In order for the logs collected by cypress to actually be useful, we really need `cons:debug`.

…trix-org#11524) * Only show Search button in RoomSummaryCard if new room UI enabled * Update snapshot

* Update vector-im * Update snapshots of Compound Avatars * Update snapshots of Compound Avatars --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

* Work around compound-web AvatarStack not applying overlap to non-Avatars * Fix FacePile overflow tile not being layed out correctly

Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net>

* Factor downloadKey out to `utils.ts` * Add a new `describe` block for event shields * create a beforeEach block * Cypress tests for event shields

* Document how to match the CI config for Cypress * Clarify language about needing Chrome * Move Cypress info into the Cypress-specific docs

…-denied-access-on-knocked-rooms

…ess-on-knocked-rooms

@kerryarchibald

Changes in [1.11.45](https://github.com/vector-im/element-web/releases/tag/v1.11.45) (2023-09-29) ================================================================================================= ## 🐛 Bug Fixes * Fix Emoji font on Safari 17 ([\#11673](matrix-org/matrix-react-sdk#11673)). Changes in [1.11.44](https://github.com/vector-im/element-web/releases/tag/v1.11.44) (2023-09-26) ================================================================================================= ## ✨ Features * Make video & voice call buttons pin conference widget if unpinned ([\#11576](matrix-org/matrix-react-sdk#11576)). Fixes vector-im/customer-retainer#72. * OIDC: persist refresh token ([\#11249](matrix-org/matrix-react-sdk#11249)). Contributed by @kerryarchibald. * ElementR: Cross user verification ([\#11364](matrix-org/matrix-react-sdk#11364)). Fixes #25752. Contributed by @florianduros. * Default intentional mentions ([\#11602](matrix-org/matrix-react-sdk#11602)). * Notify users about denied access on ask-to-join rooms ([\#11480](matrix-org/matrix-react-sdk#11480)). Contributed by @nurjinjafar. * Allow setting knock room directory visibility ([\#11529](matrix-org/matrix-react-sdk#11529)). Contributed by @charlynguyen. ## 🐛 Bug Fixes * Revert "Fix regression around FacePile with overflow (#11527)" ([\#11634](matrix-org/matrix-react-sdk#11634)). Fixes #26209. * Escape placeholder before injecting it into the style ([\#11607](matrix-org/matrix-react-sdk#11607)). * Move ViewUser action callback to RoomView ([\#11495](matrix-org/matrix-react-sdk#11495)). Fixes #26040. * Fix room timeline search toggling behaviour edge case ([\#11605](matrix-org/matrix-react-sdk#11605)). Fixes #26105. * Avoid rendering view-message link in RoomKnocksBar unnecessarily ([\#11598](matrix-org/matrix-react-sdk#11598)). Contributed by @charlynguyen. * Use knock rooms sync to reflect the knock state ([\#11596](matrix-org/matrix-react-sdk#11596)). Fixes #26043 and #26044. Contributed by @charlynguyen. * Fix avatar in right panel not using the correct font ([\#11593](matrix-org/matrix-react-sdk#11593)). Fixes #26061. Contributed by @MidhunSureshR. * Add waits in Spotlight Cypress tests, hoping this unflakes them ([\#11590](matrix-org/matrix-react-sdk#11590)). Fixes #26053, #26140 #26139 and #26138. Contributed by @andybalaam. * Fix vertical alignment of default avatar font ([\#11582](matrix-org/matrix-react-sdk#11582)). Fixes #26081. * Fix avatars in public room & space search being flex shrunk ([\#11580](matrix-org/matrix-react-sdk#11580)). Fixes #26133. * Fix EventTile avatars being rendered with a size of 0 instead of hidden ([\#11558](matrix-org/matrix-react-sdk#11558)). Fixes #26075. Changes in [1.11.43](https://github.com/vector-im/element-web/releases/tag/v1.11.43) (2023-09-15) ================================================================================================= (No changes - bumping the version number for an element-desktop release.) Changes in [1.11.42](https://github.com/vector-im/element-web/releases/tag/v1.11.42) (2023-09-13) ================================================================================================= ## 🐛 Bug Fixes * Update Compound to fix Firefox-specific avatar regression ([\#11604](matrix-org/matrix-react-sdk#11604)). Fixes #26155. Changes in [1.11.41](https://github.com/vector-im/element-web/releases/tag/v1.11.41) (2023-09-12) ================================================================================================= ## 🦖 Deprecations * Deprecate customisations in favour of Module API ([\#25736](element-hq/element-web#25736)). Fixes #25733. ## ✨ Features * Make SVGR icons use forward ref ([\#26082](element-hq/element-web#26082)). * Add support for rendering a custom wrapper around Element ([\#25537](element-hq/element-web#25537)). Contributed by @maheichyk. * Allow creating public knock rooms ([\#11481](matrix-org/matrix-react-sdk#11481)). Contributed by @charlynguyen. * Render custom images in reactions according to MSC4027 ([\#11087](matrix-org/matrix-react-sdk#11087)). Contributed by @sumnerevans. * Introduce room knocks bar ([\#11475](matrix-org/matrix-react-sdk#11475)). Contributed by @charlynguyen. * Room header UI updates ([\#11507](matrix-org/matrix-react-sdk#11507)). Fixes #25892. * Remove green "verified" bar for encrypted events ([\#11496](matrix-org/matrix-react-sdk#11496)). * Update member count on room summary update ([\#11488](matrix-org/matrix-react-sdk#11488)). * Support for E2EE in Element Call ([\#11492](matrix-org/matrix-react-sdk#11492)). * Allow requesting to join knock rooms via spotlight ([\#11482](matrix-org/matrix-react-sdk#11482)). Contributed by @charlynguyen. * Lock out the first tab if Element is opened in a second tab. ([\#11425](matrix-org/matrix-react-sdk#11425)). Fixes #25157. * Change avatar to use Compound implementation ([\#11448](matrix-org/matrix-react-sdk#11448)). ## 🐛 Bug Fixes * Fix vertical alignment of default avatar font ([\#11582](matrix-org/matrix-react-sdk#11582)). Fixes #26081. * Fix avatars in public room & space search being flex shrunk ([\#11580](matrix-org/matrix-react-sdk#11580)). Fixes #26133. * Fix EventTile avatars being rendered with a size of 0 instead of hidden ([\#11558](matrix-org/matrix-react-sdk#11558)). Fixes #26075. * Fix compound external assets path in bundle ([\#26069](element-hq/element-web#26069)). * Use RoomStateEvent.Update for knocks ([\#11516](matrix-org/matrix-react-sdk#11516)). Contributed by @charlynguyen. * Prevent event propagation when clicking icon buttons ([\#11515](matrix-org/matrix-react-sdk#11515)). * Only display RoomKnocksBar when feature flag is enabled ([\#11513](matrix-org/matrix-react-sdk#11513)). Contributed by @andybalaam. * Fix avatars of knock members for people tab of room settings ([\#11506](matrix-org/matrix-react-sdk#11506)). Fixes #26083. Contributed by @charlynguyen. * Fixes read receipt avatar offset ([\#11483](matrix-org/matrix-react-sdk#11483)). Fixes #26067, #26064 #26059 and #26061. * Fix avatar defects ([\#11473](matrix-org/matrix-react-sdk#11473)). Fixes #26051 and #26046. * Fix consistent avatar output for Percy ([\#11472](matrix-org/matrix-react-sdk#11472)). Fixes #26049 and #26052. * Fix colour of avatar and colour matching with username ([\#11470](matrix-org/matrix-react-sdk#11470)). Fixes #26042. * Fix incompatibility of Soft Logout with Element-R ([\#11468](matrix-org/matrix-react-sdk#11468)). * Fix instances of double translation and guard translation calls using typescript ([\#11443](matrix-org/matrix-react-sdk#11443)).

@kerryarchibald

…xed, not tried running yet * Make video & voice call buttons pin conference widget if unpinned ([\#11576](matrix-org/matrix-react-sdk#11576)). Fixes vector-im/customer-retainer#72. * OIDC: persist refresh token ([\#11249](matrix-org/matrix-react-sdk#11249)). Contributed by @kerryarchibald. * ElementR: Cross user verification ([\#11364](matrix-org/matrix-react-sdk#11364)). Fixes #25752. Contributed by @florianduros. * Default intentional mentions ([\#11602](matrix-org/matrix-react-sdk#11602)). * Notify users about denied access on ask-to-join rooms ([\#11480](matrix-org/matrix-react-sdk#11480)). Contributed by @nurjinjafar. * Allow setting knock room directory visibility ([\#11529](matrix-org/matrix-react-sdk#11529)). Contributed by @charlynguyen. * Revert "Fix regression around FacePile with overflow (#11527)" ([\#11634](matrix-org/matrix-react-sdk#11634)). Fixes #26209. * Escape placeholder before injecting it into the style ([\#11607](matrix-org/matrix-react-sdk#11607)). * Move ViewUser action callback to RoomView ([\#11495](matrix-org/matrix-react-sdk#11495)). Fixes #26040. * Fix room timeline search toggling behaviour edge case ([\#11605](matrix-org/matrix-react-sdk#11605)). Fixes #26105. * Avoid rendering view-message link in RoomKnocksBar unnecessarily ([\#11598](matrix-org/matrix-react-sdk#11598)). Contributed by @charlynguyen. * Use knock rooms sync to reflect the knock state ([\#11596](matrix-org/matrix-react-sdk#11596)). Fixes #26043 and #26044. Contributed by @charlynguyen. * Fix avatar in right panel not using the correct font ([\#11593](matrix-org/matrix-react-sdk#11593)). Fixes #26061. Contributed by @MidhunSureshR. * Add waits in Spotlight Cypress tests, hoping this unflakes them ([\#11590](matrix-org/matrix-react-sdk#11590)). Fixes #26053, #26140 #26139 and #26138. Contributed by @andybalaam. * Fix vertical alignment of default avatar font ([\#11582](matrix-org/matrix-react-sdk#11582)). Fixes #26081. * Fix avatars in public room & space search being flex shrunk ([\#11580](matrix-org/matrix-react-sdk#11580)). Fixes #26133. * Fix EventTile avatars being rendered with a size of 0 instead of hidden ([\#11558](matrix-org/matrix-react-sdk#11558)). Fixes #26075.

ahmadkadri and others added 7 commits August 25, 2023 10:44

Implement denied request mask and logic

f74f075

Signed-off-by: AHMAD KADRI <52747422+ahmadkadri@users.noreply.github.com>

refactor / fix deny requests isues

e494b92

Merge branch 'develop' into nic/feat/PB-3435-Notify-users-about-denie…

6e400a8

…d-access

fix tests create denied message test

828ed36

Signed-off-by: AHMAD KADRI <52747422+ahmadkadri@users.noreply.github.com>

add another test for the primary action for denied request

96ca907

Signed-off-by: AHMAD KADRI <52747422+ahmadkadri@users.noreply.github.com>

Merge branch 'matrix-org:develop' into nic/feat/PB-3435-Notify-users-…

781a9d7

…about-denied-access

fix linter issues

c024452

Signed-off-by: nurjinn jafar <nurjin.jafar@nordeck.net>

nurjinjafar requested a review from a team as a code owner August 29, 2023 12:50

nurjinjafar requested review from dbkr and kerryarchibald August 29, 2023 12:50

github-actions bot added the Z-Community-PR Issue is solved by a community member's PR label Aug 29, 2023

Merge branch 'develop' into nurjinjafar/notify-users-about-denied-acc…

465fb22

…ess-on-knocked-rooms

github-actions bot deployed to Netlify August 29, 2023 13:00 View deployment

regenerate translation

cf70b0f

Signed-off-by: nurjinn jafar <nurjin.jafar@nordeck.net>

github-actions bot deployed to Netlify August 29, 2023 13:08 View deployment

github-actions bot added the T-Enhancement New features, changes in functionality, performance boosts, user-facing improvements label Aug 31, 2023

Merge branch 'develop' into nurjinjafar/notify-users-about-denied-acc…

ab645d5

…ess-on-knocked-rooms

github-actions bot deployed to Netlify August 31, 2023 09:40 View deployment

Merge branch 'develop' into nurjinjafar/notify-users-about-denied-acc…

a3c0d4e

…ess-on-knocked-rooms

github-actions bot deployed to Netlify September 4, 2023 08:13 View deployment

Merge branch 'develop' into nurjinjafar/notify-users-about-denied-acc…

ccc1bc5

…ess-on-knocked-rooms

github-actions bot deployed to Netlify September 4, 2023 10:33 View deployment

kerryarchibald reviewed Sep 5, 2023

View reviewed changes

nurjinjafar and others added 5 commits September 6, 2023 12:19

fix translation and minor refactoring

c571e1f

Signed-off-by: nurjinn jafar <nurjin.jafar@nordeck.net>

segment into 4

65d61d9

Remove parallel from Cypress command to avoid talking to Cypress Cloud

955a7b2

Re-add --parallel flag for Percy

628e188

Prevent event propagation when clicking icon buttons (matrix-org#11515)

96d78e7

* Prevent event propagation when clicking icon buttons * Inhibit view user on click behaviour for room header face pile * Update snapshot

andybalaam and others added 12 commits September 6, 2023 12:19

Collect console.debug logs during cypress tests (matrix-org#11478)

fbbd83c

In order for the logs collected by cypress to actually be useful, we really need `cons:debug`.

Migrate more strings to translation keys (matrix-org#11522)

d67bd1d

Only show Search button in RoomSummaryCard if new room UI enabled (ma…

5536965

…trix-org#11524) * Only show Search button in RoomSummaryCard if new room UI enabled * Update snapshot

Migrate more strings to translation keys (matrix-org#11530)

f083b25

Fix regression around FacePile with overflow (matrix-org#11527)

93e2f9d

* Work around compound-web AvatarStack not applying overlap to non-Avatars * Fix FacePile overflow tile not being layed out correctly

Use RoomStateEvent.Update for knocks (matrix-org#11516)

2e4fd67

Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net>

Cypress tests for event shields (matrix-org#11525)

3fc5886

* Factor downloadKey out to `utils.ts` * Add a new `describe` block for event shields * create a beforeEach block * Cypress tests for event shields

Document how to match the CI config for Cypress (matrix-org#11531)

315c92d

* Document how to match the CI config for Cypress * Clarify language about needing Chrome * Move Cypress info into the Cypress-specific docs

Migrate more strings to translation keys (matrix-org#11532)

7612f6d

nurjinjafar requested a review from a team as a code owner September 6, 2023 10:20

github-actions bot deployed to Netlify September 6, 2023 10:25 View deployment

Merge branch 'matrix-org:develop' into nurjinjafar/notify-users-about…

0285e23

…-denied-access-on-knocked-rooms

github-actions bot deployed to Netlify September 6, 2023 10:30 View deployment

kerryarchibald approved these changes Sep 7, 2023

View reviewed changes

kerryarchibald enabled auto-merge September 7, 2023 00:09

Merge branch 'develop' into nurjinjafar/notify-users-about-denied-acc…

c77d8ad

…ess-on-knocked-rooms

github-actions bot deployed to Netlify September 7, 2023 07:28 View deployment

kerryarchibald added this pull request to the merge queue Sep 7, 2023

Merged via the queue into matrix-org:develop with commit ce96853 Sep 7, 2023
73 checks passed

charlynguyen deleted the nurjinjafar/notify-users-about-denied-access-on-knocked-rooms branch September 11, 2023 20:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Notify users about denied access on ask-to-join rooms #11480

Notify users about denied access on ask-to-join rooms #11480

nurjinjafar commented Aug 29, 2023 •

edited by github-actions bot

Loading

charlynguyen commented Aug 31, 2023 •

edited

Loading

nurjinjafar commented Sep 4, 2023

kerryarchibald left a comment

kerryarchibald Sep 5, 2023

kerryarchibald Sep 5, 2023

kerryarchibald Sep 5, 2023

nurjinjafar Sep 6, 2023

Notify users about denied access on ask-to-join rooms #11480

Notify users about denied access on ask-to-join rooms #11480

Conversation

nurjinjafar commented Aug 29, 2023 • edited by github-actions bot Loading

Checklist

✨ Features

charlynguyen commented Aug 31, 2023 • edited Loading

nurjinjafar commented Sep 4, 2023

kerryarchibald left a comment

Choose a reason for hiding this comment

kerryarchibald Sep 5, 2023

Choose a reason for hiding this comment

kerryarchibald Sep 5, 2023

Choose a reason for hiding this comment

kerryarchibald Sep 5, 2023

Choose a reason for hiding this comment

nurjinjafar Sep 6, 2023

Choose a reason for hiding this comment

nurjinjafar commented Aug 29, 2023 •

edited by github-actions bot

Loading

charlynguyen commented Aug 31, 2023 •

edited

Loading