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

Fix some search issues #16943

Merged
merged 5 commits into from
Jan 6, 2025
Merged

Fix some search issues #16943

merged 5 commits into from
Jan 6, 2025

Conversation

jrainville
Copy link
Member

What does the PR do

Fixes #10184

  • Fixes the order of channels in the location menu
  • Makes sure that only channels that can be read are shown in the location menu

Missing part: the emoji size wasn't fixed as I need help

Affected areas

Location menu in the search popup

Architecture compliance

Screenshot of functionality (including design for comparison)

Fixed order:
image

Spectated community not appearing:
image

Encrypted channels don't show:
image

Impact on end user

Fixes the location menu

How to test

  1. Be part of a community with lots of channels with categories
  2. Press CTRL+F
  3. Check the location menu for the channels of that community
  4. Have an encrypted channel (a channel the user can't view)
  5. As a member of the channel (not owner), check the menu again
  6. The encrypted channel doesn't show

Risk

Tick one:

  • Low risk: 2 devs MUST perform testing as specified above and attach their results as comments to this PR before merging.
  • High risk: QA team MUST perform additional testing in the specified affected areas before merging.

Worst case the order of channel could still be messed up

@jrainville jrainville requested review from micieslak, caybro, alexjba and a team as code owners December 11, 2024 21:29
@jrainville jrainville requested a review from osmaczko December 11, 2024 21:29
@status-im-auto
Copy link
Member

status-im-auto commented Dec 11, 2024

Jenkins Builds

Click to see older builds (51)
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ b187c0c #1 2024-12-11 21:35:56 ~6 min macos/aarch64 🍎dmg
✔️ b187c0c #1 2024-12-11 21:37:33 ~8 min tests/nim 📄log
b187c0c #1 2024-12-11 21:41:31 ~12 min tests/ui 📄log
✔️ b187c0c #1 2024-12-11 21:45:52 ~16 min macos/x86_64 🍎dmg
✔️ b187c0c #1 2024-12-11 21:46:25 ~17 min linux-nix/x86_64 📦tgz
✔️ b187c0c #1 2024-12-11 21:47:07 ~17 min linux/x86_64 📦tgz
✔️ b187c0c #1 2024-12-11 21:55:59 ~26 min windows/x86_64 💿exe
✔️ 092d357 #2 2024-12-11 23:43:19 ~4 min macos/aarch64 🍎dmg
✔️ 092d357 #2 2024-12-11 23:45:45 ~7 min tests/nim 📄log
✔️ 092d357 #2 2024-12-11 23:49:13 ~10 min macos/x86_64 🍎dmg
092d357 #2 2024-12-11 23:51:02 ~12 min tests/ui 📄log
✔️ 092d357 #2 2024-12-11 23:52:14 ~13 min linux-nix/x86_64 📦tgz
✔️ 092d357 #2 2024-12-11 23:56:27 ~17 min linux/x86_64 📦tgz
✔️ 092d357 #2 2024-12-12 00:02:17 ~23 min windows/x86_64 💿exe
✔️ 4abdfef #3 2024-12-12 19:37:57 ~4 min macos/aarch64 🍎dmg
✔️ 4abdfef #3 2024-12-12 19:40:20 ~7 min tests/nim 📄log
✔️ 4abdfef #3 2024-12-12 19:44:39 ~11 min macos/x86_64 🍎dmg
4abdfef #3 2024-12-12 19:45:46 ~12 min tests/ui 📄log
✔️ 4abdfef #3 2024-12-12 19:47:06 ~13 min linux-nix/x86_64 📦tgz
✔️ 4abdfef #3 2024-12-12 19:49:26 ~16 min linux/x86_64 📦tgz
✔️ 4abdfef #3 2024-12-12 19:58:51 ~25 min windows/x86_64 💿exe
✔️ 4abdfef #4 2024-12-12 22:56:11 ~11 min tests/ui 📄log
✔️ db66f4c #4 2024-12-12 23:26:54 ~4 min macos/aarch64 🍎dmg
✔️ db66f4c #4 2024-12-12 23:29:58 ~7 min tests/nim 📄log
✔️ db66f4c #4 2024-12-12 23:33:32 ~11 min macos/x86_64 🍎dmg
db66f4c #5 2024-12-12 23:34:03 ~11 min tests/ui 📄log
✔️ db66f4c #4 2024-12-12 23:37:43 ~15 min linux-nix/x86_64 📦tgz
✔️ db66f4c #4 2024-12-12 23:38:32 ~16 min linux/x86_64 📦tgz
✔️ db66f4c #4 2024-12-12 23:47:41 ~25 min windows/x86_64 💿exe
✔️ db66f4c #6 2024-12-13 15:35:57 ~11 min tests/ui 📄log
✔️ 1575ef7 #5 2024-12-17 16:47:22 ~5 min macos/aarch64 🍎dmg
✔️ 1575ef7 #5 2024-12-17 16:49:05 ~7 min tests/nim 📄log
✔️ 1575ef7 #7 2024-12-17 16:53:23 ~12 min tests/ui 📄log
1575ef7 #5 2024-12-17 16:54:17 ~12 min macos/x86_64 📄log
✔️ 1575ef7 #5 2024-12-17 16:55:40 ~14 min linux-nix/x86_64 📦tgz
✔️ 1575ef7 #5 2024-12-17 16:58:47 ~17 min linux/x86_64 📦tgz
✔️ 1575ef7 #5 2024-12-17 17:05:14 ~23 min windows/x86_64 💿exe
✔️ 167f735 #6 2024-12-18 15:10:57 ~4 min macos/aarch64 🍎dmg
✔️ 167f735 #6 2024-12-18 15:13:44 ~7 min tests/nim 📄log
✔️ 167f735 #6 2024-12-18 15:17:33 ~11 min macos/x86_64 🍎dmg
✔️ 167f735 #8 2024-12-18 15:18:06 ~12 min tests/ui 📄log
✔️ 167f735 #6 2024-12-18 15:20:42 ~14 min linux-nix/x86_64 📦tgz
✔️ 167f735 #6 2024-12-18 15:21:21 ~15 min linux/x86_64 📦tgz
✔️ 167f735 #6 2024-12-18 15:30:20 ~24 min windows/x86_64 💿exe
✔️ e53de77 #7 2024-12-19 16:40:01 ~4 min macos/aarch64 🍎dmg
✔️ e53de77 #7 2024-12-19 16:43:22 ~7 min tests/nim 📄log
✔️ e53de77 #7 2024-12-19 16:46:48 ~11 min macos/x86_64 🍎dmg
✔️ e53de77 #9 2024-12-19 16:47:22 ~12 min tests/ui 📄log
✔️ e53de77 #7 2024-12-19 16:49:30 ~14 min linux-nix/x86_64 📦tgz
✔️ e53de77 #7 2024-12-19 16:52:30 ~17 min linux/x86_64 📦tgz
✔️ e53de77 #7 2024-12-19 16:58:49 ~23 min windows/x86_64 💿exe
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 60ceb07 #8 2024-12-20 16:31:24 ~4 min macos/aarch64 🍎dmg
✔️ 60ceb07 #8 2024-12-20 16:34:26 ~7 min tests/nim 📄log
✔️ 60ceb07 #8 2024-12-20 16:38:04 ~11 min macos/x86_64 🍎dmg
✔️ 60ceb07 #10 2024-12-20 16:38:33 ~11 min tests/ui 📄log
✔️ 60ceb07 #8 2024-12-20 16:39:53 ~13 min linux-nix/x86_64 📦tgz
✔️ 60ceb07 #8 2024-12-20 16:43:11 ~16 min linux/x86_64 📦tgz
✔️ 60ceb07 #8 2024-12-20 16:48:10 ~21 min windows/x86_64 💿exe
✔️ 7ea8d43 #9 2025-01-06 19:06:43 ~5 min macos/aarch64 🍎dmg
✔️ 7ea8d43 #9 2025-01-06 19:09:42 ~8 min tests/nim 📄log
✔️ 7ea8d43 #11 2025-01-06 19:14:50 ~13 min tests/ui 📄log
✔️ 7ea8d43 #9 2025-01-06 19:15:10 ~13 min macos/x86_64 🍎dmg
✔️ 7ea8d43 #9 2025-01-06 19:20:41 ~19 min linux-nix/x86_64 📦tgz
✔️ 7ea8d43 #9 2025-01-06 19:25:55 ~24 min linux/x86_64 📦tgz
✔️ 7ea8d43 #9 2025-01-06 19:27:57 ~26 min windows/x86_64 💿exe

@caybro
Copy link
Member

caybro commented Dec 11, 2024

I fixed the emoji rendering in a separate commit: 092d357

@caybro
Copy link
Member

caybro commented Dec 11, 2024

"Chat" no longer has submenus (this PR vs. master):

image

image

Another problem, in both branches, the list of Status CC channels is very incomplete

Copy link
Member

@caybro caybro left a comment

Choose a reason for hiding this comment

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

Nice work, but need to fix the "Chat" submenu items regression, and preferably also the (incomplete) list of Status CC channels

@jrainville
Copy link
Member Author

Nice work, but need to fix the "Chat" submenu items regression, and preferably also the (incomplete) list of Status CC channels

@caybro nice finds. I fixed in my second commit. You'll need to reset the branch

Copy link
Member

@caybro caybro left a comment

Choose a reason for hiding this comment

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

Looks good!

I just amended my last emoji fix commit with a little fix for group chats

@jrainville
Copy link
Member Author

@micieslak @osmaczko friendly reminder to review

Copy link
Member

@micieslak micieslak left a comment

Choose a reason for hiding this comment

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

lgtm!

@jrainville
Copy link
Member Author

@alexjba you've been randomly chosen to test this

List Randomizer
There were 5 items in your list. Here they are in random order:

alexjba
micieslak
caybro
osmaczko
alaibe

Copy link
Contributor

@alexjba alexjba left a comment

Choose a reason for hiding this comment

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

LGTM! I have two findings below, but looks to me like it's not related to this PR. Please let me know what you think of these:

  1. One community icon doesn't show in the search context menu
    https://status.app/c/GzwAAGTGNrOXuOplX3Esx8vOUxjSqDQOVVEcttR_-H5JaYfvX85J_TjqcfXD_qnD37kypONGHKV-3ZiQiwI=#zQ3shnortLaN5azfhAUYM6Abmqyjp9NP3Wq3nH38DibS6Xzqz
Screenshot 2024-12-19 at 11 55 32
  1. Chats sorting order is different in the context menu
Screenshot 2024-12-19 at 11 56 28

@jrainville
Copy link
Member Author

One community icon doesn't show in the search context menu

Weird. I would expect them to either all work or all fail. It seems like it also doesn't have chats. I'll check if I can reproduce, but I'm not sure if I caused that.

Chats sorting order is different in the context menu

Ah, the issue was only about the community order. I'll check real quick if I can get the same order for the personal chats. I think it uses the last message timestamp, so maybe it's harder.

@jrainville
Copy link
Member Author

@alexjba I fixed the ordering of the personal chat (see last commit).

I also found a small bug with the color of the channels with emojis. I fixed that too.

As for the missing icon on the community, I couldn't reproduce. Can you check if you can see it on master too? I haven't touched the section items, only the subitems (chats), so I don't know how I could have done that.

@alexjba
Copy link
Contributor

alexjba commented Dec 19, 2024

As for the missing icon on the community, I couldn't reproduce. Can you check if you can see it on master too? I haven't touched the section items, only the subitems (chats), so I don't know how I could have done that.

Looks good on master. I can have a look tomorrow if you can't reproduce

Screenshot 2024-12-19 at 22 25 23

@alexjba
Copy link
Contributor

alexjba commented Dec 19, 2024

It's probably due to the condition here https://github.com/status-im/status-desktop/pull/16943/files#diff-503ac13f5e21b6a8dc452952c801a2239dd091d538cc9e092ca0cc90bd3b31fcR74

Found a way to reproduce:
Create a community with Request to join required. Leave the community and restart the app.

@alexjba
Copy link
Contributor

alexjba commented Dec 19, 2024

But on top of this, I see a new regression on the group chats icons

Screenshot 2024-12-19 at 23 45 21

@jrainville
Copy link
Member Author

Nice finds @alexjba

I fixed the group chat issue by adding a new property called isImage. We didn't have a good way before to know if the image was an emoji or an image, so we either broke one or the other. Now both work.

As for the community issue, I just make it so that you can only search communities you actually joined. This in line with the original ticket too.

jrainville and others added 5 commits January 6, 2025 14:00
- we have a dedicated asset category for them; makes no sense to try to
parse the path to the emoji file and treat it as an (SVG) image
- also fix the signal calls; over time more params were added and not
all the calls were adjusted
- fix selecting the "Chats" category, `model.colorHash.toJson()` is not
something we can do directly in QML :)
- fix group chat images
@jrainville jrainville merged commit 0aea6fc into master Jan 6, 2025
9 checks passed
@jrainville jrainville deleted the fix/search-issues branch January 6, 2025 19:51
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.

Messages / Search bar / search filter dropdown menu fixes
7 participants