fix 22745: change filter rule to exclude pending delete workspace #23064

tienifr · 2023-07-18T09:15:15Z

Details

Filter out pending delete workspaces before displaying the options in WorkspaceNewRoomPage
Include .pendingAction field in FloatingActionButtonAndPopover policySelector
Filter out pending delete workspaces in FloatingActionButtonAndPopover

Fixed Issues

$ #22745
PROPOSAL: #22745 (comment)

Tests

Access an account with no workspaces
Create a new workspace A
Create another workspace B
Force offline mode
Go to workspace detail of workspace A
Click three dot => Delete workspace
Click FAB button
Click New room button
Verify that the deleted workspace A is not displayed in the workspace dropdown selection
Go to workspace detail of workspace B
Click three dot => Delete workspace
Click FAB button
Verify that the New room button is not displayed
Verify that the New workspace button is displayed

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Access an account with no workspaces
Create a new workspace A
Create another workspace B
Force offline mode
Go to workspace detail of workspace A
Click three dot => Delete workspace
Click FAB button
Click New room button
Verify that the deleted workspace A is not displayed in the workspace dropdown selection
Go to workspace detail of workspace B
Click three dot => Delete workspace
Click FAB button
Verify that the New room button is not displayed
Verify that the New workspace button is displayed

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

23064-web.1.mp4

Mobile Web - Chrome

23064-mweb-chrome.mp4

Mobile Web - Safari

23064-mweb-safari.mp4

Desktop

23064-desktop.mp4

iOS

23064-ios.mp4

Android

23064-android.mp4

melvin-bot · 2023-07-18T11:01:54Z

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

tienifr · 2023-07-18T11:05:56Z

I accidentally open the PR while lacking of the GH link. Can you help reassign? Sorry for this inconvenience @AndrewGable @0xmiroslav

AndrewGable · 2023-07-18T16:42:05Z

No problem, assigned reviewers.

0xmiros · 2023-07-19T05:31:36Z

src/libs/PolicyUtils.js

@@ -4,6 +4,15 @@ import Str from 'expensify-common/lib/str';
 import CONST from '../CONST';
 import ONYXKEYS from '../ONYXKEYS';

+/**
+ * Filter out the active policies, which will exclude the pending delete policies


Suggested change

* Filter out the active policies, which will exclude the pending delete policies

* Filter out the active policies, which will exclude policies with pending deletion

0xmiros · 2023-07-19T05:32:41Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

@@ -171,8 +172,8 @@ function FloatingActionButtonAndPopover(props) {
        },
    }));

-    // Workspaces are policies with type === 'free'
-    const workspaces = _.filter(props.allPolicies, (policy) => policy && policy.type === CONST.POLICY.TYPE.FREE);
+    // Workspaces are policies with type === 'free' and is not pending delete


This comment can be removed. PolicyUtils.getActivePolicies should have enough explanation

Suggested change

// Workspaces are policies with type === 'free' and is not pending delete

0xmiros · 2023-07-19T05:33:00Z

src/pages/workspace/WorkspaceNewRoomPage.js

-            ),
-        [props.policies],
-    );
+    // Workspaces are policies with type === 'free' and is not pending delete


Same here

Suggested change

// Workspaces are policies with type === 'free' and is not pending delete

0xmiros · 2023-07-19T06:05:23Z

Optimisation suggestion:

move getActivePolicies to /actions/Policy.js
refactor hasActiveFreePolicy function like this:

function hasActiveFreePolicy(policies) {
    return getActivePolicies(policies).length > 0;
}

update New room option visibility logic

-           ...(Permissions.canUsePolicyRooms(props.betas) && workspaces.length
+           ...(Permissions.canUsePolicyRooms(props.betas) && Policy.hasActiveFreePolicy(props.allPolicies)

tienifr · 2023-07-19T08:07:34Z

@0xmiroslav I don't think we should move getActivePolicies to /actions/Policy.js, this function doesn't affect on onyx data.
Furthermore, the original hasActiveFreePolicy is filtering admin role

App/src/libs/actions/Policy.js

Line 179 in e19a620

    
           const adminFreePolicies = _.filter(policies, (policy) => policy && policy.type === CONST.POLICY.TYPE.FREE && policy.role === CONST.POLICY.ROLE.ADMIN);

but my getActivePolicies function is not related to admin role.

pls correct me if I missed sth. Thanks

0xmiros · 2023-07-19T08:35:00Z

Furthermore, the original hasActiveFreePolicy is filtering admin role

Ah you're right. I missed that.

0xmiros · 2023-07-19T09:32:40Z

App/src/libs/PolicyUtils.js

Line 82 in 9508dfa

    
           (isOffline || policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !_.isEmpty(policy.errors))

Reviewing this code, I think it's intentional to show workspace avatars which are pending deletion when offline

0xmiros · 2023-07-19T09:42:38Z

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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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

Web

web.mov

Mobile Web - Chrome

mchrome.mov

Mobile Web - Safari

msafari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

android.mov

0xmiros

LGTM!

amyevans

Looks good, thank you both for the hustle!

OSBotify · 2023-07-19T13:47:52Z

✋ 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 · 2023-07-19T18:00:08Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.43-0 🚀

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

OSBotify · 2023-07-20T18:21:09Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.43-0 🚀

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

OSBotify · 2023-07-21T18:52:06Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.44-0 🚀

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

OSBotify · 2023-07-22T00:19:17Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.43-7 🚀

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

OSBotify · 2023-07-25T01:26:03Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.3.44-2 🚀

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

tienifr added 4 commits July 18, 2023 15:58

policy: change filter rule to include pending delete workspace

417a816

correct variable name

3bca95d

fix lint

9fd088c

fix lint: prettier

3dde6d2

tienifr changed the title ~~policy: change filter rule to include pending delete workspace~~ fix 22745: change filter rule to exclude pending delete workspace Jul 18, 2023

tienifr marked this pull request as ready for review July 18, 2023 11:01

tienifr requested a review from a team as a code owner July 18, 2023 11:01

melvin-bot bot requested review from AndrewGable and removed request for a team July 18, 2023 11:01

AndrewGable requested review from 0xmiros and amyevans and removed request for AndrewGable July 18, 2023 16:41

0xmiros suggested changes Jul 19, 2023

View reviewed changes

refactor comment

d3f3b25

0xmiros approved these changes Jul 19, 2023

View reviewed changes

amyevans approved these changes Jul 19, 2023

View reviewed changes

amyevans merged commit 16a83ac into Expensify:main Jul 19, 2023

OSBotify mentioned this pull request Jul 19, 2023

Deploy Checklist: New Expensify 2023-07-19 #23183

Closed

42 tasks

OSBotify mentioned this pull request Jul 21, 2023

Deploy Checklist: New Expensify 2023-07-21 #23362

Closed

melvin-bot bot mentioned this pull request Jul 21, 2023

[HOLD for payment - MIROSLAV ONLY] [$1000] Web - Offline - Deleted workspace still shows in the create room dropdown #22745

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix 22745: change filter rule to exclude pending delete workspace #23064

fix 22745: change filter rule to exclude pending delete workspace #23064

tienifr commented Jul 18, 2023 •

edited

Loading

melvin-bot bot commented Jul 18, 2023

tienifr commented Jul 18, 2023

AndrewGable commented Jul 18, 2023

0xmiros Jul 19, 2023

0xmiros Jul 19, 2023

0xmiros Jul 19, 2023

0xmiros commented Jul 19, 2023

tienifr commented Jul 19, 2023

0xmiros commented Jul 19, 2023

0xmiros commented Jul 19, 2023

0xmiros commented Jul 19, 2023

0xmiros left a comment

amyevans left a comment

OSBotify commented Jul 19, 2023

OSBotify commented Jul 19, 2023

OSBotify commented Jul 20, 2023

OSBotify commented Jul 21, 2023

OSBotify commented Jul 22, 2023

OSBotify commented Jul 25, 2023

	* Filter out the active policies, which will exclude the pending delete policies
	* Filter out the active policies, which will exclude policies with pending deletion

fix 22745: change filter rule to exclude pending delete workspace #23064

fix 22745: change filter rule to exclude pending delete workspace #23064

Conversation

tienifr commented Jul 18, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 18, 2023

tienifr commented Jul 18, 2023

AndrewGable commented Jul 18, 2023

0xmiros Jul 19, 2023

Choose a reason for hiding this comment

0xmiros Jul 19, 2023

Choose a reason for hiding this comment

0xmiros Jul 19, 2023

Choose a reason for hiding this comment

0xmiros commented Jul 19, 2023

tienifr commented Jul 19, 2023

0xmiros commented Jul 19, 2023

0xmiros commented Jul 19, 2023

0xmiros commented Jul 19, 2023

Reviewer Checklist

Screenshots/Videos

0xmiros left a comment

Choose a reason for hiding this comment

amyevans left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 19, 2023

OSBotify commented Jul 19, 2023

OSBotify commented Jul 20, 2023

OSBotify commented Jul 21, 2023

OSBotify commented Jul 22, 2023

OSBotify commented Jul 25, 2023

tienifr commented Jul 18, 2023 •

edited

Loading