Skip to content
Snippets Groups Projects
Commit a1b5873d authored by Sam Roberts's avatar Sam Roberts
Browse files

a few tweaks from feedback

parent 6ed4be1b
No related branches found
No related tags found
1 merge request!11Feature/pol1 700 mws page
...@@ -230,6 +230,8 @@ def provision_folder(token_request, folder_name, dash, services, ...@@ -230,6 +230,8 @@ def provision_folder(token_request, folder_name, dash, services,
is_nren = folder_name == "NREN Access" is_nren = folder_name == "NREN Access"
is_re_peer = folder_name == "RE Peer" is_re_peer = folder_name == "RE Peer"
is_service = 'service_type' in dash is_service = 'service_type' in dash
# todo: figure out a neater way to do this?
is_complex = is_nren or is_nren_beta or is_re_peer or is_service
if is_nren: if is_nren:
data = get_nren_interface_data_old(interfaces) data = get_nren_interface_data_old(interfaces)
...@@ -257,7 +259,7 @@ def provision_folder(token_request, folder_name, dash, services, ...@@ -257,7 +259,7 @@ def provision_folder(token_request, folder_name, dash, services,
with ThreadPoolExecutor(max_workers=MAX_WORKERS) as executor: with ThreadPoolExecutor(max_workers=MAX_WORKERS) as executor:
for dashboard in dash_data: for dashboard in dash_data:
if is_nren or is_nren_beta or is_re_peer or is_service: if is_complex:
rendered = render_complex_dashboard(**dashboard) rendered = render_complex_dashboard(**dashboard)
else: else:
rendered = render_simple_dashboard(**dashboard) rendered = render_simple_dashboard(**dashboard)
......
...@@ -276,8 +276,7 @@ def render_complex_dashboard( ...@@ -276,8 +276,7 @@ def render_complex_dashboard(
): ):
assert tag or tags assert tag or tags
panels = [create_infobox()] panels = [create_infobox()]
if len(aggregate_panels) > 0: panels.extend(aggregate_panels)
panels.extend(aggregate_panels)
for group in dropdown_groups: for group in dropdown_groups:
panels.append(group["dropdown"]) panels.append(group["dropdown"])
panels.extend(group["panels"]) panels.extend(group["panels"])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment