Arrange Manager tree (#1625)

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/CTrees.pm

@@ -36,21 +36,7 @@ sub cTrees {
         samlIDPMetaDataNode => [
             'samlIDPMetaDataXML',
             'samlIDPMetaDataExportedAttributes',
-            {
-                title => 'samlIDPMetaDataOptions',
-                help  => 'authsaml.html#options',
-                form  => 'simpleInputContainer',
-                nodes => [
-                    'samlIDPMetaDataOptionsResolutionRule',
-                    'samlIDPMetaDataOptionsNameIDFormat',
-                    'samlIDPMetaDataOptionsForceAuthn',
-                    'samlIDPMetaDataOptionsIsPassive',
-                    'samlIDPMetaDataOptionsAllowProxiedAuthn',
-                    'samlIDPMetaDataOptionsAllowLoginFromIDP',
-                    'samlIDPMetaDataOptionsRequestedAuthnContext',
-                    'samlIDPMetaDataOptionsRelayStateURL',
-                ],
-            },
+
             {
                 title => "samlIDPMetaDataOptionsSession",
                 form  => 'simpleInputContainer',
@@ -87,6 +73,21 @@ sub cTrees {
                     "samlIDPMetaDataOptionsCheckTime",
                     "samlIDPMetaDataOptionsCheckAudience"
                 ]
+            },
+                        {
+                title => 'samlIDPMetaDataOptions',
+                help  => 'authsaml.html#options',
+                form  => 'simpleInputContainer',
+                nodes => [
+                    'samlIDPMetaDataOptionsResolutionRule',
+                    'samlIDPMetaDataOptionsNameIDFormat',
+                    'samlIDPMetaDataOptionsForceAuthn',
+                    'samlIDPMetaDataOptionsIsPassive',
+                    'samlIDPMetaDataOptionsAllowProxiedAuthn',
+                    'samlIDPMetaDataOptionsAllowLoginFromIDP',
+                    'samlIDPMetaDataOptionsRequestedAuthnContext',
+                    'samlIDPMetaDataOptionsRelayStateURL',
+                ],
             },
             {
                 title => "samlIDPMetaDataOptionsDisplay",
@@ -169,6 +170,9 @@ sub cTrees {
                             'oidcOPMetaDataOptionsIDTokenMaxAge',
                             'oidcOPMetaDataOptionsUseNonce'
                         ]
+                    },
+
+                ]
             },
                     {
                         title => 'oidcOPMetaDataOptionsDisplayParams',
@@ -178,11 +182,10 @@ sub cTrees {
                             'oidcOPMetaDataOptionsIcon'
                         ]
                     },
-                ]
-            },
         ],
         oidcRPMetaDataNode => [
             'oidcRPMetaDataExportedVars',
+                     'oidcRPMetaDataOptionsExtraClaims',
             {
                 title => 'oidcRPMetaDataOptions',
                 nodes => [ {
@@ -220,7 +223,7 @@ sub cTrees {
                     'oidcRPMetaDataOptionsRule',
                 ]
             },
-            'oidcRPMetaDataOptionsExtraClaims',
+   
         ],
         casSrvMetaDataNode => [ {
                 title => 'casSrvMetaDataOptions',

lemonldap-ng-manager/site/htdocs/static/js/conftree.js

@@ -313,6 +313,10 @@ function templates(tpl,key) {
             "id" : "oidcOPMetaDataOptionsProtocol",
             "title" : "oidcOPMetaDataOptionsProtocol",
             "type" : "simpleInputContainer"
+         }
+      ],
+      "id" : "oidcOPMetaDataOptions",
+      "title" : "oidcOPMetaDataOptions"
    },
    {
       "_nodes" : [
@@ -331,10 +335,6 @@ function templates(tpl,key) {
       "title" : "oidcOPMetaDataOptionsDisplayParams",
       "type" : "simpleInputContainer"
    }
-      ],
-      "id" : "oidcOPMetaDataOptions",
-      "title" : "oidcOPMetaDataOptions"
-   }
 ]
 ;
   case 'oidcRPMetaDataNode':
@@ -365,6 +365,13 @@ function templates(tpl,key) {
       "title" : "oidcRPMetaDataExportedVars",
       "type" : "keyTextContainer"
    },
+   {
+      "cnodes" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
+      "default" : [],
+      "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
+      "title" : "oidcRPMetaDataOptionsExtraClaims",
+      "type" : "keyTextContainer"
+   },
    {
       "_nodes" : [
          {
@@ -520,13 +527,6 @@ function templates(tpl,key) {
       ],
       "id" : "oidcRPMetaDataOptions",
       "title" : "oidcRPMetaDataOptions"
-   },
-   {
-      "cnodes" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
-      "default" : [],
-      "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
-      "title" : "oidcRPMetaDataOptionsExtraClaims",
-      "type" : "keyTextContainer"
    }
 ]
 ;
@@ -546,134 +546,6 @@ function templates(tpl,key) {
       "title" : "samlIDPMetaDataExportedAttributes",
       "type" : "samlAttributeContainer"
    },
-   {
-      "_nodes" : [
-         {
-            "default" : "",
-            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
-            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
-            "title" : "samlIDPMetaDataOptionsResolutionRule",
-            "type" : "longtext"
-         },
-         {
-            "default" : "",
-            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsNameIDFormat",
-            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsNameIDFormat",
-            "select" : [
-               {
-                  "k" : "",
-                  "v" : ""
-               },
-               {
-                  "k" : "unspecified",
-                  "v" : "Unspecified"
-               },
-               {
-                  "k" : "email",
-                  "v" : "Email"
-               },
-               {
-                  "k" : "x509",
-                  "v" : "X509 certificate"
-               },
-               {
-                  "k" : "windows",
-                  "v" : "Windows"
-               },
-               {
-                  "k" : "kerberos",
-                  "v" : "Kerberos"
-               },
-               {
-                  "k" : "entity",
-                  "v" : "Entity"
-               },
-               {
-                  "k" : "persistent",
-                  "v" : "Persistent"
-               },
-               {
-                  "k" : "transient",
-                  "v" : "Transient"
-               },
-               {
-                  "k" : "encrypted",
-                  "v" : "Encrypted"
-               }
-            ],
-            "title" : "samlIDPMetaDataOptionsNameIDFormat",
-            "type" : "select"
-         },
-         {
-            "default" : 0,
-            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsForceAuthn",
-            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsForceAuthn",
-            "title" : "samlIDPMetaDataOptionsForceAuthn",
-            "type" : "bool"
-         },
-         {
-            "default" : 0,
-            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsIsPassive",
-            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsIsPassive",
-            "title" : "samlIDPMetaDataOptionsIsPassive",
-            "type" : "bool"
-         },
-         {
-            "default" : 0,
-            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowProxiedAuthn",
-            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowProxiedAuthn",
-            "title" : "samlIDPMetaDataOptionsAllowProxiedAuthn",
-            "type" : "bool"
-         },
-         {
-            "default" : 0,
-            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowLoginFromIDP",
-            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowLoginFromIDP",
-            "title" : "samlIDPMetaDataOptionsAllowLoginFromIDP",
-            "type" : "bool"
-         },
-         {
-            "default" : "",
-            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRequestedAuthnContext",
-            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRequestedAuthnContext",
-            "select" : [
-               {
-                  "k" : "",
-                  "v" : ""
-               },
-               {
-                  "k" : "kerberos",
-                  "v" : "Kerberos"
-               },
-               {
-                  "k" : "password-protected-transport",
-                  "v" : "Password protected transport"
-               },
-               {
-                  "k" : "password",
-                  "v" : "Password"
-               },
-               {
-                  "k" : "tls-client",
-                  "v" : "TLS client certificate"
-               }
-            ],
-            "title" : "samlIDPMetaDataOptionsRequestedAuthnContext",
-            "type" : "select"
-         },
-         {
-            "default" : 0,
-            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRelayStateURL",
-            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRelayStateURL",
-            "title" : "samlIDPMetaDataOptionsRelayStateURL",
-            "type" : "bool"
-         }
-      ],
-      "help" : "authsaml.html#options",
-      "id" : "samlIDPMetaDataOptions",
-      "title" : "samlIDPMetaDataOptions",
-      "type" : "simpleInputContainer"
-   },
    {
       "_nodes" : [
          {
@@ -841,6 +713,134 @@ function templates(tpl,key) {
       "title" : "samlIDPMetaDataOptionsSecurity",
       "type" : "simpleInputContainer"
    },
+   {
+      "_nodes" : [
+         {
+            "default" : "",
+            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
+            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
+            "title" : "samlIDPMetaDataOptionsResolutionRule",
+            "type" : "longtext"
+         },
+         {
+            "default" : "",
+            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsNameIDFormat",
+            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsNameIDFormat",
+            "select" : [
+               {
+                  "k" : "",
+                  "v" : ""
+               },
+               {
+                  "k" : "unspecified",
+                  "v" : "Unspecified"
+               },
+               {
+                  "k" : "email",
+                  "v" : "Email"
+               },
+               {
+                  "k" : "x509",
+                  "v" : "X509 certificate"
+               },
+               {
+                  "k" : "windows",
+                  "v" : "Windows"
+               },
+               {
+                  "k" : "kerberos",
+                  "v" : "Kerberos"
+               },
+               {
+                  "k" : "entity",
+                  "v" : "Entity"
+               },
+               {
+                  "k" : "persistent",
+                  "v" : "Persistent"
+               },
+               {
+                  "k" : "transient",
+                  "v" : "Transient"
+               },
+               {
+                  "k" : "encrypted",
+                  "v" : "Encrypted"
+               }
+            ],
+            "title" : "samlIDPMetaDataOptionsNameIDFormat",
+            "type" : "select"
+         },
+         {
+            "default" : 0,
+            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsForceAuthn",
+            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsForceAuthn",
+            "title" : "samlIDPMetaDataOptionsForceAuthn",
+            "type" : "bool"
+         },
+         {
+            "default" : 0,
+            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsIsPassive",
+            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsIsPassive",
+            "title" : "samlIDPMetaDataOptionsIsPassive",
+            "type" : "bool"
+         },
+         {
+            "default" : 0,
+            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowProxiedAuthn",
+            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowProxiedAuthn",
+            "title" : "samlIDPMetaDataOptionsAllowProxiedAuthn",
+            "type" : "bool"
+         },
+         {
+            "default" : 0,
+            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowLoginFromIDP",
+            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowLoginFromIDP",
+            "title" : "samlIDPMetaDataOptionsAllowLoginFromIDP",
+            "type" : "bool"
+         },
+         {
+            "default" : "",
+            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRequestedAuthnContext",
+            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRequestedAuthnContext",
+            "select" : [
+               {
+                  "k" : "",
+                  "v" : ""
+               },
+               {
+                  "k" : "kerberos",
+                  "v" : "Kerberos"
+               },
+               {
+                  "k" : "password-protected-transport",
+                  "v" : "Password protected transport"
+               },
+               {
+                  "k" : "password",
+                  "v" : "Password"
+               },
+               {
+                  "k" : "tls-client",
+                  "v" : "TLS client certificate"
+               }
+            ],
+            "title" : "samlIDPMetaDataOptionsRequestedAuthnContext",
+            "type" : "select"
+         },
+         {
+            "default" : 0,
+            "get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRelayStateURL",
+            "id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRelayStateURL",
+            "title" : "samlIDPMetaDataOptionsRelayStateURL",
+            "type" : "bool"
+         }
+      ],
+      "help" : "authsaml.html#options",
+      "id" : "samlIDPMetaDataOptions",
+      "title" : "samlIDPMetaDataOptions",
+      "type" : "simpleInputContainer"
+   },
    {
       "_nodes" : [
          {