Merge pull request #653 from /issues/652

Issue #652: Account for new label scheme in the API endpoints.

Author: karlcow

tests/test_urls.py

@@ -90,16 +90,16 @@ def test_issues_new(self):
             {u'labels': [],
              u'title': u"fake bug 1",
              u'id': 1},
-            {u'labels': [{u'name': u'contactready'}],
+            {u'labels': [{u'name': u'status-contactready'}],
              u'title': u"fake bug 2",
              u'id': 2},
-            {u'labels': [{u'name': u'needsdiagnosis'}],
+            {u'labels': [{u'name': u'status-needsdiagnosis'}],
              u'title': u"fake bug 3",
              u'id': 3},
-            {u'labels': [{u'name': u'needscontact'}],
+            {u'labels': [{u'name': u'status-needscontact'}],
              u'title': u"fake bug 4",
              u'id': 4},
-            {u'labels': [{u'name': u'sitewait'}],
+            {u'labels': [{u'name': u'status-sitewait'}],
              u'title': u"fake bug 5",
              u'id': 5}]
         result = '[{"labels": [{"name": "bug"}, {"name": "help wanted"}], "id": 0, "title": "fake bug 0"}, {"labels": [], "id": 1, "title": "fake bug 1"}]'

webcompat/api/endpoints.py

@@ -120,7 +120,9 @@ def get_issue_category(issue_category):
     params = request.args.copy()
 
     if issue_category in category_list:
-        params['labels'] = issue_category
+        # add "status-" before the filter param to match the naming scheme
+        # of the repo labels.
+        params['labels'] = 'status-' + issue_category
         if g.user:
             issues = github.raw_request('GET', issues_path, params=params)
         else:
@@ -202,7 +204,9 @@ def get_category_from_search(issue_category):
     params = request.args.copy()
 
     if issue_category in category_list:
-        query_string = 'label:{0}'.format(issue_category)
+        # add "status-" before the issue_category to match the naming scheme
+        # of the repo labels.
+        query_string = 'label:{0}'.format('status-' + issue_category)
     elif issue_category == 'new':
         query_string = ' '.join(['-label:%s' % cat for cat in category_list])
         query_string += ' state:open '

webcompat/issues.py

@@ -63,8 +63,8 @@ def filter_new(issues):
     def is_new(issue):
         '''Filter function.'''
         match = True
-        category_list = ['contactready', 'needscontact',
-                         'needsdiagnosis', 'sitewait']
+        category_list = ['status-contactready', 'status-needscontact',
+                         'status-needsdiagnosis', 'status-sitewait']
         labels = [label.get('name') for label in issue.get('labels')]
         # if the intersection of labels and category_list is not empty
         # then it's not part of untriaged

webcompat/static/js/lib/models/issue.js

@@ -32,15 +32,15 @@
       this.set('stateClass', 'close');
       return 'Closed';
     }
-    if (labelsNames.indexOf('sitewait') > -1) {
+    if (labelsNames.indexOf('status-sitewait') > -1) {
       this.set('stateClass', 'sitewait');
       return 'Site Contacted';
     }
-    if (labelsNames.indexOf('contactready') > -1) {
+    if (labelsNames.indexOf('status-contactready') > -1) {
       this.set('stateClass', 'ready');
       return 'Ready for Outreach';
     }
-    if (labelsNames.indexOf('needsdiagnosis') > -1) {
+    if (labelsNames.indexOf('status-needsdiagnosis') > -1) {
       this.set('stateClass', 'need');
       return 'Needs Diagnosis';
     }