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

Report: added ordering options to columns in tests view #302

Merged
merged 2 commits into from
Jan 17, 2023
Merged

Report: added ordering options to columns in tests view #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
829ad4e
added ordering options to columns in tests view
sbke-mms Jan 5, 2023
673e715
use String Enum for sort order
sbke-mms Jan 9, 2023
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
29 changes: 22 additions & 7 deletions report-ng/app/src/components/classes/classes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,36 @@

<thead>
<th class="status-column centered-text">Status (${_uniqueStatuses})</th>
<th>Class (${_uniqueClasses})</th>
<th class="run-index-column">#</th>
<th>Method (${_filteredMethodDetails.length})</th>
<!-- <th>Failure Aspect (${_uniqueFailureAspects})</th>-->
</thead>
<tbody>
<th class="mdc-data-table__header-cell" click.delegate="_sortByRunIndex()">
<div class="mdc-data-table__header-cell-wrapper" >
<div class="mdc-data-table__header-cell-label" >Run index</div>
<button class="mdc-icon-button material-icons mdc-data-table__sort-icon-button">arrow_upward</button>
</div>
</th>
<th class="mdc-data-table__header-cell" click.delegate="_sortByClass()">
<div class="mdc-data-table__header-cell-wrapper">
<div class="mdc-data-table__header-cell-label">Class (${_uniqueClasses})</div>
<button class="mdc-icon-button material-icons mdc-data-table__sort-icon-button">arrow_upward</button>
</div>
</th>
<th class="mdc-data-table__header-cell" click.delegate="_sortByMethod()">
<div class="mdc-data-table__header-cell-wrapper">
<div class="mdc-data-table__header-cell-label">Method (${_filteredMethodDetails.length})</div>
<button class="mdc-icon-button material-icons mdc-data-table__sort-icon-button">arrow_upward</button>
</div>
</th>
<!-- <th>Failure Aspect (${_uniqueFailureAspects})</th>-->
</thead>
<tbody>
<tr repeat.for="methodDetails of _filteredMethodDetails">
<td class="p1 centered-text">
<a class="badge status-${methodDetails.methodContext.resultStatus|statusClass}">${methodDetails.methodContext.resultStatus|statusName}</a>
</td>
<td class="run-index-cell">${methodDetails.methodContext.methodRunIndex}</td>
<td class="p1 wrapable">
<a route-href="route: tests; params.bind: withQueryParams({class: methodDetails.classStatistics.classIdentifier})"
>${methodDetails.classStatistics.classIdentifier}</a>
</td>
<td>${methodDetails.methodContext.methodRunIndex}</td>
<td class="p1 wrapable" mdc-body1>

<!-- Method name -->
Expand Down
5 changes: 3 additions & 2 deletions report-ng/app/src/components/classes/classes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
width: 160px;
}

.run-index-column {
width: 40px;
.run-index-cell {
padding-right: 5em;
text-align: right;
}
56 changes: 43 additions & 13 deletions report-ng/app/src/components/classes/classes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,24 @@ import {NavigationInstruction, RouteConfig} from "aurelia-router";
import MethodType = data.MethodType;
import "./classes.scss"

enum SortBy {
Class = "CLASS",
Method = "METHOD",
RunIndex = "RUNINDEX",
}

@autoinject()
export class Classes extends AbstractViewModel {
private _executionStatistics: ExecutionStatistics;
private _selectedStatus:data.ResultStatusType;
private _availableStatuses:data.ResultStatusType[]|number[];
private _filteredMethodDetails:MethodDetails[];
private _showConfigurationMethods:boolean = null;
private _searchRegexp:RegExp;
private _selectedStatus: data.ResultStatusType;
private _availableStatuses: data.ResultStatusType[] | number[];
private _filteredMethodDetails: MethodDetails[];
private _showConfigurationMethods: boolean = null;
private _searchRegexp: RegExp;
private _uniqueStatuses = 0;
private _uniqueClasses = 0;
private _loading = false;
private _sortBy = SortBy.Class;

constructor(
private _dataLoader: DataLoader,
Expand Down Expand Up @@ -105,10 +112,10 @@ export class Classes extends AbstractViewModel {
// }
// });

let relevantFailureAspect:FailureAspectStatistics;
let relevantFailureAspect: FailureAspectStatistics;
let filterByFailureAspect = false;
if (this.queryParams.failureAspect > 0) {
relevantFailureAspect = executionStatistics.uniqueFailureAspects[this.queryParams.failureAspect-1];
relevantFailureAspect = executionStatistics.uniqueFailureAspects[this.queryParams.failureAspect - 1];
filterByFailureAspect = true;
}
this._executionStatistics = executionStatistics;
Expand Down Expand Up @@ -166,12 +173,20 @@ export class Classes extends AbstractViewModel {

});



// Sort by method name
//this._filteredMethodDetails = this._filteredMethodDetails.sort((a, b) => a.methodContext.contextValues.name.localeCompare(b.methodContext.contextValues.name));
// Sort by run index
this._filteredMethodDetails = this._filteredMethodDetails.sort((a, b) => a.methodContext.methodRunIndex-b.methodContext.methodRunIndex);
switch (this._sortBy) {
case SortBy.Method :
this._filteredMethodDetails = this._filteredMethodDetails.sort((a,b) => a.identifier.localeCompare(b.identifier));
break;
case SortBy.RunIndex : // Sort by run index
this._filteredMethodDetails = this._filteredMethodDetails.sort((a, b) => a.methodContext.methodRunIndex-b.methodContext.methodRunIndex);
break;
case SortBy.Class :
default:
// Sort by class and method name
this._filteredMethodDetails = this._filteredMethodDetails.sort(
(a, b) => a.classStatistics.classIdentifier === b.classStatistics.classIdentifier ?
a.identifier.localeCompare(b.identifier) : a.classStatistics.classIdentifier.localeCompare(b.classStatistics.classIdentifier));
}

this._uniqueClasses = Object.keys(uniqueClasses).length;
this._uniqueStatuses = Object.keys(uniqueStatuses).length;
Expand All @@ -192,6 +207,21 @@ export class Classes extends AbstractViewModel {
}
}

private _sortByRunIndex() {
this._sortBy = SortBy.RunIndex;
this._filterOnce();
}

private _sortByClass() {
this._sortBy = SortBy.Class;
this._filterOnce();
}

private _sortByMethod() {
this._sortBy = SortBy.Method;
this._filterOnce();
}

private _statusChanged() {
this._filterOnce();
}
Expand Down