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.

Sign up for GitHub

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

Jump to bottom

Add reorder-item component #16225

Merged
merged 20 commits into from
Jun 16, 2023
Merged

Add reorder-item component #16225

merged 20 commits into from
Jun 16, 2023

Conversation

mmilad75
Copy link
Contributor

@mmilad75 mmilad75 commented Jun 8, 2023 •
edited
Loading

fixes #15948

Summary

[comment]: # This PR adds reorder-items component to the project.

Theme Mode iOS Android
Dark Mode
milad.15948-ios-darkmode.mp4
XRecorder_12062023_125929.mp4
Light Mode
milad.15948-ios-lightmode.mp4
XRecorder_12062023_130019.mp4

Steps to test

  • Open Status
  • Go to Profile
  • Quo2.0 Preview
  • Settings -> reorder item

status: ready

@mmilad75 mmilad75 changed the title Milad/15948 Add reorder-item component Jun 8, 2023
@status-im-auto
Copy link
Member

status-im-auto commented Jun 8, 2023 •
edited
Loading

Jenkins Builds

Click to see older builds (27)
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 85a672c #2 2023-06-08 10:07:34 ~6 min ios 📱ipa 📲
✔️ 85a672c #2 2023-06-08 10:19:54 ~19 min android-e2e 🤖apk 📲
❌ 85a672c #2 2023-06-08 10:20:22 ~19 min tests 📄log
✔️ fdb4e14 #4 2023-06-08 10:34:09 ~8 min ios 📱ipa 📲
❌ fdb4e14 #4 2023-06-08 10:35:53 ~10 min tests 📄log
✔️ fdb4e14 #4 2023-06-08 10:37:41 ~12 min android 🤖apk 📲
✔️ fdb4e14 #4 2023-06-08 10:38:13 ~12 min android-e2e 🤖apk 📲
❌ 5174019 #5 2023-06-08 14:19:59 ~3 min tests 📄log
✔️ 5174019 #6 2023-06-08 14:22:31 ~5 min android-e2e 🤖apk 📲
✔️ 5174019 #6 2023-06-08 14:22:47 ~5 min android 🤖apk 📲
✔️ 5174019 #6 2023-06-08 14:23:56 ~6 min ios 📱ipa 📲
❌ 014d776 #6 2023-06-08 15:38:45 ~3 min tests 📄log
✔️ 014d776 #7 2023-06-08 15:41:07 ~5 min android-e2e 🤖apk 📲
✔️ 014d776 #7 2023-06-08 15:41:37 ~6 min android 🤖apk 📲
✔️ 014d776 #7 2023-06-08 15:42:18 ~6 min ios 📱ipa 📲
✔️ df1a789 #8 2023-06-08 15:49:49 ~7 min ios 📱ipa 📲
✔️ df1a789 #8 2023-06-08 15:51:20 ~8 min android-e2e 🤖apk 📲
✔️ df1a789 #8 2023-06-08 15:51:29 ~8 min android 🤖apk 📲
❌ df1a789 #7 2023-06-08 15:53:03 ~10 min tests 📄log
✔️ 3ffce36 #9 2023-06-08 16:44:54 ~5 min android-e2e 🤖apk 📲
✔️ 3ffce36 #9 2023-06-08 16:46:10 ~6 min ios 📱ipa 📲
✔️ 3ffce36 #9 2023-06-08 16:46:26 ~6 min android 🤖apk 📲
❌ 3ffce36 #8 2023-06-08 16:48:30 ~8 min tests 📄log
✔️ 47ab91e #11 2023-06-10 14:51:38 ~5 min android-e2e 🤖apk 📲
✔️ 47ab91e #11 2023-06-10 14:51:54 ~5 min android 🤖apk 📲
❌ 47ab91e #11 2023-06-10 14:52:51 ~6 min ios 📄log
❌ 47ab91e #10 2023-06-10 14:54:15 ~7 min tests 📄log
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 3149330 #12 2023-06-12 09:13:11 ~6 min android-e2e 🤖apk 📲
✔️ 3149330 #12 2023-06-12 09:13:13 ~6 min ios 📱ipa 📲
✔️ 3149330 #12 2023-06-12 09:13:14 ~6 min android 🤖apk 📲
❌ 3149330 #11 2023-06-12 09:17:27 ~10 min tests 📄log
✔️ bf93624 #13 2023-06-12 14:00:17 ~5 min android-e2e 🤖apk 📲
✔️ bf93624 #13 2023-06-12 14:00:58 ~6 min ios 📱ipa 📲
✔️ bf93624 #13 2023-06-12 14:03:16 ~8 min android 🤖apk 📲
❌ bf93624 #12 2023-06-12 14:06:19 ~11 min tests 📄log

@mmilad75 mmilad75 force-pushed the milad/15948 branch 2 times, most recently from fdb4e14 to dff232d Compare June 8, 2023 14:16
@mmilad75 mmilad75 marked this pull request as ready for review June 8, 2023 15:43
@J-Son89
Copy link
Contributor

J-Son89 commented Jun 8, 2023

Can you please include some screenshots of light and dark mode previews

J-Son89
J-Son89 reviewed Jun 8, 2023
View reviewed changes
Copy link
Contributor

@J-Son89 J-Son89 left a comment

Choose a reason for hiding this comment

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

Can you please remove all of the assets you added that are not used. Also they all seem like mock assets and so can you move them to that resources folder for the ones you are keeping?

src/quo2/components/settings/reorder_item/items/item_tabs.cljs Outdated Show resolved Hide resolved
src/quo2/core.cljs Show resolved Hide resolved
src/react_native/core.cljs Outdated Show resolved Hide resolved
@mmilad75
Copy link
Contributor Author

Can you please include some screenshots of light and dark mode previews

Done

@mmilad75
Copy link
Contributor Author

Can you please remove all of the assets you added that are not used. Also they all seem like mock assets and so can you move them to that resources folder for the ones you are keeping?

Done

J-Son89
J-Son89 reviewed Jun 13, 2023
View reviewed changes
lefthook.yml Outdated Show resolved Hide resolved
@mmilad75 mmilad75 requested a review from flexsurfer June 14, 2023 14:24
cammellos
cammellos approved these changes Jun 14, 2023
View reviewed changes
Copy link
Contributor

@cammellos cammellos left a comment

Choose a reason for hiding this comment

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

Left a couple of minor comments

src/quo2/components/settings/reorder_item/items/item_tabs.cljs Outdated Show resolved Hide resolved
src/quo2/components/settings/reorder_item/items/item_tabs.cljs Outdated Show resolved Hide resolved
flexsurfer
flexsurfer requested changes Jun 15, 2023
View reviewed changes
src/quo2/components/settings/reorder_item/items/item.cljs Outdated Show resolved Hide resolved
src/react_native/core.cljs Outdated Show resolved Hide resolved
@mmilad75 mmilad75 requested a review from flexsurfer June 15, 2023 16:25
@pavloburykh pavloburykh self-assigned this Jun 16, 2023
@pavloburykh
Copy link
Contributor

@mmilad75 thanx for the contribution. LGTM! Ready for merge.

@flexsurfer
Copy link
Member

hey @mmilad75 thanks for the contribution, we're ready to merge, could you confirm pls that make lint has no errors, thanks

@J-Son89
Copy link
Contributor

J-Son89 commented Jun 16, 2023

hey @mmilad75 thanks for the contribution, we're ready to merge, could you confirm pls that make lint has no errors, thanks

@flexsurfer maybe we can checkout external contributors commits, create a pr and run the checks ourselves so it can be safely merged? cc @cammellos

@status-im-auto
Copy link
Member

70% of end-end tests have passed

Total executed tests: 33
Failed tests: 10
Passed tests: 23

IDs of failed tests: 703086,702783,702813,702733,702782,702786,702732,702894,702731,702855

Failed tests (10)

Click to expand
  • Rerun failed tests

    • Class TestCommunityMultipleDeviceMerged:

    1. test_community_mark_all_messages_as_read, id: 703086

    Device 1: Find `Button` by `accessibility id`: `mark-as-read`
    Device 1: Tap on found: Button 

    critical/test_public_chat_browsing.py:790: in test_community_mark_all_messages_as_read
    self.errors.verify_no_errors()
base_test_case.py:182: in verify_no_errors
    pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
 New messages counter is not shown in home > Commmunity element



    Device sessions

    2. test_community_mentions_push_notification, id: 702786

    # STEP: Admin gets push notification with the mention and tap it
    Device 1: Getting PN by 'user_1' 

    critical/test_public_chat_browsing.py:859: in test_community_mentions_push_notification
    self.errors.verify_no_errors()
base_test_case.py:182: in verify_no_errors
    pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
 Push notification with the mention was not received by admin



    Device sessions

    3. test_community_contact_block_unblock_offline, id: 702894

    Device 2: Tap on found: Button
    Device 2: Find Button by xpath: //*[@text="# general"] 

    critical/test_public_chat_browsing.py:735: in test_community_contact_block_unblock_offline
    [home.jump_to_card_by_text('# %s' % self.channel_name) for home in [self.home_1, self.home_2]]</b>
critical/test_public_chat_browsing.py:735: in <listcomp>
    [home.jump_to_card_by_text('# %s' % self.channel_name) for home in [self.home_1, self.home_2]]</b>
../views/base_view.py:613: in jump_to_card_by_text
    self.element_by_text(text).click()
../views/base_element.py:91: in click
    self.find_element().click()
../views/base_element.py:80: in find_element
    raise NoSuchElementException(
 Device 2: Button by xpath: `//*[@text="# general"]` is not found on the screen



    Device sessions

    Class TestGroupChatMultipleDeviceMergedNewUI:

    1. test_group_chat_pin_messages, id: 702732 

    Test is not run, e2e blocker

    [[reason: [NOTRUN] Pin feature is in development]]

    Class TestOneToOneChatMultipleSharedDevicesNewUi:

    1. test_1_1_chat_is_shown_message_sent_delivered_from_offline, id: 702783

    # STEP: Device1 goes back online and checks that 1-1 chat will be fetched
    Device 1: Looking for a message by text: test message 

    critical/chats/test_1_1_public_chats.py:1253: in test_1_1_chat_is_shown_message_sent_delivered_from_offline
    self.errors.verify_no_errors()
base_test_case.py:182: in verify_no_errors
    pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
 Message status was not delivered after back up online, it is "Sending"!
E    Message was not delivered after resending from offline

    [[Issue with messages not being sent for a long time]]

    Device sessions

    2. test_1_1_chat_push_emoji, id: 702813

    # STEP: Send emoji message to Device 1 while it's on background
    Device 2: Sending message 'emoji' 

    critical/chats/test_1_1_public_chats.py:1107: in test_1_1_chat_push_emoji
    chat_2.send_message(emoji.emojize(emoji_message))
../views/chat_view.py:958: in send_message
    self.chat_message_input.wait_for_element(wait_chat_input_sec)
../views/base_element.py:117: in wait_for_element
    raise TimeoutException(
 Device `2`: `ChatMessageInput` by` accessibility id`: `chat-message-input` is not found on the screen after wait_for_element



    Device sessions

    3. test_1_1_chat_text_message_delete_push_disappear, id: 702733

    Device 2: Find Text by xpath: //*[starts-with(@text,'smth I should edit')]/ancestor::android.view.ViewGroup[@content-desc='chat-item']
    Device 2: Tap on found: Text 

    critical/chats/test_1_1_public_chats.py:1162: in test_1_1_chat_text_message_delete_push_disappear
    self.chat_2.chat_element_by_text(message_after_edit_1_1).wait_for_status_to_be("Delivered")
../views/chat_view.py:228: in wait_for_status_to_be
    raise TimeoutException("Message status was not changed to %s, it's %s" % (expected_status, current_status))
 Message status was not changed to Delivered, it's

    [[Message is being in status 'Sending' for a long time: https://github.com//issues/15385]]

    Device sessions

    4. test_1_1_chat_emoji_send_reply_and_open_link, id: 702782

    Device 2: Find OpenInStatusButton by xpath: //*[@text="Open in Status"]
    Device 2: Tap on found: OpenInStatusButton 

    critical/chats/test_1_1_public_chats.py:938: in test_1_1_chat_emoji_send_reply_and_open_link
    self.errors.verify_no_errors()
base_test_case.py:182: in verify_no_errors
    pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
 Reply for 'Test with link: https://status.im/ here should be nothing unusual.' not present in message received in public chat



    Device sessions

    5. test_1_1_chat_pin_messages, id: 702731 

    Test is not run, e2e blocker

    [[reason: [NOTRUN] Pin feature is in development]]

    6. test_1_1_chat_edit_message, id: 702855

    Device 2: Waiting for message to be sent for 30 sec
    Device 2: Find Text by xpath: //*[starts-with(@text,'Message before edit 1-1')]/ancestor::android.view.ViewGroup[@content-desc='chat-item'] 

    critical/chats/test_1_1_public_chats.py:1142: in test_1_1_chat_edit_message
    self.chat_2.chat_element_by_text(message_before_edit_1_1).wait_for_status_to_be("Delivered")
../views/chat_view.py:223: in wait_for_status_to_be
    current_status = self.status
../views/chat_view.py:200: in status
    Text(self.driver, xpath=self.locator).click()
../views/base_element.py:91: in click
    self.find_element().click()
../views/base_element.py:80: in find_element
    raise NoSuchElementException(
 Device 2: Text by xpath: `//*[starts-with(@text,'Message before edit 1-1')]/ancestor::android.view.ViewGroup[@content-desc='chat-item']` is not found on the screen

    [[Message is being in status 'Sending' for a long time: https://github.com//issues/15385]]

    Device sessions

    Passed tests (23)

    Click to expand

    Class TestActivityMultipleDevicePR:

    1. test_navigation_jump_to, id: 702936
    Device sessions

    2. test_activity_center_admin_notification_accept_swipe, id: 702958
    Device sessions

    3. test_activity_center_mentions, id: 702957
    Device sessions

    4. test_activity_center_reply_read_unread_delete_filter_swipe, id: 702947
    Device sessions

    Class TestActivityCenterContactRequestMultipleDevicePR:

    1. test_activity_center_contact_request_decline, id: 702850
    Device sessions

    2. test_activity_center_contact_request_accept_swipe_mark_all_as_read, id: 702851
    Device sessions

    Class TestOneToOneChatMultipleSharedDevicesNewUi:

    1. test_1_1_chat_delete_via_long_press_relogin, id: 702784
    Device sessions

    2. test_1_1_chat_message_reaction, id: 702730
    Device sessions

    3. test_1_1_chat_non_latin_messages_stack_update_profile_photo, id: 702745
    Device sessions

    Class TestCommunityMultipleDeviceMerged:

    1. test_community_message_send_check_timestamps_sender_username, id: 702838
    Device sessions

    2. test_community_links_with_previews_github_youtube_twitter_gif_send_enable, id: 702844
    Device sessions

    3. test_community_emoji_send_copy_paste_reply, id: 702840
    Device sessions

    4. test_community_message_edit, id: 702843
    Device sessions

    5. test_community_message_delete, id: 702839
    Device sessions

    6. test_community_unread_messages_badge, id: 702841
    Device sessions

    7. test_community_one_image_send_reply, id: 702859
    Device sessions

    8. test_community_several_images_send_reply, id: 703194
    Device sessions

    9. test_community_leave, id: 702845
    Device sessions

    Class TestCommunityOneDeviceMerged:

    1. test_community_copy_and_paste_message_in_chat_input, id: 702742
    Device sessions

    2. test_community_navigate_to_channel_when_relaunch, id: 702846
    Device sessions

    3. test_restore_multiaccount_with_waku_backup_remove_switch, id: 703133
    Device sessions

    Class TestGroupChatMultipleDeviceMergedNewUI:

    1. test_group_chat_join_send_text_messages_push, id: 702807
    Device sessions

    2. test_group_chat_offline_pn, id: 702808
    Device sessions

    @mmilad75
    Copy link
    Contributor Author

    hey @mmilad75 thanks for the contribution, we're ready to merge, could you confirm pls that make lint has no errors, thanks

    Hey @flexsurfer . There is no lint issue

    @flexsurfer flexsurfer merged commit 563a266 into status-im:develop Jun 16, 2023
    codemaster115 pushed a commit that referenced this pull request Jun 16, 2023
    @mmilad75 @codemaster115
    Add reorder-item component (#16225)
    51fe6fa
    @siddarthkay
    Copy link
    Contributor

    we can checkout external contributors commits, create a pr and run the checks ourselves so it can be safely merged? cc @cammellos

    I think we should do this, I've seen other open source projects also do this so probably its worth doing this once all review has been addressed. 👍🏻

    codemaster115 pushed a commit that referenced this pull request Jul 7, 2023
    @mmilad75 @codemaster115
    Add reorder-item component (#16225)
    c559305
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Reviewers

    @J-Son89 J-Son89 J-Son89 approved these changes

    @flexsurfer flexsurfer flexsurfer approved these changes

    @cammellos cammellos cammellos approved these changes

    Assignees

    @pavloburykh pavloburykh

    Labels
    external Tested - OK
    Projects
    No open projects
    Legacy QA Automation Project
    Archived in project
    Milestone
    No milestone
    Development

    Successfully merging this pull request may close these issues.

    Reorder item - create quo2 component
    7 participants
    @mmilad75 @status-im-auto @J-Son89 @pavloburykh @flexsurfer @siddarthkay @cammellos