feat: disable categories/tags/distance rates when feature is disabled #43637

dominictb · 2024-06-13T08:19:41Z

Details

feat: disable categories/tags/distance rates when feature is disabled

Fixed Issues

$ #39463
PROPOSAL: #39463 (comment)

Tests

Go offline
Go to workspaces > Select a workspace
Go to categories
Make sure to have one category enabled
Go to more features
Disable Categories
ReEnable Categories
Go to categories
Verify that every category is disabled
Go to distance rates
Make sure to have at least two rates enabled
Go to more features
repeat 5, 6
Go to distance rates
Verify that only one distance rate remains enabled

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go offline
Go to workspaces > Select a workspace
Go to categories
Make sure to have one category enabled
Go to more features
Disable Categories
ReEnable Categories
Go to categories
Verify that every category is disabled
Go to distance rates
Make sure to have at least two rates enabled
Go to more features
repeat 5, 6
Go to distance rates
Verify that only one distance rate remains enabled

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

compressed_android.webm.mp4

Android: mWeb Chrome

compressed_aweb.webm.mp4

iOS: Native

compressed_ios.mp4.mp4

iOS: mWeb Safari

compressed_iosweb.mp4.mp4

MacOS: Chrome / Safari

compressed_web.mov.mp4

MacOS: Desktop

compressed_web.mov.mp4

Signed-off-by: dominictb <[email protected]>

melvin-bot · 2024-06-14T10:05:59Z

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

mountiny · 2024-06-14T21:56:18Z

@getusha what is your ETA for testing this? thanks!

getusha · 2024-06-17T06:31:53Z

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-06-20.at.11.33.20.at.night.mov

Android: mWeb Chrome

Screen.Recording.2024-06-18.at.1.24.04.in.the.afternoon.mov

iOS: Native

Screen.Recording.2024-06-20.at.11.16.59.at.night.mov

iOS: mWeb Safari

Screen.Recording.2024-06-18.at.12.59.36.in.the.afternoon.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-18.at.12.53.38.in.the.afternoon.mov

MacOS: Desktop

Screen.Recording.2024-06-21.at.2.14.58.in.the.afternoon.mov

getusha · 2024-06-17T06:55:26Z

@dominictb could we update the QA steps to something like this? does the following make sense?

Go offline
Go to workspaces > Select a workspace
Go to categories
Make sure to have one category enabled
Go to more features
Disable Categories
ReEnable Categories
Go to categories
Verify that every category is disabled
Go to distance rates
Make sure to have at least two rates enabled
Go to more features
repeat 5, 6
Go to distance rates
Verify that only one distance rate remains enabled

dominictb · 2024-06-17T07:48:30Z

@getusha done!

getusha · 2024-06-18T10:41:38Z

src/libs/actions/Policy/DistanceRate.ts

+        // find the rate to be enabled after disabling the distance rate feature
+        // first check the default rate
+        let rateEntryToBeEnabled = rateEntries.find((rate) => rate[1]?.name === 'Default Rate');
+        // if the default rate is not enabled/doesn't exist, we'll switch to the first enabled rate


@dominictb noticed one case,

Create 3 distance rates

Disable the first one and leave the others enabled

Go offline

Disable and enable the feature

You'll notice the 2nd rate will remain enabled while the first one is disabled

Go online

The change will be reverted and only the first one will be re-enabled

I think we need to make sure that we re-enable the first distance rate, even if it was previously disabled.

Screen.Recording.2024-06-18.at.1.35.24.in.the.afternoon.mov

@getusha lemme check and update. Give me some time, thanks!

web-8MB.mp4

Fixed

getusha

lgtm & tests well. thanks

mountiny

Thanks!

mountiny · 2024-06-24T13:23:46Z

src/libs/actions/Policy/DistanceRate.ts

+
+        const rateEntries = Object.entries(customUnit?.rates ?? {});
+        // find the rate to be enabled after disabling the distance rate feature


NAB

Suggested change

const rateEntries = Object.entries(customUnit?.rates ?? {});

// find the rate to be enabled after disabling the distance rate feature

const rateEntries = Object.entries(customUnit?.rates ?? {});

// find the rate to be enabled after disabling the distance rate feature

OSBotify · 2024-06-24T13:51:56Z

✋ 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-06-25T20:09:01Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.2-0 🚀

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

OSBotify · 2024-07-03T19:38:00Z

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

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

OSBotify · 2024-07-10T10:56:08Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.5-13 🚀

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

dominictb added 3 commits June 13, 2024 15:15

feat: disable distance rates if feature is disabled

9dec198

Signed-off-by: dominictb <[email protected]>

chore: disable all tags/categories if feature is disabled

e851a7d

Signed-off-by: dominictb <[email protected]>

fix: prettier

c44cbc3

Signed-off-by: dominictb <[email protected]>

dominictb force-pushed the feat/39463 branch from a76ae13 to 813342a Compare June 13, 2024 10:25

Merge remote-tracking branch 'origin/main' into feat/39463

970bf98

dominictb force-pushed the feat/39463 branch from 813342a to 970bf98 Compare June 13, 2024 10:32

Merge remote-tracking branch 'origin/main' into feat/39463

3383933

dominictb marked this pull request as ready for review June 14, 2024 10:05

dominictb requested a review from a team as a code owner June 14, 2024 10:05

melvin-bot bot requested review from getusha and removed request for a team June 14, 2024 10:05

mountiny assigned dominictb Jun 14, 2024

getusha reviewed Jun 18, 2024

View reviewed changes

dominictb added 2 commits June 20, 2024 11:28

Merge remote-tracking branch 'origin/main' into feat/39463

d92bbdb

fix: always enable the default first rate entry

0bbe021

mountiny self-requested a review June 20, 2024 21:48

getusha approved these changes Jun 21, 2024

View reviewed changes

mountiny approved these changes Jun 24, 2024

View reviewed changes

mountiny merged commit 24f3bdc into Expensify:main Jun 24, 2024
17 checks passed

github-actions bot mentioned this pull request Jun 25, 2024

Deploy Checklist: New Expensify 2024-06-25 #44406

Closed

92 tasks

melvin-bot bot mentioned this pull request Jul 3, 2024

[HOLD for payment 2024-07-10] [$250] [Wave Collect] Disable all but the default distance rate when feature is disabled same for categories and tags #39463

Closed

dominictb deleted the feat/39463 branch July 18, 2024 02:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: disable categories/tags/distance rates when feature is disabled #43637

feat: disable categories/tags/distance rates when feature is disabled #43637

dominictb commented Jun 13, 2024 •

edited

Loading

melvin-bot bot commented Jun 14, 2024

mountiny commented Jun 14, 2024

getusha commented Jun 17, 2024 •

edited

Loading

getusha commented Jun 17, 2024 •

edited

Loading

dominictb commented Jun 17, 2024

getusha Jun 18, 2024

dominictb Jun 20, 2024

dominictb Jun 20, 2024

getusha left a comment

mountiny left a comment

mountiny Jun 24, 2024

OSBotify commented Jun 24, 2024

OSBotify commented Jun 25, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 10, 2024


		const rateEntries = Object.entries(customUnit?.rates ?? {});
		// find the rate to be enabled after disabling the distance rate feature

feat: disable categories/tags/distance rates when feature is disabled #43637

feat: disable categories/tags/distance rates when feature is disabled #43637

Conversation

dominictb commented Jun 13, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 14, 2024

mountiny commented Jun 14, 2024

getusha commented Jun 17, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

getusha commented Jun 17, 2024 • edited Loading

dominictb commented Jun 17, 2024

getusha Jun 18, 2024

Choose a reason for hiding this comment

dominictb Jun 20, 2024

Choose a reason for hiding this comment

dominictb Jun 20, 2024

Choose a reason for hiding this comment

getusha left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

mountiny Jun 24, 2024

Choose a reason for hiding this comment

OSBotify commented Jun 24, 2024

OSBotify commented Jun 25, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 10, 2024

dominictb commented Jun 13, 2024 •

edited

Loading

getusha commented Jun 17, 2024 •

edited

Loading

getusha commented Jun 17, 2024 •

edited

Loading