bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-12 06:13:43 +00:00
Code Issues Releases Wiki Activity

[AC-2213] Add Flexible Collections information in the Bitwarden Portal (#3801)

Browse Source 
* Add Flexible Collections information in the Bitwarden Portal

* Add collection management settings

* Add headings
This commit is contained in:
Thomas Rittson
2024-02-26 02:26:08 +10:00
committed by GitHub
parent faf84f9aa9
commit 4ae86b7d34
2 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Admin/AdminConsole/Models/OrganizationViewModel.cs
View File

@@ -9,11 +9,15 @@ namespace Bit.Admin.AdminConsole.Models;
public class OrganizationViewModel
{
public OrganizationViewModel() { }
public OrganizationViewModel()
{
}
public OrganizationViewModel(Organization org, Provider provider, IEnumerable<OrganizationConnection> connections,
IEnumerable<OrganizationUserUserDetails> orgUsers, IEnumerable<Cipher> ciphers, IEnumerable<Collection> collections,
IEnumerable<Group> groups, IEnumerable<Policy> policies, int secretsCount, int projectCount, int serviceAccountsCount,
IEnumerable<OrganizationUserUserDetails> orgUsers, IEnumerable<Cipher> ciphers,
IEnumerable<Collection> collections,
IEnumerable<Group> groups, IEnumerable<Policy> policies, int secretsCount, int projectCount,
int serviceAccountsCount,
int occupiedSmSeatsCount)
{
@@ -34,12 +38,12 @@ public class OrganizationViewModel
: OrganizationUserStatusType.Confirmed;
Owners = string.Join(", ",
orgUsers
.Where(u => u.Type == OrganizationUserType.Owner && u.Status == organizationUserStatus)
.Select(u => u.Email));
.Where(u => u.Type == OrganizationUserType.Owner && u.Status == organizationUserStatus)
.Select(u => u.Email));
Admins = string.Join(", ",
orgUsers
.Where(u => u.Type == OrganizationUserType.Admin && u.Status == organizationUserStatus)
.Select(u => u.Email));
.Where(u => u.Type == OrganizationUserType.Admin && u.Status == organizationUserStatus)
.Select(u => u.Email));
SecretsCount = secretsCount;
ProjectsCount = projectCount;
ServiceAccountsCount = serviceAccountsCount;
@@ -65,4 +69,14 @@ public class OrganizationViewModel
public int ServiceAccountsCount { get; set; }
public int OccupiedSmSeatsCount { get; set; }
public bool UseSecretsManager => Organization.UseSecretsManager;
public string GetCollectionManagementSetting(bool collectionManagementSetting)
{
if (!Organization.FlexibleCollections)
{
return "N/A";
}
return collectionManagementSetting ? "On" : "Off";
}
}