Reordered prompts

related to #273
UpendoVentures · Aug 30, 2023 · 465fd60 · 465fd60
1 parent f111aaa
commit 465fd60
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 62 deletions.
diff --git a/generators/auth-provider/index.js b/generators/auth-provider/index.js
@@ -22,16 +22,6 @@ module.exports = class extends DnnGeneratorBase {
           return str.length > 0;
         }
       },
-      {
-        when: !this.options.objectPrefix,
-        type: 'input',
-        name: 'objectPrefix',
-        message: 'What would be a good abbreviation for that (e.g., abc for Awesome Beverages Company)?',
-        store: true,
-        validate: str => {
-          return str.length > 0 && str.length < 6;
-        }
-      },
       {
         when: !this.options.friendlyName,
         type: 'input',
@@ -51,6 +41,16 @@ module.exports = class extends DnnGeneratorBase {
           return str.length > 0;
         }
       },
+      {
+        when: !this.options.objectPrefix,
+        type: 'input',
+        name: 'objectPrefix',
+        message: 'What would be a good abbreviation for that (e.g., abc for Awesome Beverages Company)?',
+        store: true,
+        validate: str => {
+          return str.length > 0 && str.length < 6;
+        }
+      },
       {
         when: !this.options.authTypeName,
         type: 'input',
@@ -63,7 +63,6 @@ module.exports = class extends DnnGeneratorBase {
     ];
 
     var msBuildVersion = this._getMsBuildVersion();
-
     if (msBuildVersion == "") {
       this.log(chalk.red("YIKES! A valid version of MSBuild was not found! This is a critical error... :("));
     }
@@ -77,7 +76,7 @@ module.exports = class extends DnnGeneratorBase {
       else {
         props.namespaceRoot = this._pascalCaseName(this.options.companyName);
       }
-      if (props.name.endsWith(" -f")) {
+      if (props.friendlyName.endsWith(" -f")) {
         props.friendlyName = props.friendlyName.replace(" -f", "");
       }
       else {
@@ -89,6 +88,7 @@ module.exports = class extends DnnGeneratorBase {
       props.openDirective = "%@";
       props.closeDirective = "%";
       props.msBuildVersion = msBuildVersion;
+      props.authTypeName = props.authTypeName;
 
       this.props = props;
     });
@@ -103,6 +103,7 @@ module.exports = class extends DnnGeneratorBase {
     let namespaceRoot = this.props.namespaceRoot;
     let currentDate = this.props.currentDate;
     let fullNamespace = this.props.fullNamespace;
+    let friendlyName = this.props.friendlyName;
 
     let template = {
       ownerName: this.options.ownerName,

diff --git a/generators/hcc/index.js b/generators/hcc/index.js
@@ -12,10 +12,10 @@ module.exports = class extends DnnGeneratorBase {
         name: 'hccType',
         message: 'Which Hotcakes Commerce extension point do you want to build?',
         choices: [
-          { name: 'Order Workflow', value: 'workflow' },
           { name: 'Action Delegate Integration', value: 'actiondelegate' },
           { name: 'Credit Card Gateway', value: 'creditcardgateway' },
           { name: 'Gift Card Gateway', value: 'giftcardgateway' },
+          { name: 'Order Workflow', value: 'workflow' },
           { name: 'Payment Method', value: 'paymentmethod' },
           { name: 'Tax Provider', value: 'taxprovider' },
           { name: 'Viewset', value: 'viewset' },          
@@ -51,7 +51,7 @@ module.exports = class extends DnnGeneratorBase {
       else {
         props.namespaceRoot = this._pascalCaseName(this.options.companyName);
       }
-      if (props.name.endsWith(" -f")) {
+      if (props.friendlyName.endsWith(" -f")) {
         props.friendlyName = props.friendlyName.replace(" -f", "");
       }
       else {

diff --git a/generators/mvc-spa/index.js b/generators/mvc-spa/index.js
@@ -12,16 +12,6 @@ module.exports = class extends DnnGeneratorBase {
 
   prompting() {
     const prompts = [
-      {
-        when: !this.options.objectPrefix,
-        type: 'input',
-        name: 'objectPrefix',
-        message: 'What would be a good abbreviation for that (e.g., abc for Awesome Beverages Company)?',
-        store: true,
-        validate: str => {
-          return str.length > 0 && str.length < 6;
-        }
-      },
       {
         when: !this.options.friendlyName,
         type: 'input',
@@ -40,6 +30,16 @@ module.exports = class extends DnnGeneratorBase {
         validate: str => {
           return str.length > 0;
         }
+      },
+      {
+        when: !this.options.objectPrefix,
+        type: 'input',
+        name: 'objectPrefix',
+        message: 'What would be a good abbreviation for that (e.g., abc for Awesome Beverages Company)?',
+        store: true,
+        validate: str => {
+          return str.length > 0 && str.length < 6;
+        }
       }
     ];
 
@@ -58,7 +58,7 @@ module.exports = class extends DnnGeneratorBase {
       else {
         props.namespaceRoot = this._pascalCaseName(this.options.companyName);
       }
-      if (props.name.endsWith(" -f")) {
+      if (props.friendlyName.endsWith(" -f")) {
         props.friendlyName = props.friendlyName.replace(" -f", "");
       }
       else {

diff --git a/generators/mvc/index.js b/generators/mvc/index.js
@@ -22,16 +22,6 @@ module.exports = class extends DnnGeneratorBase {
           return str.length > 0;
         }
       },
-      {
-        when: !this.options.objectPrefix,
-        type: 'input',
-        name: 'objectPrefix',
-        message: 'What would be a good abbreviation for that (e.g., abc for Awesome Beverages Company)?',
-        store: true,
-        validate: str => {
-          return str.length > 0 && str.length < 6;
-        }
-      },
       {
         when: !this.options.friendlyName,
         type: 'input',
@@ -50,6 +40,16 @@ module.exports = class extends DnnGeneratorBase {
         validate: str => {
           return str.length > 0;
         }
+      },
+      {
+        when: !this.options.objectPrefix,
+        type: 'input',
+        name: 'objectPrefix',
+        message: 'What would be a good abbreviation for that (e.g., abc for Awesome Beverages Company)?',
+        store: true,
+        validate: str => {
+          return str.length > 0 && str.length < 6;
+        }
       }
     ];
 
@@ -68,7 +68,7 @@ module.exports = class extends DnnGeneratorBase {
       else {
         props.namespaceRoot = this._pascalCaseName(this.options.companyName);
       }
-      if (props.name.endsWith(" -f")) {
+      if (props.friendlyName.endsWith(" -f")) {
         props.friendlyName = props.friendlyName.replace(" -f", "");
       }
       else {

diff --git a/generators/spa/index.js b/generators/spa/index.js
@@ -12,9 +12,9 @@ module.exports = class extends DnnGeneratorBase {
         name: 'spaType',
         message: 'What language do you want your SPA Module to use?',
         choices: [
+          { name: 'Angular', value: 'Angular' },
           { name: 'ReactJS', value: 'ReactJS' },
-          { name: 'VueJS', value: 'VueJS' },
-          { name: 'Angular', value: 'Angular' }
+          { name: 'VueJS', value: 'VueJS' }
         ]
       },
       {
@@ -25,20 +25,10 @@ module.exports = class extends DnnGeneratorBase {
         name: 'langType',
         message: 'What Script Language do you want to use?',
         choices: [
-          { name: 'TypeScript (tsx)', value: 'tsx' },
-          { name: 'ECMAScript (jsx)', value: 'jsx' }
+          { name: 'ECMAScript (jsx)', value: 'jsx' },
+          { name: 'TypeScript (tsx)', value: 'tsx' }
         ]
       },
-      {
-        when: !this.options.companyName,
-        type: 'input',
-        name: 'companyName',
-        message: 'Namespace root for your SPA module (Usually a company name)?',
-        store: true,
-        validate: str => {
-          return str.length > 0;
-        }
-      },
       {
         when: !this.options.friendlyName,
         type: 'input',
@@ -57,6 +47,16 @@ module.exports = class extends DnnGeneratorBase {
         validate: str => {
           return str.length > 0;
         }
+      },
+      {
+        when: !this.options.companyName,
+        type: 'input',
+        name: 'companyName',
+        message: 'Namespace root for your SPA module (Usually a company name)?',
+        store: true,
+        validate: str => {
+          return str.length > 0;
+        }
       }
     ];
 

diff --git a/generators/webforms/index.js b/generators/webforms/index.js
@@ -21,17 +21,7 @@ module.exports = class extends DnnGeneratorBase {
         validate: str => {
           return str.length > 0;
         }
-      },
-      {
-        when: !this.options.objectPrefix,
-        type: 'input',
-        name: 'objectPrefix',
-        message: 'What would be a good abbreviation for that (e.g., abc for Awesome Beverages Company)?',
-        store: true,
-        validate: str => {
-          return str.length > 0 && str.length < 6;
-        }
-      },
+      }
       {
         when: !this.options.friendlyName,
         type: 'input',
@@ -50,11 +40,20 @@ module.exports = class extends DnnGeneratorBase {
         validate: str => {
           return str.length > 0;
         }
+      },
+      {
+        when: !this.options.objectPrefix,
+        type: 'input',
+        name: 'objectPrefix',
+        message: 'What would be a good abbreviation for that (e.g., abc for Awesome Beverages Company)?',
+        store: true,
+        validate: str => {
+          return str.length > 0 && str.length < 6;
+        }
       }
     ];
 
     var msBuildVersion = this._getMsBuildVersion();
-
     if (msBuildVersion == "") {
       this.log(chalk.red("YIKES! A valid version of MSBuild was not found! This is a critical error... :("));
     }
@@ -219,6 +218,8 @@ module.exports = class extends DnnGeneratorBase {
 
     // Extend package.json file in destination path
     this.fs.extendJSON(this.destinationPath(friendlyName + '/package.json'), pkgJson);
+
+    this.log(chalk.white('Done writing Webforms module files.'));
   }
 
   install() {