Merge branch 'ws2903-sort_tiles_on_jobspec_name' into 'development'

WS-2903: Sorting tiles by their order in the jobspec name

See merge request !30

src/app/executions/execution/execution-detail/execution-detail.component.ts

@@ -89,12 +89,13 @@ export class ExecutionDetailComponent implements OnInit, OnDestroy, OnChanges {
   }
 
   refreshTiles(newTiles: Tile[]) {
-    // Sort newTiles by name before they're stored on this component
-    this.tiles = new Map<string, Tile>(
-      newTiles
-        .sort((a, b) => a.name.localeCompare(b.name, undefined, { numeric: true }))
-        .map(tile => [tile.name, tile])
-    );
+    if (this.job.jobspec_name.includes('_')) {
+      // Sort newTiles by their order in the jobspec name before they're stored on this component
+      const tileOrder: string[] = this.job.jobspec_name.split('_')[1].split('.');
+      newTiles = newTiles.sort((a, b) => tileOrder.indexOf(a.name) - tileOrder.indexOf(b.name));
+    }
+
+    this.tiles = new Map<string, Tile>(newTiles.map(tile => [tile.name, tile]));
     for (const controlName in this.tilesFormGroup.controls) {
       this.tilesFormGroup.removeControl(controlName);
     }

src/app/jobspecs/jobspec/jobspec.component.html

@@ -12,7 +12,7 @@
       <button class="btn btn-link p-0" (click)="toggleDetails()">{{ job.jobspec_name }}</button>
     </ng-container>
     <ng-template #notHomeTabName>
-      <a [routerLink]="['/jobs']" [queryParams]="{pattern: job.jobspec_id, queue: jobspec.queueName}">{{job.jobspec_name}}</a>
+      <a [routerLink]="['/jobs']" [queryParams]="{pattern: job.jobspec_id, queue: jobspec?.queueName}">{{job.jobspec_name}}</a>
       <button class="btn btn-xs btn-outline-primary border-0 ml-2" (click)="toggleDetails()">
         <fa-icon [icon]="faCaretDown" *ngIf="!detailsExposed"></fa-icon>
         <fa-icon [icon]="faCaretUp" *ngIf="detailsExposed"></fa-icon>