[OldDot Rules Migration] Tag rules by BrtqKr · Pull Request #48325 · Expensify/App

BrtqKr · 2024-08-30T11:41:05Z

Holding on:

[OldDot Rules Migration] Expense report rules #47468 (to avoid conflicts)
https://github.com/Expensify/Auth/pull/12370 (deploy)

Details

Fixed Issues

$ #47016
$ #48977
PROPOSAL:

Tests

Go to Profile => workspaces => select a workspace => tags
Select an existing tag, or create a new one
Change approver
Verify that selecting the same person, removes them as an approver
Verify that there are correct system messages being sent to the admin channel

Verify that disabling rules in more features, disables approver as well

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-09-05.at.12.26.16.mov

Android: mWeb Chrome

Screen.Recording.2024-09-05.at.12.31.59.mov

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-09-05.at.11.58.45.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-09-05.at.12.05.07.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-09-05.at.10.41.15.mov

MacOS: Desktop

Screen.Recording.2024-09-05.at.12.36.56.mov

melvin-bot · 2024-08-30T11:41:09Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

marcaaron · 2024-09-06T19:07:21Z

The PRs we were waiting on are now deployed or merged so we can take this off HOLD.

BrtqKr · 2024-09-09T09:27:38Z

@marcaaron, it seems to be in a different field than I initially expected, but I've applied the changes and it's working. I believe we can pass it on for review.

melvin-bot · 2024-09-09T09:27:52Z

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

rojiphil · 2024-09-10T03:14:28Z

@BrtqKr I will review the PR today. Meanwhile, can you please resolve the conflicts? Thanks

rojiphil

@BrtqKr I have a few observations as mentioned below but the overall code looks super good though:

Once an approver is selected, we do not allow deselecting the approver to set it to none. I think we need to support this considering that OldDot supports this.
The test steps in PR mentions this:

Verify that disabling tags in more features, disables approver as well

Neither do I see any implementation for this nor do I see any reference to this in test videos. Have we missed implementing this? Also, what would disables approver mean here? I think it will help QA if we can further break down the test steps

BrtqKr · 2024-09-10T08:25:07Z

@rojiphil

I've added the removal option
That's an error in the description, I meant rules and that's already implemented

                    {policy?.areRulesEnabled && (
                        <>
                            <View style={[styles.mh5, styles.mv3, styles.pt3, styles.borderTop]}>
                                <Text style={[styles.textNormal, styles.textStrong, styles.mv3]}>{translate('workspace.tags.tagRules')}</Text>
                            </View>
                            <OfflineWithFeedback pendingAction={policy.pendingFields?.rules}>
                                <MenuItemWithTopDescription
                                    title={tagApprover ?? ''}
                                    description={translate(`workspace.tags.approverDescription`)}
                                    onPress={navigateToEditTagApprover}
                                    shouldShowRightIcon
                                />
                            </OfflineWithFeedback>
                        </>
                    )}

rojiphil

2. That's an error in the description, I meant rules and that's already implemented

@BrtqKr Thanks for the changes. The removal feature works fine but the feature of disabling approvers does not seem to be implemented yet as we do for category approver rules. Here is a test video demonstrating this. Please have a look. Thanks

48325-disabledapprover.mp4

BrtqKr · 2024-09-10T20:56:42Z

if I understand correctly the condition should probably be uniform and it's been missing for the categories. It's already applied with the remaining fixes

BrtqKr · 2024-09-18T00:30:04Z

I've removed the offline pattern and added category/tag renaming in the rules. I believe this would be everything

Screen.Recording.2024-09-18.at.01.57.14.mov

rojiphil · 2024-09-18T10:01:35Z

src/libs/actions/Policy/Policy.ts


    // We need to move the report preview action from the DM to the workspace chat.
-    const reportPreview = ReportActionsUtils.getParentReportAction(iouReport);
+    const parentReport = ReportAcionsConnection.getAllReportActions()?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.parentReportID}`];


@BrtqKr Not sure if I am missing something here but why did we have to create ReportAcionsConnection when we already have a utility ReportActionsUtils.getAllReportActions?

because we have a new eslint rule, which is forcing us to fix those things when we edit files containing deprecated code

well, not exactly eslint rule, but more like a check included inside of the one for eslint

@BrtqKr Ah! I see. So, the deprecated function is getParentReportAction but is there a need to create ReportAcionsConnection.getAllReportActions() when ReportActionsUtils.getAllReportActions gives us the same result?

This is something I'll need to discuss separately, but from what I understand the main issue is that the rule has been prepared with components in mind, so it's expecting some kind of action to be taken anyway. I was thinking about the possible benefits of having a connection in one place instead of having logic split between different files, but as I said earlier, I'll discuss it in more detail with someone who has more context.

This doesn't feel like a blocker.

This is something I'll need to discuss separately

getParentReportAction has been used in many places and I agree that this needs a separate discussion. Since this is not at all related to this issue, I would prefer not to include the changes for this in this PR. As and when there is a conclusion on the way forward, we can add the code changes. Anyway, I would leave the final decision on this to @marcaaron.

If we are leaving the code as it is, let us correct the spelling ReportAcionsConnection.

rojiphil · 2024-09-18T12:05:50Z

package-lock.json

        "jest": "bin/jest.js"
      }
    },
-    "node_modules/jest-expo/node_modules/@babel/code-frame": {


@BrtqKr Did this change got introduced unintended as these seem unrelated to our current scope here?

I haven't modified anything in package.json and I'm using the appropriate node version. The change was introduced right after merging main to this branch and reinstalling the packages, so I'd assume it wasn't indended, but it's correct.

This also doesn't seem like a blocker.

rojiphil · 2024-09-18T12:38:06Z

Otherwise the code looks good and the feature works well.
I have left a couple of comments. Once we address them, I can do the final testing.
Looks very close to getting this done.

rojiphil

@BrtqKr I have left few suggestions related to test cases

Let us add the below mentioned steps from 5th step onward in the existing test steps.

Select an approver again
Change the name of the tag
Verify that the approver does not change.

Also, let us add the following so that QA can test categories too

Repeat the above mentioned steps for categories and verify.

Let us remove the following text from steps as QA will get confused:

Verify that disabling rules in more features, disables approver as well

@marcaaron Other than this comment, the code changes related to tag/category approver feature LGTM and works well too and I have completed the checklist.
Over to you for review.

marcaaron

LGTM

marcaaron · 2024-09-19T20:15:11Z

src/languages/es.ts

            glCode: 'Código de Libro Mayor',
            updateGLCodeFailureMessage: 'Se produjo un error al actualizar el código de Libro Mayor. Por favor, inténtelo nuevamente.',
+            tagRules: 'Reglas de etiquetas',
+            approverDescription: 'Aprobador',


NAB we could probably move this to the general since it is used twice.

OSBotify · 2024-09-19T20:28:33Z

✋ 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-09-19T23:54:25Z

🚀 Deployed to staging by https://github.com/marcaaron in version: 9.0.39-0 🚀

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

OSBotify · 2024-09-24T19:03:54Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.0.39-5 🚀

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

eh2077 · 2024-12-11T11:54:53Z

src/pages/workspace/tags/TagSettingsPage.tsx

+                                <Text style={[styles.textNormal, styles.textStrong, styles.mv3]}>{translate('workspace.tags.tagRules')}</Text>
+                            </View>
+                            <MenuItemWithTopDescription
+                                title={tagApprover ?? ''}


This change caused a regression #52678. We should show the user name instead of email if the user name is not empty

QichenZhu · 2025-03-19T23:04:26Z

src/pages/workspace/tags/TagApproverPage.tsx

+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const tagApprover = PolicyUtils.getTagApproverRule(policyID, tagName)?.approver;


This page didn’t re-render when the policy updates. For issue #57514, we want to see the checkmark immediately after selecting an approver, even though the page closes soon after. Fixed by using the usePolicy() hook.

WojtekBoman and others added 4 commits August 28, 2024 21:03

Add WorkspaceMembersSelectionList

53828c7

add interface for tag edit

374f298

wire up the tags

299856e

wire up action

4a3bfcc

marcaaron changed the title ~~[OldDot Rules Migration] Tag rules~~ [HOLD] [OldDot Rules Migration] Tag rules Sep 5, 2024

marcaaron changed the title ~~[HOLD] [OldDot Rules Migration] Tag rules~~ [OldDot Rules Migration] Tag rules Sep 6, 2024

marcaaron assigned BrtqKr Sep 6, 2024

BrtqKr added 3 commits September 9, 2024 10:22

Merge remote-tracking branch 'origin/main' into brtqkr/47016-tag-rules

d64e7b6

cleanup, modify action

10dbc8e

change translations

e9dbc5c

BrtqKr marked this pull request as ready for review September 9, 2024 09:27

BrtqKr requested a review from a team as a code owner September 9, 2024 09:27

melvin-bot bot requested a review from rojiphil September 9, 2024 09:27

melvin-bot bot removed the request for review from a team September 9, 2024 09:27

rojiphil reviewed Sep 10, 2024

View reviewed changes

BrtqKr added 2 commits September 10, 2024 09:54

Merge remote-tracking branch 'origin/main' into brtqkr/47016-tag-rules

99d973f

add remove approver option

78df971

BrtqKr requested a review from rojiphil September 10, 2024 08:27

rojiphil reviewed Sep 10, 2024

View reviewed changes

marcaaron self-requested a review September 10, 2024 20:31

BrtqKr added 3 commits September 10, 2024 22:46

disable when workflows are disabled

7f792c8

add approver conditon

6163fe5

add approver conditon to category settings

bd3fdba

BrtqKr added 4 commits September 18, 2024 01:29

remove pending action pattern for rules

6fc0879

Merge remote-tracking branch 'origin/main' into brtqkr/47016-tag-rules

69d919a

fix onyx check

08cf2a2

remove pending pattern from type

b32ed64

BrtqKr requested a review from marcaaron September 18, 2024 00:30

BrtqKr added 4 commits September 18, 2024 02:37

run prettier

71c8ef8

cleanup

669e692

cleanup

4fccbb1

remove withOnyx

2fdea82

rojiphil reviewed Sep 18, 2024

View reviewed changes

BrtqKr added 3 commits September 18, 2024 16:49

Merge remote-tracking branch 'origin/main' into brtqkr/47016-tag-rules

d91e3f3

run prettier

4810e33

cleanup

2ba3191

rojiphil approved these changes Sep 19, 2024

View reviewed changes

rename connection

e06551c

marcaaron approved these changes Sep 19, 2024

View reviewed changes

marcaaron merged commit 0045eae into Expensify:main Sep 19, 2024

github-actions bot mentioned this pull request Sep 19, 2024

Deploy Checklist: New Expensify 2024-09-19 #49505

Closed

31 tasks

nkdengineer mentioned this pull request Sep 20, 2024

[$250] Task – App crashes when click on assignee in existing task #49514

Closed

6 tasks

rojiphil mentioned this pull request Sep 24, 2024

create announce room when 3 or more participants #48660

Merged

58 tasks

FitseTLT mentioned this pull request Sep 27, 2024

Fix - Category rules - default tax rate field is blank for a moment after editing category name #49867

Merged

50 tasks

rojiphil mentioned this pull request Oct 2, 2024

[OldDot Rules Migration] Tag rules #47016

Closed

eh2077 reviewed Dec 11, 2024

View reviewed changes

QichenZhu reviewed Mar 19, 2025

View reviewed changes

Conversation

BrtqKr commented Aug 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Aug 30, 2024

Uh oh!

marcaaron commented Sep 6, 2024

Uh oh!

BrtqKr commented Sep 9, 2024

Uh oh!

melvin-bot bot commented Sep 9, 2024

Uh oh!

rojiphil commented Sep 10, 2024

Uh oh!

rojiphil left a comment

Choose a reason for hiding this comment

Uh oh!

BrtqKr commented Sep 10, 2024

Uh oh!

rojiphil left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BrtqKr commented Sep 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

BrtqKr commented Sep 18, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BrtqKr Sep 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rojiphil Sep 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rojiphil commented Sep 18, 2024

Uh oh!

rojiphil left a comment

Choose a reason for hiding this comment

Uh oh!

marcaaron left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Sep 19, 2024

Uh oh!

OSBotify commented Sep 19, 2024

Uh oh!

OSBotify commented Sep 24, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

QichenZhu Mar 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

BrtqKr commented Aug 30, 2024 •

edited

Loading

rojiphil left a comment •

edited

Loading

BrtqKr commented Sep 10, 2024 •

edited

Loading

BrtqKr Sep 18, 2024 •

edited

Loading

rojiphil Sep 18, 2024 •

edited

Loading

QichenZhu Mar 19, 2025 •

edited

Loading