updated user interface

server/src/uds/core/managers/log.py

@@ -153,7 +153,7 @@ class LogManager:
         """
 
         owner_type = transDict.get(type(wichObject), None)
-        if owner_type:
+        if owner_type is not None:
             self.__clearLogs(owner_type, wichObject.id)
         else:
             logger.debug('Requested clearLogs for a type of object not covered: %s', wichObject)

server/src/uds/core/managers/user_service.py

@@ -669,6 +669,12 @@ class UserServiceManager:
         # Sort pools related to policy now, and xtract only pools, not sort keys
         # Remove "full" pools (100%) from result and pools in maintenance mode, not ready pools, etc...
         pools: typing.List[ServicePool] = [p[1] for p in sorted(sortPools, key=lambda x: x[0]) if p[1].usage() < 100 and p[1].isUsable()]
+        poolsFull: typing.List[ServicePool] = [
+            p[1]
+            for p in sorted(sortPools, key=lambda x: x[0])
+            if p[1].usage() == 100 and p[1].isUsable()
+        ]
+
 
         logger.debug('Pools: %s', pools)
 
@@ -687,7 +693,7 @@ class UserServiceManager:
 
         try:
             alreadyAssigned: UserService = UserService.objects.filter(
-                deployed_service__in=pools,
+                deployed_service__in=pools+poolsFull,
                 state__in=State.VALID_STATES,
                 user=user,
                 cache_level=0

server/src/uds/static/modern/translations-fakejs.js

@@ -1,12 +1,5 @@
 // "Fake" javascript file for translations
 // Typescript
-gettext("Warning");
-gettext("Service is in maintenance and cannot be executed");
-gettext("Errors found");
-gettext("Invalid error string");
-gettext("We use cookies to track usage and preferences");
-gettext("I Understand");
-gettext("Learn more");
 gettext("Service is in maintenance");
 gettext("This service is currently not accessible due to schedule restrictions.");
 gettext("Launcher");
@@ -24,29 +17,14 @@ gettext("Error launching service");
 gettext("Please wait until the service is launched.");
 gettext("Please, tray again in a few moments.");
 gettext("Error launching service");
+gettext("Invalid error string");
+gettext("Errors found");
+gettext("Warning");
+gettext("Service is in maintenance and cannot be executed");
+gettext("We use cookies to track usage and preferences");
+gettext("I Understand");
+gettext("Learn more");
 // HTML
-gettext("You can access UDS Open Source code at");
-gettext("UDS has been developed using these components:");
-gettext("If you find that we missed any component, please let us know");
-gettext("UDS Client");
-gettext("Download UDS client for your platform");
-gettext("Legacy clients are only provided for old operating system support. Try to avoid them.");
-gettext("Username");
-gettext("Password");
-gettext("Authenticator");
-gettext("Login");
-gettext("Downloads");
-gettext("Always download the UDS actor matching your platform");
-gettext("Legacy actors are only provided for old operating system support. Try to avoid them.");
-gettext("An error has occurred");
-gettext("Return");
-gettext("UDS Service launcher");
-gettext("The service you have requested is being launched.");
-gettext("Please, note that reloading this page will not work.");
-gettext("To relaunch service, you will have to do it from origin.");
-gettext("If the service does not launchs automatically, probably you dont have the UDS Client installed");
-gettext("You can obtain it from the");
-gettext("UDS Client download page");
 gettext("Release service");
 gettext("Reset service");
 gettext("Connections");
@@ -69,3 +47,25 @@ gettext("UDS Client");
 gettext("About");
 gettext("UDS Client");
 gettext("About");
+gettext("You can access UDS Open Source code at");
+gettext("UDS has been developed using these components:");
+gettext("If you find that we missed any component, please let us know");
+gettext("UDS Client");
+gettext("Download UDS client for your platform");
+gettext("Legacy clients are only provided for old operating system support. Try to avoid them.");
+gettext("Downloads");
+gettext("Always download the UDS actor matching your platform");
+gettext("Legacy actors are only provided for old operating system support. Try to avoid them.");
+gettext("An error has occurred");
+gettext("Return");
+gettext("UDS Service launcher");
+gettext("The service you have requested is being launched.");
+gettext("Please, note that reloading this page will not work.");
+gettext("To relaunch service, you will have to do it from origin.");
+gettext("If the service does not launchs automatically, probably you dont have the UDS Client installed");
+gettext("You can obtain it from the");
+gettext("UDS Client download page");
+gettext("Username");
+gettext("Password");
+gettext("Authenticator");
+gettext("Login");

server/src/uds/transports/RDP/scripts/linux/direct.py.signature

@@ -1 +1 @@
-Tsg/TJGSTLZyczlvCY6qTZSuExOSTjVlVKniD/1dzTZVHQ6cxVQJlNJK9ApbyIcsp20sdLZdDb+2i1IHX+jy/2lS/IsnCaONvy1tb5Aa3R09YRfl+cRDRwhjkR3eb7VuU81C3sFRgZ8jT5ugdCrkkR4CBiRa4H1CYRBQfX9xkzJmuNp4Tev88yj3U0H19MTv62eZQL/Sp2jMXV/waMR/XbgIIi0cEpLa5qDNQ8MKnAJQUNvx0IXwBpNY6JkMpoFEhXsx0dEGte4oAOns7t0vww8QZNs71rd6IN2vun7wtNOAuTVJM2tmqS9Orf7vtfxf10ejQ5xkLRLJ6E1hGWVs5ljDVxj1V1Yp68LfnH0dVIlvTxIAx1ksj4wSL2+ZMxYrnZmpzDiFRKqyNE6C6lkFPhoDgUu343tSgWtF0xz+Hl/Qgh5MUlLs+9kd0bA64Nb2BkQA8+n1godNNc8QM6JW5jZVroV8N48KkmxsYnpPIAONmiq370CqN44y3FlcGfrpf6REt1aqhcIaRG0JD+IRbB7aEEOuJdJUuriYgsubG8f7wfrDdXH7+qwsPobyVYalG+uBAJBCP1+zXEzxz3RhLZDCOVQa8hGQyu25eidlfp9nx+zgFtQ+91NRsmTdysQhFpQY8tvKYSPGVkA9CLRQgTkzSdfaGX7CKCcgwMP1CD8=
+gzQzenuX5wtSBP3gB/qn1l2hLyK8VLCGEZJ+MBlCVkNF2UB0/rFMZkAfH6b/48MYqITJAAmS/wqYInj+AZKajT2+Ms5mzLTfpFn9p/A7QG4/+THJLAJWCaHLYFTFyFtQgriSA9PgY7+hDbQmxdRl2efM1QiJAt8aAhccn9w50F79xdU9g+MUrbuy3/1HiYoagtTxiPfp2ryjoTkxBmYwnnxQT7knPAtY7pPLUMANvnWghrVIqJHGcocJU1xV3F3s9ms+zC6VakeWlu30CJbORq7w2CH6gZql7KUPEJfCzqKb4oAiisti/Uumzok1caJywFO1Zq4beb5ZfhITYMFVn6jlPXHzht5kMBEBp32XbZ25g99844GWn62dwuKlx08NfmWl0iGZmX4WZaCu/Tl/pryq2G4i7wSSYqFmrKQImPYyjUMlZ9sx58efi5wdt59L68Mb2RxLASLeuzl3IWEOrzvv+Bq+Ls/0DNSRG75P2fde50fArMGG+uGqznB6hpuuZxRsnrN0UInWbjLY2nheTxHQHV2/2OpMkAt2AH1+OiF/Waj5HJkNAFlDQ3dRiYEq0NdP9CIruzqwHA5XytiQ26XEvTrtXa8S9sNHsmZ7d52bqe271tN8xqmvcgYT+W/K13ZlWNYVfwrsgPMD0hChyDcqbR22/hJDMgA3dCBvBQg=

server/src/uds/transports/RDP/scripts/linux/tunnel.py.signature

@@ -1 +1 @@
-qFmCTl0qAjPzl9cf0XZtBWDc8S3yJ977P4SuznFIrQIu5vg6wnCoAoVxr5RMqzYdmZRtd/QHiTVsV6sCiWUDlvn4tnMlHstiOZ9yIK/zBM/Q0EslR2Cy0+Wj4uNFJ2M+ENI1VbfdHaCNDny1eHzdloVBHhKigXXePI2J8X7G/tlQ5ixpfqi+ubj05EECEa2mPnTwUOV/DYCjDHfMYuH/xHm6t4GGQC5cu4o6AHU+wV0aK7olVJKmJB0RZoyfCYYXsihw8J4M6Fc84CZgtkwEYYL0RMyim5VbIOGG15us1GlnAHbbuLmU3cFp1YRb1Sl+8WErufpJYe9zkFIyOPWmkxJXvTJ3+nvI1GZS1AQawiyLyhTq0N2tm7Mxsh5ZotI2A2jMfmElFkqnqTXVPyotPWc33SjRRGiQvGNBaNXTiYkujNy1Ltoos3sw0Po8mg7gNRSDoWndwy9WZbAnTTKqdBkHFSeIU0y4MS93kE3/vwDwaekYr7xc2thq7pst0q9xe9GbeTiDKZ/BQNNtgCc3yyckSQ8WOG+AS1t76yneKqI1ebJHuT6IMgsX9ce3CQSCU/dreZ8nTvcu4eIPOGixLjLbHbeq5JwribxjI/JO2fJAWi21dgYpiIv9bHUK7PqSW9J/zU4NPk/JokLYFQuNrWIvwp0WUc0Eu8eTXmND7Qs=
+ZmxAm5Qsm0GlerO2A5Y6rhryStSVJ17NNSSsYaxKrUDlZl6QYFDwLDrXgHnzLj9g83wmx2KX0r6lWrTJZbHCHt9Rh36S16/1q10Zv3Av3uX8bwZ9xAE5otz4MD/KDY7pd2xL1BV1EeNHfQmhh5cQRUI3d5OtOhAyDpPXcuEqDFPkVQMNHgnrb8xp6AtiQ0T3FBLIb7NMdV7cnfzAH7ZGVQ9LJDOsVovlE4BYKAMZf0o3fR/31EvpDhhL3zB0OH1us/Yk2nkttsl6ZxuGL2dmnxL82Or5SfvlvsMyuIuDBJQLRrb9uXla4rFUv6No3ttLJk3GJNjw+PJKftYJKYPrZetq3lGK1Qckowi8ew0QZ2hT4m4Jo82/19uLzPpv5e1J6REDcUIex9SLtYv/dev5HulwNSUs1MjENGh7RJX+HNZ2VvRCHm5z9obl/kzPF9v4KuhPdaqfmNvGJOGrR6SR7G5zKIG4fWgAOmFu6lnVbTKlLb5nkrXUVOjujgjv8QUavGLXdOtezg83lIgkeEL8xJi1sFN4hMREqRHlKHb7mH6Bh4/FRMFbBiz0ozTOkknpUnUY00Qwwd9IfyScnvbYhKm/rLKxZfa/MnlqtESzd8fYQgDR5Ug9HsxMhNae6215aX8QbncHuauc41D0LLoMyJ4i+z2efvnhXK5AM/buzss=

server/src/uds/urls.py

@@ -65,7 +65,7 @@ urlpatterns = [
 
     # Login/logout
     path(r'uds/page/login', uds.web.views.modern.login, name='page.login'),
-    re_path(r'^uds/page/login/(?P<tag>[a-zA-Z0-9-]+)$', uds.web.views.modern.login, name='page.login.tag'),
+    re_path(r'^uds/page/login/(?P<tag>[a-zA-Z0-9_-]+)$', uds.web.views.modern.login, name='page.login.tag'),
 
     path(r'uds/page/logout', uds.web.views.modern.logout, name='page.logout'),
 

server/src/uds/web/util/configjs.py

@@ -98,7 +98,7 @@ def udsJs(request: 'HttpRequest') -> str:
     if tag and authenticators:  # Refilter authenticators, visible and with this tag if required
         authenticators = [x for x in authenticators if x.small_name == tag or (tag == 'disabled' and x.getType().isCustom() is False)]
 
-    if not authenticators:
+    if not authenticators and tag != 'disabled':
         try:
             authenticators = [Authenticator.objects.order_by('priority')[0]]
         except Exception:  # There is no authenticators yet...