renamed "multiline" to more convenient "lines" and ugraded dashboard

2024-12-23 17:34:17 +03:00 · 2023-10-19 13:18:43 +02:00 · 2023-10-19 13:18:43 +02:00 · 7f62bb29c0
commit 7f62bb29c0
parent 45f4f7e7d4
20 changed files with 36 additions and 35 deletions
--- a/server/src/uds/REST/model.py
+++ b/server/src/uds/REST/model.py
@ -125,7 +125,7 @@ class BaseModelHandler(Handler):
                'minValue',
                'maxValue',
                'length',
-                'multiline',
+                'lines',
                'tooltip',
                'readonly',
            ):
@ -197,6 +197,7 @@ class BaseModelHandler(Handler):
                    'name': 'comments',
                    'label': _('Comments'),
                    'type': 'text',
+                    'lines': 3,
                    'tooltip': _('Comments for this element'),
                    'length': 256,
                    'order': 0 - 90,
--- a/server/src/uds/auths/OAuth2/authenticator.py
+++ b/server/src/uds/auths/OAuth2/authenticator.py
@ -92,7 +92,7 @@ class OAuth2Authenticator(auths.Authenticator):
    )
    publicKey = gui.TextField(
        length=16384,
-        multiline=6,
+        lines=6,
        label=_('Public Key'),
        order=4,
        tooltip=_('Provided by Oauth2 provider'),
--- a/server/src/uds/auths/Radius/authenticator.py
+++ b/server/src/uds/auths/Radius/authenticator.py
@ -113,7 +113,7 @@ class RadiusAuth(auths.Authenticator):
    )
    mfaAttr = gui.TextField(
        length=2048,
-        multiline=2,
+        lines=2,
        label=_('MFA attribute'),
        order=13,
        tooltip=_('Attribute from where to extract the MFA code'),
--- a/server/src/uds/auths/RegexLdap/authenticator.py
+++ b/server/src/uds/auths/RegexLdap/authenticator.py
@ -120,7 +120,7 @@ class RegexLdap(auths.Authenticator):
    )
    certificate = gui.TextField(
        length=8192,
-        multiline=4,
+        lines=4,
        label=_('Certificate'),
        order=12,
        tooltip=_('Certificate to use for SSL verification'),
@ -156,7 +156,7 @@ class RegexLdap(auths.Authenticator):
    userNameAttr = gui.TextField(
        length=640,
        label=_('User Name Attr'),
-        multiline=2,
+        lines=2,
        default='uid',
        order=23,
        tooltip=_(
@ -168,7 +168,7 @@ class RegexLdap(auths.Authenticator):
    groupNameAttr = gui.TextField(
        length=640,
        label=_('Group Name Attr'),
-        multiline=2,
+        lines=2,
        default='cn',
        order=24,
        tooltip=_(
@ -193,7 +193,7 @@ class RegexLdap(auths.Authenticator):

    mfaAttr = gui.TextField(
        length=2048,
-        multiline=2,
+        lines=2,
        label=_('MFA attribute'),
        order=30,
        tooltip=_('Attribute from where to extract the MFA code'),
--- a/server/src/uds/auths/SAML/saml.py
+++ b/server/src/uds/auths/SAML/saml.py
@ -118,7 +118,7 @@ class SAMLAuthenticator(auths.Authenticator):

    privateKey = gui.TextField(
        length=4096,
-        multiline=10,
+        lines=10,
        label=_('Private key'),
        order=1,
        tooltip=_('Private key used for sign and encription, as generated in base 64 from openssl'),
@ -127,7 +127,7 @@ class SAMLAuthenticator(auths.Authenticator):
    )
    serverCertificate = gui.TextField(
        length=4096,
-        multiline=10,
+        lines=10,
        label=_('Certificate'),
        order=2,
        tooltip=_(
@ -138,7 +138,7 @@ class SAMLAuthenticator(auths.Authenticator):
    )
    idpMetadata = gui.TextField(
        length=8192,
-        multiline=4,
+        lines=4,
        label=_('IDP Metadata'),
        order=3,
        tooltip=_('You can enter here the URL or the IDP metadata or the metadata itself (xml)'),
@ -155,7 +155,7 @@ class SAMLAuthenticator(auths.Authenticator):

    userNameAttr = gui.TextField(
        length=2048,
-        multiline=2,
+        lines=2,
        label=_('User name attrs'),
        order=5,
        tooltip=_('Fields from where to extract user name'),
@ -165,7 +165,7 @@ class SAMLAuthenticator(auths.Authenticator):

    groupNameAttr = gui.TextField(
        length=2048,
-        multiline=2,
+        lines=2,
        label=_('Group name attrs'),
        order=6,
        tooltip=_('Fields from where to extract the groups'),
@ -175,7 +175,7 @@ class SAMLAuthenticator(auths.Authenticator):

    realNameAttr = gui.TextField(
        length=2048,
-        multiline=2,
+        lines=2,
        label=_('Real name attrs'),
        order=7,
        tooltip=_('Fields from where to extract the real name'),
@ -200,7 +200,7 @@ class SAMLAuthenticator(auths.Authenticator):
    )
    mfaAttr = gui.TextField(
        length=2048,
-        multiline=2,
+        lines=2,
        label=_('MFA attribute'),
        order=12,
        tooltip=_('Attribute from where to extract the MFA code'),
--- a/server/src/uds/auths/SimpleLDAP/authenticator.py
+++ b/server/src/uds/auths/SimpleLDAP/authenticator.py
@ -110,7 +110,7 @@ class SimpleLDAPAuthenticator(auths.Authenticator):
    )
    certificate = gui.TextField(
        length=8192,
-        multiline=4,
+        lines=4,
        label=_('Certificate'),
        order=12,
        tooltip=_('Certificate to use for SSL verification'),
@ -184,7 +184,7 @@ class SimpleLDAPAuthenticator(auths.Authenticator):
    )
    mfaAttr = gui.TextField(
        length=2048,
-        multiline=2,
+        lines=2,
        label=_('MFA attribute'),
        order=13,
        tooltip=_('Attribute from where to extract the MFA code'),
--- a/server/src/uds/core/types/ui.py
+++ b/server/src/uds/core/types/ui.py
@ -128,7 +128,7 @@ class FieldInfo:
    default: typing.Optional[typing.Union[typing.Callable[[], str], str]] = None
    required: typing.Optional[bool] = None
    length: typing.Optional[int] = None
-    multiline: typing.Optional[int] = None
+    lines: typing.Optional[int] = None
    pattern: typing.Union[FieldPatternType, 're.Pattern'] = FieldPatternType.NONE
    tab: typing.Union[Tab, str, None] = None
    choices: typing.Optional[ChoicesType] = None
--- a/server/src/uds/core/ui/user_interface.py
+++ b/server/src/uds/core/ui/user_interface.py
@ -444,7 +444,7 @@ class gui:
        Additionally to standard parameters, the length parameter is a
        recommended one for this kind of field.

-        You can specify that this is a multiline text box with **multiline**
+        You can specify that this is a lines text box with **lines**
        parameter. If it exists, and is greater than 1, indicates how much
        lines will be used to display field. (Max number is 8)

@ -479,7 +479,7 @@ class gui:
            default: typing.Union[typing.Callable[[], str], str] = '',
            value: typing.Optional[str] = None,
            pattern: typing.Union[str, types.ui.FieldPatternType] = types.ui.FieldPatternType.NONE,
-            multiline: int = 0,
+            lines: int = 0,
        ) -> None:
            super().__init__(
                label=label,
@ -493,7 +493,7 @@ class gui:
                value=value,
                type=types.ui.FieldType.TEXT,
            )
-            self._fieldsInfo.multiline = min(max(int(multiline), 0), 8)
+            self._fieldsInfo.lines = min(max(int(lines), 0), 8)
            # Pattern to validate the value
            # Can contain an regex or PatternType
            #   - 'ipv4'     # IPv4 address
--- a/server/src/uds/mfas/Email/mfa.py
+++ b/server/src/uds/mfas/Email/mfa.py
@ -151,7 +151,7 @@ class EmailMFA(mfas.MFA):
        length=1024,
        label=_('Mail text'),
        order=33,
-        multiline=4,
+        lines=4,
        tooltip=_('Text of the email. If empty, a default text will be used')
        + '\n'
        + _('Allowed variables are: ')
@ -165,7 +165,7 @@ class EmailMFA(mfas.MFA):
        length=1024,
        label=_('Mail HTML'),
        order=34,
-        multiline=4,
+        lines=4,
        tooltip=_('HTML of the email. If empty, a default HTML will be used')
        + '\n'
        + _('Allowed variables are: ')
--- a/server/src/uds/mfas/SMS/mfa.py
+++ b/server/src/uds/mfas/SMS/mfa.py
@ -138,7 +138,7 @@ class SMSMFA(mfas.MFA):

    headersParameters = gui.TextField(
        length=4096,
-        multiline=4,
+        lines=4,
        label=_('Headers for SMS requests'),
        order=4,
        tooltip=_(
@ -156,7 +156,7 @@ class SMSMFA(mfas.MFA):

    sendingParameters = gui.TextField(
        length=4096,
-        multiline=5,
+        lines=5,
        label=_('Parameters for SMS POST/PUT sending'),
        order=4,
        tooltip=_(
--- a/server/src/uds/services/PhysicalMachines/provider.py
+++ b/server/src/uds/services/PhysicalMachines/provider.py
@ -59,7 +59,7 @@ class PhysicalMachinesProvider(services.ServiceProvider):
    # No extra data needed
    config = gui.TextField(
        length=8192,
-        multiline=6,
+        lines=6,
        label=_('Advanced configuration'),
        order=3,
        tooltip=_('Advanced configuration data for the provider'),
--- a/server/src/uds/services/Sample/provider.py
+++ b/server/src/uds/services/Sample/provider.py
@ -159,7 +159,7 @@ class Provider(services.ServiceProvider):
    methText = gui.TextField(
        order=6,
        length=512,
-        multiline=5,
+        lines=5,
        label=_('Text area'),
        tooltip=_('This is a text area'),
        required=False,
--- a/server/src/uds/static/admin/3rdpartylicenses.txt
+++ b/server/src/uds/static/admin/3rdpartylicenses.txt
@ -582,7 +582,7 @@ zone.js
 MIT
 The MIT License

-Copyright (c) 2010-2022 Google LLC. https://angular.io/license
+Copyright (c) 2010-2023 Google LLC. https://angular.io/license

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/server/src/uds/static/admin/main.js
+++ b/server/src/uds/static/admin/main.js
--- a/server/src/uds/static/admin/polyfills.js
+++ b/server/src/uds/static/admin/polyfills.js
--- a/server/src/uds/static/admin/styles.css
+++ b/server/src/uds/static/admin/styles.css
--- a/server/src/uds/templates/uds/admin/index.html
+++ b/server/src/uds/templates/uds/admin/index.html
--- a/server/src/uds/transports/HTML5SSH/html5ssh.py
+++ b/server/src/uds/transports/HTML5SSH/html5ssh.py
@ -89,7 +89,7 @@ class HTML5SSHTransport(transports.Transport):
    # sshPrivateKey = gui.TextField(
    #     label=_('SSH Private Key'),
    #     order=22,
-    #     multiline=4,
+    #     lines=4,
    #     tooltip=_(
    #         'Private key for SSH authentication. If not provided, password authentication is used.'
    #     ),
--- a/server/src/uds/transports/RDP/rdp_base.py
+++ b/server/src/uds/transports/RDP/rdp_base.py
@ -319,7 +319,7 @@ class BaseRDPTransport(transports.Transport):
        order=45,
        tooltip=_('If not empty, extra parameters to include for Windows Client'),
        length=4096,
-        multiline=10,
+        lines=10,
        tab='Windows Client',
    )

--- a/server/src/uds/transports/SPICE/spice_base.py
+++ b/server/src/uds/transports/SPICE/spice_base.py
@ -79,7 +79,7 @@ class BaseSpiceTransport(transports.Transport):
    serverCertificate = gui.TextField(
        order=4,
        length=4096,
-        multiline=4,
+        lines=4,
        label=_('Certificate'),
        tooltip=_(
            'Server certificate (public), can be found on your ovirt engine, probably at /etc/pki/ovirt-engine/certs/ca.der (Use the contents of this file).'