[OldDot Rules Migration] Category Rules by WojtekBoman · Pull Request #48171 · Expensify/App

WojtekBoman · 2024-08-28T12:51:14Z

cc: @marcaaron

Details

This PR adds a new section to the Category settings: Category rules. This section allows user to:

update the category approver
set whether description is required
update the description hint
update the default tax rate
update the flag amounts over field
update the require receipt over field

Implementation details on how the actions listed above work can be found here

Fixed Issues

$ #47015
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Precondition:

Make sure you have access to the workspaceRules beta. If you run the app locally you can modify the canUseWorkspaceRules or canUseAllBetas function in Permissions.ts to always return true.
Enable rules if they are disabled for the selected workspace. This feature can be enabled on the More Features page.

Open the settings of any category.
Check that the buttons in the Category rules section work correctly in offline and online mode (check that values are updated correctly, that the correct screens are opened, etc.)

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-08-30.at.16.28.19.mp4

Android: mWeb Chrome

Screen.Recording.2024-08-30.at.16.33.34.mov

iOS: Native

Screen.Recording.2024-08-30.at.16.24.41.mp4

iOS: mWeb Safari

Screen.Recording.2024-08-30.at.16.21.56.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-08-30.at.17.18.56.mp4

MacOS: Desktop

Screen.Recording.2024-08-30.at.16.39.39.mov

…tax rate

BrtqKr

Couple small details

BrtqKr · 2024-08-30T13:36:42Z

src/ROUTES.ts

+        getRoute: (policyID: string, categoryName: string) => `settings/workspaces/${policyID}/categories/${encodeURIComponent(categoryName)}/tax-rate` as const,
+    },
+    WORSKPACE_CATEGORY_FLAG_AMOUNTS_OVER: {
+        route: 'settings/workspaces/:policyID/categories/:categoryName/flag-amounts',


shouldn't it be flag-amount as in the design doc table?

This is correct, I named it wrong in the design doc, I thought the site was called Flag Amount over. I'll adjust the table in the doc

BrtqKr · 2024-08-30T13:39:01Z

src/ROUTES.ts

+        getRoute: (policyID: string, categoryName: string) => `settings/workspaces/${policyID}/categories/${encodeURIComponent(categoryName)}/require-receipts-over` as const,
+    },
+    WORSKPACE_CATEGORY_APPROVER: {
+        route: 'settings/workspaces/:policyID/categories/:categoryName/approver',


i think that the same table is missing the /workspaces/ in the category rules urls

@WojtekBoman Did you resolve this comment?

Yes, I've updated the category urls in the doc :)

BrtqKr · 2024-08-30T13:39:26Z

src/SCREENS.ts

        CATEGORY_GL_CODE: 'Category_GL_Code',
        CATEGORY_SETTINGS: 'Category_Settings',
+        CATEGORY_DEFAULT_TAX_RATE: 'Category_Default_Tax_Rate',
+        CATEGORY_FLAG_AMOUNTS_OVER: 'Category_Flag_Amounts_Over',


src/components/WorkspaceMembersSelectionList.tsx

src/languages/es.ts

src/pages/workspace/categories/CategoryRequireReceiptsOverPage.tsx

src/pages/workspace/categories/ExpenseLimitTypeSelector/ExpenseLimitTypeSelector.tsx

melvin-bot · 2024-08-30T15:22:32Z

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

dylanexpensify · 2024-09-02T07:38:57Z

bump @dukenv0307 for review!

marcaaron

Changes LGTM

marcaaron · 2024-09-04T21:01:04Z

Tagging in Design for a last look as I'm not sure if anyone's had a chance to check these changes yet (running an AdHoc build so maybe @shawnborton or someone can peep this before I hit merge).

dubielzyk-expensify · 2024-09-05T05:15:22Z

Sorry if I missed something, but do I have to be in a beta or something? I don't see the approvers in my categories?

WojtekBoman · 2024-09-05T08:22:38Z

@dubielzyk-expensify Could you send a screenshot? And can you check if the members list is available on the Members page in the workspace settings? (/settings/workspaces/:policyID/members)

marcaaron · 2024-09-05T23:47:10Z

Yes there is a beta!

github-actions · 2024-09-06T23:35:53Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
❌ FAILED ❌	❌ FAILED ❌
The QR code can't be generated, because the android build failed	The QR code can't be generated, because the iOS build failed
Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/48171/NewExpensify.dmg	https://48171.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

shawnborton · 2024-09-08T15:32:45Z

Just took this for a spin and it looks pretty good from a design perspective!

WojtekBoman · 2024-09-08T18:12:36Z

@marcaaron Conflicts solved :)

dubielzyk-expensify

Looks good for me too. Great work

marcaaron · 2024-09-09T18:29:26Z

thanks @WojtekBoman. Stellar job here 🙇

OSBotify · 2024-09-09T18:40:17Z

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

parasharrajat · 2025-01-15T10:35:04Z

src/libs/actions/Policy/Category.ts

+                            areCommentsRequired: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                        },
+                        areCommentsRequired,
+                        commentHint: updatedCommentHint,


This does not reset the hint as this API does not support this on the backend. We have to call the API to do that. #52399

shubham1206agra · 2025-01-15T16:48:31Z

src/libs/CategoryUtils.ts

+        return translate(`workspace.rules.categoryRules.requireReceiptsOverList.never`);
+    }
+
+    const maxExpenseAmountToDisplay = policy?.maxExpenseAmount === CONST.DISABLED_MAX_EXPENSE_VALUE ? 0 : policy?.maxExpenseAmount;


We used wrong property as maxAmount here which caused #54916

WojtekBoman added 13 commits August 21, 2024 16:35

Handle toggling require description in Category settings

d11310f

Add templates of Category Rules pages

ded08af

Handle setting category description hint

02d6924

Add template of CategoryRequireReceiptsOver page

547ecdd

Merge branch 'main' into rules/category-rules

afed691

Handle setting require receipts over category rule

d74d1ed

Add link to enable workflows

b9cbddb

Add AmountForm to CategoryFlagAmountsOverPage

7b5f5c3

Add ExpenseLimitType selector

d0e5dbb

Merge branch 'main' into rules/category-rules

daab3ea

Add taxes list

04263e9

Add WorkspaceMembersSelectionList

8823278

Add rules types, cleanup category rules pages

fff4963

WojtekBoman changed the title ~~Rules/category rules~~ [OldDot Rules Migration] Category Rules Aug 28, 2024

WojtekBoman added 6 commits August 29, 2024 10:17

Add CateogryUtils

06e7480

Handle sending onyx data when updating category approver and default …

b8579b1

…tax rate

Merge branch 'main' into rules/category-rules

c80c57a

Small fixes, add missing docs and translations

40c7959

Fix old translation keys and add missing draft forms for new rules pages

8e6aaae

Add missing docs to new rules fields

f86433e

BrtqKr approved these changes Aug 30, 2024

View reviewed changes

WojtekBoman added 3 commits August 30, 2024 15:59

Refactor textInputLabel in WorkspaceMembersSelectionList

f13b4ba

Category rules cr fixes

47eef1a

Add fixes to setting the default tax rate and approver

23ccd4d

WojtekBoman marked this pull request as ready for review August 30, 2024 15:22

WojtekBoman requested a review from a team as a code owner August 30, 2024 15:22

melvin-bot bot requested a review from dukenv0307 August 30, 2024 15:22

melvin-bot bot removed the request for review from a team August 30, 2024 15:22

marcaaron added the Ready To Build label Sep 4, 2024

marcaaron previously approved these changes Sep 4, 2024

View reviewed changes

marcaaron requested a review from a team September 4, 2024 21:00

This comment has been minimized.

Sign in to view

Merge branch 'main' into rules/category-rules

c592466

WojtekBoman dismissed marcaaron’s stale review via c592466 September 5, 2024 08:15

marcaaron previously approved these changes Sep 8, 2024

View reviewed changes

Merge branch 'main' into rules/category-rules

b5ac473

WojtekBoman dismissed marcaaron’s stale review via b5ac473 September 8, 2024 17:54

dubielzyk-expensify approved these changes Sep 8, 2024

View reviewed changes

marcaaron approved these changes Sep 9, 2024

View reviewed changes

marcaaron merged commit 61ee515 into Expensify:main Sep 9, 2024

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

Deploy Checklist: New Expensify 2024-09-11 #48954

Closed

58 tasks

IuliiaHerets mentioned this pull request Sep 11, 2024

Category rules - "Approver" is enabled when "Add approvals" is still disabled in Workflows #48977

Closed

5 tasks

arosiclair mentioned this pull request Sep 11, 2024

[$250] Category rules - Description for Individual expense in "Flags amount over" is truncated #48979

Closed

6 tasks

luacmartins mentioned this pull request Sep 11, 2024

[OldDot Rules Migration] [Polish] [$250] Editing Approver offline does not gray out category but grays out Approver for other categories #49009

Closed

6 tasks

dukenv0307 mentioned this pull request Oct 8, 2024

[OldDot Rules Migration] Category Rules #47015

Closed

suneox mentioned this pull request Oct 16, 2024

[HOLD for payment 2024-10-16] [$250] Category rules - Approver field in category editor shows user email instead of user name #49277

Closed

6 tasks

parasharrajat reviewed Jan 15, 2025

View reviewed changes

shubham1206agra reviewed Jan 15, 2025

View reviewed changes

abzokhattab mentioned this pull request Jan 4, 2026

Add itemized receipt requirement settings for workspace and category rules #73939

Merged

51 tasks

Conversation

WojtekBoman commented Aug 28, 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!

BrtqKr left a comment

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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

melvin-bot bot commented Aug 30, 2024

Uh oh!

dylanexpensify commented Sep 2, 2024

Uh oh!

marcaaron left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

This comment has been minimized.

dubielzyk-expensify commented Sep 5, 2024

Uh oh!

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

Uh oh!

Uh oh!

marcaaron commented Sep 5, 2024

Uh oh!

github-actions bot commented Sep 6, 2024

Uh oh!

shawnborton commented Sep 8, 2024

Uh oh!

WojtekBoman commented Sep 8, 2024

Uh oh!

dubielzyk-expensify left a comment

Choose a reason for hiding this comment

Uh oh!

marcaaron commented Sep 9, 2024

Uh oh!

OSBotify commented Sep 9, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

WojtekBoman commented Aug 28, 2024 •

edited

Loading

marcaaron commented Sep 4, 2024 •

edited

Loading

WojtekBoman commented Sep 5, 2024 •

edited

Loading