fix: google#3515 Move upstream field in frontend and sort alphabetically (google#3583)

Author: p1gc0rn

gcp/website/frontend3/src/templates/vulnerability.html

@@ -63,6 +63,14 @@ <h1 class="title">
             </ul>
           </dd>
           {% endif -%}
+           {%- if vulnerability.upstream_hierarchy -%}
+          <dt>Upstream</dt>
+          <dd class="upstream expandible-list">{{ vulnerability.upstream_hierarchy | safe }}</dd>
+          {%- endif -%}
+          {%- if vulnerability.downstream_hierarchy -%}
+          <dt>Downstream</dt>
+          <dd class="downstream expandible-list">{{ vulnerability.downstream_hierarchy | safe }}</dd>
+          {%- endif -%}
           {% if vulnerability.related -%}
           <dt>Related</dt>
           <dd>
@@ -90,14 +98,6 @@ <h1 class="title">
           <dd>{{ vulnerability.published }}</dd>
           <dt>Modified</dt>
           <dd>{{ vulnerability.modified }}</dd>
-          {%- if vulnerability.upstream_hierarchy -%}
-          <dt>Upstream</dt>
-          <dd class="upstream expandible-list">{{ vulnerability.upstream_hierarchy | safe }}</dd>
-          {%- endif -%}
-          {%- if vulnerability.downstream_hierarchy -%}
-          <dt>Downstream</dt>
-          <dd class="downstream expandible-list">{{ vulnerability.downstream_hierarchy | safe }}</dd>
-          {%- endif -%}
           {%- if vulnerability.severity -%}
           <dt>Severity</dt>
           <dd>

gcp/website/frontend_handlers.py

@@ -974,13 +974,15 @@ def print_subtree(vuln_id: str) -> None:
         output_lines.append("<li>" + vuln_id + "</li>")
 
     if vuln_id in graph:
-      for child in graph[vuln_id]:
+      sorted_children = sorted(graph[vuln_id])
+      for child in sorted_children:
         if child != target_bug_id:
           output_lines.append("<ul class=\"substream\">")
           print_subtree(child)
           output_lines.append("</ul>")
 
-  for root in root_nodes:
+  sorted_root_nodes = sorted(root_nodes)
+  for root in sorted_root_nodes:
     output_lines.append("<ul class=\"aliases\">")
     print_subtree(root)
     output_lines.append("</ul>")