From 97dfc7b94fffc06209033f4fe4d8e3b5ea8e569f Mon Sep 17 00:00:00 2001
From: kurilova <kurilova@google.com>
Date: Wed, 25 Feb 2026 11:49:34 +0000
Subject: [PATCH 1/3] Adds certificate type

---
 modules/ui/src/app/model/certificate.ts          |  6 ++++++
 .../app/pages/certificates/certificates.store.ts |  9 ++++++++-
 .../certificates-table.component.html            | 16 +++++++++++++++-
 .../certificates-table.component.scss            | 10 +++++++++-
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/modules/ui/src/app/model/certificate.ts b/modules/ui/src/app/model/certificate.ts
index 0a36e1300..c35a78bf2 100644
--- a/modules/ui/src/app/model/certificate.ts
+++ b/modules/ui/src/app/model/certificate.ts
@@ -19,9 +19,15 @@ export interface Certificate {
   organisation?: string;
   expires?: string;
   uploading?: boolean;
+  type?: CertificateType;
 }
 
 export enum CertificateStatus {
   Valid = 'Valid',
   Expired = 'Expired',
 }
+
+export enum CertificateType {
+  Root = 'root',
+  Intermediate = 'intermediate',
+}
diff --git a/modules/ui/src/app/pages/certificates/certificates.store.ts b/modules/ui/src/app/pages/certificates/certificates.store.ts
index 9d14a014b..67af96a9d 100644
--- a/modules/ui/src/app/pages/certificates/certificates.store.ts
+++ b/modules/ui/src/app/pages/certificates/certificates.store.ts
@@ -40,7 +40,14 @@ export const CertificatesStore = signalStore(
   withState({
     certificates: [] as Certificate[],
     selectedCertificate: '',
-    displayedColumns: ['name', 'organisation', 'expires', 'status', 'actions'],
+    displayedColumns: [
+      'name',
+      'organisation',
+      'expires',
+      'status',
+      'type',
+      'actions',
+    ],
     dataLoaded: false,
   }),
   withComputed(({ certificates }) => ({
diff --git a/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.html b/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.html
index fe2084eee..18149817a 100644
--- a/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.html
+++ b/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.html
@@ -56,7 +56,7 @@
         *matHeaderCellDef
         mat-header-cell
         mat-sort-header
-        sortActionDescription="Sort by duration time">
+        sortActionDescription="Sort by status">
         Status
       </th>
       <td *matCellDef="let data" class="text-nowrap" mat-cell>
@@ -65,6 +65,20 @@
         </span>
       </td>
     </ng-container>
+    <ng-container matColumnDef="type">
+      <th
+        *matHeaderCellDef
+        mat-header-cell
+        mat-sort-header
+        sortActionDescription="Sort by type">
+        Type
+      </th>
+      <td *matCellDef="let data" class="text-nowrap" mat-cell>
+        <span [ngClass]="data.type?.toLowerCase()" class="cell-result table-cell-type">
+          {{ data.type }}
+        </span>
+      </td>
+    </ng-container>
     <ng-container matColumnDef="actions">
       <th *matHeaderCellDef mat-header-cell></th>
       <td
diff --git a/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.scss b/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.scss
index 92dd71355..6d86c797c 100644
--- a/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.scss
+++ b/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.scss
@@ -53,7 +53,7 @@
   line-height: 16px;
   letter-spacing: 0.3px;
   white-space: nowrap;
-  &.valid {
+  &.valid, &.root {
     background: colors.$tertiary-container;
     color: colors.$on-tertiary-container;
   }
@@ -61,6 +61,10 @@
     background: colors.$error-container;
     color: colors.$on-error-container;
   }
+  &.intermediate {
+    background: colors.$secondary-container;
+    color: colors.$on-secondary-container;
+  }
 }
 
 .uploading {
@@ -125,3 +129,7 @@
 .results-content-filter-empty {
   margin-top: 60px;
 }
+
+.table-cell-type {
+  text-transform: capitalize;
+}

From d5e49bb22d921ad7e168856f0819aa3551d1f53f Mon Sep 17 00:00:00 2001
From: kurilova <kurilova@google.com>
Date: Wed, 25 Feb 2026 12:07:36 +0000
Subject: [PATCH 2/3] Fix ESlint

---
 .../certificates-table/certificates-table.component.html      | 4 +++-
 .../certificates-table/certificates-table.component.scss      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.html b/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.html
index 18149817a..75c5e11c9 100644
--- a/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.html
+++ b/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.html
@@ -74,7 +74,9 @@
         Type
       </th>
       <td *matCellDef="let data" class="text-nowrap" mat-cell>
-        <span [ngClass]="data.type?.toLowerCase()" class="cell-result table-cell-type">
+        <span
+          [ngClass]="data.type?.toLowerCase()"
+          class="cell-result table-cell-type">
           {{ data.type }}
         </span>
       </td>
diff --git a/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.scss b/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.scss
index 6d86c797c..721610985 100644
--- a/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.scss
+++ b/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.scss
@@ -53,7 +53,8 @@
   line-height: 16px;
   letter-spacing: 0.3px;
   white-space: nowrap;
-  &.valid, &.root {
+  &.valid,
+  &.root {
     background: colors.$tertiary-container;
     color: colors.$on-tertiary-container;
   }

From 7ee699fd3a13c39c2d6d2acf1417b38a3bcad472 Mon Sep 17 00:00:00 2001
From: kurilova <kurilova@google.com>
Date: Fri, 27 Feb 2026 07:57:05 +0000
Subject: [PATCH 3/3] Version update

---
 make/DEBIAN/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/DEBIAN/control b/make/DEBIAN/control
index 2de8a8c1c..bd371fea9 100644
--- a/make/DEBIAN/control
+++ b/make/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: Testrun
-Version: 2.3.1-beta.5
+Version: 2.3.1-beta.6
 Architecture: amd64
 Maintainer: Google <ssm-orcas@google.com>
 Homepage: https://github.com/google/testrun