From 3c99c2b7124a01172b57b682cd09cc5ce95a41eb Mon Sep 17 00:00:00 2001
From: Elijah Oyekunle <eloyekunle@gmail.com>
Date: Fri, 26 Jul 2019 16:55:02 +0100
Subject: [PATCH] Add context menus in list views for cluster resources

---
 .../resourcelist/clusterrole/template.html    | 10 +++----
 .../resourcelist/namespace/template.html      | 16 ++++++------
 .../resourcelist/node/template.html           | 24 ++++++++---------
 .../persistentvolume/template.html            | 26 +++++++++----------
 .../resourcelist/storageclass/template.html   | 14 +++++-----
 5 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/app/frontend/common/components/resourcelist/clusterrole/template.html b/src/app/frontend/common/components/resourcelist/clusterrole/template.html
index 3ff77b5f6413..d41e3081a480 100644
--- a/src/app/frontend/common/components/resourcelist/clusterrole/template.html
+++ b/src/app/frontend/common/components/resourcelist/clusterrole/template.html
@@ -32,11 +32,11 @@
 
     <mat-table [dataSource]="getData()"
                matSort
-               [matSortActive]="getDisplayColumns()[1]"
+               [matSortActive]="getColumns()[1]"
                matSortDisableClear
                matSortDirection="asc">
 
-      <ng-container [matColumnDef]="getDisplayColumns()[0]">
+      <ng-container [matColumnDef]="getColumns()[0]">
         <mat-header-cell *matHeaderCellDef
                          mat-sort-header
                          disableClear="true"
@@ -47,7 +47,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[1]">
+      <ng-container [matColumnDef]="getColumns()[1]">
         <mat-header-cell *matHeaderCellDef
                          mat-sort-header
                          disableClear="true"
@@ -67,8 +67,8 @@
         </mat-cell>
       </ng-container>
 
-      <mat-header-row *matHeaderRowDef="getDisplayColumns()"></mat-header-row>
-      <mat-row *matRowDef="let row; columns: getDisplayColumns();"></mat-row>
+      <mat-header-row *matHeaderRowDef="getColumns()"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: getColumns();"></mat-row>
     </mat-table>
 
     <mat-paginator [length]="totalItems"
diff --git a/src/app/frontend/common/components/resourcelist/namespace/template.html b/src/app/frontend/common/components/resourcelist/namespace/template.html
index ae545af50d87..8953f77c2d99 100644
--- a/src/app/frontend/common/components/resourcelist/namespace/template.html
+++ b/src/app/frontend/common/components/resourcelist/namespace/template.html
@@ -32,10 +32,10 @@
 
     <mat-table [dataSource]="getData()"
                matSort
-               [matSortActive]="getDisplayColumns()[3]"
+               [matSortActive]="getColumns()[3]"
                matSortDisableClear
                matSortDirection="asc">
-      <ng-container [matColumnDef]="getDisplayColumns()[0]">
+      <ng-container [matColumnDef]="getColumns()[0]">
         <mat-header-cell *matHeaderCellDef></mat-header-cell>
         <mat-cell *matCellDef="let namespace">
           <mat-icon [ngClass]="getStatus(namespace).iconClass">
@@ -44,7 +44,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[1]">
+      <ng-container [matColumnDef]="getColumns()[1]">
         <mat-header-cell *matHeaderCellDef
                          mat-sort-header
                          disableClear="true"
@@ -57,7 +57,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[2]">
+      <ng-container [matColumnDef]="getColumns()[2]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Labels</mat-header-cell>
         <mat-cell *matCellDef="let namespace">
@@ -65,13 +65,13 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[3]">
+      <ng-container [matColumnDef]="getColumns()[3]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Phase</mat-header-cell>
         <mat-cell *matCellDef="let namespace">{{namespace.phase}}</mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[4]">
+      <ng-container [matColumnDef]="getColumns()[4]">
         <mat-header-cell *matHeaderCellDef
                          mat-sort-header
                          disableClear="true"
@@ -91,8 +91,8 @@
         </mat-cell>
       </ng-container>
 
-      <mat-header-row *matHeaderRowDef="getDisplayColumns()"></mat-header-row>
-      <mat-row *matRowDef="let row; columns: getDisplayColumns();"></mat-row>
+      <mat-header-row *matHeaderRowDef="getColumns()"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: getColumns();"></mat-row>
     </mat-table>
 
     <mat-paginator [length]="totalItems"
diff --git a/src/app/frontend/common/components/resourcelist/node/template.html b/src/app/frontend/common/components/resourcelist/node/template.html
index 4ab9f3c8c5d8..7db2b488e724 100644
--- a/src/app/frontend/common/components/resourcelist/node/template.html
+++ b/src/app/frontend/common/components/resourcelist/node/template.html
@@ -32,10 +32,10 @@
 
     <mat-table [dataSource]="getData()"
                matSort
-               [matSortActive]="getDisplayColumns()[8]"
+               [matSortActive]="getColumns()[8]"
                matSortDisableClear
                matSortDirection="asc">
-      <ng-container [matColumnDef]="getDisplayColumns()[0]">
+      <ng-container [matColumnDef]="getColumns()[0]">
         <mat-header-cell *matHeaderCellDef></mat-header-cell>
         <mat-cell *matCellDef="let node">
           <mat-icon [ngClass]="getStatus(node).iconClass">
@@ -44,7 +44,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[1]">
+      <ng-container [matColumnDef]="getColumns()[1]">
         <mat-header-cell *matHeaderCellDef
                          mat-sort-header
                          disableClear="true"
@@ -57,7 +57,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[2]">
+      <ng-container [matColumnDef]="getColumns()[2]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Labels</mat-header-cell>
         <mat-cell *matCellDef="let node">
@@ -65,13 +65,13 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[3]">
+      <ng-container [matColumnDef]="getColumns()[3]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Ready</mat-header-cell>
         <mat-cell *matCellDef="let node">{{node.ready}}</mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[4]">
+      <ng-container [matColumnDef]="getColumns()[4]">
         <mat-header-cell *matHeaderCellDef
                          i18n>CPU requests (cores)</mat-header-cell>
         <mat-cell *matCellDef="let node">
@@ -79,7 +79,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[5]">
+      <ng-container [matColumnDef]="getColumns()[5]">
         <mat-header-cell *matHeaderCellDef
                          i18n>CPU limits (cores)</mat-header-cell>
         <mat-cell *matCellDef="let node">
@@ -87,7 +87,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[6]">
+      <ng-container [matColumnDef]="getColumns()[6]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Memory requestes (bytes)</mat-header-cell>
         <mat-cell *matCellDef="let node">
@@ -95,7 +95,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[7]">
+      <ng-container [matColumnDef]="getColumns()[7]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Memory limits (bytes)</mat-header-cell>
         <mat-cell *matCellDef="let node">
@@ -103,7 +103,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[8]">
+      <ng-container [matColumnDef]="getColumns()[8]">
         <mat-header-cell *matHeaderCellDef
                          mat-sort-header
                          disableClear="true"
@@ -123,8 +123,8 @@
         </mat-cell>
       </ng-container>
 
-      <mat-header-row *matHeaderRowDef="getDisplayColumns()"></mat-header-row>
-      <mat-row *matRowDef="let row; columns: getDisplayColumns();"></mat-row>
+      <mat-header-row *matHeaderRowDef="getColumns()"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: getColumns();"></mat-row>
     </mat-table>
 
     <mat-paginator [length]="totalItems"
diff --git a/src/app/frontend/common/components/resourcelist/persistentvolume/template.html b/src/app/frontend/common/components/resourcelist/persistentvolume/template.html
index 5e64150a2d95..4c37212076d5 100644
--- a/src/app/frontend/common/components/resourcelist/persistentvolume/template.html
+++ b/src/app/frontend/common/components/resourcelist/persistentvolume/template.html
@@ -32,17 +32,17 @@
 
     <mat-table [dataSource]="getData()"
                matSort
-               [matSortActive]="getDisplayColumns()[9]"
+               [matSortActive]="getColumns()[9]"
                matSortDisableClear
                matSortDirection="asc">
-      <ng-container [matColumnDef]="getDisplayColumns()[0]">
+      <ng-container [matColumnDef]="getColumns()[0]">
         <mat-header-cell *matHeaderCellDef></mat-header-cell>
         <mat-cell *matCellDef="let pv">
           <mat-icon [ngClass]="getStatus(pv).iconClass">{{getStatus(pv).iconName}}</mat-icon>
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[1]">
+      <ng-container [matColumnDef]="getColumns()[1]">
         <mat-header-cell *matHeaderCellDef
                          mat-sort-header
                          disableClear="true"
@@ -53,7 +53,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[2]">
+      <ng-container [matColumnDef]="getColumns()[2]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Capacity</mat-header-cell>
         <mat-cell *matCellDef="let pv">
@@ -61,7 +61,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[3]">
+      <ng-container [matColumnDef]="getColumns()[3]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Access Modes</mat-header-cell>
         <mat-cell *matCellDef="let pv">
@@ -69,13 +69,13 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[4]">
+      <ng-container [matColumnDef]="getColumns()[4]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Reclaim Policy</mat-header-cell>
         <mat-cell *matCellDef="let pv">{{pv.reclaimPolicy}}</mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[5]">
+      <ng-container [matColumnDef]="getColumns()[5]">
         <mat-header-cell *matHeaderCellDef
                          mat-sort-header
                          disableClear="true"
@@ -83,7 +83,7 @@
         <mat-cell *matCellDef="let pv">{{pv.status}}</mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[6]">
+      <ng-container [matColumnDef]="getColumns()[6]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Claim</mat-header-cell>
         <mat-cell *matCellDef="let pv">
@@ -95,7 +95,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[7]">
+      <ng-container [matColumnDef]="getColumns()[7]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Storage Class</mat-header-cell>
         <mat-cell *matCellDef="let pv">
@@ -104,7 +104,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[8]">
+      <ng-container [matColumnDef]="getColumns()[8]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Reason</mat-header-cell>
         <mat-cell *matCellDef="let pv">
@@ -113,7 +113,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[9]">
+      <ng-container [matColumnDef]="getColumns()[9]">
         <mat-header-cell *matHeaderCellDef
                          mat-sort-header
                          disableClear="true"
@@ -133,8 +133,8 @@
         </mat-cell>
       </ng-container>
 
-      <mat-header-row *matHeaderRowDef="getDisplayColumns()"></mat-header-row>
-      <mat-row *matRowDef="let row; columns: getDisplayColumns();"></mat-row>
+      <mat-header-row *matHeaderRowDef="getColumns()"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: getColumns();"></mat-row>
     </mat-table>
 
     <mat-paginator [length]="totalItems"
diff --git a/src/app/frontend/common/components/resourcelist/storageclass/template.html b/src/app/frontend/common/components/resourcelist/storageclass/template.html
index a53b76552b46..f9cc87b9a3b8 100644
--- a/src/app/frontend/common/components/resourcelist/storageclass/template.html
+++ b/src/app/frontend/common/components/resourcelist/storageclass/template.html
@@ -32,11 +32,11 @@
 
     <mat-table [dataSource]="getData()"
                matSort
-               [matSortActive]="getDisplayColumns()[3]"
+               [matSortActive]="getColumns()[3]"
                matSortDisableClear
                matSortDirection="asc">
 
-      <ng-container [matColumnDef]="getDisplayColumns()[0]">
+      <ng-container [matColumnDef]="getColumns()[0]">
         <mat-header-cell *matHeaderCellDef
                          mat-sort-header
                          disableClear="true"
@@ -47,13 +47,13 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[1]">
+      <ng-container [matColumnDef]="getColumns()[1]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Provisioner</mat-header-cell>
         <mat-cell *matCellDef="let sc">{{sc.provisioner}}</mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[2]">
+      <ng-container [matColumnDef]="getColumns()[2]">
         <mat-header-cell *matHeaderCellDef
                          i18n>Parameters</mat-header-cell>
         <mat-cell *matCellDef="let sc">
@@ -61,7 +61,7 @@
         </mat-cell>
       </ng-container>
 
-      <ng-container [matColumnDef]="getDisplayColumns()[3]">
+      <ng-container [matColumnDef]="getColumns()[3]">
         <mat-header-cell *matHeaderCellDef
                          mat-sort-header
                          disableClear="true"
@@ -81,8 +81,8 @@
         </mat-cell>
       </ng-container>
 
-      <mat-header-row *matHeaderRowDef="getDisplayColumns()"></mat-header-row>
-      <mat-row *matRowDef="let row; columns: getDisplayColumns();"></mat-row>
+      <mat-header-row *matHeaderRowDef="getColumns()"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: getColumns();"></mat-row>
     </mat-table>
 
     <mat-paginator [length]="totalItems"