Merge pull request #676 from openziti/675-sessions-and-terminators

Updates and cleanup for sessions and terminators list pages

Author: rgallettonf

package.json

@@ -1,6 +1,6 @@
 {
   "name": "io.netfoundry.zac",
-  "version": "3.12.0",
+  "version": "3.12.1",
   "description": "Ziti Administration Console",
   "main": "server.js",
   "type": "module",

projects/ziti-console-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openziti/ziti-console-lib",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/openziti/ziti-console"

projects/ziti-console-lib/src/lib/features/data-table/cells/table-cell-name/table-cell-name.component.ts

@@ -39,11 +39,11 @@ export class TableCellNameComponent  implements ICellRendererAngularComp {
         if (!result?.confirmed) {
           return;
         }
-        this.router.navigateByUrl(`${this.cellParams.pathRoot}/${this.item.id}`);
+        this.router.navigateByUrl(`${this.cellParams.pathRoot}/${get(this.item, this.cellParams.itemProp, this.item.id)}`);
       })
       return;
     }
-    this.router.navigateByUrl(`${this.cellParams.pathRoot}/${this.item.id}`);
+    this.router.navigateByUrl(`${this.cellParams.pathRoot}/${get(this.item, this.cellParams.itemProp, this.item.id)}`);
   }
 
   get cellText() {

projects/ziti-console-lib/src/lib/features/data-table/data-table.component.html

@@ -155,5 +155,6 @@
         [image]="noItemsImage"
         [isEmpty]="!rowData || rowData.length === 0"
         [typeName]="this.entityTypeLabel"
+        [hasAdd]="showNoItemsAdd"
     ></lib-no-items>
-</ng-template>
+</ng-template>

projects/ziti-console-lib/src/lib/features/data-table/data-table.component.ts

@@ -740,9 +740,24 @@ export class DataTableComponent implements OnChanges, OnInit {
 
   updateEntityTypeLabel() {
     switch(this.svc.tableId) {
+      case 'api-sessions':
+        this.entityTypeLabel = 'API Sessions';
+        break;
+      case 'auth-policies':
+        this.entityTypeLabel = 'Auth Policies';
+        break;
+      case 'certificate-authorities':
+        this.entityTypeLabel = 'Certificate Authorities';
+        break;
+      case 'ext-jwt-signers':
+        this.entityTypeLabel = 'External JWT Signers';
+        break;
       case 'identities':
         this.entityTypeLabel = 'Identities';
         break;
+      case 'posture-checks':
+        this.entityTypeLabel = 'Posture Checks';
+        break;
       case 'edge-routers':
         this.entityTypeLabel = 'Edge Routers';
         break;
@@ -752,6 +767,9 @@ export class DataTableComponent implements OnChanges, OnInit {
       case 'configurations':
         this.entityTypeLabel = 'Configs';
         break;
+      case 'config-types':
+        this.entityTypeLabel = 'Config Types';
+        break;
       case 'service-policies':
         this.entityTypeLabel = 'Service Policies';
         break;
@@ -760,6 +778,15 @@ export class DataTableComponent implements OnChanges, OnInit {
         break;
       case 'service-edge-router-policies':
         this.entityTypeLabel = 'Service Edge Router Policies';
+        break
+      case 'sessions':
+        this.entityTypeLabel = 'Sessions';
+        break;
+      case 'terminators':
+        this.entityTypeLabel = 'Terminators';
+        break;
+      case 'transit-routers':
+        this.entityTypeLabel = 'Transit Routers';
         break;
     }
   }
@@ -810,7 +837,11 @@ export class DataTableComponent implements OnChanges, OnInit {
           this.menuColumnDefinition.headerComponentParams;
     } else if ( (this.options.noSelect && this.options.noMenu)) {
       // Don't add any additional columns
-    } else if (this._view !== 'upload') {
+    } else if ( (this.options.noSelect && !this.options.noMenu)) {
+      this.mergedColumnDefinitions.push(this.menuColumnDefinition);
+    } else if ( !this.options.noSelect && this.options.noMenu) {
+      this.mergedColumnDefinitions.push(this.selectColumnDefinition);
+    }  else if (this._view !== 'upload') {
       this.mergedColumnDefinitions.splice(0, 0, this.selectColumnDefinition);
       this.mergedColumnDefinitions.push(this.menuColumnDefinition);
     }

projects/ziti-console-lib/src/lib/features/no-items/no-items.component.html

@@ -2,7 +2,8 @@
     <div (click)="iconClick()">
         <div [ngStyle]="background" class="icon"></div>
         <div class="title">
-            This network currently has no {{ typeName }} to display.<br/><span [hidden]="!hasAdd"
+            This network currently has no {{ typeName }} to display.<br/>
+            <span [hidden]="!hasAdd"
         >Tap on the <span class="addExample"></span> to add one.</span
         >
         </div>

projects/ziti-console-lib/src/lib/features/projectable-forms/identity/identity-form.component.ts

@@ -288,7 +288,7 @@ export class IdentityFormComponent extends ProjectableForm implements OnInit, On
     });
   }
 
-  validate() {
+  validate(identity?) {
     this.errors = {};
     if (isEmpty(this.formData.name)) {
       this.errors['name'] = true;

projects/ziti-console-lib/src/lib/features/projectable-forms/jwt-signer/jwt-signer-form.component.html

@@ -185,6 +185,7 @@
                             <code class="oidc-error-message-source">{{oidcErrorMessageSource}}: </code>
                             <code class="oidc-error-message-detail">{{oidcErrorMessageDetail}}</code>
                             <code class="oidc-error-message-detail2" *ngIf="oidcErrorMessageDetail2">{{oidcErrorMessageDetail2}}</code>
+                            <code class="oidc-error-message-detail2" *ngIf="oidcErrorMessageDetail3">{{oidcErrorMessageDetail3}}</code>
                         </div>
                         <div class="oidc-token-claims-container" *ngIf="oidcAuthTokenClaims">
                             <code class="oidc-token-claims-title">OAuth Token Claims: </code>

projects/ziti-console-lib/src/lib/features/projectable-forms/jwt-signer/jwt-signer-form.component.ts

@@ -69,6 +69,7 @@ export class JwtSignerFormComponent extends ProjectableForm implements OnInit, O
     oidcErrorMessageSource;
     oidcErrorMessageDetail;
     oidcErrorMessageDetail2;
+    oidcErrorMessageDetail3;
     jwksValidationError;
     oidcAuthTokenClaims;
     oidcClaims;
@@ -480,6 +481,7 @@ export class JwtSignerFormComponent extends ProjectableForm implements OnInit, O
         this.oidcErrorMessageSource = undefined;
         this.oidcErrorMessageDetail = undefined;
         this.oidcErrorMessageDetail2 = undefined;
+        this.oidcErrorMessageDetail3 = undefined;
         this.jwksValidationError = undefined;
         const jwksValid = await this.testJWKS();
         if (!jwksValid) {
@@ -529,6 +531,7 @@ export class JwtSignerFormComponent extends ProjectableForm implements OnInit, O
             this.oidcErrorMessageSource = errorMessageSource;
             if (oidcAuthTokenClaims) {
                 this.oidcAuthTokenClaims = JSON.parse(oidcAuthTokenClaims);
+                this.oidcErrorMessageDetail3 = 'Check the list of auth token claims below to confirm if your provider is returning the correct details.'
                 this.validateTokenClaims(this.oidcAuthTokenClaims, this.overrideFormData);
             }
         }

projects/ziti-console-lib/src/lib/models/api-session.ts

@@ -8,8 +8,9 @@ export class APISession {
     identityId: string;
     service: any;
     edgeRouters: any[];
-    apiSessionId: string;
-    apiSession: any;
+    isCertExtendable: boolean;
+    isMfaComplete: boolean;
+    isMfaRequired: boolean;
     updatedAt: any;
     createdAt: any;
     id: string;

projects/ziti-console-lib/src/lib/pages/api-sessions/api-sessions-page.component.html

@@ -13,8 +13,8 @@
                     [totalCount]="totalCount"
                     [emptyMsg]="'No API Sessions defined'"
                     [filterApplied]="filterApplied"
-                    [filterColumn]="'identity'"
-                    [filterName]="'identity'"
+                    [filterColumn]="'id'"
+                    [filterName]="'ID'"
                     [menuItems]="svc.menuItems"
                     (gridReady)="gridReady($event)"
     >

projects/ziti-console-lib/src/lib/pages/api-sessions/api-sessions-page.service.ts

@@ -83,19 +83,57 @@ export class ApiSessionsPageService extends ListPageServiceClass {
 
         return [
             {
-                colId: 'identity',
-                field: 'identity.name',
-                headerName: 'Identity',
+                colId: 'id',
+                field: 'id',
+                headerName: 'ID',
                 headerComponent: TableColumnDefaultComponent,
                 headerComponentParams: this.headerComponentParams,
                 cellRenderer: TableCellNameComponent,
                 cellRendererParams: { pathRoot: this.basePath },
+                resizable: true,
+                cellClass: 'nf-cell-vert-align tCol',
+                width: this.remToPx(10),
+                hide: false,
                 onCellClicked: (data) => {
                     if (this.hasSelectedText()) {
                         return;
                     }
                     this.openEditForm(data?.data?.id);
                 },
+            },
+            {
+                colId: 'identity.name',
+                field: 'identity.name',
+                headerName: 'Identity Name',
+                headerComponent: TableColumnDefaultComponent,
+                cellRenderer: TableCellNameComponent,
+                cellRendererParams: { pathRoot: 'identities', itemProp: 'identity.id' },
+                onCellClicked: (data) => {
+                    if (this.hasSelectedText()) {
+                        return;
+                    }
+                    this.openIdentityForm(data?.data?.identityId);
+                },
+                resizable: true,
+                cellClass: 'nf-cell-vert-align tCol',
+                sortable: false,
+                filter: true,
+                sortColumn: this.sort.bind(this),
+            },
+            {
+                colId: 'identity',
+                field: 'identity.id',
+                headerName: 'Identity ID',
+                headerComponent: TableColumnDefaultComponent,
+                headerComponentParams: this.headerComponentParams,
+                cellRenderer: TableCellNameComponent,
+                cellRendererParams: { pathRoot: 'identities', itemProp: 'identity.id' },
+                onCellClicked: (data) => {
+                    if (this.hasSelectedText()) {
+                        return;
+                    }
+                    this.openIdentityForm(data?.data?.identityId);
+                },
                 resizable: true,
                 cellClass: 'nf-cell-vert-align tCol',
                 sortable: true,
@@ -106,6 +144,7 @@ export class ApiSessionsPageService extends ListPageServiceClass {
                 colId: 'ipAddress',
                 field: 'ipAddress',
                 headerName: 'IP Address',
+                headerComponentParams: this.headerComponentParams,
                 headerComponent: TableColumnDefaultComponent,
                 resizable: true,
                 cellClass: 'nf-cell-vert-align tCol',
@@ -114,20 +153,22 @@ export class ApiSessionsPageService extends ListPageServiceClass {
             {
                 colId: 'isMfaRequired',
                 field: 'isMfaRequired',
-                headerName: 'Is System',
+                headerName: 'MFA Required',
                 headerComponent: TableColumnDefaultComponent,
                 resizable: true,
                 cellClass: 'nf-cell-vert-align tCol',
                 width: this.remToPx(10),
+                hide: true
             },
             {
                 colId: 'isMfaComplete',
                 field: 'isMfaComplete',
-                headerName: 'Is System',
+                headerName: 'MFA Complete',
                 headerComponent: TableColumnDefaultComponent,
                 resizable: true,
                 cellClass: 'nf-cell-vert-align tCol',
                 width: this.remToPx(10),
+                hide: true
             },
             {
                 colId: 'lastActivity',
@@ -140,16 +181,6 @@ export class ApiSessionsPageService extends ListPageServiceClass {
                 cellClass: 'nf-cell-vert-align tCol',
                 width: this.remToPx(10),
             },
-            {
-                colId: 'id',
-                field: 'id',
-                headerName: 'ID',
-                headerComponent: TableColumnDefaultComponent,
-                resizable: true,
-                cellClass: 'nf-cell-vert-align tCol',
-                width: this.remToPx(10),
-                hide: true
-            },
             {
                 colId: 'createdAt',
                 field: 'createdAt',
@@ -165,9 +196,17 @@ export class ApiSessionsPageService extends ListPageServiceClass {
         ];
     }
 
+    public openIdentityForm(itemId = '', basePath?) {
+        if (isEmpty(itemId)) {
+            itemId = 'create';
+        }
+        basePath = basePath ? basePath : this.basePath;
+        this.router?.navigateByUrl(`identities/${itemId}`);
+    }
+
     getData(filters?: FilterObj[], sort?: any) {
         if (sort.sortBy === 'name') {
-            sort.sortBy = 'identity';
+            sort.sortBy = 'id';
         }
         // we can customize filters or sorting here before moving on...
         return super.getTableData('api-sessions', this.paging, filters, sort)

projects/ziti-console-lib/src/lib/pages/callback/callback.component.ts

@@ -106,7 +106,7 @@ export class CallbackComponent implements OnInit {
                                 queryParams: {
                                     oidcAuthResult: 'failed',
                                     oidcAuthErrorMessageDetail: 'Unable to initialize OAuth login. Empty response of OAuth service.',
-                                    oidcAuthErrorMessageSource: 'OAuth Login Error',
+                                    oidcAuthErrorMessageSource: 'OAuth Provider Error',
                                 }
                             });
                         }
@@ -125,7 +125,7 @@ export class CallbackComponent implements OnInit {
                                 queryParams: {
                                     oidcAuthResult: 'failed',
                                     oidcAuthErrorMessageDetail: errorMessage,
-                                    oidcAuthErrorMessageSource: 'OAuth Login Error',
+                                    oidcAuthErrorMessageSource: 'OAuth Provider Error',
                                 }
                             });
                         }
@@ -144,7 +144,7 @@ export class CallbackComponent implements OnInit {
                             queryParams: {
                                 oidcAuthResult: 'failed',
                                 oidcAuthErrorMessageDetail: errorMessage,
-                                oidcAuthErrorMessageSource: 'OAuth Login Error',
+                                oidcAuthErrorMessageSource: 'OAuth Provider Error',
                             }
                         });
                     }

projects/ziti-console-lib/src/lib/pages/jwt-signers/jwt-signers-page.component.html

@@ -12,7 +12,7 @@
                           [showAdd]="!itemsSelected"
                           (actionClicked)="headerActionClicked($event)"></lib-list-page-header>
 
-    <lib-data-table [tableId]="'configurations'"
+    <lib-data-table [tableId]="'ext-jwt-signers'"
                     [rowData]="rowData"
                     [columnDefinitions]="columnDefs"
                     (actionRequested)="tableAction($event)"

projects/ziti-console-lib/src/lib/pages/sessions/sessions-page.component.html

@@ -13,9 +13,10 @@
                     [totalCount]="totalCount"
                     [emptyMsg]="'No Sessions defined'"
                     [filterApplied]="filterApplied"
-                    [filterColumn]="'service'"
-                    [filterName]="'service'"
+                    [filterColumn]="'id'"
+                    [filterName]="'id'"
                     [menuItems]="svc.menuItems"
+                    [showNoItemsAdd]="false"
                     (gridReady)="gridReady($event)"
     >
     </lib-data-table>