Skip to content
Snippets Groups Projects
Commit df2deea3 authored by Wojciech Taisner's avatar Wojciech Taisner
Browse files

NMAAS-1040 add sorting with semver comparator

parent 3df17a8e
No related branches found
No related tags found
No related merge requests found
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</span> </span>
</td> </td>
</tr> </tr>
<ng-template ngFor let-version [ngForOf]="app.versions"> <ng-template ngFor let-version [ngForOf]="app.versions.sort(appVersionCompare)">
<tr *ngIf="versionRowVisible[i]" class="table-row" [routerLink]="['/admin/apps/edit/version', version?.appVersionId]"> <tr *ngIf="versionRowVisible[i]" class="table-row" [routerLink]="['/admin/apps/edit/version', version?.appVersionId]">
<td></td> <td></td>
<td></td> <td></td>
......
...@@ -7,6 +7,7 @@ import {AppChangeStateModalComponent} from '../app-change-state-modal/appchanges ...@@ -7,6 +7,7 @@ import {AppChangeStateModalComponent} from '../app-change-state-modal/appchanges
import {ApplicationVersion} from '../../../model/application-version'; import {ApplicationVersion} from '../../../model/application-version';
import {map} from 'rxjs/operators'; import {map} from 'rxjs/operators';
import {ApplicationBase} from '../../../model/application-base'; import {ApplicationBase} from '../../../model/application-base';
import * as semver from 'semver'
@Component({ @Component({
selector: 'nmaas-appmanagementlist', selector: 'nmaas-appmanagementlist',
...@@ -77,4 +78,9 @@ export class AppManagementListComponent implements OnInit { ...@@ -77,4 +78,9 @@ export class AppManagementListComponent implements OnInit {
return this.versionRowVisible.reduce((prev: boolean, curr: boolean, i: number, array: boolean[]) => prev && curr); return this.versionRowVisible.reduce((prev: boolean, curr: boolean, i: number, array: boolean[]) => prev && curr);
} }
public appVersionCompare(a: ApplicationVersion, b: ApplicationVersion): number {
// defaults version that cannot be parsed to `0.0.0`
return semver.compare(semver.coerce(a.version) || '0.0.0', semver.coerce(b.version) || '0.0.0')
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment