Skip to content

[NEW] Seats Card#23077

Merged
gabriellsh merged 5 commits intofeat/seats-capfrom
feat/seats-cap-info-card
Sep 14, 2021
Merged

[NEW] Seats Card#23077
gabriellsh merged 5 commits intofeat/seats-capfrom
feat/seats-cap-info-card

Conversation

@gabriellsh
Copy link
Member

@gabriellsh gabriellsh commented Aug 31, 2021 •
edited
Loading

Proposed changes (including videos or screenshots)

image
image

Issue(s)

Steps to test or reproduce

Further comments

@gabriellsh gabriellsh requested review from a team and tassoevan August 31, 2021 14:05
@gabriellsh gabriellsh changed the title Seats Card [NEW] Seats Card Aug 31, 2021
tassoevan
tassoevan requested changes Aug 31, 2021
View reviewed changes
Copy link
Contributor

@tassoevan tassoevan left a comment

Choose a reason for hiding this comment

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

What's up with client/views/admin/info/NewInformationPage.js' basename? I guess it should be InformationPage.js (or InformationPage.tsx).

tassoevan
tassoevan requested changes Aug 31, 2021
View reviewed changes
tassoevan
tassoevan requested changes Sep 3, 2021
View reviewed changes
tassoevan
tassoevan reviewed Sep 8, 2021
View reviewed changes
@tassoevan tassoevan force-pushed the feat/seats-cap-info-card branch from 44eaf4e to d2273bb Compare September 8, 2021 21:53
tassoevan and others added 2 commits September 8, 2021 18:56
@tassoevan
Add type guard for CardIcon props
6375f08
@gabriellsh
Merge branch 'feat/seats-cap' of github.com:RocketChat/Rocket.Chat in…
afda7d2 
…to feat/seats-cap-info-card

* 'feat/seats-cap' of github.com:RocketChat/Rocket.Chat: (59 commits)
  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)
  [IMPROVE] Use PaginatedSelectFiltered in department edition (#23054)
  ...
@gabriellsh gabriellsh merged commit 4dc1738 into feat/seats-cap Sep 14, 2021
@gabriellsh gabriellsh deleted the feat/seats-cap-info-card branch September 14, 2021 16:43
gabriellsh added a commit that referenced this pull request Sep 14, 2021
@gabriellsh
Merge branch 'feat/seats-cap' of github.com:RocketChat/Rocket.Chat in…
e38eaa5 
…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)
  ...
gabriellsh added a commit that referenced this pull request Sep 21, 2021
@gabriellsh
Merge branch 'feat/seats-cap' of github.com:RocketChat/Rocket.Chat in…
78b5093 
…to fix/bannerParser

* 'feat/seats-cap' of github.com:RocketChat/Rocket.Chat: (91 commits)
  [NEW] stats on seats request  (#23225)
  [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)
  [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)
  [NEW] Seats Card (#23077)
  [FIX] User list not being updated after creation/deletion of user (#23032)
  ...
casalsgh pushed a commit that referenced this pull request Sep 23, 2021
@tassoevan @pierre-lehnen-rc
@ggazzo @gabriellsh @gabrieleiro
[NEW] Seats Cap (#23017)
558bab0 
* 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

Reviewers

@tassoevan tassoevan tassoevan requested changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@gabriellsh @tassoevan

Comments