Fix filter based on reportField.disabledOptions #38958

aldo-expensify · 2024-03-25T19:55:38Z

The filter was wrong and it was checking if the elements in reportField.values were not inside reportField.disabledOptions, and instead we should just used the index to see if the same position inside reportField.disabledOptions was true or not.

Sample reportField.disabledOptions: [false, false, true]

Details

Fixed Issues

$ #38898
PROPOSAL: #38898 (comment)

Tests

Log into OD with a new expensifail account

OD: Create a Collect workspace with chat enabled. Run this snippet in OD:

g_policyPage.policy.policy.isPolicyExpenseChatEnabled = 'true';
g_policyPage.policy.save();

OD: Navigate to Workspace settings - Reports - Report and Invoice Fields
OD: Add a dropdown field with any name and "Expense Report" type
OD: Add 3 options under the dropdown "1" "2" and "3"
OD: Set "1" as the initial value
OD: Invite a new expensifail account to the workspace as member
ND: Log in as the member
ND: Create a manual IOU in the workspace chat
ND: Open the IOU
Verify All options (1, 2 and 3) are visible

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Log into OD with a new expensifail account
OD: Create a Collect workspace with chat enabled
OD: Navigate to Workspace settings - Reports - Report and Invoice Fields
OD: Add a dropdown field with any name and "Expense Report" type
OD: Add 3 options under the dropdown "1" "2" and "3"
OD: Set "1" as the initial value
OD: Invite a new expensifail account to the workspace as member
ND: Log in as the member
ND: Create a manual IOU in the workspace chat
ND: Open the IOU
Verify All options (1, 2 and 3) are visible

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-03-25T19:56:07Z

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

amyevans · 2024-03-25T20:00: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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

aldo-expensify · 2024-03-25T20:19:40Z

src/pages/EditReportFieldDropdownPage.tsx

@@ -89,7 +89,7 @@ function EditReportFieldDropdownPage({fieldName, onSubmit, fieldKey, fieldValue,
                });
            }

-            const filteredRecentlyUsedOptions = recentlyUsedOptions.filter((option) => option !== selectedValue);
+            const filteredRecentlyUsedOptions = recentlyUsedOptions.filter((option) => option !== selectedValue && fieldOptions.includes(option));


We shouldn't show options that are not available in "Recent"

aldo-expensify · 2024-03-25T20:21:47Z

Update: @GandalfGwaihir found that we still had a bug where we could offer a disabled option in the "Recents" list. Added a fix for that too.

aldo-expensify · 2024-03-25T20:31:52Z

@amyevans this should be ready for review again, thanks

amyevans · 2024-03-25T20:33:01Z

Cool, I'll test locally as well

allgandalf

LGTM! 🥂

OSBotify · 2024-03-25T21:07:25Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

aldo-expensify · 2024-03-25T21:10:27Z

Requested CP: https://expensify.slack.com/archives/C07J32337/p1711400834463309

Fix filter based on reportField.disabledOptions (cherry picked from commit b6d2c59)

aldo-expensify · 2024-03-25T22:40:40Z

QA passed:

Testing accounts: [email protected], [email protected]

OSBotify · 2024-03-25T23:07:59Z

🚀 Cherry-picked to staging by https://github.com/yuwenmemon in version: 1.4.56-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-03-27T04:52:33Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.56-8 🚀

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

Fix filter

4caf61a

aldo-expensify self-assigned this Mar 25, 2024

aldo-expensify requested a review from a team as a code owner March 25, 2024 19:55

melvin-bot bot requested review from amyevans and removed request for a team March 25, 2024 19:56

Filter out unexisting options from "Recents"

cd7d814

aldo-expensify commented Mar 25, 2024

View reviewed changes

allgandalf reviewed Mar 25, 2024

View reviewed changes

yuwenmemon approved these changes Mar 25, 2024

View reviewed changes

amyevans approved these changes Mar 25, 2024

View reviewed changes

amyevans merged commit b6d2c59 into main Mar 25, 2024
16 of 19 checks passed

amyevans deleted the aldo_fix-disabled-option-filter branch March 25, 2024 21:00

OSBotify pushed a commit that referenced this pull request Mar 25, 2024

Merge pull request #38958 from Expensify/aldo_fix-disabled-option-filter

1c927ce

Fix filter based on reportField.disabledOptions (cherry picked from commit b6d2c59)

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

Deploy Checklist: New Expensify 2024-03-22 #38811

Closed

melvin-bot bot mentioned this pull request Mar 29, 2024

[$250] [HOLD for payment 2024-04-05] Workspace - One of the dropdown options configured in OD is missing from ND #38898

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix filter based on reportField.disabledOptions #38958

Fix filter based on reportField.disabledOptions #38958

aldo-expensify commented Mar 25, 2024 •

edited

Loading

melvin-bot bot commented Mar 25, 2024

amyevans commented Mar 25, 2024 •

edited

Loading

aldo-expensify Mar 25, 2024

aldo-expensify commented Mar 25, 2024

aldo-expensify commented Mar 25, 2024

amyevans commented Mar 25, 2024

allgandalf left a comment

OSBotify commented Mar 25, 2024

aldo-expensify commented Mar 25, 2024

aldo-expensify commented Mar 25, 2024

OSBotify commented Mar 25, 2024

OSBotify commented Mar 27, 2024

Fix filter based on reportField.disabledOptions #38958

Fix filter based on reportField.disabledOptions #38958

Conversation

aldo-expensify commented Mar 25, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 25, 2024

amyevans commented Mar 25, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

aldo-expensify Mar 25, 2024

Choose a reason for hiding this comment

aldo-expensify commented Mar 25, 2024

aldo-expensify commented Mar 25, 2024

amyevans commented Mar 25, 2024

allgandalf left a comment

Choose a reason for hiding this comment

OSBotify commented Mar 25, 2024

aldo-expensify commented Mar 25, 2024

aldo-expensify commented Mar 25, 2024

OSBotify commented Mar 25, 2024

OSBotify commented Mar 27, 2024

aldo-expensify commented Mar 25, 2024 •

edited

Loading

amyevans commented Mar 25, 2024 •

edited

Loading