Bug 1443667 - Fix 'tier' not yet assigned when getJobGroupInfo() creates map

tests/ui/mock/mappedGroup.json

@@ -1,6 +1,7 @@
 {
   "name": "Web platform tests with e10s",
   "symbol": "W-e10s",
+  "tier": 1,
   "jobs": [
     {
       "build_architecture": "-",
@@ -120,6 +121,6 @@
       "selected": false
     }
   ],
-  "mapKey": "313281W-e10sundefinedlinux64debug",
+  "mapKey": "313281W-e10s1linux64debug",
   "visible": true
 }

tests/ui/mock/mappedGroupDups.json

@@ -1,6 +1,7 @@
 {
   "name": "Spidermonkey builds",
   "symbol": "SM",
+  "tier": 1,
   "jobs": [
     {
       "build_architecture": "-",
@@ -276,6 +277,6 @@
       "selected": false
     }
   ],
-  "mapKey": "313293SMundefinedlinux64opt",
+  "mapKey": "313293SM1linux64opt",
   "visible": true
 }

ui/job-view/JobGroup.jsx

@@ -9,13 +9,14 @@ import { failedResults } from "../js/constants";
 class GroupSymbol extends React.PureComponent {
   render() {
     const { symbol, tier, toggleExpanded } = this.props;
+    const groupSymbol = symbol === '?' ? '' : symbol;
 
     return (
       <button
         className="btn group-symbol"
         data-ignore-job-clear-on-click
         onClick={toggleExpanded}
-      >{symbol}{tier && <span className="small text-muted">[tier {tier}]</span>}
+      >{groupSymbol}{tier !== 1 && <span className="small text-muted">[tier {tier}]</span>}
       </button>
     );
   }

ui/job-view/JobsAndGroups.jsx

@@ -11,7 +11,7 @@ export default class JobsAndGroups extends React.Component {
     return (
       <td className="job-row">
         {groups.map((group) => {
-          if (group.symbol !== '?') {
+          if (group.tier !== 1 || group.symbol !== '?') {
             return (
               group.visible && <JobGroup
                 group={group}

ui/js/models/resultsets_store.js

@@ -910,20 +910,18 @@ treeherder.factory('ThResultSetStore', [
           )
         );
 
-        var getJobGroupInfo = function (job) {
+        const getJobGroupInfo = function (job) {
+          const {
+            job_group_name: name, job_group_symbol,
+            platform, platform_option, result_set_id, tier
+          } = job;
+          // this has to do with group sorting so that the tier-1 ungrouped
+          // jobs show first, and the tier>1 ungrouped jobs show last.
+          const symbol = tier > 1 ? '' : job_group_symbol;
+          const mapKey = thAggregateIds.getGroupMapKey(
+            result_set_id, symbol, tier, platform, platform_option);
 
-            var name = job.job_group_name;
-            var symbol = job.job_group_symbol;
-            var mapKey = thAggregateIds.getGroupMapKey(job.result_set_id, symbol, tier, job.platform, job.platform_option);
-            var tier;
-
-            if (job.tier && job.tier !== 1) {
-                if (symbol === "?") {
-                    symbol = "";
-                }
-                tier = job.tier;
-            }
-            return { name: name, tier: tier, symbol: symbol, mapKey: mapKey };
+          return { name, tier, symbol, mapKey };
         };
 
         /*