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

[NEW] Seats cap banners #23211

Merged
merged 8 commits into from
Sep 21, 2021
Merged

[NEW] Seats cap banners #23211

merged 8 commits into from
Sep 21, 2021

Conversation

gabriellsh
Copy link
Member

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

pierre-lehnen-rc and others added 8 commits August 27, 2021 04:15
…nse by adding more users than the license allows.
…to max-seats-backend

* 'feat/seats-cap' of github.com:RocketChat/Rocket.Chat: (61 commits)
  [NEW] Seats Card (#23077)
  Chore: client endpoints typings (#23152)
  Chore: Update pino and pino-pretty (#23157)
  Bump @rocket.chat/string-helpers in /ee/server/services (#23138)
  [FIX] Inaccurate use of 'Mobile notifications' instead of 'Push notifications' in i18n strings (#22978)
  Bump xml-crypto from 2.1.2 to 2.1.3 (#23141)
  [IMPROVE] Change log format to JSON (#22975)
  Regression: Auth banner for EE (#23091)
  [IMPROVE][APPS] Return task ids when using the scheduler api (#23023)
  [FIX] Update bugsnag package (#23104)
  Bump pm2 from 5.1.0 to 5.1.1 in /ee/server/services (#23128)
  Bump @types/ejson from 2.1.2 to 2.1.3 in /ee/server/services (#23126)
  Chore: Remove non-used dependencies (#23109)
  Bump @types/ws from 7.4.6 to 7.4.7 in /ee/server/services (#23095)
  Bump tar from 6.1.0 to 6.1.11 in /ee/server/services (#23068)
  Bump @types/imap from 0.8.34 to 0.8.35 (#23122)
  Bump csv-parse from 4.16.0 to 4.16.3 (#23120)
  Language update from LingoHub 🤖 (#23123)
  Bump juice from 5.2.0 to 8.0.0 (#22177)
  [FIX] Change way emails are validated on livechat registerGuest method (#23089)
  ...
…to feat/seats-cap-banners

* 'feat/seats-cap' of github.com:RocketChat/Rocket.Chat:
  [NEW] Seats Cap: Request seats link (#23151)
  Regression: View Logs administration page crashing (#23205)
  Chore: Move client helpers (#23178)
  Chore: Change Ubuntu version to 20.04 on all GitHub Actions (#23200)
  Regression: Properly trickle-down state from UsersPage to UsersTable (#23196)
  [IMPROVE] Add missing pt-BR translations, fix typos and unify language (#23176)
  [FIX] User list not being updated after creation/deletion of user (#23032)
  Chore: Upgrade limax (#23187)
  [FIX] "Parent channel or group" search in discussions' creation throws "Unexpected end of JSON input" error (#23076)
  [BREAK] Stop sending audio notifications via stream (#23108)
  Language update from LingoHub 🤖 (#23184)
  [FIX] Remove margin from quote inside quote (#21779)
  [BREAK] Remove Google Vision features (#23160)
  Bump @storybook/react from 6.3.6 to 6.3.8 (#23165)
  Bump jsrsasign from 10.3.0 to 10.4.0 (#23163)
  [BREAK][ENTERPRISE] "Download CSV" button doesn't work in the Engagement Dashboard's Active Users section (#23013)
  [BREAK][ENTERPRISE] CSV file downloaded in the Engagement Dashboard's New Users section contains undefined data (#23014)
  Bump supertest from 6.1.3 to 6.1.6 (#23139)
…to feat/seats-cap-banners

* 'feat/seats-cap' of github.com:RocketChat/Rocket.Chat:
  [NEW] Prevent users from accidentally deactivating an enterprise license by adding more users than the license allows. (#23050)
  [IMPROVE] Ensure Seats-cap design and UI are the same (#23222)
  [NEW] Remove license downgrade if exceeding seats cap (#23220)
  [IMPROVE] Throw error if no appId is provided to useUIKitHandleAction (#23221)
  [IMPROVE] General room reappears after being deleted (#22957)
  [NEW][APPS] Get livechat's room transcript via bridge method (#22985)
  Regression: `renderEmoji` helper referred as a template (#23212)
  Chore: Convert VerticalBar component to typescript (#22542)
  Add missing custom fields to apps' users converter (#21176)
  Regression: Fix view logs admin screen (#23194)
  [BREAK] Remove deprecated endpoints (#23162)
@tassoevan tassoevan changed the base branch from feat/seats-cap to develop September 21, 2021 14:36
@tassoevan tassoevan changed the base branch from develop to feat/seats-cap September 21, 2021 14:36
@tassoevan tassoevan merged commit 3818eeb into feat/seats-cap Sep 21, 2021
@tassoevan tassoevan deleted the feat/seats-cap-banners branch September 21, 2021 18:17
gabriellsh added a commit that referenced this pull request Sep 21, 2021
…to fix/bannerParser

* 'feat/seats-cap' of github.com:RocketChat/Rocket.Chat:
  [NEW] Seats cap banners (#23211)
casalsgh pushed a commit that referenced this pull request Sep 23, 2021
* Base commit

* [NEW] licenses.maxActiveUsers endpoint (#23011)

* [IMPROVE] Banner Service (#22989)

* WIP

* Fix type import

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>

* [NEW] canAddNewUser function

* [NEW] Seats usage bar (#23018)

* usage bar component

* Seats limit in admin users page

* Remove dangling console.log

* Add some details on StatisticsEndpoint type

* Move to EE and use new endpoint

* Rename some components and hooks

* Refactor UsersPage

Co-authored-by: Gabriel Henriques <gabriel.henriques@rocket.chat>

* Fix edit and info page

* [NEW] Seats Card (#23077)

* Seats Card

* Fix review, make ts

* Fix review

* Add type guard for CardIcon props

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>

* [NEW] Seats Cap: Request seats link (#23151)

* create endpoint and consume it in the ui

* Fix review

* Remove unused param type

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>

* [NEW] Remove license downgrade if exceeding seats cap (#23220)

* [IMPROVE] Ensure Seats-cap design and UI are the same (#23222)

* Fix labels and buttons

* Reload seats cap data on user changes

* Use Fuselage on development version

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>

* [NEW] Prevent users from accidentally deactivating an enterprise license by adding more users than the license allows. (#23050)

Co-authored-by: Gabriel Henriques <gabriel.henriques@rocket.chat>
Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>

* [NEW] stats on seats request  (#23225)

Co-authored-by: Gabriel Henriques <gabriel.henriques@rocket.chat>

* [NEW] Seats cap banners (#23211)

* [NEW] Prevent users from accidentally deactivating an enterprise license by adding more users than the license allows.

* Seats cap banners

* Deprecate preserveDismiss

* use request seats link

* Fix banner not closing and request seats link

Co-authored-by: Pierre Lehnen <pierre.lehnen@rocket.chat>

* [FIX] Banner not parsing markdown (#23036)

* Parse markdown

* Use markdownText

* Fix translations

* Move startup

* Always create seats limit banners

* Remove uneffective conditional

* [FIX] Seats Cap QA reports (#23272)

* Fix create banner and link

* Remove call from startup

* QA

* Improve readability

* Avoid using an outdated absolute URL

* Embedded counters into translation strings

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>

* Patch object-path so Snyk stop complaining

Co-authored-by: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
Co-authored-by: Pierre Lehnen <pierre.lehnen@rocket.chat>
Co-authored-by: Gabriel Henriques <gabriel.henriques@rocket.chat>
Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Co-authored-by: Gabriel Thomé <38537062+g-thome@users.noreply.github.com>
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.

3 participants