Change the order of Sort Setup Wizard options (#21073)

app/lib/server/startup/settings.js

@@ -1527,8 +1527,8 @@ settings.addGroup('Setup_Wizard', function() {
 			type: 'select',
 			values: [
 				{
-					key: 'nonprofit',
-					i18nLabel: 'Nonprofit',
+					key: 'community',
+					i18nLabel: 'Community',
 				},
 				{
 					key: 'enterprise',
@@ -1539,8 +1539,8 @@ settings.addGroup('Setup_Wizard', function() {
 					i18nLabel: 'Government',
 				},
 				{
-					key: 'community',
-					i18nLabel: 'Community',
+					key: 'nonprofit',
+					i18nLabel: 'Nonprofit',
 				},
 			],
 			wizard: {
@@ -1567,92 +1567,92 @@ settings.addGroup('Setup_Wizard', function() {
 					i18nLabel: 'Blockchain',
 				},
 				{
-					key: 'contactCenter',
-					i18nLabel: 'Contact_Center',
-				},
-				{
-					key: 'manufacturing',
-					i18nLabel: 'Manufacturing',
-				},
-				{
-					key: 'education',
-					i18nLabel: 'Education',
+					key: 'consulting',
+					i18nLabel: 'Consulting',
 				},
 				{
-					key: 'insurance',
-					i18nLabel: 'Insurance',
+					key: 'consumerGoods',
+					i18nLabel: 'Consumer_Packaged_Goods',
 				},
 				{
-					key: 'logistics',
-					i18nLabel: 'Logistics',
+					key: 'contactCenter',
+					i18nLabel: 'Contact_Center',
 				},
 				{
-					key: 'consulting',
-					i18nLabel: 'Consulting',
+					key: 'education',
+					i18nLabel: 'Education',
 				},
 				{
 					key: 'entertainment',
 					i18nLabel: 'Entertainment',
 				},
 				{
-					key: 'religious',
-					i18nLabel: 'Religious',
+					key: 'financialServices',
+					i18nLabel: 'Financial_Services',
 				},
 				{
 					key: 'gaming',
 					i18nLabel: 'Gaming',
 				},
 				{
-					key: 'socialNetwork',
-					i18nLabel: 'Social_Network',
+					key: 'healthcare',
+					i18nLabel: 'Healthcare',
 				},
 				{
-					key: 'realEstate',
-					i18nLabel: 'Real_Estate',
+					key: 'hospitalityBusinness',
+					i18nLabel: 'Hospitality_Businness',
 				},
 				{
-					key: 'telecom',
-					i18nLabel: 'Telecom',
+					key: 'insurance',
+					i18nLabel: 'Insurance',
 				},
 				{
-					key: 'consumerGoods',
-					i18nLabel: 'Consumer_Packaged_Goods',
+					key: 'itSecurity',
+					i18nLabel: 'It_Security',
 				},
 				{
-					key: 'financialServices',
-					i18nLabel: 'Financial_Services',
+					key: 'logistics',
+					i18nLabel: 'Logistics',
 				},
 				{
-					key: 'healthcare',
-					i18nLabel: 'Healthcare',
+					key: 'manufacturing',
+					i18nLabel: 'Manufacturing',
+				},
+				{
+					key: 'media',
+					i18nLabel: 'Media',
 				},
 				{
 					key: 'pharmaceutical',
 					i18nLabel: 'Pharmaceutical',
 				},
 				{
-					key: 'media',
-					i18nLabel: 'Media',
+					key: 'realEstate',
+					i18nLabel: 'Real_Estate',
+				},
+				{
+					key: 'religious',
+					i18nLabel: 'Religious',
 				},
 				{
 					key: 'retail',
 					i18nLabel: 'Retail',
 				},
 				{
-					key: 'technologyServices',
-					i18nLabel: 'Technology_Services',
+					key: 'socialNetwork',
+					i18nLabel: 'Social_Network',
 				},
 				{
 					key: 'technologyProvider',
 					i18nLabel: 'Technology_Provider',
 				},
 				{
-					key: 'hospitalityBusinness',
-					i18nLabel: 'Hospitality_Businness',
+					key: 'technologyServices',
+					i18nLabel: 'Technology_Services',
 				},
 				{
-					key: 'itSecurity',
-					i18nLabel: 'It_Security',
+					key: 'telecom',
+					i18nLabel: 'Telecom',
 				},
 				{
 					key: 'utilities',
@@ -1712,10 +1712,6 @@ settings.addGroup('Setup_Wizard', function() {
 		this.add('Country', '', {
 			type: 'select',
 			values: [
-				{
-					key: 'worldwide',
-					i18nLabel: 'Worldwide',
-				},
 				{
 					key: 'afghanistan',
 					i18nLabel: 'Country_Afghanistan',
@@ -2672,6 +2668,10 @@ settings.addGroup('Setup_Wizard', function() {
 					key: 'zimbabwe',
 					i18nLabel: 'Country_Zimbabwe',
 				},
+				{
+					key: 'worldwide',
+					i18nLabel: 'Worldwide',
+				},
 			],
 			wizard: {
 				step: 2,

client/views/setupWizard/steps/SettingsBasedStep.js

@@ -157,9 +157,7 @@ function SettingsBasedStep({ step, title, active }) {
 								placeholder={t('Default')}
 								value={value}
 								onChange={(value) => setFieldValue(_id, value)}
-								options = {languages
-									.map(({ key, name }) => [key, name])
-									.sort(([a], [b]) => a - b)}
+								options = {languages.map(({ key, name }) => [key, name])}
 							/>}
 						</Field.Row>
 					</Field>,

server/startup/migrations/index.js

@@ -216,4 +216,5 @@ import './v216';
 import './v217';
 import './v218';
 import './v219';
+import './v220';
 import './xrun';