fix: when deleting a workspace offline, the layout breaks #17639

akinwale · 2023-04-18T21:35:23Z

Details

Updated PR for #17310 rebased on the main branch.

This PR includes an additional commit to fix #17580. Wrapping the MenuItem with a HOC or using React.forwardRef seems to be disregarding (or discarding?) some or all of the defaultProps, which includes the defaultProps.style change introduced by commit a453d1e.

This can be observed when applyStrikeThrough is called on the children of an OfflineWithFeedback component, when the children are MenuItem components.

This PR applies the defaultProps to a reference of the wrapped component before the export call.

Fixed Issues

$ #16946
$ #17656
PROPOSAL: #16946 (comment)

Tests

Log in to any account
Open the Settings page.
Long-press the Help link. This should present the Copy to Clipboard overlay with the action and link displayed at the bottom.
Use the Copy to Clipboard action and verify the copied URL.
Open the About page.
Long-press the View the code link. This should present the Copy to Clipboard overlay.
Repeat step 4.
Long-press the View open jobs link. This should present the Copy to Clipboard overlay.
Repeat step 4.
Click on App download links.
Long-press on each of the links. The Copy to Clipboard overlay should be displayed after long-pressing each link.
Verify that copied URL matches for each of the links.

Verify that no errors appear in the JS console

Offline tests

Open the expensify URL.
Sign into a valid account that is ready for Error tests.
Turn off internet connection.
Delete a workspace while offline.
Ensure that the layout is not broken for a workspace that was deleted while offline. This means proper padding should be maintained for the left and right icons and the text.
Ensure that strikethrough is applied to the text of a workspace that was deleted while offline, especially on native iOS and Android.

QA Steps

Run test steps above.
Run offline test steps above.
Verify old dot URL: On the Workspace Travel view, verify that that the URL to copy for the "Issue and manage cards" menu item matches the string: https://<oldDotDomain>/domain_companycards where <oldDotDomain> is the configured old dot domain for that particular environment.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Mobile Web - Chrome

16946-android-chrome.webm

Mobile Web - Safari

16946-ios-safari.mov

Desktop

iOS

16946-ios-native.mov

Android

16946-android-native.webm

…ome refactoring

…ional

MelvinBot · 2023-04-18T21:35:29Z

@mountiny @eVoloshchak One of you needs to 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]

mountiny

Thanks @akinwale Can you highlight the changes compared to the previous PR?

Also can you please leave the same tests and QA which were for the previous PR we still need to test for this here since it was not QAed in staging

akinwale · 2023-04-18T22:39:52Z

Thanks @akinwale Can you highlight the changes compared to the previous PR?

The only new change is this commit: 3bcbdfb

Every other prior commit is from https://github.com/Expensify/App/pull/17310/commits (except the merge with main since this PR is rebased on the current main).

Also can you please leave the same tests and QA which were for the previous PR we still need to test for this here since it was not QAed in staging

Done. I changed the steps for the offline tests to cover the workspace deletion operation.

mountiny · 2023-04-18T23:14:09Z

Thanks for the update 🙇

eVoloshchak · 2023-04-19T17:51:39Z

src/components/MenuItem.js

 MenuItem.displayName = 'MenuItem';

-export default MenuItem;
+const MenuItemWithWindowDimensions = withWindowDimensions(React.forwardRef((props, ref) => (


That is a weird bug.
Thanks for coming up with a fix so fast, but I wonder why this is happening and how could we fix this without applying workarounds.
I'll try to investigate this further a bit before we can merge this

Sounds good. I have an additional fix incoming for this issue: #17656. Just need to verify the details first.

akinwale · 2023-04-19T18:58:35Z

@eVoloshchak You can find more details about my approach with the latest commit here: #17656 (comment)

mountiny · 2023-04-19T19:11:19Z

Thanks @akinwale I have also linked the other bug to this PR in the body, can you also update the QA/tests to cover that strikethrough styling?

akinwale · 2023-04-20T03:08:21Z

Thanks @akinwale I have also linked the other bug to this PR in the body, can you also update the QA/tests to cover that strikethrough styling?

Done.

eVoloshchak

This problem appears when we have a component created with React.forwardRef and we clone it using React.cloneElement.

This comment suggests we might change the way we apply defaultProps, started a discussion here

akinwale · 2023-04-20T14:08:14Z

This problem appears when we have a component created with React.forwardRef and we clone it using React.cloneElement.

This comment suggests we might change the way we apply defaultProps, started a discussion here

Looks like I'd also have to move the displayName and propTypes below as well.

For propTypes I had a problem where if I removed it above, eslint complained, and there were console errors with the withWindowDimension props, so I guess I'll just set it again instead, depending on what is concluded in the discussion.

Update: Moving them causes eslint and console errors, so I'll just leave things the way they are for now.

akinwale · 2023-04-21T14:03:19Z

@eVoloshchak @mountiny Just checking in to see if there will be any potential responses in the Slack discussion thread. I think that's the only thing left to close out this PR. Thanks.

mountiny · 2023-04-22T00:29:17Z

Bumped the thread, I see there are merge conflicts, we can resolve those after we get agreement on the thread

akinwale · 2023-04-22T04:26:00Z

The merge conflict appears to be minor, just a new style added to titleTextStyle, styles.ltr, so I'll just do a merge with the main branch to keep things updated.

src/components/MenuItem.js

src/CONST.js

eVoloshchak · 2023-04-24T14:00:24Z

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 / Chrome
- iOS / native
- iOS / 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 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 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(themeColors.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 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

Web

Screen.Recording.2023-04-24.at.17.12.10.mov

Mobile Web - Chrome

Screen_Recording_20230424-170804_Chrome.mp4

Mobile Web - Safari

IMG_0038.MP4

Desktop

Screen.Recording.2023-04-24.at.17.11.02.mov

iOS

IMG_0037.MP4

Android

Screen_Recording_20230424-170555_New.Expensify.mp4

eVoloshchak

Tests well on all platforms
cc: @mountiny

mountiny

One question

mountiny · 2023-04-24T19:44:12Z

src/libs/actions/Link.js

- * @param {String} url
+ * @param {String} [url] the url path
+ * @param {String} [shortLivedAuthToken]
+ *
+ * @returns {Promise<string>}
 */
-function openOldDotLink(url) {
-    /**
-     * @param {String} [shortLivedAuthToken]
-     * @returns {Promise<string>}
-     */
-    function buildOldDotURL(shortLivedAuthToken) {
-        const hasHashParams = url.indexOf('#') !== -1;
-        const hasURLParams = url.indexOf('?') !== -1;
+function buildOldDotURL(url, shortLivedAuthToken) {
+    const hasHashParams = url.indexOf('#') !== -1;
+    const hasURLParams = url.indexOf('?') !== -1;


@akinwale @eVoloshchak can you remind me please why is this change here?

To summarise: Some of the menu items made use of the openOldDotLink(url) method, which built the URLs using the inner defined buildOldDotURL method. Since the original issue scope was to make the "Copy to clipboard" behaviour happen for all links, I had to refactor this method to the outer scope.

You can follow the discussion here for more details: #17310 (comment)

@akinwale Ok thank you, can you also add a Qa test which will check the deeplink works as expected, also tehre is a merge conflict, I will merge once this is resolved, thank you!

@mountiny All done!

OSBotify · 2023-04-25T06:08:23Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.5-0 🚀

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

OSBotify · 2023-04-26T05:50:23Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.5-6 🚀

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

akinwale added 15 commits April 18, 2023 20:56

avoid nested Pressable and change the root MenuItem component, with s…

6930885

…ome refactoring

use React.forwardRef for MenuItem, and fix prop types

9a094e3

changes based on PR review feedback

e8e90e1

clean up onPressOut in MenuItem component

d07e3b1

implement Copy to Clipboard behaviour for all links

cfb3b76

cleanup

0240f90

cleanup boolean checks

4da28a3

update more links with the Copy to Clipboard behaviour

732c034

conditional onSecondaryInteraction

3e532f7

conditional onLongPress

58a96ff

cleanup conditional checks, make onSecondaryInteraction prop type opt…

4ca7979

…ional

make executeSecondaryInteraction a class method, fix typo

75ab457

add JSDoc for executeSecondaryInteraction

9f61f84

fix onSecondaryInteraction prop check in MenuItemList

59bcbd9

set defaultProps for MenuItem wrapped with HOC

3bcbdfb

akinwale requested a review from a team as a code owner April 18, 2023 21:35

melvin-bot bot requested review from eVoloshchak and mountiny and removed request for a team April 18, 2023 21:35

mountiny assigned akinwale Apr 18, 2023

mountiny reviewed Apr 18, 2023

View reviewed changes

eVoloshchak reviewed Apr 19, 2023

View reviewed changes

make applyStrikethrough work with titleStyle

cd1f55c

eVoloshchak reviewed Apr 20, 2023

View reviewed changes

akinwale added 2 commits April 20, 2023 17:06

fix AboutPage.js merge conflict

2d898b1

conditionally apply styles.offlineFeedback.deleted for menu item text

ae1ae33

eVoloshchak mentioned this pull request Apr 20, 2023

[PAID] [$500] Workspace - Deleted Workspace offline is not crossed out #17656

Closed

6 tasks

fix MenuItem.js merge conflict

9f9d54b

akinwale requested a review from eVoloshchak April 24, 2023 10:13

eVoloshchak suggested changes Apr 24, 2023

View reviewed changes

src/components/MenuItem.js Outdated Show resolved Hide resolved

src/CONST.js Outdated Show resolved Hide resolved

code cleanup

b56477e

akinwale requested a review from eVoloshchak April 24, 2023 13:31

eVoloshchak previously approved these changes Apr 24, 2023

View reviewed changes

mountiny previously approved these changes Apr 24, 2023

View reviewed changes

fix AboutPage.js merge conflict

56a90a7

akinwale dismissed stale reviews from mountiny and eVoloshchak via 56a90a7 April 24, 2023 20:21

eVoloshchak approved these changes Apr 24, 2023

View reviewed changes

mountiny approved these changes Apr 24, 2023

View reviewed changes

mountiny merged commit dd827e9 into Expensify:main Apr 24, 2023

OSBotify mentioned this pull request Apr 25, 2023

Deploy Checklist: New Expensify 2023-04-25 #17948

Closed

37 tasks

MelvinBot mentioned this pull request Apr 26, 2023

[HOLD for payment 2023-05-03] [$1000] Long pressing any of the app download link on mweb Safari does not open the copy to clipboard menu #16946

Closed

6 tasks

fix: when deleting a workspace offline, the layout breaks #17639

fix: when deleting a workspace offline, the layout breaks #17639

Uh oh!

Conversation

akinwale commented Apr 18, 2023 • 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!

MelvinBot commented Apr 18, 2023

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

akinwale commented Apr 18, 2023

Uh oh!

mountiny commented Apr 18, 2023

Uh oh!

eVoloshchak Apr 19, 2023

Choose a reason for hiding this comment

Uh oh!

akinwale Apr 19, 2023

Choose a reason for hiding this comment

Uh oh!

akinwale commented Apr 19, 2023

Uh oh!

mountiny commented Apr 19, 2023

Uh oh!

akinwale commented Apr 20, 2023

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

akinwale commented Apr 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

akinwale commented Apr 21, 2023

Uh oh!

mountiny commented Apr 22, 2023

Uh oh!

akinwale commented Apr 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

eVoloshchak commented Apr 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Apr 24, 2023

Choose a reason for hiding this comment

Uh oh!

akinwale Apr 24, 2023

Choose a reason for hiding this comment

Uh oh!

mountiny Apr 24, 2023

Choose a reason for hiding this comment

Uh oh!

akinwale Apr 24, 2023

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Apr 25, 2023

Uh oh!

OSBotify commented Apr 26, 2023

Uh oh!

Reviewers

Assignees

Labels

akinwale commented Apr 18, 2023 •

edited

Loading

akinwale commented Apr 20, 2023 •

edited

Loading

akinwale commented Apr 22, 2023 •

edited

Loading

eVoloshchak commented Apr 24, 2023 •

edited

Loading