Skip to content

Omnichannel Admin rewritten in React (#18438)#18438

Merged
ggazzo merged 47 commits intodevelopfrom
ref/omni
Aug 22, 2020
Merged

Omnichannel Admin rewritten in React (#18438)#18438
ggazzo merged 47 commits intodevelopfrom
ref/omni

Conversation

@gabriellsh
Copy link
Copy Markdown
Member

@gabriellsh gabriellsh commented Jul 30, 2020

Proposed changes

Issue(s)

How to test or reproduce

Screenshots

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves a current function)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Hotfix (a major bugfix that has to be merged asap)
  • Documentation Update (if none of the other choices apply)

Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA
  • 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

Further comments

gabriellsh and others added 4 commits July 30, 2020 14:18
@gabriellsh
Router and Installation
30b8cac
@gabriellsh
Added createRouteGroup helper
c76902b
@MartinSchoeler
Ref/omni sidebar (#18467)
b1c41ee 
* New sidebar

* fix  permission

* add ee

* remove old sidebar

* remove icons

* move logic to a better place

* fix issue with accountbox not redirecting
@gabriellsh
Refactor Custom Fields
2c89527 
EE Additional Form

save bugs

Fix sidebar items

Remove old files and routes

Fix button label

Fix inputs

fix callback

check license
gabriellsh and others added 25 commits August 10, 2020 11:36
@gabriellsh
Refactor: Omnichannel Appearance (#18509)
9a5e6e4
@gabriellsh
Refactor: Omnichannel Webhooks (#18507)
82d3c3c
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into ref/…
4013527 
…omni

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [NEW] Add REST API endpoint to search Livechat visitors (#18514)
  LingoHub based on develop (#18516)
  Update README.md (#18503)
  [NEW] Channel avatar (#18443)
  [FIX] Sending notifications from senders without a name (#18479)
  [FIX] UserCard avatar cache (avatarETag) (#18466)
  [IMPROVE] Admin Info page requires permission (#18408)
  [FIX] Marking room as read with unread threads still (#18410)
  [FIX] Random generated password not matching the Password Policy (#18475)
  Typo in privacy agreement message (#18476)
  bugfix for uploading files from livechat (#18474)
  LingoHub based on develop (#18465)
  [NEW] Add the ability to set the character message limit on Livechat widget (#18261)
  [FIX] Migration 194 (#18457)
  [FIX] Omnichannel session monitor is not starting (#18412)
  [FIX] Invalid MIME type when uploading audio files (#18426)
  [FIX] Error when updating omnichannel department without agents parameter (#18428)
  [FIX] Omnichannel Take Inquiry endpoint checking wrong permission (#18446)
  [FIX] Multiple push notifications sent via native drivers (#18442)
  [FIX] Appending 'false' to Jitsi URL (#18430)
@gabriellsh
Fix tsconfig
8ec05c0
@gabriellsh
Add missing fields (#18519)
a899bdf
@tassoevan
Types for Fuselage, contexts and some Omnichannel components (#18520)
87854e9
@MartinSchoeler
Refactor: Omnichannel Managers View (#18527)
65a3611
@MartinSchoeler @ggazzo
Refactor: Agents screens (#18499)
824fd2d 
Co-authored-by: Guilherme Gazzo <[email protected]>
@gabriellsh
Refactor: Omnichannel Business Hours (#18588)
257ca5c
@ggazzo
Merge branch 'develop' into ref/omni
ceb4076
@MartinSchoeler @ggazzo
Refactor: Omnichannel Priorities (#18603)
b17e03e 
Co-authored-by: Guilherme Gazzo <[email protected]>
@gabriellsh @ggazzo
Refactor: Omnichannel Monitors (#18601)
1b77aae 
Co-authored-by: Guilherme Gazzo <[email protected]>
Co-authored-by: Guilherme Gazzo <[email protected]>
@ggazzo
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into ref/…
dc35a63 
…omni
@MartinSchoeler @ggazzo
Refactor: Omnichannel Tags (#18604)
b44d9b7 
Co-authored-by: Guilherme Gazzo <[email protected]>
@ggazzo
Merge branch 'ref/omni' of github.com:RocketChat/Rocket.Chat into ref…
5c5d2b0 
…/omni
@ggazzo
fix createSidebarItems
9974148
@MartinSchoeler
units wip
bd6e6fa
@MartinSchoeler
remove old files
6b39d99
@MartinSchoeler
liiinttt
c4f0ea9
@MartinSchoeler
Merge branch 'ref/omni' into ref/omni-unit
9e19882
@MartinSchoeler
add monitors to new
35f9976
@MartinSchoeler
Merge remote-tracking branch 'origin/ref/omni-unit' into ref/omni-unit
9d613d6
@MartinSchoeler
Refactor: Omnichannel Units (#18611)
6db783d
@gabriellsh
Triggers
87e8e54
@gabriellsh
Remove Files, fix route
3009118
ggazzo
ggazzo previously approved these changes Aug 21, 2020
View reviewed changes
@ggazzo ggazzo force-pushed the ref/omni branch 2 times, most recently from 3aca1b0 to 9974148 Compare August 21, 2020 21:34
@tassoevan tassoevan force-pushed the ref/omni branch 2 times, most recently from 9edfcdf to 15e725e Compare August 22, 2020 01:17
@tassoevan
Refactor: Omnichannel Current Chats (#18627)
c6c96f4 
Squashed commit of the following:

commit 3d28fb9
Author: Guilherme Gazzo <[email protected]>
Date:   Fri Aug 21 17:25:15 2020 -0300

    Review

commit b560888
Merge: 2e5417c 40c7226
Author: Guilherme Gazzo <[email protected]>
Date:   Fri Aug 21 17:05:37 2020 -0300

    Merge branch 'ref/omni' of github.com:RocketChat/Rocket.Chat into ref/omni-curr-chats

commit 40c7226
Merge: ab78f68 575df22
Author: Guilherme Gazzo <[email protected]>
Date:   Fri Aug 21 17:04:51 2020 -0300

    Merge branch 'develop' into ref/omni

commit 2e5417c
Merge: da8388b 6b04ba5
Author: Guilherme Gazzo <[email protected]>
Date:   Fri Aug 21 16:23:21 2020 -0300

    Merge branch 'ref/omni-curr-chats' of github.com:RocketChat/Rocket.Chat into ref/omni-curr-chats

commit da8388b
Merge: 07f2e89 ab78f68
Author: Guilherme Gazzo <[email protected]>
Date:   Fri Aug 21 16:22:43 2020 -0300

    Merge branch 'ref/omni' of github.com:RocketChat/Rocket.Chat into ref/omni-curr-chats

commit 575df22
Author: Anton Kazarinov <[email protected]>
Date:   Fri Aug 21 23:31:45 2020 +0500

    [IMPROVE] Slack bridge: add support to threads (#15992)

    Co-authored-by: Rodrigo Nascimento <[email protected]>
    Co-authored-by: pierre-lehnen-rc <[email protected]>

commit 40520f4
Author: Douglas Gubert <[email protected]>
Date:   Fri Aug 21 15:16:10 2020 -0300

    [NEW][APPS-ENGINE] Implement new IPostLivechatRoomTransferred event (#18625)

    * Implement new IPostLivechatRoomTransferred event

    * Move event trigger to correct place

    * Update Apps-Engine version

commit ab78f68
Merge: 3aca1b0 06467a6
Author: Guilherme Gazzo <[email protected]>
Date:   Fri Aug 21 13:57:53 2020 -0300

    Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into ref/omni

commit 6b04ba5
Author: Martin <[email protected]>
Date:   Fri Aug 21 03:39:05 2020 -0300

    Remove old files

commit 47c92ce
Author: Martin <[email protected]>
Date:   Fri Aug 21 03:33:21 2020 -0300

    Revert develop merge

commit 4a23db7
Author: Martin <[email protected]>
Date:   Fri Aug 21 03:27:45 2020 -0300

    add tags

commit 06467a6
Author: Guilherme Gazzo <[email protected]>
Date:   Fri Aug 21 03:10:31 2020 -0300

    [IMPROVE] UserCard and UserInfo Show Real Names Setting (#18628)

commit ebcfbd3
Author: Martin <[email protected]>
Date:   Fri Aug 21 01:30:35 2020 -0300

    remove test data

commit 07f2e89
Author: Guilherme Gazzo <[email protected]>
Date:   Fri Aug 21 01:25:12 2020 -0300

    Fix

commit 7cb736b
Merge: d7840be 7d60bee
Author: Guilherme Gazzo <[email protected]>
Date:   Fri Aug 21 00:48:02 2020 -0300

    Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into ref/omni-curr-chats

commit d7840be
Author: Martin <[email protected]>
Date:   Fri Aug 21 00:21:26 2020 -0300

    use old url

commit cfb5a33
Author: Martin <[email protected]>
Date:   Fri Aug 21 00:09:45 2020 -0300

    lint

commit 2cfbafb
Author: Martin <[email protected]>
Date:   Fri Aug 21 00:08:27 2020 -0300

    Current Chats wip

commit 7d60bee
Author: Guilherme Gazzo <[email protected]>
Date:   Thu Aug 20 22:45:51 2020 -0300

    [FIX] MarkdownText usage (#18621)

commit 3aca1b0
Author: gabriellsh <[email protected]>
Date:   Thu Aug 20 22:43:22 2020 -0300

    Refactor: Omnichannel Facebook Integration (#18624)

    Co-authored-by: Guilherme Gazzo <[email protected]>

commit 528fbe7
Author: Marcos Spessatto Defendi <[email protected]>
Date:   Thu Aug 20 22:42:05 2020 -0300

    Anonymous user were being created based on manually approve users (#17427)

commit 88649be
Author: gabriellsh <[email protected]>
Date:   Thu Aug 20 22:14:08 2020 -0300

    Fix Triggers (#18626)

commit abae419
Author: Rodrigo Nascimento <[email protected]>
Date:   Thu Aug 20 22:00:41 2020 -0300

    Update dependencies (#18593)

commit 09b825d
Author: pierre-lehnen-rc <[email protected]>
Date:   Thu Aug 20 21:15:39 2020 -0300

    [NEW] Banner for servers in the middle of the registration process (#18623)

commit bce223a
Author: Murtaza Patrawala <[email protected]>
Date:   Fri Aug 21 04:11:42 2020 +0530

    [NEW]Add new endpoint to change Omnichannel room's visitor (#18528)

    * add new endpoint to change room visitor

    * Apply suggestions from code review

    Co-authored-by: Renato Becker <[email protected]>

    * fix errors in previous commit

    * modify livechat.config endpoint to support new param - roomId

    * Apply suggestions from code review

    Co-authored-by: Renato Becker <[email protected]>

    * remove changes to livechat-config endpoint

    * move permission check into Livechat lib

    * refactor code

    * Apply suggestions from code review

    Co-authored-by: Renato Becker <[email protected]>

    * query optimization and fix return value

    * return whole room object

    * limit room fields from while loading from DB

    * Remove unecessary promise statement.

    Co-authored-by: Renato Becker <[email protected]>

commit a0a4948
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Aug 20 14:10:47 2020 -0300

    Bump bcrypt from 3.0.7 to 5.0.0 (#18622)

    Bumps [bcrypt](https://github.com/kelektiv/node.bcrypt.js) from 3.0.7 to 5.0.0.
    - [Release notes](https://github.com/kelektiv/node.bcrypt.js/releases)
    - [Changelog](https://github.com/kelektiv/node.bcrypt.js/blob/master/CHANGELOG.md)
    - [Commits](kelektiv/node.bcrypt.js@v3.0.7...v5.0.0)

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 4a2636d
Author: Paulo Bernardo <[email protected]>
Date:   Thu Aug 20 11:45:56 2020 -0300

    [FIX] Agents enabledDepartment attribute not set on collection (#18614)

commit 28cf942
Author: jbguerraz <[email protected]>
Date:   Thu Aug 20 14:43:29 2020 +0200

    [IMPROVE] Jitsi room name hash or plain (#17481)

commit 452589f
Author: Diego Sampaio <[email protected]>
Date:   Wed Aug 19 20:22:40 2020 -0300

    Explain why issue is closed when not using an issue template (#18420)

commit b491b26
Author: Rodrigo Nascimento <[email protected]>
Date:   Wed Aug 19 18:36:51 2020 -0300

    Prevent directory API to return emails if the user has no permission (#18478)

commit 0a2d8ca
Author: Rodrigo Nascimento <[email protected]>
Date:   Wed Aug 19 18:20:16 2020 -0300

    Set default timeout of 20s for HTTP calls (#18549)

commit 0e2309e
Author: Guilherme Gazzo <[email protected]>
Date:   Wed Aug 19 18:07:36 2020 -0300

    [FIX] UIKit Select and Multiselects not working (#18598)

commit dc549a5
Author: Martin Schoeler <[email protected]>
Date:   Wed Aug 19 10:27:34 2020 -0300

    [IMPROVE] Add agentId parameter to changeLivechatStatus method (#18571)

    * Add agentId parameter to changeLivechatStatus method

    * Fix reviews

    * fix problems

    * return if the same as before

    * Update app/livechat/server/methods/changeLivechatStatus.js

    Co-authored-by: Renato Becker <[email protected]>

    * Fix review

    Co-authored-by: Guilherme Gazzo <[email protected]>
    Co-authored-by: Renato Becker <[email protected]>
    Co-authored-by: Guilherme Gazzo <[email protected]>

commit fdda142
Author: Martin Schoeler <[email protected]>
Date:   Wed Aug 19 04:11:26 2020 -0300

    [FIX] Auto complete user suggestions (#18437)

    Co-authored-by: Tasso Evangelista <[email protected]>
@tassoevan
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into ref/…
f86b063 
…omni
@ggazzo ggazzo changed the title Omnichannel rewritten Omnichannel rewritten in React Aug 22, 2020
@ggazzo ggazzo changed the title Omnichannel rewritten in React Admin Omnichannel rewritten in React (#18438) Aug 22, 2020
@ggazzo ggazzo changed the title Admin Omnichannel rewritten in React (#18438) Omnichannel Admin rewritten in React (#18438) Aug 22, 2020
@ggazzo ggazzo merged commit ed7ff1f into develop Aug 22, 2020
@ggazzo ggazzo deleted the ref/omni branch August 22, 2020 03:41
@sampaiodiego sampaiodiego mentioned this pull request Aug 29, 2020
Merged
hugopeixoto added a commit to hugopeixoto/Rocket.Chat that referenced this pull request Oct 28, 2020
@hugopeixoto
Fix infinite loop in federation dashboard
b72d1fa 
The infinite loop was caused by the improper comparison of a useEffect
dependency.

useEffect uses Object.is(previous, current) do determine if it should
rerun the effect or not. Since we're using args, which in the federation
calls is an empty array literal, it will always return false.

Initially this was passed as ...args, which didn't cause any problems.
It was changed in RocketChat#18438, an unrelated Omnichannel admin dashboard
rewrite that also uses useMethodData.

Changing it to JSON.stringify(args) ensures that we're comparing strings
instead of arbitrary objects, solving the problem. This pattern seems to
be used in other useEffects as well throughout the codebase.
@hugopeixoto hugopeixoto mentioned this pull request Oct 28, 2020
Closed
12 tasks
hugopeixoto added a commit to hugopeixoto/Rocket.Chat that referenced this pull request Oct 28, 2020
@hugopeixoto
Fix infinite loop in federation dashboard
79eaa70 
The infinite loop was caused by the improper comparison of a useEffect
dependency.

useEffect uses Object.is(previous, current) do determine if it should
rerun the effect or not. Since we're using args, which in the federation
calls is an empty array literal, it will always return false.

Initially this was passed as ...args, which didn't cause any problems.
It was changed in RocketChat#18438, an unrelated Omnichannel admin dashboard
rewrite that also uses useMethodData.

Changing it to JSON.stringify(args) ensures that we're comparing strings
instead of arbitrary objects, solving the problem. This pattern seems to
be used in other useEffects as well throughout the codebase.
hugopeixoto added a commit to hugopeixoto/Rocket.Chat that referenced this pull request Oct 28, 2020
@hugopeixoto
Fix infinite loop in federation dashboard
47b5a08 
The infinite loop was caused by the improper comparison of a useEffect
dependency.

useEffect uses Object.is(previous, current) do determine if it should
rerun the effect or not. Since we're using args, which in the federation
calls is an empty array literal, it will always return false.

Initially this was passed as ...args, which didn't cause any problems.
It was changed in RocketChat#18438, an unrelated Omnichannel admin dashboard
rewrite that also uses useMethodData.

Changing it to JSON.stringify(args) ensures that we're comparing strings
instead of arbitrary objects, solving the problem. This pattern seems to
be used in other useEffects as well throughout the codebase.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ggazzo ggazzo ggazzo approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@gabriellsh @ggazzo @MartinSchoeler @tassoevan