From da341e131767461cd8b4c7ba9f2da622f2140603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Tom=C3=A9?=
 <108268980+r-tome@users.noreply.github.com>
Date: Thu, 28 Jul 2022 09:31:57 +0100
Subject: [PATCH] [EC-247] Add columns to provider portal clients table (#3147)

* Added properties "userCount", "seats" and "plan" to ProviderOrganizationResponse

* Added text message "numberOfUsers"

* Updated provider clients component with new columns

* Removed never used dependency

* Changed userCount to non nullable number

* Added condition on the component to only show seats number if not null

* Changed view condition to an explicit check
---
 apps/web/src/locales/en/messages.json             |  3 +++
 .../app/providers/clients/clients.component.html  | 15 +++++++++++++++
 .../provider/providerOrganizationResponse.ts      |  6 ++++++
 3 files changed, 24 insertions(+)

diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 11dec443941..873cd53e745 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -5306,5 +5306,8 @@
   },
   "cardBrandMir": {
     "message": "Mir"
+  },
+  "numberOfUsers": {
+    "message": "Number of users"
   }
 }
diff --git a/bitwarden_license/bit-web/src/app/providers/clients/clients.component.html b/bitwarden_license/bit-web/src/app/providers/clients/clients.component.html
index e5d048002e1..7e48c1b2886 100644
--- a/bitwarden_license/bit-web/src/app/providers/clients/clients.component.html
+++ b/bitwarden_license/bit-web/src/app/providers/clients/clients.component.html
@@ -48,6 +48,14 @@
       [infiniteScrollDisabled]="!isPaging()"
       (scrolled)="loadMore()"
     >
+      <thead>
+        <tr>
+          <th colspan="2">{{ "name" | i18n }}</th>
+          <th>{{ "numberOfUsers" | i18n }}</th>
+          <th>{{ "billingPlan" | i18n }}</th>
+          <th></th>
+        </tr>
+      </thead>
       <tbody>
         <tr *ngFor="let o of searchedClients">
           <td width="30">
@@ -61,6 +69,13 @@
           <td>
             <a [routerLink]="['/organizations', o.organizationId]">{{ o.organizationName }}</a>
           </td>
+          <td>
+            <span>{{ o.userCount }}</span>
+            <span *ngIf="o.seats != null"> / {{ o.seats }}</span>
+          </td>
+          <td>
+            <span>{{ o.plan }}</span>
+          </td>
           <td class="table-list-options" *ngIf="manageOrganizations">
             <div class="dropdown" appListDropdown>
               <button
diff --git a/libs/common/src/models/response/provider/providerOrganizationResponse.ts b/libs/common/src/models/response/provider/providerOrganizationResponse.ts
index d733362a248..959ae8065b5 100644
--- a/libs/common/src/models/response/provider/providerOrganizationResponse.ts
+++ b/libs/common/src/models/response/provider/providerOrganizationResponse.ts
@@ -8,6 +8,9 @@ export class ProviderOrganizationResponse extends BaseResponse {
   settings: string;
   creationDate: string;
   revisionDate: string;
+  userCount: number;
+  seats?: number;
+  plan?: string;
 
   constructor(response: any) {
     super(response);
@@ -18,6 +21,9 @@ export class ProviderOrganizationResponse extends BaseResponse {
     this.settings = this.getResponseProperty("Settings");
     this.creationDate = this.getResponseProperty("CreationDate");
     this.revisionDate = this.getResponseProperty("RevisionDate");
+    this.userCount = this.getResponseProperty("UserCount");
+    this.seats = this.getResponseProperty("Seats");
+    this.plan = this.getResponseProperty("Plan");
   }
 }