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

Update dynamically attachment modal #22543

Merged
merged 13 commits into from
Jul 28, 2023
Merged

Conversation

dukenv0307
Copy link
Contributor

@dukenv0307 dukenv0307 commented Jul 10, 2023

Details

Update dynamically attachment modal

Fixed Issues

$ #21334
PROPOSAL: #21334 (comment)

Tests

  • The attachment modal should update dynamically if another user sends a new attachment
  1. Login with user A
  2. On another device, login with user B
  3. From user B, send an attachment
  4. From user A, click on the attachment to open attachment modal
  5. From user B, send an attachment again
  6. From user A, verify that the user can click on the arrow right button to see the newest attachment that is sent by user B
  • The attachment modal should dismiss if another user deletes the attachment that is displaying
  1. Login with user A
  2. On another device, login with user B
  3. From user Bm send an attachment
  4. From user A, click on the attachment to open attachment modal
  5. From user B, delete this attachment
  6. From user A, verify that attachment modal closed
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  • The attachment modal should update dynamically if another user sends a new attachment
  1. Login with user A
  2. On another device, login with user B
  3. From user B, send an attachment
  4. From user A, click on the attachment to open attachment modal
  5. From user B, send an attachment again
  6. From user A, verify that the user can click on the arrow right button to see the newest attachment that is sent by user B
  • The attachment modal should dismiss if another user deletes the attachment that is displaying
  1. Login with user A
  2. On another device, login with user B
  3. From user Bm send an attachment
  4. From user A, click on the attachment to open attachment modal
  5. From user B, delete this attachment
  6. From user A, verify that attachment modal closed
  • 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 / Chrome
    • iOS / native
    • iOS / 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 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
  • The attachment modal should update dynamically if another user sends a new attachment
Screencast.from.10-07-2023.15.46.21.webm
  • The attachment modal should dismiss if another user deletes the attachment that is displaying
Screencast.from.10-07-2023.15.48.38.webm
Mobile Web - Chrome
  • The attachment modal should update dynamically if another user sends a new attachment
Record_2023-07-10-15-53-05.mp4
  • The attachment modal should dismiss if another user deletes the attachment that is displaying
Record_2023-07-10-15-53-33.mp4
Mobile Web - Safari
  • The attachment modal should update dynamically if another user sends a new attachment
safari-1.mp4
  • The attachment modal should dismiss if another user deletes the attachment that is displaying
safari-2.mp4
Desktop
  • The attachment modal should update dynamically if another user sends a new attachment
desktop-1.mp4
  • The attachment modal should dismiss if another user deletes the attachment that is displaying
desktop-2.mp4
iOS
  • The attachment modal should update dynamically if another user sends a new attachment
ios-1.mp4
  • The attachment modal should dismiss if another user deletes the attachment that is displaying
ios-2.mp4
Android
  • The attachment modal should update dynamically if another user sends a new attachment
21334-1.mp4
  • The attachment modal should dismiss if another user deletes the attachment that is displaying
21334-2.mp4

@dukenv0307 dukenv0307 marked this pull request as ready for review July 11, 2023 03:31
@dukenv0307 dukenv0307 requested a review from a team as a code owner July 11, 2023 03:31
@melvin-bot melvin-bot bot requested review from narefyev91 and removed request for a team July 11, 2023 03:31
@melvin-bot
Copy link

melvin-bot bot commented Jul 11, 2023

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

@narefyev91
Copy link
Contributor

narefyev91 commented Jul 11, 2023

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 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 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
8mb.video-EhW-6bvC514d.mp4
Mobile Web - Chrome
8mb.video-lF7-znKLgFD6.mp4
Mobile Web - Safari
8mb.video-TOI-QXXyQkHZ.mp4
Desktop
8mb.video-Rcx-NO0KpwyH.mp4
iOS
8mb.video-vhR-xwaCpLo5.mp4
Android
8mb.video-dBO-FJ7wcQBn.mp4

Copy link
Contributor

@narefyev91 narefyev91 left a comment

Choose a reason for hiding this comment

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

LGTM
🎀 👀 🎀 C+ reviewed

@melvin-bot melvin-bot bot requested a review from jasperhuangg July 11, 2023 17:20
@dukenv0307
Copy link
Contributor Author

dukenv0307 commented Jul 11, 2023

@narefyev91 We have another bug when we update dynamically with this PR that I mentioned in slack thread here https://expensify.slack.com/archives/C01GTK53T8Q/p1688999272836799?thread_ts=1688646398.596839&cid=C01GTK53T8Q Can you take a look at this.

Screencast.from.10-07-2023.21_19_32.webm

@jasperhuangg
Copy link
Contributor

@narefyev91 We have another bug when we update dynamically with this PR that I mentioned in slack thread here https://expensify.slack.com/archives/C01GTK53T8Q/p1688999272836799?thread_ts=1688646398.596839&cid=C01GTK53T8Q Can you take a look at this.

Screencast.from.10-07-2023.21_19_32.webm

@dukenv0307 does this happen when the sender is viewing the image?

@dukenv0307
Copy link
Contributor Author

dukenv0307 commented Jul 11, 2023

@jasperhuangg This only happens when the user is viewing the first image of the report and from another device, the participant of the report add an attachment.

@jasperhuangg
Copy link
Contributor

@dukenv0307 gotcha, then it sounds like we need to fix that before this is merged. What have you tried thus far to preserve the index of the currently displayed image?

@jasperhuangg jasperhuangg self-requested a review July 11, 2023 23:25
Copy link
Contributor

@jasperhuangg jasperhuangg left a comment

Choose a reason for hiding this comment

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

taking away my approval since it looks like this isn't ready yet

@dukenv0307
Copy link
Contributor Author

dukenv0307 commented Jul 11, 2023

@jasperhuangg The page state is updated correctly but when we is viewing the first image and then page state is updated, onViewableItemsChanged of FlatList is triggered, and viewableItems that is passed to update fucntion is the next image instead of the current image. It is the behavior of FlatList and I cannot find the reason and the solution for this.

@narefyev91
Copy link
Contributor

@jasperhuangg The page state is updated correctly but when we is viewing the first image and then page state is updated, onViewableItemsChanged of FlatList is triggered, and viewableItems that is passed to update fucntion is the next image instead of the current image. It is the behavior of FlatList and I cannot find the reason and the solution for this.

@dukenv0307 maybe you can store latest viewed page in ref and when you get updates for pages - you will check if user already seen any of the image and use that stored page index/id

@dukenv0307
Copy link
Contributor Author

@jasperhuangg The page state is updated correctly but when we is viewing the first image and then page state is updated, onViewableItemsChanged of FlatList is triggered, and viewableItems that is passed to update fucntion is the next image instead of the current image. It is the behavior of FlatList and I cannot find the reason and the solution for this.

@narefyev91 onViewableItemsChanged is auto-triggered for this case and the next image will always display even we don't update page state in update function.

@narefyev91
Copy link
Contributor

onViewableItemsChanged

Why does this not happened for all other platforms - but only happened for web and desktop? Also seems you should not be getting to next image if this condition will be met
const entry = _.first(viewableItems);
if (!entry) {
this.setState({activeSource: null});
return;
}

@dukenv0307
Copy link
Contributor Author

dukenv0307 commented Jul 12, 2023

Also seems you should not be getting to next image if this condition will be met

viewableItems is passed by onViewableItemsChanged and it is the next image.

const entry = _.first(viewableItems);
if (!entry) {
this.setState({activeSource: null});
return;
}

And it is not empty.

@dukenv0307
Copy link
Contributor Author

dukenv0307 commented Jul 12, 2023

@narefyev91 It Seems the reason is in native we revert the array and when we add new attachment, page state doesn't change.But in native, we have the same bug when we delete the previous image of the current image that we are viewing

@jasperhuangg
Copy link
Contributor

@dukenv0307 there's no way you can store some type of index anywhere, either in this component or the a parent component, that keeps track of the currently viewed attachment?

@dukenv0307
Copy link
Contributor Author

@jasperhuangg page state stored correctly the index of the currently viewed attachment, but for this bug, it's the behavior of FlatList and we cannot control this.

@jasperhuangg
Copy link
Contributor

@dukenv0307 what have you tried to fix this problem?

There seems to be a viewabilityConfig that we can provide to the FlatList, could anything in there help us solve this problem?

@dukenv0307
Copy link
Contributor Author

@jasperhuangg I tried to add waitForInteraction: true into viewabilityConfig and move the logic to set page state in update fucntion into cycleThroughAttachments. With this config, onViewableItemsChanged isn't triggered but this issue still occurs.

@dukenv0307
Copy link
Contributor Author

@jasperhuangg I just tried to add a callback after the update state in componentDidUpdate to scroll to current image by using ref, this bug doesn't occur but it make a werid because it move from next image to current image.

Screencast.from.14-07-2023.07.31.36.webm

@dukenv0307
Copy link
Contributor Author

@jasperhuangg Friendly bump.

@dukenv0307
Copy link
Contributor Author

@narefyev91 Please help to review this PR again.

@dukenv0307
Copy link
Contributor Author

@narefyev91 I just updated to set animatied as false when we dynamic update attachment. Please help to check again.

@dukenv0307
Copy link
Contributor Author

@narefyev91 Friendly Bump for reviewing

@dukenv0307
Copy link
Contributor Author

dukenv0307 commented Jul 27, 2023

@jasperhuangg
narefyev91 seems to be busy, Please help me to review the PR again before he comes back.

@narefyev91
Copy link
Contributor

@dukenv0307 @jasperhuangg sorry guys i'm on vacation - will not be able to have one more look at it for now

@dukenv0307
Copy link
Contributor Author

merge main to update to function component

Copy link
Contributor

@jasperhuangg jasperhuangg left a comment

Choose a reason for hiding this comment

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

good work!

@jasperhuangg jasperhuangg merged commit 0c4bcd1 into Expensify:main Jul 28, 2023
10 checks passed
@melvin-bot melvin-bot bot added the Emergency label Jul 28, 2023
@melvin-bot
Copy link

melvin-bot bot commented Jul 28, 2023

@jasperhuangg looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@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/jasperhuangg in version: 1.3.48-0 🚀

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

@@ -50,7 +51,7 @@ function createInitialState(props) {

const page = _.findIndex(attachments, (a) => a.source === props.source);
if (page === -1) {
throw new Error('Attachment not found');
Navigation.dismissModal();
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to return after this so that props.onNavigate doesn't still get called?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Beamanator When we create the PR, this component is a class component and I added return here. And then after it is changed to a function component, I resolve conflict, and if we return here the function doesn't return the state and the app also crashes, So I think we should the check to prevent call props.onNavigate or check in props.onNavigate function to do nothing if the attachment is empty.

image

Copy link
Contributor

Choose a reason for hiding this comment

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

Ya looks like this is causing this regression: #23964

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Beamanator Do I need to create a PR to quickly fix it?

Copy link
Contributor

Choose a reason for hiding this comment

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

@dukenv0307 interesting - I did this and it seemed to work fine for me: #23988

So I returned an object, not undefined

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for offering creating a PR, but I already created one 😅 ^ feel free to review if you'd like

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So I returned an object, not undefined

That looks good to me.

Thanks for offering creating a PR, but I already created one sweat_smile ^ feel free to review if you'd like

Thank you.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hey @Beamanator and @dukenv0307,

I've noticed we've opted to remove the error throw in this section. While I understand this might be an attempt to address the issue of deleting an image, we need to recall that it was previously flagged as a bug when the carousel closed upon an image deletion (Issue #18451). Reintroducing this behavior might not be the best move.

The original intent of the createInitialState—as the name suggests—was to execute just once upon the carousel's opening. Its purpose was to display the "Ooops" screen if a user tries to open an unlocatable attachment. In my opinion, presenting this error screen offers a more insightful user experience compared to abruptly closing the modal, which may come off as if the user's action was disregarded.

Can we reconsider this change and perhaps retain the error throw?

@OSBotify
Copy link
Contributor

OSBotify commented Aug 1, 2023

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.48-5 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Aug 2, 2023

🚀 Deployed to staging by https://github.com/jasperhuangg in version: 1.3.49-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Aug 3, 2023

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.49-3 🚀

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

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

Successfully merging this pull request may close these issues.

6 participants