From 66f9864394a0f5064d0f8bf883d3f62d79b04dfd Mon Sep 17 00:00:00 2001 From: Jordan Blasenhauer Date: Thu, 7 Mar 2024 16:27:00 +0100 Subject: [PATCH] enhance settings filter + fix modal height + changelog --- CHANGELOG.md | 17 ++++++++++++----- src/ui/static/js/utils/settings.js | 14 +++++++++----- src/ui/templates/services_modal.html | 19 +++++++++++-------- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d9ca1b60..5a2baae09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,13 +8,20 @@ - [BUGFIX] Fix ModSecurity FP on antibot page - [BUGFIX] Fix Whitelist core plugin missing a check for empty server_name in multisite mode - [BUGFIX] Fix Templator missing some common configs +- [BUGFIX] Database update with external plugins reupload - [LINUX] Add logrotate support for the logs -- [UI] Add bans management page in the web UI +- [UI] New : add bans management page in the web UI +- [UI] New : some core plugins pages in the web UI +- [UI] General : enhance the Content-Security-Policy header in the web UI +- [UI] General : dark mode enhancement +- [UI] General : add visual feedback when filtering is matching nothing - [UI] Add blocked requests page in the web UI -- [UI] Add the possibility to clone a service in the web UI -- [UI] Add the possibility to set a service as draft in the web UI -- [UI] Enhance the Content-Security-Policy header in the web UI -- [UI] Add some core plugins pages in the web UI +- [UI] Global config / service page : remove tabs for select and enhance filtering (plugin name includes) +- [UI] Service page : add the possibility to clone a service in the web UI +- [UI] Service page : add the possibility to set a service as draft in the web UI +- [UI] Service page : add services filter when at least 4 services +- [UI] Configs page : add path filtering related to config presence +- [UI] Pro license : add home card, show pro plugis on menu and plugins page, resume in account page, alert in case issue with license usage - [FEATURE] Add setting REDIS_SSL_VERIFY to activate/disable the SSL certificate verification when using Redis - [FEATURE] Add Redis Sentinel fallback to master automatically if no slaves are available - [FEATURE] Add Redis Sentinel support for bwcli diff --git a/src/ui/static/js/utils/settings.js b/src/ui/static/js/utils/settings.js index 340b1f5f5..181c2bdc2 100644 --- a/src/ui/static/js/utils/settings.js +++ b/src/ui/static/js/utils/settings.js @@ -215,14 +215,18 @@ class FilterSettings { } } catch (err) {} }); - //case no setting match, hidden tab and content + //case no setting match, check if match at least tab name + //if not, hide tab if (settingCount === hiddenCount) { const tabName = tab.getAttribute(`data-tab-select-handler`); - tab.classList.add("!hidden"); + const tabTxt = tab.textContent.trim().toLowerCase(); + if (!tabTxt.includes(inpValue)) { + tab.classList.add("!hidden"); - this.contentContainer - .querySelector(`[data-plugin-item=${tabName}]`) - .classList.add("hidden"); + this.contentContainer + .querySelector(`[data-plugin-item=${tabName}]`) + .classList.add("hidden"); + } } }); diff --git a/src/ui/templates/services_modal.html b/src/ui/templates/services_modal.html index 9ca9550b4..e8e541eb8 100644 --- a/src/ui/templates/services_modal.html +++ b/src/ui/templates/services_modal.html @@ -3,7 +3,7 @@ data-services-modal class="dark:brightness-110 hidden w-screen h-screen fixed bg-gray-600/50 z-[1001] top-0 left-0 justify-center items-center">
+ class="overflow-y-auto mx-0 sm:mx-6 lg:mx-8 my-3 px-3 sm:px-4 pt-4 pb-8 w-full sm:min-w-[500px] max-w-[1000px] max-h-[95vh] md:max-h-[90vh] flex flex-col break-words bg-white shadow-xl dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border">

-

- - +
+
+ + + +
+ +
- -