From 5fa9cbc4a9bde5ef0380ea4af56e39e1e653e61c Mon Sep 17 00:00:00 2001 From: Julio-Oliveira-Encora Date: Mon, 22 Apr 2024 12:42:19 -0300 Subject: [PATCH] Addressed PR comments --- netbox/project-static/dist/netbox.js | Bin 530170 -> 530286 bytes netbox/project-static/dist/netbox.js.map | Bin 450498 -> 450585 bytes netbox/project-static/src/search.ts | 45 +++++++++++------- netbox/templates/inc/table_controls_htmx.html | 2 +- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index 45ec6b5e7c44a70cc0f88b4b07762f27bc85e6e8..5d1396b830b73623e349cb600d326c579c08f1ff 100644 GIT binary patch delta 19162 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 MkSl&%s#H?{4~=4?Q~&?~ delta 19021 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 diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index a32d864d43d38eac2206b25ff966f6d299d47455..49fd205f8cee473e0c055dc36ab613273db5c044 100644 GIT binary patch delta 255 zcmZvWy$ZrW5QIteM6t9pudrZc8N=KWB?JjU#7>bAL{UuVPbCcjlXY+?>ikX-5YbX1 zo+}yyQ$-4@A&sMJauM}_9;HA^6DG`*IVDWf$BSL7cc9kqRcPX4VqVO-xG8nj6^_69 uq7sCe@wGuA{J@|$k|nor;fMOS(EOsGu8>xI^;$ga%s=csaou|*@B9K9sz;On delta 207 zcmbPvK>E;r>4p}@7N!>F7M3ln9JY*k(>ZNf<3!yZ9m91(9UVh;JRKc9b#k2?U8|g? zH`=la*N5gf>qI&_W;*Kt73DkWI6FG$x#$EsItD`2COSGtfuwvv+;S%fGuhGE63q11 z33hZ0)=71AOw~zua&#^N8{-L5Tj`|Z4blcQFbgaSHX#=*>J2ic*a>LO^i(@m14jSt X)9hHC7@5jk+HcvjZog&EX1@Rc55hYg diff --git a/netbox/project-static/src/search.ts b/netbox/project-static/src/search.ts index dc0325e24..1c8ae8da6 100644 --- a/netbox/project-static/src/search.ts +++ b/netbox/project-static/src/search.ts @@ -1,6 +1,5 @@ import { isTruthy } from './util'; - /** * Show/hide quicksearch clear button. * @@ -10,52 +9,66 @@ function quickSearchEventHandler(event: Event): void { const quicksearch = event.currentTarget as HTMLInputElement; const inputgroup = quicksearch.parentElement as HTMLDivElement; if (isTruthy(inputgroup)) { - if (quicksearch.value === '') { - inputgroup.classList.add('hide-last-child'); + if (quicksearch.value === "") { + inputgroup.classList.add("hide-last-child"); + clearLinkParams(); } else { - inputgroup.classList.remove('hide-last-child'); + inputgroup.classList.remove("hide-last-child"); } } } +/** + * Clear the existing search parameters in the link to export Current View. + */ +function clearLinkParams(): void { + const link = document.getElementById("current_view") as HTMLLinkElement; + let linkUpdated = link?.href.split("&")[0]; + link.setAttribute("href", linkUpdated); +} + /** * Update the Export View link to add the Quick Search parameters. * @param event */ function handleQuickSearchParams(event: Event): void { - console.log('getParams'); const quickSearchParameters = event.currentTarget as HTMLInputElement; - const link = document.getElementById('current_view') as HTMLLinkElement; + + // Clear the existing search parameters + clearLinkParams(); + if (quickSearchParameters != null) { + const link = document.getElementById("current_view") as HTMLLinkElement; const search_parameter = `q=${quickSearchParameters.value}`; - const linkUpdated = link?.href + '&' + search_parameter; - link.setAttribute('href', linkUpdated); + const linkUpdated = link?.href + "&" + search_parameter; + link.setAttribute("href", linkUpdated); } + } /** * Initialize Quicksearch Event listener/handlers. */ export function initQuickSearch(): void { - const quicksearch = document.getElementById('quicksearch') as HTMLInputElement; - const clearbtn = document.getElementById('quicksearch_clear') as HTMLButtonElement; + const quicksearch = document.getElementById("quicksearch") as HTMLInputElement; + const clearbtn = document.getElementById("quicksearch_clear") as HTMLButtonElement; if (isTruthy(quicksearch)) { - quicksearch.addEventListener('keyup', quickSearchEventHandler, { + quicksearch.addEventListener("keyup", quickSearchEventHandler, { passive: true, }); - quicksearch.addEventListener('search', quickSearchEventHandler, { + quicksearch.addEventListener("search", quickSearchEventHandler, { passive: true, }); - quicksearch.addEventListener('change', handleQuickSearchParams); + quicksearch.addEventListener("change", handleQuickSearchParams); if (isTruthy(clearbtn)) { clearbtn.addEventListener( - 'click', + "click", async () => { - const search = new Event('search'); - quicksearch.value = ''; + const search = new Event("search"); + quicksearch.value = ""; await new Promise(f => setTimeout(f, 100)); quicksearch.dispatchEvent(search); }, diff --git a/netbox/templates/inc/table_controls_htmx.html b/netbox/templates/inc/table_controls_htmx.html index eb5a241e9..053a25eca 100644 --- a/netbox/templates/inc/table_controls_htmx.html +++ b/netbox/templates/inc/table_controls_htmx.html @@ -6,7 +6,7 @@
+ hx-trigger="keyup changed delay:500ms, search" />