Moving naming schema settings up in the config panel

mattermost-community · Jun 11, 2020 · 0185ff9 · 0185ff9
1 parent f899f42
commit 0185ff9
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 77 deletions.
diff --git a/plugin.json b/plugin.json
@@ -33,31 +33,6 @@
                 "type": "bool",
                 "help_text": "(Experimental) When true, Jitsi video is embedded as a floating window inside Mattermost."
             },
-            {
-                "key": "JitsiJWT",
-                "display_name": "Use JWT Authentication for Jitsi",
-                "type": "bool",
-                "help_text": "(Optional) If your Jitsi server uses JSON Web Tokens (JWT) for authentication, set this value to true."
-            },
-            {
-                "key": "JitsiAppID",
-                "display_name": "App ID for JWT Authentication",
-                "type": "text",
-                "help_text": "(Optional) The App ID used for authentication by the Jitsi server and JWT token generator."
-            },
-            {
-                "key": "JitsiAppSecret",
-                "display_name": "App Secret for JWT Authentication",
-                "type": "text",
-                "help_text": "(Optional) The App Secret used for authentication by the Jitsi server and JWT token generator."
-            },
-            {
-                "key": "JitsiLinkValidTime",
-                "display_name": "Meeting Link Expiry Time (minutes)",
-                "type": "number",
-                "help_text": "(Optional) The number of minutes from when the meeting link is created to when it becomes invalid. Minimum is 1 minute. Only applies if using JWT authentication for your Jitsi server.",
-                "default": 30
-            },
             {
                 "key": "JitsiNamingScheme",
                 "display_name": "Jitsi Meeting Names",
@@ -82,6 +57,31 @@
                         "value": "ask"
                     }
                 ]
+            },
+            {
+                "key": "JitsiJWT",
+                "display_name": "Use JWT Authentication for Jitsi",
+                "type": "bool",
+                "help_text": "(Optional) If your Jitsi server uses JSON Web Tokens (JWT) for authentication, set this value to true."
+            },
+            {
+                "key": "JitsiAppID",
+                "display_name": "App ID for JWT Authentication",
+                "type": "text",
+                "help_text": "(Optional) The App ID used for authentication by the Jitsi server and JWT token generator."
+            },
+            {
+                "key": "JitsiAppSecret",
+                "display_name": "App Secret for JWT Authentication",
+                "type": "text",
+                "help_text": "(Optional) The App Secret used for authentication by the Jitsi server and JWT token generator."
+            },
+            {
+                "key": "JitsiLinkValidTime",
+                "display_name": "Meeting Link Expiry Time (minutes)",
+                "type": "number",
+                "help_text": "(Optional) The number of minutes from when the meeting link is created to when it becomes invalid. Minimum is 1 minute. Only applies if using JWT authentication for your Jitsi server.",
+                "default": 30
             }
         ]
     }

diff --git a/server/manifest.go b/server/manifest.go
diff --git a/webapp/src/manifest.ts b/webapp/src/manifest.ts
@@ -42,6 +42,32 @@ const manifest = JSON.parse(`
                 "placeholder": "",
                 "default": null
             },
+            {
+                "key": "JitsiNamingScheme",
+                "display_name": "Jitsi Meeting Names",
+                "type": "radio",
+                "help_text": "Select how meeting names are generated.",
+                "placeholder": "",
+                "default": "english-titlecase",
+                "options": [
+                    {
+                        "display_name": "Random English words in title case (e.g. PlayfulDragonsObserveCuriously)",
+                        "value": "english-titlecase"
+                    },
+                    {
+                        "display_name": "UUID (universally unique identifier)",
+                        "value": "uuid"
+                    },
+                    {
+                        "display_name": "Mattermost context specific names. Combination of team name, channel name and random text in public and private channels; personal meeting name in direct and group messages channels.",
+                        "value": "mattermost"
+                    },
+                    {
+                        "display_name": "Allow user to select meeting name",
+                        "value": "ask"
+                    }
+                ]
+            },
             {
                 "key": "JitsiJWT",
                 "display_name": "Use JWT Authentication for Jitsi",
@@ -73,32 +99,6 @@ const manifest = JSON.parse(`
                 "help_text": "(Optional) The number of minutes from when the meeting link is created to when it becomes invalid. Minimum is 1 minute. Only applies if using JWT authentication for your Jitsi server.",
                 "placeholder": "",
                 "default": 30
-            },
-            {
-                "key": "JitsiNamingScheme",
-                "display_name": "Jitsi Meeting Names",
-                "type": "radio",
-                "help_text": "Select how meeting names are generated.",
-                "placeholder": "",
-                "default": "english-titlecase",
-                "options": [
-                    {
-                        "display_name": "Random English words in title case (e.g. PlayfulDragonsObserveCuriously)",
-                        "value": "english-titlecase"
-                    },
-                    {
-                        "display_name": "UUID (universally unique identifier)",
-                        "value": "uuid"
-                    },
-                    {
-                        "display_name": "Mattermost context specific names. Combination of team name, channel name and random text in public and private channels; personal meeting name in direct and group messages channels.",
-                        "value": "mattermost"
-                    },
-                    {
-                        "display_name": "Allow user to select meeting name",
-                        "value": "ask"
-                    }
-                ]
             }
         ]
     }