[NEW] stats on seats request #23225
Merged
gabrieleiro merged 7 commits intofeat/seats-capfrom Sep 20, 2021
Merged
Conversation
gabriellsh
previously requested changes
Sep 17, 2021
ee/server/api/licenses.ts
Outdated
| } | ||
|
|
||
| const url = getSeatsRequestLink(); | ||
| Promise.await(Analytics.saveSeatRequest()); |
Member
There was a problem hiding this comment.
Not sure this should go here... This endpoint is called every time the Users page is accessed, and not when clicking the link...
…to feat/seats-cap-stats * '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)
Contributor
|
LGTM, just waiting for @ostjen 's review so that we can approve this 😄 |
matheusbsilva137
approved these changes
Sep 20, 2021
gabriellsh
added a commit
that referenced
this pull request
Sep 21, 2021
…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) ...
|
|
||
| import { getSeatsRequestLink } from '../app/license/server/getSeatsRequestLink'; | ||
| import { Analytics } from '../../server/sdk'; | ||
| import { isEnterprise } from '../app/license/server/license'; |
Contributor
There was a problem hiding this comment.
Hey @g-thome , following the changes that Rodrigo suggested to #23256 , I think we should create a regression to fix this import too 😬
Contributor
Author
There was a problem hiding this comment.
I believe Rodrigo sees that import as problematic because I was importing EE outside of EE, so I think doing it over here is ok. Am I right? @rodrigok
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>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Add seat request count on statistics report
Proposed changes (including videos or screenshots)
Issue(s)
Steps to test or reproduce
Further comments