From 9f22a643046b4a4d91cfe119f719ff465c722f88 Mon Sep 17 00:00:00 2001
From: Rupenieks <ru@myos,co>
Date: Tue, 19 May 2020 17:40:17 +0200
Subject: [PATCH] Options alphabetical sort

---
 .../nodes/Zulip/StreamDescription.ts          | 59 ++++++++++---------
 .../nodes-base/nodes/Zulip/UserDescription.ts | 36 +++++------
 2 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/packages/nodes-base/nodes/Zulip/StreamDescription.ts b/packages/nodes-base/nodes/Zulip/StreamDescription.ts
index 189ee1acf87..777ae7ba612 100644
--- a/packages/nodes-base/nodes/Zulip/StreamDescription.ts
+++ b/packages/nodes-base/nodes/Zulip/StreamDescription.ts
@@ -89,7 +89,6 @@ export const streamFields = [
 
 		description: `JSON format parameters for stream creation.`,
 	},
-
 	{
 		displayName: 'Additional Fields',
 		name: 'additionalFields',
@@ -243,20 +242,6 @@ export const streamFields = [
             },
         },
         options: [
-            {
-                displayName: 'Include Public',
-                name: 'includePublic',
-                type: 'boolean',
-                default: true,
-                description: 'Include all public streams.',
-            },
-            {
-                displayName: 'Include Subscribed',
-                name: 'includeSubscribed',
-                type: 'boolean',
-                default: true,
-                description: 'Include all streams that the user is subscribed to.',
-            },
             {
                 displayName: 'Include All Active',
                 name: 'includeAllActive',
@@ -278,6 +263,20 @@ export const streamFields = [
                 default: true,
                 description: 'If the user is a bot, include all streams that the bots owner is subscribed to.',
             },
+            {
+                displayName: 'Include Public',
+                name: 'includePublic',
+                type: 'boolean',
+                default: true,
+                description: 'Include all public streams.',
+            },
+            {
+                displayName: 'Include Subscribed',
+                name: 'includeSubscribed',
+                type: 'boolean',
+                default: true,
+                description: 'Include all streams that the user is subscribed to.',
+            },
         ]
     },
 /* -------------------------------------------------------------------------- */
@@ -392,20 +391,6 @@ export const streamFields = [
 			},
 		},
 		options: [
-            {
-                displayName: 'Description',
-                name: 'description',
-                type: 'string',
-                default: '',
-                description: 'The new description for the stream.',
-            },
-            {
-                displayName: 'New Name',
-                name: 'newName',
-                type: 'string',
-                default: '',
-                description: 'The new name for the stream.',
-            },
             {
                 displayName: 'Announcement Only',
                 name: 'isAnnouncementOnly',
@@ -413,6 +398,14 @@ export const streamFields = [
                 default: false,
                 description: 'Whether the stream is limited to announcements.',
             },
+            {
+                displayName: 'Description',
+                name: 'description',
+                type: 'string',
+                default: '',
+                description: 'The new description for the stream.',
+                placeholder: 'Place of discussion'
+            },
             {
                 displayName: 'Is Private',
                 name: 'isPrivate',
@@ -427,6 +420,14 @@ export const streamFields = [
                 default: false,
                 description: 'Whether the streams message history should be available to newly subscribed members, or users can only access messages they actually received while subscribed to the stream.',
             },
+            {
+                displayName: 'New Name',
+                name: 'newName',
+                type: 'string',
+                default: '',
+                description: 'The new name for the stream.',
+                placeholder: 'Italy'
+            },
             {
 				displayName: 'Stream Post Policy',
 				name: 'streamPostPolicy',
diff --git a/packages/nodes-base/nodes/Zulip/UserDescription.ts b/packages/nodes-base/nodes/Zulip/UserDescription.ts
index 28b272e50e6..1ae3269d3e7 100644
--- a/packages/nodes-base/nodes/Zulip/UserDescription.ts
+++ b/packages/nodes-base/nodes/Zulip/UserDescription.ts
@@ -66,24 +66,6 @@ export const userFields = [
 		default: '',
 		description: 'The email address of the new user.',
     },
-    {
-		displayName: 'Password',
-		name: 'password',
-		type: 'string',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: [
-					'user',
-				],
-				operation: [
-					'create',
-				],
-			},
-		},
-		default: '',
-		description: 'The password of the new user.',
-    },
     {
 		displayName: 'Full Name',
 		name: 'fullName',
@@ -102,6 +84,24 @@ export const userFields = [
 		default: '',
 		description: 'The full name of the new user.',
     },
+    {
+		displayName: 'Password',
+		name: 'password',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: '',
+		description: 'The password of the new user.',
+    },
     {
 		displayName: 'Short Name',
 		name: 'shortName',