From 3f63370f27311b7cde53cb3bd2df81aeb71d1f4c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 18 Jun 2024 10:01:17 -0400 Subject: [PATCH] Omit saved filters from 'applied filters'; clean up form widget --- netbox/project-static/dist/netbox.css | Bin 551835 -> 551938 bytes netbox/project-static/dist/netbox.js | Bin 390566 -> 390360 bytes netbox/project-static/dist/netbox.js.map | Bin 355414 -> 355215 bytes netbox/project-static/src/appliedFilter.ts | 18 ------------------ netbox/project-static/src/netbox.ts | 2 -- netbox/project-static/styles/netbox.scss | 1 + .../styles/overrides/_tomselect.scss | 8 ++++++++ netbox/templates/inc/table_controls_htmx.html | 16 ++++++++-------- .../templates/helpers/applied_filters.html | 2 +- netbox/utilities/templatetags/helpers.py | 4 ++++ 10 files changed, 22 insertions(+), 29 deletions(-) delete mode 100644 netbox/project-static/src/appliedFilter.ts create mode 100644 netbox/project-static/styles/overrides/_tomselect.scss diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index 0696d2e827f51ae3142a610e546459a4bba62033..36ed4defca8e8ed69115468fac126f7bbb72ce1d 100644 GIT binary patch delta 86 zcmbPzU9stgVnYjK3sVbo3rh=Y3tJ2O77n?n>7Trw#^U|%%3n~;q*tno# k`o}O1IdO%Q%(Cj-#G>@fJSzhQ6QC3b8*G<};;0t{04HJ{CIA2c delta 31 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 i{z;~E?IgQ06cdOX)Gq2zsWvcG zN)#UsY?>w=!7z80^uZ{6*8y@34%)SvRQqj?^oIB>h=rYh%A~_Y}cxbrCUepLfrKVOXpu#N+yh$ zR3%MAF|SJ6isH2@=?WC*tEBQ#kia3gFYM0dyHCKuci8bg4or?+N*7IX2QCf}3ms<@ zx1C@TKW3MZbnvUHr7RSK)e;Poc7L_>!w5+9J#|v$6eW0L?pUO5|t~n&bO(X`t zJ>8J5jTm9rA;fs+7(*kTPtJ`oH1X_zNp-xk$}m@Zf2`pfi7eILm|(z{Y@vcW=ddZ-%cl$*$%GjG5+~#4EvF6caqhNDaFI5Cu!3a@SDC=ioHl$6zxCD` z!@QA~#x806D=SMF7s0@vRL;Q-XALFEYb=UlzGOm0Ydveg>$1YPd~KL+aCptgZ*$H{ R8N+=CClH5r>}$gT`oG3T5dQ!G delta 11564 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 diff --git a/netbox/project-static/src/appliedFilter.ts b/netbox/project-static/src/appliedFilter.ts deleted file mode 100644 index 099351ff1..000000000 --- a/netbox/project-static/src/appliedFilter.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { isTruthy } from './util'; - -/** - * Initialize the applied filter display. - * - */ -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/netbox.ts b/netbox/project-static/src/netbox.ts index c9d5e5a5f..ce0aad93f 100644 --- a/netbox/project-static/src/netbox.ts +++ b/netbox/project-static/src/netbox.ts @@ -14,7 +14,6 @@ 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 [ @@ -34,7 +33,6 @@ function initDocument(): void { initRackElevation, initHtmx, initSavedFilterSelect, - initAppliedFilter, ]) { init(); } diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index b04b85fc9..af2905312 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -7,6 +7,7 @@ // Overrides of external libraries @import 'overrides/bootstrap'; @import 'overrides/tabler'; +@import 'overrides/tomselect'; // Transitional styling to ease migration of templates from NetBox v3.x @import 'transitional/badges'; diff --git a/netbox/project-static/styles/overrides/_tomselect.scss b/netbox/project-static/styles/overrides/_tomselect.scss new file mode 100644 index 000000000..29aa9d361 --- /dev/null +++ b/netbox/project-static/styles/overrides/_tomselect.scss @@ -0,0 +1,8 @@ +.ts-wrapper.multi { + .ts-control { + padding: 7px 7px 3px 7px; + div { + margin: 0 4px 4px 0; + } + } +} diff --git a/netbox/templates/inc/table_controls_htmx.html b/netbox/templates/inc/table_controls_htmx.html index 9bd4b93c9..ec913d32a 100644 --- a/netbox/templates/inc/table_controls_htmx.html +++ b/netbox/templates/inc/table_controls_htmx.html @@ -4,9 +4,8 @@
- + @@ -15,11 +14,12 @@
- -
- -
- {{ filter_form.filter_id }} +
+
+ +
+ {{ filter_form.filter_id }} +