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

[Simplified Collect][CLEAN UP][LOW] Standardize on Workspace wrapper #40598

Merged

Conversation

BrtqKr
Copy link
Contributor

@BrtqKr BrtqKr commented Apr 19, 2024

Details

Fixed Issues

$ #37898
PROPOSAL:

Tests

That's a very broad cleanup, so to verify that nothing is broken would require:

For admin case:

  1. Go to Account Settings > Workspaces > create/open any Collect Workspace with admin role.
  2. From LHN click on Categories.
  3. Open your browser console and write this code with replacing YOUR_WORKSPACE_ID with your workspace ID, then press ENTER (you can roll back by merge role: 'admin').
Onyx.merge('policy_YOUR_WORKSPACE_ID', {
    role: 'test',
});
  1. Verify that NoFoundPage is appeared, and you don't access the page.

For paid case:

  1. Go to Account Settings > Workspaces > create/open any Collect Workspace with admin role.
  2. From LHN click on Categories.
  3. Open your browser console and write this code with replacing YOUR_WORKSPACE_ID with your workspace ID, then press ENTER (you can roll back by merge type: 'team').
Onyx.merge('policy_YOUR_WORKSPACE_ID', {
    type: 'free',
});
  1. Verify that NoFoundPage is appeared, and you don't access the page.

For feature flag case:

  1. Go to Account Settings > Workspaces > create/open any Collect Workspace with admin role.
  2. From LHN click on Categories and copy page URL.
  3. From LHN click on More features and disable Categories feature.
  4. Navigate to disabled feature Categories by the URL you copied in step 2.
  5. Verify that NoFoundPage is appeared, and you don't access the page.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

  • Verify that no errors appear in the JS console

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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 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 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.

Screenshots/Videos

Android: Native
Screen.Recording.2024-04-25.at.15.05.25.mov
Android: mWeb Chrome
Screen.Recording.2024-04-25.at.15.12.00.mov
iOS: Native
Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-04-25.at.12.59.44.mp4
iOS: mWeb Safari
Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-04-25.at.13.31.50.mp4
MacOS: Chrome / Safari
Screen.Recording.2024-04-24.at.14.04.05.mov
Screen.Recording.2024-04-24.at.14.10.12.mov
MacOS: Desktop
Screen.Recording.2024-04-24.at.15.14.17.mov

Copy link
Contributor

@kosmydel kosmydel left a comment

Choose a reason for hiding this comment

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

Good job, LGTM

@BrtqKr BrtqKr marked this pull request as ready for review April 22, 2024 08:31
@BrtqKr BrtqKr requested a review from a team as a code owner April 22, 2024 08:31
@melvin-bot melvin-bot bot requested review from ahmedGaber93 and removed request for a team April 22, 2024 08:31
Copy link

melvin-bot bot commented Apr 22, 2024

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

@ahmedGaber93
Copy link
Contributor

ahmedGaber93 commented Apr 22, 2024

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
a1.mov
a2.mov
a3.mov
Android: mWeb Chrome
aw1.mov
aw2.mov
iOS: Native
i1.mov
i2.mov
i3.mov
iOS: mWeb Safari
iw1.mov
iw2.mov
MacOS: Chrome / Safari
w4.mov
w1.mov
w3.mov
w2.mov
MacOS: Desktop
d1.mov
d2.mov
d3.mov

Copy link
Contributor

@ahmedGaber93 ahmedGaber93 left a comment

Choose a reason for hiding this comment

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

The code works well, Just small suggestions to make the code more readable and simple.

Comment on lines 18 to 21
const POLICY_ACCESS_VARIANTS = {
PAID: (policy: OnyxEntry<OnyxTypes.Policy>) => !PolicyUtils.isPaidGroupPolicy(policy) || !policy?.isPolicyExpenseChatEnabled,
ADMIN: (policy: OnyxEntry<OnyxTypes.Policy>) => !PolicyUtils.isPolicyAdmin(policy),
} as const satisfies Record<string, (policy: OnyxTypes.Policy) => boolean>;
Copy link
Contributor

Choose a reason for hiding this comment

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

The code here is working well, but I think we need to make it more clean, because while the const name is ACCESS, the return method return true when INACCESS not when ACCESS, so I suggest the following change.

// revert the condition to return true when access
PAID: (policy: OnyxEntry<OnyxTypes.Policy>) => PolicyUtils.isPaidGroupPolicy(policy) && !!policy?.isPolicyExpenseChatEnabled,
ADMIN: (policy: OnyxEntry<OnyxTypes.Policy>) => PolicyUtils.isPolicyAdmin(policy),

// and change its usage here.
// const pageUnaccessible = accessVariants.reduce((acc, variant) => {
//     const accessFunction = POLICY_ACCESS_VARIANTS[variant];
//     return acc || accessFunction(policy);
// }, false);
const isPageAccessible = accessVariants.reduce((acc, variant) => {
    const accessFunction = POLICY_ACCESS_VARIANTS[variant];
    return acc && accessFunction(policy);
}, true);

// const shouldShowNotFoundPage = ... && pageUnaccessible
const shouldShowNotFoundPage = ... && !isPageAccessible

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, I think using accessVariant name as a const (CONST.POLICY.ACCESS_VARIANTS.PAID) will be more safe than string ('PAID')

const POLICY_ACCESS_VARIANTS = {
    [CONST.POLICY.ACCESS_VARIANTS.PAID]: ....,
    [CONST.POLICY.ACCESS_VARIANTS.ADMIN]: ....
}
<AccessOrNotFoundWrapper accessVariants={[CONST.POLICY.ACCESS_VARIANTS.PAID]}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

  1. Sure, I'll apply this, it seems more readable
  2. the idea is that this const is being used only in the context of AccessOrNotFoundWrapper, so splitting its keys to a separate file might be unintuitive, especially since POLICY_ACCESS_VARIANTS is being used as the type source which would be exported to the other places. I'd suggest keeping it this way until we find a case for using POLICY_ACCESS_VARIANTS outside of this component and then move it as a whole

Copy link
Contributor

Choose a reason for hiding this comment

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

the idea is that this const is being used only in the context of AccessOrNotFoundWrapper.

@BrtqKr But it used in many places where AccessOrNotFoundWrapper is used as a prop of it, so I think we need to update it.

Also, this point is a Reviewer Checklist item

[ ] 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

featureName?: PolicyFeatureName;
};

type PageNotFoundFallackProps = Pick<AccessOrNotFoundWrapperProps, 'policyID'> & {showFullScreenFallback: boolean};
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
type PageNotFoundFallackProps = Pick<AccessOrNotFoundWrapperProps, 'policyID'> & {showFullScreenFallback: boolean};
type PageNotFoundFallbackProps = Pick<AccessOrNotFoundWrapperProps, 'policyID'> & {shouldShowFullScreenFallback: boolean};

Comment on lines 49 to 59
function PageNotFoundFallback({policyID, showFullScreenFallback}: PageNotFoundFallackProps) {
return showFullScreenFallback ? (
<FullPageNotFoundView
shouldShow
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
shouldForceFullScreen
/>
) : (
<NotFoundPage onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_PROFILE.getRoute(policyID))} />
);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think no need for using both FullPageNotFoundView and NotFoundPage because NotFoundPage is the same as FullPageNotFoundView else if we pass prop shouldForceFullScreen = true.
What do you think about using only FullPageNotFoundView like this?

<FullPageNotFoundView
    shouldShow
    onBackButtonPress={() => Navigation.goBack(!isFeatureEnabled ? ROUTES.SETTINGS_WORKSPACES : ROUTES.WORKSPACE_PROFILE.getRoute(policyID))}
    shouldForceFullScreen={!isFeatureEnabled}
/>

Copy link
Contributor

Choose a reason for hiding this comment

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

We can also use it inline and remove PageNotFoundFallback component.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

NotFoundPage is inside of a ScreenWrapper, which has a SafeAreaView included. If we replace it with FullPageNotFoundView, it will break the mobile version of the app as shown below. It's been done this way to preserve the logic present in the previous version.
I think we should take the wider approach and unify them both in a separate ticket.

@ahmedGaber93
Copy link
Contributor

Bug: NoFoundPage appear briefly then loading, then back to appear again when trying to open not found workspace, for example go to /settings/workspace/fdfdfdfdfdfdfdfdfdfdfdfdf/categories

Screen.Recording.2024-04-23.at.8.59.10.AM.mov

@ahmedGaber93
Copy link
Contributor

We need to edit tests steps to be more clear.

For admin case:

  1. Go to Account Settings > Workspaces > create/open any Collect Workspace with admin role.
  2. From LHN click on Categories.
  3. Open your browser console and write this code with replacing YOUR_WORKSPACE_ID with your workspace ID, then press ENTER (you can roll back by merge role: 'admin').
Onyx.merge('policy_YOUR_WORKSPACE_ID', {
    role: 'test',
});
  1. Verify that NoFoundPage is appeared, and you don't access the page.

For paid case:

  1. Go to Account Settings > Workspaces > create/open any Collect Workspace with admin role.
  2. From LHN click on Categories.
  3. Open your browser console and write this code with replacing YOUR_WORKSPACE_ID with your workspace ID, then press ENTER (you can roll back by merge type: 'team').
Onyx.merge('policy_YOUR_WORKSPACE_ID', {
    type: 'free',
});
  1. Verify that NoFoundPage is appeared, and you don't access the page.

For feature flag case:

  1. Go to Account Settings > Workspaces > create/open any Collect Workspace with admin role.
  2. From LHN click on Categories and copy page URL.
  3. From LHN click on More features and disable Categories feature.
  4. Navigate to disabled feature Categories by the URL you copied in step 2.
  5. Verify that NoFoundPage is appeared, and you don't access the page.

also, please add some Screenshots/Videos, and fill Offline tests QA Steps, if it the same as Tests add it `Same as "Tests"`

@BrtqKr
Copy link
Contributor Author

BrtqKr commented Apr 24, 2024

Bug: NoFoundPage appear briefly then loading, then back to appear again when trying to open not found workspace, for example go to /settings/workspace/fdfdfdfdfdfdfdfdfdfdfdfdf/categories

Screen.Recording.2024-04-23.at.8.59.10.AM.mov

Yeah, it's also present on the main branch, so let's create a ticket for that

@ahmedGaber93
Copy link
Contributor

Reviewing now.

featureName?: PolicyFeatureName;
};

type PageNotFoundFallackProps = Pick<AccessOrNotFoundWrapperProps, 'policyID'> & {shouldShowFullScreenFallback: boolean};
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
type PageNotFoundFallackProps = Pick<AccessOrNotFoundWrapperProps, 'policyID'> & {shouldShowFullScreenFallback: boolean};
type PageNotFoundFallbackProps = Pick<AccessOrNotFoundWrapperProps, 'policyID'> & {shouldShowFullScreenFallback: boolean};

@ahmedGaber93
Copy link
Contributor

Tested well! And record videos for all cases.
@BrtqKr just small updates still here #40598 (comment) #40598 (comment)
Thanks!

@ahmedGaber93
Copy link
Contributor

We have 2 issues from the previous code before this Standardize, we need to open new issues for it.

issue 1

Bug: NoFoundPage appear briefly then loading, then back to appear again when trying to open not found workspace, for example go to /settings/workspace/fdfdfdfdfdfdfdfdfdfdfdfdf/categories

Screen.Recording.2024-04-23.at.8.59.10.AM.mov
issue 2

Native - back button overlapping with stausbar when trying to access page without feature enable, and the not found page is displayed.

issue1.mov

Copy link
Contributor

@ahmedGaber93 ahmedGaber93 left a comment

Choose a reason for hiding this comment

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

LGTM!

@melvin-bot melvin-bot bot requested a review from luacmartins April 25, 2024 21:14
luacmartins
luacmartins previously approved these changes Apr 25, 2024
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.

Nice! Thanks for cleaning this up. Just noting that we're deprecating all Free policies soon, so we'll need to update the access type to remove the Paid type.

@luacmartins
Copy link
Contributor

@BrtqKr conflicts

@luacmartins
Copy link
Contributor

@BrtqKr friendly bump to fix conflicts :)

@BrtqKr
Copy link
Contributor Author

BrtqKr commented Apr 29, 2024

@BrtqKr friendly bump to fix conflicts :)

Done 🙏 , but I had to adjust the wrapper to handle further customization. Let's get this reviewed and merged before we get more conflicts since this PR is modifying many parts of the app

@luacmartins luacmartins merged commit eda7522 into Expensify:main Apr 29, 2024
14 of 15 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

🚀 Cherry-picked to staging by https://github.com/francoisl in version: 1.4.67-7 🚀

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

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

@kavimuru
Copy link

@BrtqKr @ahmedGaber93 @luacmartins Could you help us how to validate in native apps and mweb?

Onyx.merge('policy_YOUR_WORKSPACE_ID', {
role: 'test',
});

@OSBotify
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/francoisl in version: 1.4.67-7 🚀

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

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

@ahmedGaber93
Copy link
Contributor

@kavimuru Sorry for unclear that.

mWeb/Native apps.

We can test is page access or not by links in mWeb and deeplinks in Native apps.

For admin case: try to open admin feature (categories) for any workspace you don't have admin role for it.

Precondition: user is Admin in workspace A and member in workspace B.

  1. In Your web browser, go to Account Settings > Workspaces > workspace B (member role) and copy your WORKSPACE_ID from browser URL.
  2. In mWeb/Native apps login with same account, try to open /settings/workspaces/WORKSPACE_ID/categories
  3. Verify that NoFoundPage is appeared, and you don't access the page.

For paid case: try to open paid feature (categories) for any free workspace.

Precondition: user is Admin in paid and free Workspaces.

  1. In Your web browser, go to Account Settings > Workspaces > free workspace, and copy your WORKSPACE_ID from browser URL.
  2. In mWeb/Native apps login with same account, try to open /settings/workspaces/WORKSPACE_ID/categories
  3. Verify that NoFoundPage is appeared, and you don't access the page.

For feature flag case: disable any feature (categories) in a workspace, try to open this feature by URL.

Precondition: user is Admin in paid workspace.

  1. In Your web browser, go to Account Settings > Workspaces > paid workspace > Categories and copy page URL.
  2. Go back > More features and disable Categories feature.
  3. In mWeb/Native apps login with same account, try to open the URL you copied in step 1.
  4. Verify that NoFoundPage is appeared, and you don't access the page.

@BrtqKr can you link this comment in tests step, or add it manually for mWeb/Native apps.
For more test videos, see here #40598 (comment)

@OSBotify
Copy link
Contributor

OSBotify commented May 1, 2024

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.68-3 🚀

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

testID={WorkspaceCreateTaxPage.displayName}
includeSafeAreaPaddingBottom={false}
style={[styles.defaultModalContainer]}
<AccessOrNotFoundWrapper
Copy link
Contributor

Choose a reason for hiding this comment

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

We weren't blocking the tax rate page by deep link when already connected to xero (#42925), so we fixed this in #43087

return acc && accessFunction(policy);
}, true);

const shouldShowNotFoundPage = isEmptyObject(policy) || (Object.keys(policy).length === 1 && !isEmptyObject(policy.errors)) || !policy?.id || !isPageAccessible || !isFeatureEnabled;
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 #44206:
Please be careful when fix conflict.
Recent code in FeatureEnabledAccessOrWrapper was not applied to this file so the fix of #39443 was partially reverted.
More details: #44206 (comment)

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.

8 participants