Add possibility to leave from workspaces and workspace expense chats #35671

rezkiy37 · 2024-02-02T14:47:22Z

Details

The PR introduces a couple flows for leaving a workspace and a workspace chat. It is based on rules that described here for these scenarios.

Fixed Issues

$ #35286
PROPOSAL: N/A

Tests

Leaving a workspace

A current user shouldn't be a creator or an admin of a workspace you want to leave.
1.1. So invite the user from another account to a workspace. You can do it via the workspace settings members page.
Open the workspaces page.
Hover on a "three dots" button on a workspace.
Verify that there is a button "Leave" for a workspace that satisfies the 1st point.
Click on the button.
Verify that the workspace has gone from the list.
Verify that the #announce room has been archived.
Verify other related chats have been archived.

Leaving a workspace chat

Login with user A
Create or join a workspace if not done previously.
In user A expense chat, mention user B and click invite them on the whisper message (user B shouldn't be an admin or a direct member (default) of the workspace chat you want to leave).
Login with user B
Open the workspace chat page.
Hover on a "three dots" button on a header.
Verify that there is a button "Leave" for a workspace that satisfies the 1st point.
Click on the button.
Verify that the workspace chat has gone from the LHN.

Verify that no errors appear in the JS console

Offline tests

Same as "Tests".

QA Steps

Same as "Tests".

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android.Leave.Workspace.mp4

Android: mWeb Chrome

Android.Chrome.Leave.Workspace.mp4

iOS: Native

IOS.Leave.Workspace.mp4

iOS: mWeb Safari

IOS.Safari.Leave.Workspace.mp4

MacOS: Chrome / Safari

Chrome.Leave.Workspace.mp4

Leave.mp4

MacOS: Desktop

Desktop.Leave.Workspace.mp4

…ture/35286-leave-workspace

This reverts commit 3775ad0.

…ture/35286-leave-workspace

MonilBhavsar · 2024-03-15T08:45:53Z

@rezkiy37 can we please resolve this conflicts 🙏

…ture/35286-leave-workspace

rezkiy37 · 2024-03-15T12:45:27Z

@MonilBhavsar, you can try to use this PR for the testing.

…ture/35286-leave-workspace

src/pages/workspace/WorkspacesListPage.tsx

…ture/35286-leave-workspace

This reverts commit 5ca68a6.

rezkiy37 · 2024-03-29T12:53:31Z

Update - #35286 (comment).

…ture/35286-leave-workspace

MonilBhavsar · 2024-04-12T06:11:03Z

There are some conflicts to resolve and @rayane-djouah looks like last bug is not reproducible. Can you please take a look?

…ture/35286-leave-workspace

rayane-djouah · 2024-04-12T16:23:22Z

Bug: endless LeavePolicy requests after logout and logging back:
Recording.2024-04-10.231629.mp4

Sorry, I need more context on how to reproduce the bug. Also, I don't see any specific configuration for this request. Is it a common bug across the app?

I'm not able to reproduce.

rayane-djouah

LGTM and tests well 🚀

MonilBhavsar

Thanks! Looks good overall

MonilBhavsar · 2024-04-12T16:51:41Z

src/libs/ReportActionsUtils.ts


    // Currently, we only render messages when members are invited
-    const verb = isInviteAction ? Localize.translateLocal('workspace.invite.invited') : Localize.translateLocal('workspace.invite.removed');
+    let verb = Localize.translateLocal('workspace.invite.removed');
+


Suggested change

Done - 7321ad2.

MonilBhavsar · 2024-04-12T16:52:06Z

src/libs/ReportActionsUtils.ts

    );
 }

 function isInviteMemberAction(reportAction: OnyxEntry<ReportAction>) {
    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ROOMCHANGELOG.INVITE_TO_ROOM || reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG.INVITE_TO_ROOM;
 }

+function isLeaveMemberAction(reportAction: OnyxEntry<ReportAction>) {


Suggested change

function isLeaveMemberAction(reportAction: OnyxEntry<ReportAction>) {

function isLeavePolicyAction(reportAction: OnyxEntry<ReportAction>) {

Done - 7321ad2.

MonilBhavsar · 2024-04-12T16:55:23Z

src/libs/actions/Policy.ts

@@ -960,6 +974,101 @@ function removeMembers(accountIDs: number[], policyID: string) {
    API.write(WRITE_COMMANDS.DELETE_MEMBERS_FROM_WORKSPACE, params, {optimisticData, successData, failureData});
 }

+/** Leave a workspace */


We can remove this. name implies the reason

Suggested change

/** Leave a workspace */

Done - 7321ad2.

…ture/35286-leave-workspace

MonilBhavsar

Thank you! Let's ship it

OSBotify · 2024-04-15T07:56:15Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2024-04-18T04:54:23Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 1.4.63-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

MonilBhavsar · 2024-04-18T05:57:18Z

@rayane-djouah @rezkiy37 there were just this two backend bugs to fix #35671 (comment), right?

rayane-djouah · 2024-04-18T07:07:58Z

@MonilBhavsar, Yes!

MonilBhavsar · 2024-04-18T07:12:17Z

Thank you for confirming!

OSBotify · 2024-04-22T14:55:22Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.63-21 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

MonilBhavsar · 2024-04-25T11:54:17Z

@getusha @rezkiy37 this is the exact issue we discussed here, right?
#35671 (comment)
#40417

MonilBhavsar · 2024-04-25T11:58:42Z

and as per the security guidelines, a non workspace member can join the workspace chat https://github.com/Expensify/App?tab=readme-ov-file#security. So I think we should update both frontend and backend to allow anyone to rejoin the chat. What do you think?

rezkiy37 · 2024-04-26T08:18:06Z

and as per the security guidelines, a non workspace member can join the workspace chat https://github.com/Expensify/App?tab=readme-ov-file#security. So I think we should update both frontend and backend to allow anyone to rejoin the chat. What do you think?

Can we create an issue for this or do you want to fix it in a scope of the current issue?

rezkiy37 · 2024-04-26T13:48:45Z

Hey!
I just wanted to let you know about my vacation for next week. I will be back on 06.05.2024. Meanwhile, I asked @waterim to take over this issue.
See you soon!

arosiclair · 2024-06-06T21:28:10Z

src/pages/home/ReportScreen.tsx

+        }
+
+        if (report?.errorFields?.notFound) {
+            Report.clearReportNotFoundErrors(report.reportID);


This doesn't seem right to me. Why is this needed? @rezkiy37

@arosiclair, please check the condition above. The app checks if a report has reportID, if yes it means that the notFound error is not relevant anymore.

That's not necessarily true. If you lose access to a report,report.errorFields.notFound will be set along with the rest of the report data including the reportID.

So why is this needed? errorFields.notFound should already be cleared in the successData for OpenReport.

There was a bug - #35671 (comment). I fixed it - #35671 (comment), #35671 (comment).

Okay it sounds like the notFound error is not cleared when we push reports to users. I think we can just fix that on the backend. Do you know which API command you were testing that caused that bug? cc @MonilBhavsar

Looks like InviteToRoom

Alright looks like we just need to update Report::structureReportForOnyx to clear errorFields.notFound. I opened an issue to clean this up here.

mollfpr · 2024-08-07T07:35:45Z

src/pages/workspace/WorkspacesListPage.tsx

@@ -165,6 +170,14 @@ function WorkspacesListPage({policies, allPolicyMembers, reimbursementAccount, r
                });
            }

+            if (!(isAdmin || isOwner)) {
+                threeDotsMenuItems.push({
+                    icon: Expensicons.ChatBubbles,


Hi 👋 coming from #46248.

Pretty minor issue and part of the polish issue. We should be using the Exit icon.

rezkiy37 added 11 commits February 2, 2024 15:32

implement isPolicyOwner

107f84c

implement isReportOwner

4111039

implement draft types for leave API

52b16ce

implement draft for leave API

5788e86

implement draft for leave a workspace chat

2114adb

implement draft for leave a workspace

eb62992

integrate draft api data

3775ad0

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

cf3b66e

…ture/35286-leave-workspace

use real api for leaving workspaces

95b8741

Revert "integrate draft api data"

af8c733

This reverts commit 3775ad0.

minor fix

8a3473f

rezkiy37 mentioned this pull request Feb 5, 2024

[Awaiting payment][$500] HIGH: Add possibility to leave from the workspaces #35286

Closed

rezkiy37 added 4 commits February 6, 2024 12:09

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

d27f6e4

…ture/35286-leave-workspace

move button to top

0ce1db1

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

9fde01e

…ture/35286-leave-workspace

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

a8b9da5

…ture/35286-leave-workspace

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

184a6cd

…ture/35286-leave-workspace

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

eb6d577

…ture/35286-leave-workspace

MonilBhavsar reviewed Mar 26, 2024

View reviewed changes

src/pages/workspace/WorkspacesListPage.tsx Outdated Show resolved Hide resolved

rezkiy37 added 7 commits March 26, 2024 09:46

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

8ddf9be

…ture/35286-leave-workspace

integrate leave policy command

ea03623

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

d850c85

…ture/35286-leave-workspace

Add leave policy change log const

5ca68a6

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

f40cedd

…ture/35286-leave-workspace

Revert "Add leave policy change log const"

f8c8395

This reverts commit 5ca68a6.

integrate leave policy function

80caecd

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

ceff5e2

…ture/35286-leave-workspace

rezkiy37 added 2 commits April 12, 2024 10:27

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

7db78ee

…ture/35286-leave-workspace

fix spanish string

b028a6f

rayane-djouah approved these changes Apr 12, 2024

View reviewed changes

melvin-bot bot requested a review from MonilBhavsar April 12, 2024 16:24

MonilBhavsar reviewed Apr 12, 2024

View reviewed changes

rezkiy37 added 2 commits April 15, 2024 09:20

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

d07e04a

…ture/35286-leave-workspace

address comments

7321ad2

rezkiy37 requested a review from MonilBhavsar April 15, 2024 07:27

MonilBhavsar approved these changes Apr 15, 2024

View reviewed changes

MonilBhavsar merged commit 2ce785c into Expensify:main Apr 15, 2024
18 checks passed

github-actions bot mentioned this pull request Apr 18, 2024

Deploy Checklist: New Expensify 2024-04-18 #40392

Closed

NikkiWines mentioned this pull request Apr 18, 2024

Workspace - Workspace chat member list does not remove user when user has left the chat #40417

Closed

6 tasks

twisterdotcom mentioned this pull request Apr 22, 2024

[Awaiting checklist] [$250] LHN - LHN disappears upon leaving a public room / back button isn't redirecting to LHN #40680

Closed

6 tasks

arosiclair reviewed Jun 6, 2024

View reviewed changes

arosiclair mentioned this pull request Jun 10, 2024

[HOLD for payment 2024-07-17] report.errorFields.notFound is being cleared incorrectly #43357

Closed

6 tasks

allgandalf mentioned this pull request Jun 26, 2024

[HOLD for payment 2024-07-10] [$250] Workspace - Error page when navigate to Workspace Join link after leaving the workspace #43436

Closed

6 tasks

mollfpr reviewed Aug 7, 2024

View reviewed changes

mollfpr mentioned this pull request Aug 7, 2024

[HOLD for payment 2024-08-09] [$250] "Leave" option icon should have "exit" icon instead of "thread" icon #46248

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add possibility to leave from workspaces and workspace expense chats #35671

Add possibility to leave from workspaces and workspace expense chats #35671

rezkiy37 commented Feb 2, 2024 •

edited

Loading

MonilBhavsar commented Mar 15, 2024

rezkiy37 commented Mar 15, 2024

rezkiy37 commented Mar 29, 2024

MonilBhavsar commented Apr 12, 2024

rayane-djouah commented Apr 12, 2024

rayane-djouah left a comment

MonilBhavsar left a comment

MonilBhavsar Apr 12, 2024

rezkiy37 Apr 15, 2024

MonilBhavsar Apr 12, 2024

rezkiy37 Apr 15, 2024

MonilBhavsar Apr 12, 2024

rezkiy37 Apr 15, 2024

MonilBhavsar left a comment

OSBotify commented Apr 15, 2024

OSBotify commented Apr 18, 2024

MonilBhavsar commented Apr 18, 2024

rayane-djouah commented Apr 18, 2024

MonilBhavsar commented Apr 18, 2024

OSBotify commented Apr 22, 2024

MonilBhavsar commented Apr 25, 2024

MonilBhavsar commented Apr 25, 2024

rezkiy37 commented Apr 26, 2024 •

edited

Loading

rezkiy37 commented Apr 26, 2024

arosiclair Jun 6, 2024

rezkiy37 Jun 7, 2024

arosiclair Jun 7, 2024

rezkiy37 Jun 7, 2024 •

edited

Loading

arosiclair Jun 7, 2024

rezkiy37 Jun 7, 2024

arosiclair Jun 10, 2024

mollfpr Aug 7, 2024

	function isLeaveMemberAction(reportAction: OnyxEntry<ReportAction>) {
	function isLeavePolicyAction(reportAction: OnyxEntry<ReportAction>) {

Add possibility to leave from workspaces and workspace expense chats #35671

Add possibility to leave from workspaces and workspace expense chats #35671

Conversation

rezkiy37 commented Feb 2, 2024 • edited Loading

Details

Fixed Issues

Tests

Leaving a workspace

Leaving a workspace chat

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

MonilBhavsar commented Mar 15, 2024

rezkiy37 commented Mar 15, 2024

rezkiy37 commented Mar 29, 2024

MonilBhavsar commented Apr 12, 2024

rayane-djouah commented Apr 12, 2024

rayane-djouah left a comment

Choose a reason for hiding this comment

MonilBhavsar left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MonilBhavsar left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 15, 2024

OSBotify commented Apr 18, 2024

MonilBhavsar commented Apr 18, 2024

rayane-djouah commented Apr 18, 2024

MonilBhavsar commented Apr 18, 2024

OSBotify commented Apr 22, 2024

MonilBhavsar commented Apr 25, 2024

MonilBhavsar commented Apr 25, 2024

rezkiy37 commented Apr 26, 2024 • edited Loading

rezkiy37 commented Apr 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rezkiy37 Jun 7, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rezkiy37 commented Feb 2, 2024 •

edited

Loading

rezkiy37 commented Apr 26, 2024 •

edited

Loading

rezkiy37 Jun 7, 2024 •

edited

Loading