Skip to content

Commit 5d3f31e

Browse files
committed
Update chart and table components
1 parent 07515df commit 5d3f31e

File tree

2 files changed

+39
-7
lines changed

2 files changed

+39
-7
lines changed

src/app/components/usage/actions/charts/chart-line-usage-daily/chart-line-usage-daily.component.html

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p>
2-
<mat-button-toggle-group name="toggleChart" aria-label="Toggle Chart" [value]="chartType" (change)="chartType = $event.value; redrawChart()">
2+
<!-- <mat-button-toggle-group name="toggleChart" aria-label="Toggle Chart" [value]="chartType" (change)="chartType = $event.value; redrawChart()">
33
<mat-button-toggle value="total">All</mat-button-toggle>
44
<mat-button-toggle value="repo">Repo</mat-button-toggle>
55
<mat-button-toggle value="sku">Runner</mat-button-toggle>
@@ -12,9 +12,31 @@
1212
<mat-button-toggle value="daily">Day</mat-button-toggle>
1313
<mat-button-toggle value="weekly">Week</mat-button-toggle>
1414
<mat-button-toggle value="monthly">Month</mat-button-toggle>
15-
<mat-button-toggle value="rolling20">20-Day</mat-button-toggle>
15+
<mat-button-toggle value="rolling30">30-Day</mat-button-toggle>
1616
<mat-button-toggle value="rolling7">7-Day</mat-button-toggle>
17-
</mat-button-toggle-group>
17+
</mat-button-toggle-group> -->
18+
<mat-form-field>
19+
<mat-label>Grouping</mat-label>
20+
<mat-select [(value)]="chartType" (selectionChange)="chartType = $event.value; redrawChart()">
21+
<mat-option value="total">All</mat-option>
22+
<mat-option value="repo">Repo</mat-option>
23+
<mat-option value="sku">Runner</mat-option>
24+
<mat-option value="workflow">Workflow</mat-option>
25+
<mat-option value="user">User</mat-option>
26+
</mat-select>
27+
</mat-form-field>
28+
<mat-form-field>
29+
<mat-label>Time Aggregate</mat-label>
30+
<mat-select [(value)]="timeType" (selectionChange)="timeType = $event.value; redrawChart()">
31+
<mat-option value="total">Total</mat-option>
32+
<mat-option value="run">Run</mat-option>
33+
<mat-option value="daily">Day</mat-option>
34+
<mat-option value="weekly">Week</mat-option>
35+
<mat-option value="monthly">Month</mat-option>
36+
<mat-option value="rolling30">30-Day</mat-option>
37+
<mat-option value="rolling7">7-Day</mat-option>
38+
</mat-select>
39+
</mat-form-field>
1840
</p>
1941

2042
<highcharts-chart #chart

src/app/components/usage/actions/table-workflow-usage/table-workflow-usage.component.html

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
<div class="table-responsive">
22
<div class="table-control">
3+
<mat-form-field>
4+
<mat-label>Grouping</mat-label>
5+
<mat-select [(value)]="tableType" (selectionChange)="tableType = $event.value; ngOnChanges()">
6+
<mat-option value="sku">Runner</mat-option>
7+
<mat-option value="repo">Repo</mat-option>
8+
<mat-option value="workflow">Workflow</mat-option>
9+
<mat-option value="user">User</mat-option>
10+
</mat-select>
11+
</mat-form-field>
12+
313
<mat-form-field [class.hide]="dataSource.data.length <= 1">
414
<mat-label>Filter</mat-label>
515
<input matInput (keyup)="applyFilter($event)" placeholder="Ex. .github/workflows/build.yml " #input>
616
</mat-form-field>
7-
<div>
17+
<!-- <div>
818
<mat-button-toggle-group name="toggleChart" aria-label="Toggle Chart" [value]="tableType"
919
(change)="tableType = $event.value; ngOnChanges()">
1020
<mat-button-toggle value="sku">Runner</mat-button-toggle>
1121
<mat-button-toggle value="repo">Repo</mat-button-toggle>
1222
<mat-button-toggle value="workflow">Workflow</mat-button-toggle>
1323
<mat-button-toggle value="user">User</mat-button-toggle>
1424
</mat-button-toggle-group>
15-
</div>
25+
</div> -->
1626
</div>
1727

1828
<div class="table-container">
@@ -25,10 +35,10 @@
2535
</th>
2636
<td mat-cell *matCellDef="let row">
2737
{{column.cell(row)}}
28-
<ng-container *ngIf="column.icon">
38+
<!-- <ng-container *ngIf="column.icon">
2939
<mat-icon [matTooltip]="column.tooltip ? column.tooltip(row) : ''" inline="true">{{ column.icon(row)
3040
}}</mat-icon>
31-
</ng-container>
41+
</ng-container> -->
3242
</td>
3343
<td mat-footer-cell *matFooterCellDef> <b>{{ column.footer ? column.footer() : '' }}</b> </td>
3444
</ng-container>

0 commit comments

Comments
 (0)