diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index ba094258e..759cc2517 100644 Binary files a/netbox/project-static/dist/netbox.js and b/netbox/project-static/dist/netbox.js differ diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index e7e13b6d6..590bb408a 100644 Binary files a/netbox/project-static/dist/netbox.js.map and b/netbox/project-static/dist/netbox.js.map differ diff --git a/netbox/project-static/src/appliedFilter.ts b/netbox/project-static/src/appliedFilter.ts new file mode 100644 index 000000000..f655ce4fb --- /dev/null +++ b/netbox/project-static/src/appliedFilter.ts @@ -0,0 +1,13 @@ +import { isTruthy } from './util'; +export function initAppliedFilter(): void { + const appliedFilter = document.getElementById('appliedfilters'); + if (isTruthy(appliedFilter)) { + const divResults = document.getElementById('results'); + if (isTruthy(divResults)) { + const savedFilterSelect = divResults.getElementsByTagName('select')[0]; + if (savedFilterSelect.selectedOptions.length > 0) { + appliedFilter.hidden = true; + } + } + } +} diff --git a/netbox/project-static/src/forms/savedFiltersSelect.ts b/netbox/project-static/src/forms/savedFiltersSelect.ts index 82bdceb63..e7e700439 100644 --- a/netbox/project-static/src/forms/savedFiltersSelect.ts +++ b/netbox/project-static/src/forms/savedFiltersSelect.ts @@ -20,9 +20,11 @@ function handleSavedFilterChange(event: Event): void { } export function initSavedFilterSelect(): void { - const savedFilterSelect = document.getElementById('id_filter_id'); - - if (isTruthy(savedFilterSelect)) { - savedFilterSelect.addEventListener('change', handleSavedFilterChange); + const divResults = document.getElementById('results'); + if (isTruthy(divResults)) { + const savedFilterSelect = divResults.getElementsByTagName('select')[0]; + if (isTruthy(savedFilterSelect)) { + savedFilterSelect.addEventListener('change', handleSavedFilterChange); + } } } diff --git a/netbox/project-static/src/netbox.ts b/netbox/project-static/src/netbox.ts index ce0aad93f..c9d5e5a5f 100644 --- a/netbox/project-static/src/netbox.ts +++ b/netbox/project-static/src/netbox.ts @@ -14,6 +14,7 @@ import { initDashboard } from './dashboard'; import { initRackElevation } from './racks'; import { initHtmx } from './htmx'; import { initSavedFilterSelect } from './forms/savedFiltersSelect'; +import { initAppliedFilter } from './appliedFilter'; function initDocument(): void { for (const init of [ @@ -33,6 +34,7 @@ function initDocument(): void { initRackElevation, initHtmx, initSavedFilterSelect, + initAppliedFilter, ]) { init(); } diff --git a/netbox/templates/inc/table_controls_htmx.html b/netbox/templates/inc/table_controls_htmx.html index c6cf99b1f..041d9d187 100644 --- a/netbox/templates/inc/table_controls_htmx.html +++ b/netbox/templates/inc/table_controls_htmx.html @@ -1,7 +1,7 @@ {% load helpers %} {% load i18n %} -