Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add context menus in list views for cluster resources #4130

Merged
merged 1 commit into from
Aug 1, 2019
Merged

Add context menus in list views for cluster resources #4130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/app/frontend/common/components/resourcelist/clusterrole/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
16 changes: 8 additions & 8 deletions src/app/frontend/common/components/resourcelist/namespace/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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"
Expand All @@ -57,21 +57,21 @@
</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">
<kd-chips [map]="namespace.objectMeta.labels"></kd-chips>
</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"
Expand All @@ -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"
Expand Down
24 changes: 12 additions & 12 deletions src/app/frontend/common/components/resourcelist/node/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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"
Expand All @@ -57,53 +57,53 @@
</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">
<kd-chips [map]="node.objectMeta.labels"></kd-chips>
</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">
{{node.allocatedResources.cpuRequests | kdCores}} ({{node.allocatedResources.cpuRequestsFraction | number:"1.2-2"}}%)
</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">
{{node.allocatedResources.cpuLimits | kdCores}} ({{node.allocatedResources.cpuLimitsFraction | number:"1.2-2"}}%)
</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">
{{node.allocatedResources.memoryRequests | kdMemory}} ({{node.allocatedResources.memoryRequestsFraction | number:"1.2-2"}}%)
</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">
{{node.allocatedResources.memoryLimits | kdMemory}} ({{node.allocatedResources.memoryLimitsFraction | number:"1.2-2"}}%)
</mat-cell>
</ng-container>

<ng-container [matColumnDef]="getDisplayColumns()[8]">
<ng-container [matColumnDef]="getColumns()[8]">
<mat-header-cell *matHeaderCellDef
mat-sort-header
disableClear="true"
Expand All @@ -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"
Expand Down
26 changes: 13 additions & 13 deletions src/app/frontend/common/components/resourcelist/persistentvolume/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -53,37 +53,37 @@
</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">
<kd-chips [map]="pv.capacity"></kd-chips>
</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">
<kd-chips [map]="pv.accessModes"></kd-chips>
</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"
i18n>Status</mat-header-cell>
<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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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"
Expand All @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions src/app/frontend/common/components/resourcelist/storageclass/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -47,21 +47,21 @@
</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">
<kd-chips [map]="sc.parameters"></kd-chips>
</mat-cell>
</ng-container>

<ng-container [matColumnDef]="getDisplayColumns()[3]">
<ng-container [matColumnDef]="getColumns()[3]">
<mat-header-cell *matHeaderCellDef
mat-sort-header
disableClear="true"
Expand All @@ -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"
Expand Down