Merge pull request #2973 from bunkerity/dev

Merge branch "dev" into branch "staging"

Author: TheophileDiot

src/common/utils/logger.py

@@ -10,7 +10,7 @@
     _nameToLevel,
     addLevelName,
     basicConfig,
-    getLogger,
+    getLogger as logging_getLogger,
     setLoggerClass,
 )
 from logging.handlers import SysLogHandler
@@ -122,7 +122,7 @@ def __init__(self, name, level=INFO):
     "sqlalchemy.engine.Engine",
 )
 for logger_name in sqlalchemy_loggers:
-    getLogger(logger_name).setLevel(database_default_level)
+    logging_getLogger(logger_name).setLevel(database_default_level)
 
 # Customize log level names with emojis
 addLevelName(CRITICAL, "🚨")
@@ -135,7 +135,7 @@ def __init__(self, name, level=INFO):
 def setup_logger(title: str, level: Optional[Union[str, int]] = None) -> Logger:
     """Set up and return a logger with the specified title and level."""
     title = title.upper()
-    logger = getLogger(title)
+    logger = logging_getLogger(title)
     level = level or default_level
 
     if isinstance(level, str):
@@ -146,6 +146,8 @@ def setup_logger(title: str, level: Optional[Union[str, int]] = None) -> Logger:
 
 
 if warnings:
-    logger = getLogger("LOGGER_SETUP")
+    logger = logging_getLogger("LOGGER_SETUP")
     for warn in warnings:
         logger.warning(warn)
+
+getLogger = setup_logger  # Alias for easier access

src/ui/app/static/js/plugins-settings.js

@@ -904,8 +904,14 @@ $(document).ready(() => {
 
     $pluginItems.each(function () {
       const $item = $(this);
+      const itemType = $item.data("type");
+
+      // Treat external and ui types as the same category
       const typeMatches =
-        currentType === "all" || $item.data("type") === currentType;
+        currentType === "all" ||
+        itemType === currentType ||
+        (currentType === "external" && itemType === "ui") ||
+        (currentType === "ui" && itemType === "external");
 
       const pluginId = $item.data("plugin");
       const pluginName = $item.find(".fw-bold").text().toLowerCase();
@@ -1749,7 +1755,7 @@ $(document).ready(() => {
   var hasProPlugins = false;
   $pluginItems.each(function () {
     const type = $(this).data("type");
-    if (type === "external") {
+    if (type === "external" || type === "ui") {
       hasExternalPlugins = true;
     } else if (type === "pro") {
       hasProPlugins = true;