Fix invited members for admin threads #34362

narefyev91 · 2024-01-11T14:47:56Z

Details

After allowing threads for admin rooms - there were some issues to resolve

Fixed Issues

$ #33738
PROPOSAL: #33738 (comment)

Tests

Alice creates a workspace Alice's Apples
Alice invites Bob to the workspace
Bob creates a room #bagel-lovers that Alice is not in
Bob invites Cathy (who is not a member of the workspace) to #bagel-lovers
This cause Bob to post a system message to the #admins room of Alice's Apples saying: Bob invited Cathy to #bagel-lovers
Alice opens a thread on that system message
Alice posts "What up Bob, why did you invite Cathy?" in that thread
Confirm Bob is invited to that thread and sees Alice's message
Mention by @ should be available
Click into the room header and go to Members
It shows the member list with options to add/remove

Verify that no errors appear in the JS console

Offline tests

Alice creates a workspace Alice's Apples
Alice invites Bob to the workspace
Bob creates a room #bagel-lovers that Alice is not in
Bob invites Cathy (who is not a member of the workspace) to #bagel-lovers
This cause Bob to post a system message to the #admins room of Alice's Apples saying: Bob invited Cathy to #bagel-lovers
Alice opens a thread on that system message
Alice posts "What up Bob, why did you invite Cathy?" in that thread
Confirm Bob is invited to that thread and sees Alice's message
Mention by @ should be available
Click into the room header and go to Members
It shows the member list with options to add/remove

QA Steps

Alice creates a workspace Alice's Apples
Alice invites Bob to the workspace
Bob creates a room #bagel-lovers that Alice is not in
Bob invites Cathy (who is not a member of the workspace) to #bagel-lovers
This cause Bob to post a system message to the #admins room of Alice's Apples saying: Bob invited Cathy to #bagel-lovers
Alice opens a thread on that system message
Alice posts "What up Bob, why did you invite Cathy?" in that thread
Confirm Bob is invited to that thread and sees Alice's message
Mention by @ should be available
Click into the room header and go to Members
It shows the member list with options to add/remove

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

8mb.video-HFf-jgKBs2vF.mp4

Android: mWeb Chrome

8mb.video-Ef6-HVujRQyb.mp4

iOS: Native

8mb.video-mSR-rt3IUl3Y.mp4

iOS: mWeb Safari

8mb.video-3Dv-nc3F8yeb.mp4

MacOS: Chrome / Safari

8mb.video-4wq-qr90Z52d.mp4

MacOS: Desktop

8mb.video-Ha5-ox1Wz5un.mp4

src/libs/ReportUtils.ts

narefyev91 · 2024-01-12T11:33:33Z

~~Have some issues with building android - but will not block the review~~

melvin-bot · 2024-01-12T11:33:50Z

@aimane-chnaif Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

narefyev91 · 2024-01-15T10:31:01Z

@aimane-chnaif friendly bump on this one

aimane-chnaif · 2024-01-15T10:31:53Z

reviewing today

aimane-chnaif · 2024-01-15T14:06:37Z

Please resolve conflict

# Conflicts: # src/libs/ReportUtils.ts

aimane-chnaif · 2024-01-18T12:50:07Z

there were some issues to resolve

Can you please add context what issues are fixed?

aimane-chnaif · 2024-01-18T12:51:00Z

Testing against main, I haven't found any case of thread disabled for system messages.
So I assume this PR only fixes some issues in admin threads.

aimane-chnaif · 2024-01-18T13:04:22Z

Mention @[email protected]

Cathy should be added to the thread

Is this supposed to work? I don't see Cathy is being invited to the thread

My test accounts:

narefyev91 · 2024-01-18T13:10:44Z

Testing against main, I haven't found any case of thread disabled for system messages. So I assume this PR only fixes some issues in admin threads.

Yup the PR is mostly fixing issues with admin threads - like correct naming in the headers and left section

narefyev91 · 2024-01-18T13:50:19Z

Mention @[email protected]

Cathy should be added to the thread

Is this supposed to work? I don't see Cathy is being invited to the thread
My test accounts:

[email protected]: Alice

[email protected]: Bob

[email protected]: Cathy

I think that it is correct behaviour - because here you just mentioned person in thread. Previously just @ was not working

aimane-chnaif · 2024-01-18T13:55:07Z

If that's the correct behavior, 10. Cathy should be added to the thread should be removed from Tests

narefyev91 · 2024-01-18T15:10:43Z

If that's the correct behavior, 10. Cathy should be added to the thread should be removed from Tests

Updated description and add small fix for broken single thread for same user

quinthar · 2024-01-19T01:06:14Z

What's the next step and who is doing it, when?

narefyev91 · 2024-01-19T07:15:49Z

What's the next step and who is doing it, when?

I think that @aimane-chnaif will make final test - already saw based on his latest screenshot that flow is working fine. In any case will be here during all day and the weekend to help pushing it asap

aimane-chnaif · 2024-01-19T21:00:43Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

aimane-chnaif

Before:

After:

src/pages/home/ReportScreen.js

src/libs/ReportUtils.ts

melvin-bot · 2024-01-22T11:28:26Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #33738 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

src/libs/ReportUtils.ts

blimpich

Looks good! ✅

OSBotify · 2024-01-23T18:28:24Z

✋ 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-01-25T08:51:13Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.31-7 🚀

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

narefyev91 added 2 commits January 11, 2024 16:20

Fix invited members for admin threads

9949e48

clean up

37d532b

lukemorawski reviewed Jan 11, 2024

View reviewed changes

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

narefyev91 added 2 commits January 11, 2024 18:47

Code improvements

995588c

remove not needed space

e42ad55

narefyev91 marked this pull request as ready for review January 12, 2024 11:33

narefyev91 requested a review from a team as a code owner January 12, 2024 11:33

melvin-bot bot requested review from aimane-chnaif and removed request for a team January 12, 2024 11:33

narefyev91 added 4 commits January 15, 2024 16:18

Merge branch 'main' into fix-invited-members-in-admin-rooms

94d708d

# Conflicts: # src/libs/ReportUtils.ts

Merge branch 'main' into fix-invited-members-in-admin-rooms

4cf5d36

# Conflicts: # src/libs/ReportUtils.ts

fix linter

26bafc8

Merge branch 'main' into fix-invited-members-in-admin-rooms

642f234

# Conflicts: # src/libs/ReportUtils.ts

Fix undefined in report admin simple thread

05272b8

aimane-chnaif reviewed Jan 22, 2024

View reviewed changes

src/pages/home/ReportScreen.js Outdated Show resolved Hide resolved

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

src/libs/ReportUtils.ts Show resolved Hide resolved

aimane-chnaif approved these changes Jan 22, 2024

View reviewed changes

melvin-bot bot requested a review from blimpich January 22, 2024 11:29

narefyev91 added 2 commits January 22, 2024 13:56

add suggested changes

00a21a9

Merge branch 'Expensify:main' into fix-invited-members-in-admin-rooms

14672af

blimpich reviewed Jan 22, 2024

View reviewed changes

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

blimpich mentioned this pull request Jan 23, 2024

[HOLD for payment 2024-02-01] [$500] HIGH: Enable threading on all system messages #33738

Closed

narefyev91 added 3 commits January 23, 2024 11:21

Add safe check for Ts to remove direct assign to variable

4af50ce

prettier

0272df7

add safe check

a17a9fa

blimpich approved these changes Jan 23, 2024

View reviewed changes

blimpich merged commit f267baf into Expensify:main Jan 23, 2024
15 checks passed

github-actions bot mentioned this pull request Jan 24, 2024

Deploy Checklist: New Expensify 2024-01-24 #35037

Closed

48 tasks

dummy-1111 mentioned this pull request Jan 24, 2024

[HOLD for payment 2024-02-07] [$500] Thread - Thread header in room shows skeleton loading when replying in thread offline #35090

Closed

6 tasks

bernhardoj mentioned this pull request Jan 25, 2024

[HOLD for payment 2024-02-07] Display Name Appears as "hidden" in Preview Instead of User Email When Searching for New Email #35101

Closed

6 tasks

nebiyuelias1 mentioned this pull request Feb 1, 2024

[HOLD #35539][#VIP-VSB] Thread in #admin shows Hidden with avatar placeholder in LHN for workspace member #35132

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix invited members for admin threads #34362

Fix invited members for admin threads #34362

narefyev91 commented Jan 11, 2024 •

edited

Loading

narefyev91 commented Jan 12, 2024 •

edited

Loading

melvin-bot bot commented Jan 12, 2024

narefyev91 commented Jan 15, 2024

aimane-chnaif commented Jan 15, 2024

aimane-chnaif commented Jan 15, 2024

aimane-chnaif commented Jan 18, 2024

aimane-chnaif commented Jan 18, 2024 •

edited

Loading

aimane-chnaif commented Jan 18, 2024 •

edited

Loading

narefyev91 commented Jan 18, 2024

narefyev91 commented Jan 18, 2024

aimane-chnaif commented Jan 18, 2024

narefyev91 commented Jan 18, 2024

quinthar commented Jan 19, 2024

narefyev91 commented Jan 19, 2024

aimane-chnaif commented Jan 19, 2024

aimane-chnaif left a comment

melvin-bot bot commented Jan 22, 2024

blimpich left a comment

OSBotify commented Jan 23, 2024

OSBotify commented Jan 25, 2024

Fix invited members for admin threads #34362

Fix invited members for admin threads #34362

Conversation

narefyev91 commented Jan 11, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

narefyev91 commented Jan 12, 2024 • edited Loading

melvin-bot bot commented Jan 12, 2024

narefyev91 commented Jan 15, 2024

aimane-chnaif commented Jan 15, 2024

aimane-chnaif commented Jan 15, 2024

aimane-chnaif commented Jan 18, 2024

aimane-chnaif commented Jan 18, 2024 • edited Loading

aimane-chnaif commented Jan 18, 2024 • edited Loading

narefyev91 commented Jan 18, 2024

narefyev91 commented Jan 18, 2024

aimane-chnaif commented Jan 18, 2024

narefyev91 commented Jan 18, 2024

quinthar commented Jan 19, 2024

narefyev91 commented Jan 19, 2024

aimane-chnaif commented Jan 19, 2024

Reviewer Checklist

Screenshots/Videos

aimane-chnaif left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jan 22, 2024

blimpich left a comment

Choose a reason for hiding this comment

OSBotify commented Jan 23, 2024

OSBotify commented Jan 25, 2024

narefyev91 commented Jan 11, 2024 •

edited

Loading

narefyev91 commented Jan 12, 2024 •

edited

Loading

aimane-chnaif commented Jan 18, 2024 •

edited

Loading

aimane-chnaif commented Jan 18, 2024 •

edited

Loading