Skip to content

[FIX] Room Avatar being deleted after upload. #27060

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
Merged
kodiakhq merged 4 commits into from
Nov 1, 2022
Merged

[FIX] Room Avatar being deleted after upload. #27060

kodiakhq merged 4 commits into from
Nov 1, 2022

Conversation

@gabriellsh
Copy link
Member

@gabriellsh gabriellsh commented Oct 13, 2022 •
edited
Loading

Proposed changes (including videos or screenshots)

Remove avatar before updating it. S3 already overwrites the old image, but since this part of the code is shared among many other File Storage providers, we need to make this deletion before the upload.

Issue(s)

Closes #22903
Closes #15470
Closes #26677

Steps to test or reproduce

1 - Enable Amazon S3 as File Storage
2 - Upload Avatar to a room
3 - On the same room, upload a different image as a new avatar

Further comments

TC-154

@gabriellsh @hrenard
Delete before update
8a684ef 
Co-authored-by: Hugo Renard <[email protected]>
@gabriellsh gabriellsh mentioned this pull request Oct 13, 2022
Closed
@codecov
Copy link

codecov bot commented Oct 13, 2022 •
edited
Loading

Codecov Report

Merging #27060 (3444493) into develop (a0077e5) will decrease coverage by 0.20%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #27060      +/-   ##
===========================================
- Coverage    41.21%   41.00%   -0.21%     
===========================================
  Files          803      802       -1     
  Lines        17824    17806      -18     
  Branches      1971     1971              
===========================================
- Hits          7346     7302      -44     
- Misses       10183    10206      +23     
- Partials       295      298       +3
Flag Coverage Δ
e2e 41.00% <ø> (-0.21%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@gabriellsh gabriellsh added this to the 5.3.0 milestone Oct 14, 2022
@gabriellsh gabriellsh changed the title [FIX] Room Avatar beign deleted after upload. [FIX] Room Avatar being deleted after upload. Oct 17, 2022
hugocostadev
hugocostadev previously approved these changes Oct 17, 2022
View reviewed changes
@carlosrodrigues94 carlosrodrigues94 self-requested a review October 17, 2022 13:31
@gabriellsh gabriellsh requested a review from a team as a code owner October 19, 2022 18:22
@d-gubert d-gubert modified the milestones: 5.3.0, 5.4.0 Oct 19, 2022
@ggazzo ggazzo added stat: ready to merge PR tested and approved waiting for merge and removed stat: needs QA labels Oct 31, 2022
@kodiakhq kodiakhq bot merged commit a2d446e into develop Nov 1, 2022
@kodiakhq kodiakhq bot deleted the fix/s3Avatar branch November 1, 2022 19:28
gabriellsh added a commit to sidmohanty11/Rocket.Chat that referenced this pull request Nov 3, 2022
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into sidb…
b45e12f 
…ranch2

* 'develop' of github.com:RocketChat/Rocket.Chat: (1555 commits)
  Chore: Show better error logs (RocketChat#27156)
  [FIX] Message search breaking URL, usertags and emojis (RocketChat#20878)
  [NEW] REST API endpoint `/v1/oauth-apps.create` (RocketChat#27054)
  i18n: Language update from LingoHub 🤖 on 2022-10-31Z (RocketChat#27150)
  Chore: Convert client/views/directory/hooks to ts (RocketChat#26936)
  Chore: Convert client/views/directory/RoomTags to ts (RocketChat#26937)
  [FIX] UserCard not opening inside Threads (RocketChat#27096)
  [FIX] Gap between message content and message header when there's no text. (RocketChat#27165)
  Chore: docs grammar fix (RocketChat#26894)
  [FIX]  Removed mobile requirement for showing real name (RocketChat#26968)
  Chore: Cursor pointer to all the action buttons (RocketChat#24440)
  Chore: Bump actions/upload-artifact from 2 to 3 (RocketChat#27109)
  Chore: Enable PR Title Checker for forks (RocketChat#27144)
  Chore: Converting game center to typescript (RocketChat#26915)
  i18n: Language update from LingoHub 🤖 on 2022-10-24Z (RocketChat#27127)
  Chore: Add info log to remove all rooms method (RocketChat#27106)
  [IMPROVE] Quotes on E2EE Messages (RocketChat#26303)
  [NEW] REST API endpoint `/v1/rooms.delete` (RocketChat#26866)
  [FIX] Room Avatar being deleted after upload. (RocketChat#27060)
  Chore: Apps/Marketplace code organization (RocketChat#27061)
  ...
gabriellsh added a commit that referenced this pull request Nov 3, 2022
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into FixA…
26d70b6 
…llowArchived

* 'develop' of github.com:RocketChat/Rocket.Chat: (2426 commits)
  Chore: Show better error logs (#27156)
  [FIX] Message search breaking URL, usertags and emojis (#20878)
  [NEW] REST API endpoint `/v1/oauth-apps.create` (#27054)
  i18n: Language update from LingoHub 🤖 on 2022-10-31Z (#27150)
  Chore: Convert client/views/directory/hooks to ts (#26936)
  Chore: Convert client/views/directory/RoomTags to ts (#26937)
  [FIX] UserCard not opening inside Threads (#27096)
  [FIX] Gap between message content and message header when there's no text. (#27165)
  Chore: docs grammar fix (#26894)
  [FIX]  Removed mobile requirement for showing real name (#26968)
  Chore: Cursor pointer to all the action buttons (#24440)
  Chore: Bump actions/upload-artifact from 2 to 3 (#27109)
  Chore: Enable PR Title Checker for forks (#27144)
  Chore: Converting game center to typescript (#26915)
  i18n: Language update from LingoHub 🤖 on 2022-10-24Z (#27127)
  Chore: Add info log to remove all rooms method (#27106)
  [IMPROVE] Quotes on E2EE Messages (#26303)
  [NEW] REST API endpoint `/v1/rooms.delete` (#26866)
  [FIX] Room Avatar being deleted after upload. (#27060)
  Chore: Apps/Marketplace code organization (#27061)
  ...
gabriellsh added a commit to Kartik18g/Rocket.Chat that referenced this pull request Nov 3, 2022
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into patch-9
9c72321 
* 'develop' of github.com:RocketChat/Rocket.Chat: (2462 commits)
  [FIX] Uploading Custom Sound files not working, but showing success (RocketChat#27177)
  Chore: Show better error logs (RocketChat#27156)
  [FIX] Message search breaking URL, usertags and emojis (RocketChat#20878)
  [NEW] REST API endpoint `/v1/oauth-apps.create` (RocketChat#27054)
  i18n: Language update from LingoHub 🤖 on 2022-10-31Z (RocketChat#27150)
  Chore: Convert client/views/directory/hooks to ts (RocketChat#26936)
  Chore: Convert client/views/directory/RoomTags to ts (RocketChat#26937)
  [FIX] UserCard not opening inside Threads (RocketChat#27096)
  [FIX] Gap between message content and message header when there's no text. (RocketChat#27165)
  Chore: docs grammar fix (RocketChat#26894)
  [FIX]  Removed mobile requirement for showing real name (RocketChat#26968)
  Chore: Cursor pointer to all the action buttons (RocketChat#24440)
  Chore: Bump actions/upload-artifact from 2 to 3 (RocketChat#27109)
  Chore: Enable PR Title Checker for forks (RocketChat#27144)
  Chore: Converting game center to typescript (RocketChat#26915)
  i18n: Language update from LingoHub 🤖 on 2022-10-24Z (RocketChat#27127)
  Chore: Add info log to remove all rooms method (RocketChat#27106)
  [IMPROVE] Quotes on E2EE Messages (RocketChat#26303)
  [NEW] REST API endpoint `/v1/rooms.delete` (RocketChat#26866)
  [FIX] Room Avatar being deleted after upload. (RocketChat#27060)
  ...
gabriellsh added a commit to im-adithya/Rocket.Chat that referenced this pull request Nov 3, 2022
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into new-…
e86a350 
…password-change

* 'develop' of github.com:RocketChat/Rocket.Chat: (2885 commits)
  [FIX] Uploading Custom Sound files not working, but showing success (RocketChat#27177)
  Chore: Show better error logs (RocketChat#27156)
  [FIX] Message search breaking URL, usertags and emojis (RocketChat#20878)
  [NEW] REST API endpoint `/v1/oauth-apps.create` (RocketChat#27054)
  i18n: Language update from LingoHub 🤖 on 2022-10-31Z (RocketChat#27150)
  Chore: Convert client/views/directory/hooks to ts (RocketChat#26936)
  Chore: Convert client/views/directory/RoomTags to ts (RocketChat#26937)
  [FIX] UserCard not opening inside Threads (RocketChat#27096)
  [FIX] Gap between message content and message header when there's no text. (RocketChat#27165)
  Chore: docs grammar fix (RocketChat#26894)
  [FIX]  Removed mobile requirement for showing real name (RocketChat#26968)
  Chore: Cursor pointer to all the action buttons (RocketChat#24440)
  Chore: Bump actions/upload-artifact from 2 to 3 (RocketChat#27109)
  Chore: Enable PR Title Checker for forks (RocketChat#27144)
  Chore: Converting game center to typescript (RocketChat#26915)
  i18n: Language update from LingoHub 🤖 on 2022-10-24Z (RocketChat#27127)
  Chore: Add info log to remove all rooms method (RocketChat#27106)
  [IMPROVE] Quotes on E2EE Messages (RocketChat#26303)
  [NEW] REST API endpoint `/v1/rooms.delete` (RocketChat#26866)
  [FIX] Room Avatar being deleted after upload. (RocketChat#27060)
  ...
MartinSchoeler pushed a commit that referenced this pull request Nov 28, 2022
@gabriellsh @MartinSchoeler
[FIX] Room Avatar being deleted after upload. (#27060)
ac216ae
@ggazzo ggazzo mentioned this pull request Dec 5, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

3 more reviewers

@filipemarins filipemarins filipemarins approved these changes

@hugocostadev hugocostadev hugocostadev left review comments

@carlosrodrigues94 carlosrodrigues94 carlosrodrigues94 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

squad: team-collab stat: ready to merge PR tested and approved waiting for merge

Projects

None yet

Milestone

5.4.0

Development

Successfully merging this pull request may close these issues.

Problem with room avatars Uploaded channel avatar photo doesn't appear Avatar upload to S3 bucket only works when initial avatar is set

7 participants

@gabriellsh @filipemarins @hugocostadev @carlosrodrigues94 @d-gubert @ggazzo