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

[FIX] Wrong license seats number administration info panel #21222

Merged
merged 2 commits into from
Mar 20, 2021

Conversation

rodrigok
Copy link
Member

Proposed changes (including videos or screenshots)

The administration info panel was showing the total of users as the number counted for the usage of the license seats. Now it's showing the correct number that is active users. This was not affecting the license validation on the server-side, only causing confusion for the administrators to check how the usage was being counted.

Issue(s)

Steps to test or reproduce

Further comments

@rodrigok rodrigok added this to the 3.13.0 milestone Mar 20, 2021
@pierre-lehnen-rc pierre-lehnen-rc merged commit 9bbf11a into develop Mar 20, 2021
@pierre-lehnen-rc pierre-lehnen-rc deleted the license-info branch March 20, 2021 18:44
pierre-lehnen-rc added a commit that referenced this pull request Mar 22, 2021
* add folder structure

* Create ChannelAutoCompleteMultiple component

* Create GenericModal with Variants

* remove enum

* [WIP] Create Team Modal

* add pagination prop to GenericTable

* create teams modal

* remove ChannelAutoCompleteMultiple component

* set description in team

* fix redirect to room

* remove braces from simple string

Co-authored-by: Tasso Evangelista <[email protected]>

* single coat instead bool

* refactor useReactModal

* Move CreateTeam module

* Split TeamNameInput

* Convert BaseAvatar and UserAvatar to TypeScript

* Add UsersInput

* Convert CreateTeamModal to TypeScript

* Upgrade Fuselage

* update generic modal

* Fix team name validation

* Update i18n strings

* Add autofocus

* Pass translation-check

* Fix goToRoomById call

* Fix JSX expression

* [FIX] Unexpected open or close visitor info (#21094)

* fix unexpected open or close visitor info

* fix lgtm bot warning

Co-authored-by: Tasso Evangelista <[email protected]>

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

* Type check useMethod hook

* Type check useEndpoint hook

* Type check useTranslation hook

* [NEW] use _rocketchatLogger in Apps debugLog (#21000)

* Remove redundant polyfill

* [IMPROVE] Improve Apps permission modal (#21193)

* improve modal design

* add en and pt-BR translations

* fix icon size

* [NEW][APPS] Map description as a room value in Apps (#20811)

* map 'description' as a room value

* Update Apps-Engine version

* [FIX] Wrong license seats number administration info panel (#21222)

* Use active users to display on limit of users for the license on info panel

* Print more info about issues with licenses on server

Co-authored-by: dougfabris <[email protected]>
Co-authored-by: gabriellsh <[email protected]>
Co-authored-by: Tiago Evangelista Pinto <[email protected]>
Co-authored-by: Gabriel Henriques <[email protected]>
Co-authored-by: Tasso Evangelista <[email protected]>
Co-authored-by: Renato Becker <[email protected]>
Co-authored-by: meomay503 <[email protected]>
Co-authored-by: Lucas Sartor Chauvin <[email protected]>
Co-authored-by: Rodrigo Nascimento <[email protected]>
gabriellsh added a commit that referenced this pull request Mar 22, 2021
…ams/info

* 'new/teams' of github.com:RocketChat/Rocket.Chat:
  Merge teams frontend changes to the backend branch (#21190)
  [NEW] users.listTeams endpoint (#21225)
  Include teams on admin.listRooms (#21224)
  [NEW] Add number of rooms in each team to the teams.list endpoint (#21223)
  [FIX] Wrong license seats number administration info panel (#21222)
  Changed the order of some operations
  Fix lint issues
  Add teamId and teamMain properties to subscriptions/get
  More lint fixes
  Fixing issues from gh conflicts
  Fix lint issues
  Allow users to add private channels to teams
  Reduced duplicated code between community and enterprise Spotlight code
  Fix e2e test
  Fix lint issues part 2
  Fix lint issues
  Spotlight show teams as clickable users
gabriellsh added a commit that referenced this pull request Mar 23, 2021
…w/channel-to-team

* 'new/teams' of github.com:RocketChat/Rocket.Chat: (174 commits)
  [NEW] teams.leave "rooms" argument (#21262)
  Add teams section and team icon logic
  expose teams fields to local collection
  [FIX] rooms.adminRooms to properly return teams regardless of the other filters (#21257)
  [FIX] subscriptions/get team data (#21254)
  [NEW] teams.addRooms endpoint (#21251)
  Include fname on the results of 'rooms.autocomplete.channelAndPrivate' (#21250)
  Merge teams frontend changes to the backend branch (#21190)
  [NEW] users.listTeams endpoint (#21225)
  Include teams on admin.listRooms (#21224)
  [NEW] Add number of rooms in each team to the teams.list endpoint (#21223)
  [FIX] Wrong license seats number administration info panel (#21222)
  Changed the order of some operations
  Fix lint issues
  [NEW][APPS] Map description as a room value in Apps (#20811)
  Add teamId and teamMain properties to subscriptions/get
  [IMPROVE] Improve Apps permission modal (#21193)
  More lint fixes
  Fixing issues from gh conflicts
  Fix lint issues
  ...
pierre-lehnen-rc added a commit that referenced this pull request Mar 23, 2021
* add folder structure

* Rewrite Infopanels, create teaminfo

* Convert buttons to actions

* Create ChannelAutoCompleteMultiple component

* Create GenericModal with Variants

* wip

* Create GenericModal with Variants

* Create GenericModal with Variants

* WIP DeleteTeamModal

* add visual components

* remove enum

* [WIP] Create Team Modal

* add pagination prop to GenericTable

* Separate files, table logic

* lint

* create teams modal

* remove ChannelAutoCompleteMultiple component

* set description in team

* fix redirect to room

* remove braces from simple string

Co-authored-by: Tasso Evangelista <[email protected]>

* single coat instead bool

* refactor useReactModal

* Move CreateTeam module

* Split TeamNameInput

* Convert BaseAvatar and UserAvatar to TypeScript

* Add UsersInput

* Convert CreateTeamModal to TypeScript

* Upgrade Fuselage

* WIP

Co-authored-by: Douglas Fabris <[email protected]>

* update generic modal

* Fix team name validation

* Update i18n strings

* Add autofocus

* Pass translation-check

* Fix goToRoomById call

* Fix JSX expression

* [FIX] Unexpected open or close visitor info (#21094)

* fix unexpected open or close visitor info

* fix lgtm bot warning

Co-authored-by: Tasso Evangelista <[email protected]>

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

* Type check useMethod hook

* Type check useEndpoint hook

* Type check useTranslation hook

* [NEW] use _rocketchatLogger in Apps debugLog (#21000)

* Remove redundant polyfill

* [IMPROVE] Improve Apps permission modal (#21193)

* improve modal design

* add en and pt-BR translations

* fix icon size

* [NEW][APPS] Map description as a room value in Apps (#20811)

* map 'description' as a room value

* Update Apps-Engine version

* WIP

* [FIX] Wrong license seats number administration info panel (#21222)

* Use active users to display on limit of users for the license on info panel

* Print more info about issues with licenses on server

* Delete & Leave Modals

* wip

* Fix bugs and remove logs

* expose teams fields to local collection

* Add teams section and team icon logic

* Add prototype of teams.listRoomsOfUser

* fix leave room array

* Add tabbar actions to team room

* Review

* backend integration

* Review

* Review

* Review

* Review

* Review

* hide renderTrackHorizontal on rc-scrollbars

Co-authored-by: dougfabris <[email protected]>
Co-authored-by: Gabriel Henriques <[email protected]>
Co-authored-by: gabriellsh <[email protected]>
Co-authored-by: Tiago Evangelista Pinto <[email protected]>
Co-authored-by: Tasso Evangelista <[email protected]>
Co-authored-by: Douglas Fabris <[email protected]>
Co-authored-by: Renato Becker <[email protected]>
Co-authored-by: meomay503 <[email protected]>
Co-authored-by: Lucas Sartor Chauvin <[email protected]>
Co-authored-by: Rodrigo Nascimento <[email protected]>
@sampaiodiego sampaiodiego mentioned this pull request Apr 3, 2021
13 tasks
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