Merge branch 'main' into initial_test

RHsyseng · Jan 26, 2024 · fb3fe3d · fb3fe3d
2 parents b48b627 + 5649c35
commit fb3fe3d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/dashboard/src/t5gweb/cache.py b/dashboard/src/t5gweb/cache.py
@@ -463,6 +463,22 @@ def get_issue_details(cfg):
                     if bug.fields.priority:
                         priority = bug.fields.priority.name
 
+                    try:
+                        private_keywords_raw = bug.fields.customfield_12323649
+                    except AttributeError:
+                        private_keywords = None
+                    else:
+                        if (
+                            private_keywords_raw is not None
+                            and len(private_keywords_raw) > 0
+                        ):
+                            private_keywords = [
+                                private_keyword.value
+                                for private_keyword in private_keywords_raw
+                            ]
+                        else:
+                            private_keywords = None
+
                     case_issues.append(
                         {
                             "id": issue["resourceKey"],
@@ -481,6 +497,7 @@ def get_issue_details(cfg):
                             "priority": priority,
                             "jira_severity": jira_severity,
                             "jira_type": jira_type,
+                            "private_keywords": private_keywords,
                         }
                     )
             if len(case_issues) > 0:

diff --git a/dashboard/src/t5gweb/static/js/table.js b/dashboard/src/t5gweb/static/js/table.js
@@ -33,7 +33,7 @@ function format(data) {
   }
   if (data.issues != null) {
     result +=
-      '<h3>JIRA Issues:</h3><table class="table table-bordered table-hover table-responsive w-100"><thead><tr><th>#</th><th>Summary</th><th>Priority</th><th>Severity</th><th>Target Release</th><th>Assignee</th><th>QA Contact</th><th>Last Updated</th><th>Status</th></tr></thead><tbody>';
+      '<h3>JIRA Issues:</h3><table class="table table-bordered table-hover table-responsive w-100"><thead><tr><th>#</th><th>Summary</th><th>Priority</th><th>Severity</th><th>Telco Priority</th><th>Target Release</th><th>Assignee</th><th>QA Contact</th><th>Last Updated</th><th>Status</th></tr></thead><tbody>';
     for (let issue = 0; issue < data.issues.length; issue++) {
       result +=
         '<tr><td><a href="' +
@@ -43,12 +43,20 @@ function format(data) {
         "</a></td><td>" +
         data.issues[issue].title +
         "</td><td>" +
-        data.issues[issue].priority +
+        (data.issues[issue].priority != null
+          ? data.issues[issue].priority
+          : "---") +
         "</td><td>" +
         (data.issues[issue].jira_severity != null
           ? data.issues[issue].jira_severity
           : "---") +
         "</td><td>" +
+        (data.issues[issue].private_keywords != null
+          ? data.issues[issue].private_keywords.find((str) =>
+              str.includes("Priority"),
+            ) || "---"
+          : "---") +
+        "</td><td>" +
         (data.issues[issue].fix_versions != null
           ? data.issues[issue].fix_versions
           : "---") +