Filter deleted workspace categories#54613
Merged
blimpich merged 6 commits intoExpensify:mainfrom Dec 30, 2024
Merged
Conversation
melvin-bot
bot
requested review from
ZhenjaHorbach
and removed request for
a team
|
@ZhenjaHorbach 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] |
8 tasks
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: Nativeandroid.movAndroid: mWeb Chromeandroid-web.moviOS: Nativeios.moviOS: mWeb Safariios-web.movMacOS: Chrome / Safariweb.movMacOS: Desktopdesktop.mov |
Comment on lines
+110
to
+124
| (lodashSortBy(Object.values(policyCategories ?? {}), 'name', localeCompare) as PolicyCategory[]) | ||
| .filter((value) => (isOffline ? value : value.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)) | ||
| .map((value) => { | ||
| const isDisabled = value.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE; | ||
| return { | ||
| text: value.name, | ||
| keyForList: value.name, | ||
| isSelected: !!selectedCategories[value.name] && canSelectMultiple, | ||
| isDisabled, | ||
| pendingAction: value.pendingAction, | ||
| errors: value.errors ?? undefined, | ||
| rightElement: <ListItemRightCaretWithLabel labelText={value.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')} />, | ||
| }; | ||
| }), | ||
| [policyCategories, isOffline, selectedCategories, canSelectMultiple, translate], |
Contributor
There was a problem hiding this comment.
Minor comment
but maybe we should use reduce instead filter+map to decrease the number of operations and increase performance a bit?
const categoryList = useMemo<PolicyOption[]>(
() =>
(lodashSortBy(Object.values(policyCategories ?? {}), 'name', localeCompare) as PolicyCategory[]).reduce((acc, value) => {
const isDeleted = value.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
if (!isOffline && isDeleted) {
return acc;
}
acc.push({
text: value.name,
keyForList: value.name,
isSelected: !!selectedCategories[value.name] && canSelectMultiple,
isDisabled: isDeleted,
pendingAction: value.pendingAction,
errors: value.errors ?? undefined,
rightElement: <ListItemRightCaretWithLabel labelText={value.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')} />,
});
return acc;
}, [] as PolicyOption[]),
[policyCategories, isOffline, selectedCategories, canSelectMultiple, translate],
);
Contributor
Author
There was a problem hiding this comment.
@ZhenjaHorbach I've addressed both of your comments
Contributor
|
And let's update QA Steps and make a mention that the remaining elements after removed appear immediately |
ZhenjaHorbach
approved these changes
Dec 27, 2024
Contributor
|
LGTM ! @mountiny |
Contributor
|
Posted a question in Slack about adding a unit test to this here: https://expensify.slack.com/archives/C01GTK53T8Q/p1735322052721899 Otherwise looks good 👍 |
Contributor
|
Tests look good ! |
ZhenjaHorbach
approved these changes
Dec 30, 2024
Contributor
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
68 tasks
Contributor
|
🚀 Deployed to staging by https://github.com/blimpich in version: 9.0.80-1 🚀
|
Contributor
|
🚀 Deployed to production by https://github.com/puneetlath in version: 9.0.80-6 🚀
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
Problem:
Changes:
pendingAction: deleteFixed Issues
$ #53035
PROPOSAL: #53035 (comment)
Tests
Offline tests
QA Steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Online:
Screen.Recording.2024-12-27.at.12.39.35.mp4
Offline:
Screen.Recording.2024-12-27.at.12.40.24.mp4
MacOS: Desktop