Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/categories main page #36324

Merged
merged 36 commits into from
Feb 23, 2024
Merged

Conversation

ArekChr
Copy link
Contributor

@ArekChr ArekChr commented Feb 12, 2024

Details

This PR introduces a new categories page. This is a basic version, which means that the ability to select and unselect categories. This future update will allow for the displaying details, removal, and editing of selected categories.

Fixed Issues

$ 35705
PROPOSAL: https://docs.google.com/document/d/1gk3xqOs7epMbUrSSiX8K7YcqfPLVgqEos0sf-D-GMDA/edit#bookmark=id.qdiriu8utc5u

Tests

  • Verify that no errors appear in the JS console
  1. Navigate to the workspace settings as an admin within a paid policy group.
  2. Verify that you can access the categories page.
  3. Verify that categories are listed.
  4. Confirm that you can select all categories by clicking on 'name', and deselect them by clicking on 'name' once more.
  5. Access workspace settings as a member with a paid group policy.
  6. Replace the sub-path /profile with /categories in the URL.
  7. Verify that a 'not found' screen is displayed on the central page.
  8. Repeat steps 4 through 6 as both an administrator and a member under a free policy.
  9. Confirm that you are unable to access the categories page.

Offline tests

QA Steps

  • Verify that no errors appear in the JS console
  1. Navigate to the workspace settings as an admin within a paid policy group.
  2. Verify that you can access the categories page.
  3. Verify that categories are listed.
  4. Confirm that you can select all categories by clicking on 'name', and deselect them by clicking on 'name' once more.
  5. Access workspace settings as a member with a paid group policy.
  6. Replace the sub-path /profile with /categories in the URL.
  7. Verify that a 'not found' screen is displayed on the central page.
  8. Repeat steps 4 through 6 as both an administrator and a member under a free policy.
  9. Confirm that you are unable to access the categories page.

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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.

Screenshots/Videos

Android: Native Zrzut ekranu 2024-02-13 o 12 09 42
Android: mWeb Chrome Zrzut ekranu 2024-02-13 o 12 12 43 Zrzut ekranu 2024-02-13 o 12 12 33
iOS: Native Zrzut ekranu 2024-02-13 o 11 42 16
iOS: mWeb Safari Zrzut ekranu 2024-02-13 o 12 12 53
MacOS: Chrome / Safari Zrzut ekranu 2024-02-20 o 12 57 47 Zrzut ekranu 2024-02-20 o 12 53 37
MacOS: Desktop Zrzut ekranu 2024-02-13 o 11 42 14

@ArekChr
Copy link
Contributor Author

ArekChr commented Feb 13, 2024

@luacmartins, it appears that to access policy categories, we must first open a report, as I couldn't find any other API read command for fetching this data directly. Given that we're opening a workspace rather than a specific report, might we require an additional backend endpoint to retrieve this information?

It would be great if we could include this data in the OpenWorkspace read command to streamline the process.

image

@ArekChr ArekChr marked this pull request as ready for review February 14, 2024 08:43
@ArekChr ArekChr requested a review from a team as a code owner February 14, 2024 08:43
@melvin-bot melvin-bot bot requested review from Gonals and removed request for a team February 14, 2024 08:43
Copy link

melvin-bot bot commented Feb 14, 2024

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

@ArekChr
Copy link
Contributor Author

ArekChr commented Feb 14, 2024

@luacmartins, regarding slack thread, I'm thinking about what we should do next because we're waiting for the OpenWorkspaceCategoriesPage API command. Can we keep going with other things, or should we wait and put this PR on hold?

@mountiny
Copy link
Contributor

@ArekChr i think you can continue with as much as possible, as i explained everything works as expected in case of the primary workspace and that is a usecase for 90+% users they only have one workspace

How is this blocking you

@luacmartins luacmartins self-requested a review February 14, 2024 12:03
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I'm still ooo but I agree with @mountiny that we shouldn't hold on that

@trjExpensify
Copy link
Contributor

Asked in Slack here to confirm if this is ready for a C+ to conduct an initial review.

@ArekChr
Copy link
Contributor Author

ArekChr commented Feb 15, 2024

@ArekChr i think you can continue with as much as possible, as i explained everything works as expected in case of the primary workspace and that is a usecase for 90+% users they only have one workspace

How is this blocking you

I wasn't sure, thanks for the clear confirmation! Let's move forward

@trjExpensify
Copy link
Contributor

@rushatgabhane is going to review this PR :)

@trjExpensify
Copy link
Contributor

Maybe helpful for @rushatgabhane's reference, here is the categories page from the design doc on both web and mobile:

image

@mountiny
Copy link
Contributor

@ArekChr @burczu I think we should use the same Stylized SelectionList wrapper - TableList here #35712 (comment)

@trjExpensify
Copy link
Contributor

@ArekChr also, just to confirm... the Categories page should only visible in the workspace settings of collect type workspaces, not free type workspaces. From the mockup in the OP, it looks like we're showing it in a free workspace.

@luacmartins
Copy link
Contributor

@ArekChr we just merged #37074, can you please incorporate the new ListItem into this PR?

@ArekChr
Copy link
Contributor Author

ArekChr commented Feb 23, 2024

I've observed that select all checkbox is too easy to hit, if you tap anywhere on the header, it selects all items. is it ok?

Nagranie.z.ekranu.2024-02-23.o.11.09.17.mov

@rushatgabhane
Copy link
Member

yeah i think it's ok for now

@trjExpensify
Copy link
Contributor

Oh hm, I don't think we want that long term though. Like the individual rows, it should be limited to the select all checkbox being clicked/pressed.

Copy link
Member

@rushatgabhane rushatgabhane left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link

melvin-bot bot commented Feb 23, 2024

🎯 @rushatgabhane, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #37135.

@luacmartins
Copy link
Contributor

@ArekChr could you add some test steps to the issue please?

@ArekChr
Copy link
Contributor Author

ArekChr commented Feb 23, 2024

@luacmartins Updated tests steps

Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, we’ll have to address the checkbox toggling issue in a follow up, but we can tackle that when we update each row to navigate to the RHP.

@luacmartins luacmartins merged commit 0280d4e into Expensify:main Feb 23, 2024
28 of 29 checks passed
@OSBotify
Copy link
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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.44-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.44-13 🚀

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

@Ollyws
Copy link
Contributor

Ollyws commented Mar 13, 2024

We missed adding padding between the category name and status causing #37417, so we fixed this in #37668

@@ -928,6 +929,7 @@ function getCheckboxPressableStyle(borderRadius = 6): ViewStyle {
alignItems: 'center',
// eslint-disable-next-line object-shorthand
borderRadius: borderRadius,
...cursor.cursorPointer,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coming from #37236.

Adding cursorPointer here caused regression #37236, even though the button is disabled, it still might display the pointer. :)

return <FullscreenLoadingIndicator />;
}

if (shouldShowNotFoundPage) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not found page is shown in sidebar and main page causing two not found pages, ref: #39092

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.