Bug 1408671 - Display job field filter classification by name not id (#…

…2922)
mozilla · Nov 15, 2017 · 9473911 · 9473911
1 parent 7513310
commit 9473911
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/ui/js/services/jobfilters.js b/ui/js/services/jobfilters.js
@@ -407,15 +407,25 @@ treeherder.factory('thJobFilters', [
          */
         function getFieldFiltersArray() {
             const fieldFilters = [];
+            const clopt = thClassificationTypes.classificationOptions;
 
             _.each($location.search(), function (values, fieldName) {
                 if (_isFieldFilter(fieldName)) {
                     const valArr = _toArray(values);
                     _.each(valArr, function (val) {
+                        let text = '';
+                        if (_withoutPrefix(fieldName) === 'failure_classification_id') {
+                            clopt.forEach(function (el) {
+                                if (el.id.toString() === val) {
+                                    text = el.name;
+                                }
+                            });
+                        }
                         if (fieldName !== QS_SEARCH_STR) {
                             fieldFilters.push({
                                 field: _withoutPrefix(fieldName),
                                 value: val,
+                                text: text,
                                 key: fieldName
                             });
                         }

diff --git a/ui/partials/main/thActiveFiltersBar.html b/ui/partials/main/thActiveFiltersBar.html
@@ -10,8 +10,9 @@
             class="filtersbar-filter">
           <span title="Filter by {{ filter.field}}: {{ filter.value }}">
             <b>{{ filter.field }}:</b>
+            <span ng-if="filter.field === 'failure_classification_id'">{{ filter.text }}</span>
             <span ng-if="filter.field === 'author'"> {{filter.value.split('@')[0] | limitTo: 20}}</span>
-            <span ng-if="filter.field !== 'author'"> {{filter.value | limitTo: 12}}</span>
+            <span ng-if="filter.field !== 'author' && filter.field !== 'failure_classification_id'"> {{filter.value | limitTo: 12}}</span>
           </span>
           <span class="pointable"
                 title="Click to clear {{ filter.field }}"