Regression: TOTP Modal with new rest api package #25893
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yash-rajpal
added
stat: ready to merge
ggazzo
changed the title
ggazzo
approved these changes
Jun 16, 2022
gabriellsh
added a commit
that referenced
this pull request
Jun 20, 2022
…homepage * 'develop' of github.com:RocketChat/Rocket.Chat: (45 commits) Chore: Collect e2e coverage (#25743) Regression: Unable to edit user details via admin panel (#25923) [FIX] Members selection field on creating team modal (#25871) Chore: Remove Imperative Modal from context (#25911) Chore: Keep the option to run only the meteor app (#25915) [FIX] Update chartjs usage to v3 (#25873) Chore: Rewrite AddUsers to TS (#25830) Chore: Replace `useSubscription` with `useSyncExternalStore` (#25909) Chore: Run tests on docker (#25556) Chore: Convert RoomMenu (#25914) [NEW] Create Team with a member list of usernames (#25868) Chore: Convert apps/meteor/client/sidebar/search (#25754) Chore: Split useUserInfoActions into small hooks (#25747) Chore: Watch for package changes (#25910) Chore: Convert assets endpoint to Typescript (#25358) Chore: Convert users endpoints (#25635) [FIX] Settings not being overwritten to their default values (#25891) [FIX] Update import from `csv-parse` (#25872) Regression: TOTP Modal with new rest api package (#25893) Chore: create a e2e test guideline (#25884) ...
albuquerquefabio
added a commit
that referenced
this pull request
Jun 21, 2022
commit 4911a08fec973e948efcd7f7f018917a2c884fe5
Merge: 5af8802699 419f07ab48
Author: yash-rajpal <rajpal.yash03@gmail.com>
Date: Fri Jun 17 01:18:58 2022 +0530
Merge branch 'develop' into new/device-management
commit 419f07ab48b0f9539019eba510a7f0276ba4990c
Author: Luciano Marcos Pierdona Junior <64279791+LucianoPierdona@users.noreply.github.com>
Date: Thu Jun 16 11:55:31 2022 -0300
[FIX] Update import from `csv-parse` (#25872)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
This PR updates the importing of `csv-parse` because the used method wasn't working anymore, we were receiving the following error:
`error: "this.csvParser is not a function"`
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit 750f0ef5b146ed6e42ac1c922badf9c21b10c3ff
Author: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Thu Jun 16 09:25:21 2022 +0530
Regression: TOTP Modal with new rest api package (#25893)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>
commit 45b6640f41092c068210f95ccab0ee7d66885029
Author: souzaramon <ramon.souza@objective.com.br>
Date: Wed Jun 15 17:04:47 2022 -0300
Chore: create a e2e test guideline (#25884)
- Create a e2e guideline
commit 38d3a81c501b13da7ef6fa4a99d317a36dad6856
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed Jun 15 15:36:28 2022 -0300
Chore: Fix correct unit test to api files (#25870)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit 04564dbc1b71804e33a56ae735b41c3103c82b17
Author: Felipe <84182706+felipe-rod123@users.noreply.github.com>
Date: Wed Jun 15 14:26:49 2022 -0300
Chore: convert apps/meteor/app/api/server/lib/ files to TS (#25840)
Co-authored-by: Guilherme Gazzo <guilherme@gazzo.xyz>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
commit c03dd9e6575552559559cb35d12d0aff9d4d065d
Author: Douglas Fabris <devfabris@gmail.com>
Date: Wed Jun 15 12:55:45 2022 -0300
[FIX] Kebab menu clicking issue (#25869)
Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
commit 52573cc1f8f82c0929409e887f859578032f04ff
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed Jun 15 12:41:35 2022 -0300
Regression: Fix extended sidebar item (#25887)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>
commit 208b6ad952b7c844c543e443fb1a8313c04541f1
Author: Henrique Guimarães Ribeiro <henrique.jobs1@gmail.com>
Date: Wed Jun 15 11:55:28 2022 -0300
Chore: Translate admin helpers to TS (#25690)
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
commit 648dd164bb9aa78093698ef24b2d560321ddd406
Author: Felipe <84182706+felipe-rod123@users.noreply.github.com>
Date: Wed Jun 15 10:22:32 2022 -0300
Chore: convert communication methods to Typescript (#25503)
Co-authored-by: Guilherme Gazzo <guilherme@gazzo.xyz>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
commit bff2f4af8a39a1c134e23a4906d8af1ea19f72f5
Author: souzaramon <ramon.souza@objective.com.br>
Date: Wed Jun 15 09:36:27 2022 -0300
Chore: update pageobjects to use es6 getters and remove export default (#25867)
- Simplify imports of pageobjects
- Refactor pageobjects to use es6 getters
- Move BagePage stuff to Global page object
commit 6eb84146e92aef85c8c6edf2c57f5d2fc32ae817
Author: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com>
Date: Tue Jun 14 18:12:38 2022 -0300
[BREAK] Deactivated team members are added to auto-join rooms (#25016)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
- Do not add deactivated users to auto-join rooms.
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
1. Create a new team and add a team member to it;
2. Go to **Administration > Users** and deactivate one of the team members;
3. Return to the team and add an auto-join channel/group. **_Expected behavior:_** the deactivated user should not be added to the room.
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit 5af88026999282f9c39890c510c3ba9e750d08e6
Merge: ef83ca0b0a 66c5a77c18
Author: yash-rajpal <rajpal.yash03@gmail.com>
Date: Wed Jun 15 01:45:08 2022 +0530
merge develop, fix conflicts
commit 66c5a77c18d221e27f325a0ec6b55f4cfc9217b4
Author: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date: Tue Jun 14 12:41:44 2022 -0300
Chore: Broken Storybook (#25714)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
There is another small improvement on the way we got storybook files.
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com>
commit 8064fbe073c452922392c7edcf43b73ee6a74790
Author: Guilherme Jun Grillo <48109548+guijun13@users.noreply.github.com>
Date: Tue Jun 14 11:31:07 2022 -0300
[FIX] User avatar reseting and getting random image (#25603)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
- resolve user avatar not being saved after editing the user profile issue
- resolve user avatar not getting another user picture due to database deletion error
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
1. As a user log in to the app
2. Click on Avatar/My account
3. Change the username
4. Click on `Save changes` -> Should not change the avatar image
6. Logout and create a new user on the same server
7. Repeat steps 1 to 4 -> Should not change the avatar image as well
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
Co-authored-by: Filipe Marins <9275105+filipemarins@users.noreply.github.com>
Co-authored-by: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com>
commit 7990a01be917adf9120d131605f3a5aa036cb8ec
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue Jun 14 01:06:15 2022 -0300
Chore: Remove old rest api code (#25863)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit 36fe4998a4dce70416f268d897f968440ba166a8
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue Jun 14 02:51:45 2022 +0000
Chore(deps): Bump sharp from 0.30.4 to 0.30.6 (#25719)
Bumps [sharp](https://github.com/lovell/sharp) from 0.30.4 to 0.30.6.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/lovell/sharp/blob/main/docs/changelog.md">sharp's changelog</a>.</em></p>
<blockquote>
<h3>v0.30.6 - 30th May 2022</h3>
<ul>
<li>
<p>Allow values for <code>limitInputPixels</code> larger than 32-bit.
<a href="https://github-redirect.dependabot.com/lovell/sharp/issues/3238">#3238</a></p>
</li>
<li>
<p>Ensure brew-installed <code>vips</code> can be detected (regression in 0.30.5).
<a href="https://github-redirect.dependabot.com/lovell/sharp/issues/3239">#3239</a></p>
</li>
</ul>
<h3>v0.30.5 - 23rd May 2022</h3>
<ul>
<li>
<p>Install: pass <code>PKG_CONFIG_PATH</code> via env rather than substitution.
<a href="https://github.com/dwisiswant0"><code>@dwisiswant0</code></a></p>
</li>
<li>
<p>Add support for <code>--libc</code> flag to improve cross-platform installation.
<a href="https://github-redirect.dependabot.com/lovell/sharp/pull/3160">#3160</a>
<a href="https://github.com/joonamo"><code>@joonamo</code></a></p>
</li>
<li>
<p>Allow installation of prebuilt libvips binaries from filesystem.
<a href="https://github-redirect.dependabot.com/lovell/sharp/pull/3196">#3196</a>
<a href="https://github.com/ankurparihar"><code>@ankurparihar</code></a></p>
</li>
<li>
<p>Fix rotate-then-extract for EXIF orientation 2.
<a href="https://github-redirect.dependabot.com/lovell/sharp/pull/3218">#3218</a>
<a href="https://github.com/jakob0fischl"><code>@jakob0fischl</code></a></p>
</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/lovell/sharp/commit/b91875d3d9fd628b572a12a155df2e783e0812a5"><code>b91875d</code></a> Release v0.30.6</li>
<li><a href="https://github.com/lovell/sharp/commit/a0568ec0c312e7fa290874ddfa6797b93ffe0a67"><code>a0568ec</code></a> Allow values for limitInputPixels larger than 32-bit <a href="https://github-redirect.dependabot.com/lovell/sharp/issues/3238">#3238</a></li>
<li><a href="https://github.com/lovell/sharp/commit/48e3ea5e29b98d6e9a5ac842782053e9941d5d00"><code>48e3ea5</code></a> Ensure brew-installed vips can be detected <a href="https://github-redirect.dependabot.com/lovell/sharp/issues/3239">#3239</a></li>
<li><a href="https://github.com/lovell/sharp/commit/93b29057e4d759ff9251cdef374c62416a16d26b"><code>93b2905</code></a> Docs: changelog and credit for <a href="https://github-redirect.dependabot.com/lovell/sharp/issues/3160">#3160</a></li>
<li><a href="https://github.com/lovell/sharp/commit/db654de385e06ee6c56a05aa11a11a2e2f781b14"><code>db654de</code></a> Release v0.30.5</li>
<li><a href="https://github.com/lovell/sharp/commit/a6aeef612be50f5868a77481848b1de674216f0c"><code>a6aeef6</code></a> Install: pass <code>PKG_CONFIG_PATH</code> via env rather than substitution</li>
<li><a href="https://github.com/lovell/sharp/commit/7bf6cbd66973a4feedbf670aa20ff184f30553d1"><code>7bf6cbd</code></a> Docs: correct links to libvips documentation</li>
<li><a href="https://github.com/lovell/sharp/commit/04c31b35a7e2d88931e1cb7cde0fe1720e4685b7"><code>04c31b3</code></a> Install: warn about filesystem owner running npm v8+ as root</li>
<li><a href="https://github.com/lovell/sharp/commit/ee9cdb65987735caca614eceb7098726ebe5fd3c"><code>ee9cdb6</code></a> Bump deps</li>
<li><a href="https://github.com/lovell/sharp/commit/8960eb8309629c1c97f06aa45e605dad8c97f0c1"><code>8960eb8</code></a> Docs: changelog entry for <a href="https://github-redirect.dependabot.com/lovell/sharp/issues/3218">#3218</a></li>
<li>Additional commits viewable in <a href="https://github.com/lovell/sharp/compare/v0.30.4...v0.30.6">compare view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
</details>
Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>
commit b32d3803b82d87e029b2eddade9769c021d4a081
Author: Jean Brito <jeanfbrito@gmail.com>
Date: Mon Jun 13 22:41:09 2022 -0300
Chore: Convert sidebar/item (#25634)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit 83ec2f90ac22325757e57910ea711f08eaa6c0c5
Author: Douglas Fabris <devfabris@gmail.com>
Date: Mon Jun 13 19:41:31 2022 -0300
Chore: Rewrite RoomWithData (#25858)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit 666740adb59bdc418491e93bd9ff14b52f50aa05
Author: souzaramon <ramon.souza@objective.com.br>
Date: Mon Jun 13 19:28:22 2022 -0300
Chore: remove unused locators from e2e tests (#25860)
- Remove unused locators
commit f8065bf4fb961d68d19daaa28e33739c9983e5fb
Author: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Mon Jun 13 19:08:37 2022 -0300
[FIX] fixes HTML sanitizing error. (#25410)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
If the user sent a HTML message over our product to a livechat user the HTML would get rendered on the message box, this prevents it from happening.
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
try to send some html tags in livechat
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
**Will be ready to review as soon as https://github.com/RocketChat/Rocket.Chat/pull/25312 is merged**
Co-authored-by: Cauê Felchar <11652381+cauefcr@users.noreply.github.com>
commit 949fcae91975ade218c092d7b4c8cd7675f5c032
Author: Douglas Fabris <devfabris@gmail.com>
Date: Mon Jun 13 18:02:38 2022 -0300
Chore: Rewrite Admin UsersTable to Typescript (#25698)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com>
commit e23cd3e01c94fc476f013f9acf320e708081f970
Author: Felipe <84182706+felipe-rod123@users.noreply.github.com>
Date: Mon Jun 13 17:42:54 2022 -0300
Chore: add _id and name options to JSON Schemas (#25813)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
This pull request adds the `roomId` and `roomName` options for the Ajv JSON Schemas on the `packages/rest-typings/src/v1/channels/` and `packages/rest-typings/src/v1/dm/` folders.
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>
commit 3c1bc073ea287775ef6debbd10f9650d576053a0
Author: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Mon Jun 13 15:02:39 2022 -0300
Chore: Remove unused tokenpass integration code (#25831)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit 22383aaab17fa9fc66fc13f6112a07d78fc1d3e9
Author: Diego Sampaio <chinello@gmail.com>
Date: Mon Jun 13 14:37:30 2022 -0300
Chore: Fix version on develop branch (#25842)
commit 813883181a362e6e1614bae89c583fed0b16ae5f
Author: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Mon Jun 13 22:54:08 2022 +0530
Chore: RouteGroup for My Account sidebar (#25632)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
Refactoring My Accounts routes. Allows to add "my account" routes for EE.
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>
commit 554091c3cf96cde62cb6ea838d874a3a911ed977
Author: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Mon Jun 13 13:43:29 2022 -0300
[FIX] Attachments and OEmbed margins (#25713)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit 2a40792c3a2fb7e7aed00756c63afd2f832dbb5d
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon Jun 13 11:50:42 2022 -0300
Chore: Typescript Sidebar RoomList (#25835)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit 79d229bf1667b1009e89f8f96fb14559792f2c32
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon Jun 13 11:50:27 2022 -0300
Chore: Typescript Sidebar RoomList (#25835)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit 322b6150829d6a9678bcee136c03ac2dfc9b5014
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon Jun 13 11:50:13 2022 -0300
Chore: Typescript Sidebar RoomList (#25835)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit 5a37518e42dec114e0ed1a71b5d103b4a62e9b58
Author: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
Date: Mon Jun 13 15:08:39 2022 +0200
[FIX] Client-generated sort parameters in channel directory (#25768)
- In the web-client, sorting the channel directory by "Last Message" raises the error "Invalid sort parameter provided".
I don't think a screenshot is necessary, but if you'd like one anyway, here it is:
Closes #25695
- Open the web client, i.e. navigate your browser to `https://rocketchat.$DOMAIN/home`
- Click the "Directory" button in the top left, (or just navigate directly to `https://rocketchat.$DOMAIN/directory/channels`)
- In the table header, click on "Last message" once
- In the table header, click on "Last message" again
Expected behavior: Clicking "Last message" turns on and then toggles sorting by the date of the last message, either first ascending and then descending, or the other way around.
Actual behavior: The first click sorts the messages in ascending order (good!), the second click shows a red warning box "FIXME", the table content disappears, and is replaced by throbbing grey placeholders.
`https://rocketchat.domain.org/api/v1/directory?query=%7B%22type%22%3A%22channels%22%2C%22text%22%3A%22%22%2C%22workspace%22%3A%22local%22%7D&sort=%7B%22lastMessage%22%3A1%7D&count=25`
More easily readable GET parameters:
```
query | {"type":"channels","text":"","workspace":"local"}
sort | {"lastMessage":1}
count | 25
```
Response:
```
{"result":[{"_id":"AAAAAAAAAAAAAAAAA","name":"foobar","fname":"foobar","t":"c","usersCount":10,"ts":"2019-01-01T00:00:00.000Z","default":false,"lastMessage":{"_id":"AAAAAAAAAAAAAAAAA","rid":"AAAAAAAAAAAAAAAAA","msg":"Hello, World!","ts":"2019-01-01T00:00:00.000Z","u":{"_id":"AAAAAAAAAAAAAAAAA","username":"normaluser","name":"normaluser"},"unread":true,"_updatedAt":"2019-01-01T00:00:00.000Z","urls":[],"mentions":[],"channels":[]},"description":"Obviously, this JSON response is heavily censored."}],"count":25,"offset":0,"total":52,"success":true}
```
(Obviously, this JSON response is heavily censored, but you get the gist: It was successful.)
`https://rocketchat.domain.org/api/v1/directory?query=%7B%22type%22%3A%22channels%22%2C%22text%22%3A%22%22%2C%22workspace%22%3A%22local%22%7D&sort=%7B%22lastMessage%22%3A0%7D&count=25`
More easily readable GET parameters:
```
query | {"type":"channels","text":"","workspace":"local"}
sort | {"lastMessage":0}
count | 25
```
Response:
```
{"success":false,"error":"Invalid sort parameter provided: \"{\"lastMessage\":0}\" [error-invalid-sort]","errorType":"error-invalid-sort","details":{"helperMethod":"parseJsonQuery"}}
```
Version on the server where I noticed this: `https://rocketchat.$DOMAIN/api/info` returns `{"version":"4.8","success":true}`. According to the "Releases" page, this version appeared 5 days ago, so I believe this is up to date.
For some reason, the descending order uses the wrong magic number "0", and the server can't interpret that. However, this *used* to work, so I'm not very sure about this.
The error message appears in the source code of the entire organization exactly once: https://github.com/RocketChat/Rocket.Chat/blob/31ae30f30ad71d9e5a1b0cad494b3471a7dd8807/apps/meteor/app/api/server/helpers/parseJsonQuery.ts#L42
So I'll guess that this is the line of code that generated this particular message.
A few lines above we see that the server only knows 1 and -1 as magic numbers for the sorting:
https://github.com/RocketChat/Rocket.Chat/blob/31ae30f30ad71d9e5a1b0cad494b3471a7dd8807/apps/meteor/app/api/server/helpers/parseJsonQuery.ts#L35
This matches the observed bug: The browser sends 1 (which works) and 0 (which doesn't work).
Generally, it seems that the web client actually uses the strings "asc" and "desc" internally, which are hard to mix up. So I assume that it's the conversion of that is broken somehow.
Exactly this seems to be the case here:
https://github.com/RocketChat/Rocket.Chat/blob/31ae30f30ad71d9e5a1b0cad494b3471a7dd8807/apps/meteor/client/views/directory/hooks.js#L11
The code around it produces exactly the kind of query seen in the network log, and can also produce the buggy parameter `sort: 0`. This either fixes bug #25695, or a different bug of the same kind.
I am not sure how to add tests for this, can someone do this for me or show me where to start? I'm actually just an end-user and "accidentally" found the fix for the bug while writing the bug report ^^'
EDIT: Rebased for convenience, and to re-check CI.
commit 0d8a2aa2a6467acef6b7af76ffd07850fdda2de1
Author: Weslley Campos <30299972+weslley543@users.noreply.github.com>
Date: Fri Jun 10 21:58:58 2022 -0300
Chore: Add tests for agents screens (#25637)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
Add some tests for omnichannel agents screen and add some data-qa in components f
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit ffd64572464786c7b4a34c840c99dc80fd23d365
Author: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Sat Jun 11 04:35:59 2022 +0530
Chore: Notification Preferences to TS (#25827)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
- Lint and unit tests pass locally with my changes
- I have added tests that prove my fix is effective or that my feature works (if applicable)
- I have added necessary documentation (if applicable)
- Any dependent changes have been merged and published in downstream modules
-->
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
-->
- Notifications Preferences to TS.
- Fix broken save action.
<!-- END CHANGELOG -->
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
commit e01c8eac92467fd1e4e6a21c19539e2950d4f8dd
Author: Júlia Jaeger Foresti <60678893+juliajforesti@users.noreply.github.com>
Date: Fri Jun 10 19:18:50 2022 -0300
Chore: Convert MemoizedSetting, Setting, Section (#25572)
<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
<!-- Your Pull Request name should start with one of the following tags
[NEW] For new features
[IMPROVE] For an improvement (performance or little improvements) in existing features
[FIX] For bug fixes that affect the end-user
[BREAK] For pull requests including breaking changes
Chore: For small tasks
Doc: For documentation
-->
<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
- I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
- I have signed the CLA - https://cla-assistant.io/RocketC…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes (including videos or screenshots)
Issue(s)
Steps to test or reproduce
Further comments