Fix bug with Room - Workspaces listed in room are not listed in alphabetical order #36178

ZhenjaHorbach · 2024-02-08T20:39:01Z

Details

Fixed Issues

$ #35551
PROPOSAL: #35551 (comment)

Tests

Launch app
Tap fab---start chat
Tap room
Tap Workspace
Verify that workspaces listed in room are listed in alphabetical order

Verify that no errors appear in the JS console

Offline tests

Launch app
Tap fab---start chat
Tap room
Tap Workspace
Verify that workspaces listed in room are listed in alphabetical order

QA Steps

Launch app
Tap fab---start chat
Tap room
Tap Workspace
Verify that workspaces listed in room are listed in alphabetical order

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-02-09.at.09.27.39.mov

Android: mWeb Chrome

android.mov

iOS: Native

Screen.Recording.2024-02-09.at.08.54.43.mov

iOS: mWeb Safari

Screen.Recording.2024-02-09.at.09.22.50.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

…betical order

melvin-bot · 2024-02-08T20:39:06Z

@fedirjh 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]

ZhenjaHorbach · 2024-02-08T20:43:23Z

@fedirjh

Hello )
Before I start making videos)
How do you think
What's better ?)

The same behavior as on Choose a workspace and first element is selected item and the rest in alphabetical order

Or just in alphabetical order as on Workspaces page but there is no option to select elements))

fedirjh · 2024-02-08T21:03:03Z

The same behavior as on Choose a workspace and first element is selected item

I liked this one, what do you think @francoisl? should the selected workspace be pushed to the top?

francoisl · 2024-02-09T00:12:06Z

I'd say just sort the list of workspaces by name, and keep the current behavior that the active one is automatically in view when the page opens (so we automatically scroll if needed).

ZhenjaHorbach · 2024-02-09T08:50:44Z

@fedirjh
@francoisl

In this case
One more question ))

How should we process numbers?

Current behavior for all screens where we use workspaces - 1 => 11 => 2

Or

1 => 2 => 11

francoisl · 2024-02-09T18:35:33Z

I don't think it matters a lot, though I'd go with 1 - 11 - 2, which is what we do on Expensify Classic at the moment (and I think it's also simpler to implement)

ZhenjaHorbach · 2024-02-09T18:38:43Z

I don't think it matters a lot, though I'd go with 1 - 11 - 2, which is what we do on Expensify Classic at the moment (and I think it's also simpler to implement)

Hello )
It's actually not very difficult to implement )
But I agree with you if the same behavior is on Expensify Classic )
Thank you )

ZhenjaHorbach · 2024-02-09T18:39:24Z

@fedirjh
Hello )
PR is ready )

fedirjh · 2024-02-09T19:41:08Z

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

CleanShot.2024-02-10.at.13.06.19.mp4

MacOS: Desktop

CleanShot.2024-02-10.at.13.18.58.mp4

fedirjh · 2024-02-09T21:03:23Z

@ZhenjaHorbach I get this crash on web

ZhenjaHorbach · 2024-02-09T21:05:56Z

@ZhenjaHorbach I get this crash on web

Oh, Looks like a very specific case
But I'll add a check

ZhenjaHorbach · 2024-02-09T21:24:21Z

Actually, this is a strange problem
Which is not entirely related to these changes

That we get some kind of fake value from onyx

ZhenjaHorbach · 2024-02-09T21:30:15Z

@fedirjh
I added additional filtering
What we would expect is only valid workspaces

fedirjh · 2024-02-09T21:59:05Z

src/pages/workspace/WorkspaceNewRoomPage.js

+                _.filter(
+                    _.filter(PolicyUtils.getActivePolicies(props.policies), (policy) => policy.type !== CONST.POLICY.TYPE.PERSONAL),
+                    (policy) => policy.name && policy.id,
+                ),


Let's move the filtering logic to PolicyUtils.getActivePolicies

fedirjh

Looks good to me.

OSBotify · 2024-02-12T21:34:49Z

✋ 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-02-15T05:25:13Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.41-12 🚀

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

shubham1206agra · 2025-01-06T12:46:07Z

src/libs/PolicyUtils.ts

@@ -15,7 +15,9 @@ type UnitRate = {rate: number};
 * These are policies that we can use to create reports with in NewDot.
 */
 function getActivePolicies(policies: OnyxCollection<Policy>): Policy[] | undefined {
-    return Object.values(policies ?? {}).filter<Policy>((policy): policy is Policy => policy !== null && policy && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+    return Object.values(policies ?? {}).filter<Policy>(
+        (policy): policy is Policy => policy !== null && policy && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !!policy.name && !!policy.id,


We forgot to check for a user role, which caused the issue #53315

Fix bug with Room - Workspaces listed in room are not listed in alpha…

d6432bf

…betical order

ZhenjaHorbach requested a review from a team as a code owner February 8, 2024 20:39

melvin-bot bot requested review from fedirjh and removed request for a team February 8, 2024 20:39

Revert changes and leave only sort

78e4a9c

Update branch

b3ecc3b

ZhenjaHorbach added 2 commits February 9, 2024 22:27

Add filter for checking valid workspace values

5a875b9

Кemove unnecessary code

faf8973

fedirjh suggested changes Feb 9, 2024

View reviewed changes

Refactor code

78bbc35

fedirjh approved these changes Feb 10, 2024

View reviewed changes

melvin-bot bot requested a review from francoisl February 10, 2024 12:23

francoisl approved these changes Feb 12, 2024

View reviewed changes

francoisl merged commit 6ce5574 into Expensify:main Feb 12, 2024
16 of 17 checks passed

github-actions bot mentioned this pull request Feb 13, 2024

Deploy Checklist: New Expensify 2024-02-13 #36429

Closed

shubham1206agra reviewed Jan 6, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix bug with Room - Workspaces listed in room are not listed in alphabetical order #36178

Fix bug with Room - Workspaces listed in room are not listed in alphabetical order #36178

ZhenjaHorbach commented Feb 8, 2024 •

edited

Loading

melvin-bot bot commented Feb 8, 2024

ZhenjaHorbach commented Feb 8, 2024 •

edited

Loading

fedirjh commented Feb 8, 2024

francoisl commented Feb 9, 2024

ZhenjaHorbach commented Feb 9, 2024

francoisl commented Feb 9, 2024

ZhenjaHorbach commented Feb 9, 2024 •

edited

Loading

ZhenjaHorbach commented Feb 9, 2024

fedirjh commented Feb 9, 2024 •

edited

Loading

fedirjh commented Feb 9, 2024

ZhenjaHorbach commented Feb 9, 2024

ZhenjaHorbach commented Feb 9, 2024

ZhenjaHorbach commented Feb 9, 2024

fedirjh Feb 9, 2024

ZhenjaHorbach Feb 9, 2024

fedirjh left a comment

OSBotify commented Feb 12, 2024

OSBotify commented Feb 15, 2024

shubham1206agra Jan 6, 2025 •

edited

Loading

Fix bug with Room - Workspaces listed in room are not listed in alphabetical order #36178

Fix bug with Room - Workspaces listed in room are not listed in alphabetical order #36178

Conversation

ZhenjaHorbach commented Feb 8, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Feb 8, 2024

ZhenjaHorbach commented Feb 8, 2024 • edited Loading

fedirjh commented Feb 8, 2024

francoisl commented Feb 9, 2024

ZhenjaHorbach commented Feb 9, 2024

francoisl commented Feb 9, 2024

ZhenjaHorbach commented Feb 9, 2024 • edited Loading

ZhenjaHorbach commented Feb 9, 2024

fedirjh commented Feb 9, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

fedirjh commented Feb 9, 2024

ZhenjaHorbach commented Feb 9, 2024

ZhenjaHorbach commented Feb 9, 2024

ZhenjaHorbach commented Feb 9, 2024

fedirjh Feb 9, 2024

Choose a reason for hiding this comment

ZhenjaHorbach Feb 9, 2024

Choose a reason for hiding this comment

fedirjh left a comment

Choose a reason for hiding this comment

OSBotify commented Feb 12, 2024

OSBotify commented Feb 15, 2024

shubham1206agra Jan 6, 2025 • edited Loading

Choose a reason for hiding this comment

ZhenjaHorbach commented Feb 8, 2024 •

edited

Loading

ZhenjaHorbach commented Feb 8, 2024 •

edited

Loading

ZhenjaHorbach commented Feb 9, 2024 •

edited

Loading

fedirjh commented Feb 9, 2024 •

edited

Loading

shubham1206agra Jan 6, 2025 •

edited

Loading