diff --git a/brian_dashboard_manager/templating/helpers.py b/brian_dashboard_manager/templating/helpers.py index 6426eb71d86c0d0f5d29ecb6b3c836407c3ee010..5f7a44e77cccce2b5f1b010b7585d37d803261d5 100644 --- a/brian_dashboard_manager/templating/helpers.py +++ b/brian_dashboard_manager/templating/helpers.py @@ -607,24 +607,25 @@ def get_nren_dashboard_data_single(data, datasource, tag): iface_dropdown = create_dropdown_panel('Interfaces', **next(gridPos)) phys_panels = panel_gen(dash['PHYSICAL'], datasource, True) + dropdown_groups = [{ + 'dropdown': services_dropdown, + 'panels': service_panels, + }] + if len(service_ipv6_panels) > 0: + dropdown_groups.append({ + 'dropdown': services_ipv6_dropdown, + 'panels': service_ipv6_panels + }) + dropdown_groups.append({ + 'dropdown': iface_dropdown, + 'panels': phys_panels, + }) + result = { 'nren_name': nren, 'datasource': datasource, 'aggregate_panels': agg_panels, - 'dropdown_groups': [ - { - 'dropdown': services_dropdown, - 'panels': service_panels, - }, - { - 'dropdown': services_ipv6_dropdown, - 'panels': service_ipv6_panels - }, - { - 'dropdown': iface_dropdown, - 'panels': phys_panels, - } - ] + 'dropdown_groups': dropdown_groups } if isinstance(tag, list): result['tags'] = tag diff --git a/changelog.md b/changelog.md index ae6f889ad242271b73c41312a20097bc22475976..ede1942c9d6f16e395ce61686c1aeeaee9a42e6f 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,9 @@ All notable changes to this project will be documented in this file. +## [0.55] - 2023-02-12 +- POL1-648 minor change/fix: don't show IPv6 graph sections for dashboards lacking IPv6 graphs + ## [0.54] - 2023-02-09 - POL1-648: Added IPv6 graphs for NREN dashboards diff --git a/setup.py b/setup.py index bdef8ce35787a79235b59199077d9c4b4178f3e7..16ee3abb8d527501d1a778ab7ce360431ad3075e 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name='brian-dashboard-manager', - version="0.54", + version="0.55", author='GEANT', author_email='swd@geant.org', description='',