Merge branch 'release/5.5.1'

hso-nn · Sep 1, 2021 · bbb39b6 · bbb39b6
2 parents 17ef467 + 70dd3c1
commit bbb39b6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/bin/main.js b/bin/main.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hso/d365-cli",
-  "version": "5.5.0",
+  "version": "5.5.1",
   "author": "HSO Innovation <[email protected]> (http://www.hso.com)",
   "description": "HSO D365 Command Line Interface",
   "repository": {

diff --git a/src/generator/ControlFormContext.ts b/src/generator/ControlFormContext.ts
@@ -81,8 +81,10 @@ export class ControlFormContext {
         return columnsControlsString;
     }
 
+    private static usedNames: string[];
     private async getSectionsString(tab: FormJsonTab, sections: FormJsonSection[]): Promise<string> {
         let sectionsControlsString = '';
+        ControlFormContext.usedNames = [];
         for (const section of sections) {
             const {Name: sectionName} = section;
             if (sectionName) {
@@ -116,9 +118,14 @@ export class ControlFormContext {
                 if (xrmControlType) {
                     const pascalSchemaName = dataFieldName === id ?
                         ControlFormContext.capitalize(attributeMetadata.SchemaName) : ControlFormContext.capitalize(id);
-                    const methodName = `    static get${pascalSchemaName}Control(formContext: FormContext): ${xrmControlType} {`;
-                    const returnString = `return formContext.getControl('${id}');`;
-                    cellControlsString += `${methodName}\n        ${returnString}\n    }\n`;
+                    if (!ControlFormContext.usedNames.includes(pascalSchemaName)) {
+                        ControlFormContext.usedNames.push(pascalSchemaName);
+                        const methodName = `    static get${pascalSchemaName}Control(formContext: FormContext): ${xrmControlType} {`;
+                        const returnString = `return formContext.getControl('${id}');`;
+                        cellControlsString += `${methodName}\n        ${returnString}\n    }\n`;
+                    } else {
+                        await this.log(`Duplicate control name found: '${pascalSchemaName}'`);
+                    }
                 }
             }
         }