Filter out rate with pending action #41997

cretadn22 · 2024-05-10T18:19:35Z

Details

Fixed Issues

$ #41594
PROPOSAL: #41594 (comment)

Tests

**Precondition:

There is only one default distance rate in the workspace.

Go to staging.new.expensify.com
Go to Account settings > Workspaces > any workspace.
Go to Distance rates.
Go offline.
Add a distance rate,
Delete the default workspace rate (not the newly-added rate).
Click on the checkbox of the newly added distance rate.
Select Delete option from the dropdown.
Note that the distance rate cannot be deleted because there must be at least one distance rate.
Click on the distance rate row.
Delete it from the three-dot menu.
App will show the same pop-up in Step 9 that the distance rate cannot be deleted as there is only one distance rate.

Verify that no errors appear in the JS console

Offline tests

Integrate to above

QA Steps

**Precondition:

There is only one default distance rate in the workspace.

Go to staging.new.expensify.com
Go to Account settings > Workspaces > any workspace.
Go to Distance rates.
Go offline.
Add a distance rate,
Delete the default workspace rate (not the newly-added rate).
Click on the checkbox of the newly added distance rate.
Select Delete option from the dropdown.
Note that the distance rate cannot be deleted because there must be at least one distance rate.
Click on the distance rate row.
Delete it from the three-dot menu.
App will show the same pop-up in Step 9 that the distance rate cannot be deleted as there is only one distance rate.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-05-11.at.10.48.11.mov

Android: mWeb Chrome

Screen.Recording.2024-05-11.at.10.47.00.mov

iOS: Native

Screen.Recording.2024-05-11.at.10.45.49.mov

iOS: mWeb Safari

Screen.Recording.2024-05-11.at.10.43.21.mov

MacOS: Chrome / Safari

2.mov

MacOS: Desktop

1.mp4

melvin-bot · 2024-05-10T18:19:40Z

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

sobitneupane

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design 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

Screen.Recording.2024-05-14.at.13.39.08.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-05-14.at.13.36.56.mov

iOS: mWeb Safari

Screen.Recording.2024-05-14.at.13.27.30.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-14.at.13.20.39.mov

MacOS: Desktop

Screen.Recording.2024-05-14.at.13.32.11.mov

sobitneupane · 2024-05-14T07:57:55Z

@cretadn22 The branch has some conflicts. Can you please resolve it.

src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx

cretadn22 · 2024-05-14T15:39:16Z

@tgolen I added a comment to explain the logic

tgolen

Thank you!

OSBotify · 2024-05-14T15:59:57Z

✋ 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-05-15T10:15:47Z

🚀 Deployed to staging by https://github.com/tgolen in version: 1.4.74-0 🚀

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

ishpaul777 · 2024-05-22T17:37:26Z

src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx

-    const canDisableRate = Object.values(customUnit?.rates ?? {}).filter((distanceRate) => distanceRate?.enabled).length > 1;
+
+    // Rates can be disabled or deleted as long as in the remaining rates there is always at least one enabled rate and there are no pending delete action
+    const canDisableOrDeleteRate = Object.values(customUnit?.rates).some(


There's a regression #41293 (comment), this reintroduced #40481, we are handling this as follow up of orignal issue

@ishpaul777 We need to update to

const canDisableOrDeleteRate = Object.values(customUnit?.rates ?? {})

PR here: #42502

OSBotify · 2024-05-23T00:00:48Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.4.74-6 🚀

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

cretadn22 requested a review from a team as a code owner May 10, 2024 18:19

melvin-bot bot requested review from sobitneupane and removed request for a team May 10, 2024 18:19

cretadn22 marked this pull request as draft May 10, 2024 18:48

filter out rate with pending action

96e0fd8

cretadn22 force-pushed the update-logic-to-allow-disabling-or-deleting-rate branch from 71f5e21 to 96e0fd8 Compare May 11, 2024 03:36

cretadn22 marked this pull request as ready for review May 11, 2024 03:49

sobitneupane approved these changes May 14, 2024

View reviewed changes

melvin-bot bot requested a review from tgolen May 14, 2024 07:57

resolve conflict

aa2a06a

tgolen requested changes May 14, 2024

View reviewed changes

src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx Outdated Show resolved Hide resolved

add a comment to explain logic

8bcf840

tgolen approved these changes May 14, 2024

View reviewed changes

tgolen merged commit 82ecbcd into Expensify:main May 14, 2024
16 checks passed

github-actions bot mentioned this pull request May 15, 2024

Deploy Checklist: New Expensify 2024-05-15 #42185

Closed

This was referenced May 16, 2024

Revert "Filter out rate with pending action" #42319

Closed

Fix app crash with optional chaining #41293

Merged

[$250] WS - App crashes when changing workspace ID to invalid ID while distance rate RHP is open #40481

Closed

ishpaul777 reviewed May 22, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Filter out rate with pending action #41997

Filter out rate with pending action #41997

cretadn22 commented May 10, 2024 •

edited

Loading

melvin-bot bot commented May 10, 2024

sobitneupane left a comment

sobitneupane commented May 14, 2024

cretadn22 commented May 14, 2024

tgolen left a comment

OSBotify commented May 14, 2024

OSBotify commented May 15, 2024

ishpaul777 May 22, 2024 •

edited

Loading

cretadn22 May 23, 2024

cretadn22 May 23, 2024

OSBotify commented May 23, 2024

Filter out rate with pending action #41997

Filter out rate with pending action #41997

Conversation

cretadn22 commented May 10, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 10, 2024

sobitneupane left a comment

Choose a reason for hiding this comment

Reviewer Checklist

Screenshots/Videos

sobitneupane commented May 14, 2024

cretadn22 commented May 14, 2024

tgolen left a comment

Choose a reason for hiding this comment

OSBotify commented May 14, 2024

OSBotify commented May 15, 2024

ishpaul777 May 22, 2024 • edited Loading

Choose a reason for hiding this comment

cretadn22 May 23, 2024

Choose a reason for hiding this comment

cretadn22 May 23, 2024

Choose a reason for hiding this comment

OSBotify commented May 23, 2024

cretadn22 commented May 10, 2024 •

edited

Loading

ishpaul777 May 22, 2024 •

edited

Loading