Merge branch 'release/5.4.0'

hso-nn · Aug 23, 2021 · fbd4284 · fbd4284
2 parents 5e94b56 + 1e53eb7
commit fbd4284
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 9 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.3.2",
+  "version": "5.4.0",
   "author": "HSO Innovation <[email protected]> (http://www.hso.com)",
   "description": "HSO D365 Command Line Interface",
   "repository": {

diff --git a/src/generator/Enum.ts b/src/generator/Enum.ts
@@ -42,7 +42,7 @@ export class Enum {
         let savedQueriesString = '';
         savedQueriesString += `export const ${this.entityName.charAt(0).toLowerCase()}${this.entityName.slice(1)}Views = {\n`;
         const savedQueries = await SavedQueryService.retrieveMultipleRecords({
-            select: ['savedqueryid', 'name', 'returnedtypecode', 'savedqueryidunique'],
+            select: ['savedqueryid', 'name', 'returnedtypecode'],
             filters: [{
                 conditions: [{
                     attribute: 'returnedtypecode',
@@ -52,10 +52,10 @@ export class Enum {
         }, this.bearer);
         for (const savedQuery of savedQueries) {
             if (savedQuery && savedQuery.returnedtypecode === this.entityLogicalName) {
-                const {name, savedqueryidunique} = savedQuery;
+                const {name, savedqueryid} = savedQuery;
                 savedQueriesString += `    ${Enum.capitalize(name.replace(/ /g, ''))}: {\n`;
                 savedQueriesString += `        name: '${name}',\n`;
-                savedQueriesString += `        savedqueryidunique: '${savedqueryidunique}',\n`;
+                savedQueriesString += `        savedqueryid: '${savedqueryid}',\n`;
                 savedQueriesString += `    },\n`;
             }
         }
@@ -91,11 +91,16 @@ export class Enum {
         let enumStrings = '';
         const attributesMetadata = await NodeApi.getAttributesMetadata(this.entityLogicalName, this.bearer);
         for (const attribute of attributesMetadata) {
-            const {AttributeType: attributeType, LogicalName: logicalName, SchemaName: schemaName} = attribute;
-            if (attributeType === 'Picklist') {
+            const {AttributeType: attributeType, LogicalName: logicalName, SchemaName: schemaName, AttributeTypeName: attributeTypeName} = attribute;
+            if (attributeType === 'Picklist' || attributeTypeName.Value === 'MultiSelectPicklistType') {
                 const pascalSchemaName = Enum.capitalize(schemaName);
                 enumStrings += `export enum ${pascalSchemaName} {\n`;
-                const options = await NodeApi.getPicklistOptionSet(this.entityLogicalName, logicalName, this.bearer);
+                let options;
+                if (attributeType === 'Picklist') {
+                    options = await NodeApi.getPicklistOptionSet(this.entityLogicalName, logicalName, this.bearer);
+                } else {
+                    options = await NodeApi.getMultiSelectPicklistAttributeMetadata(this.entityLogicalName, logicalName, this.bearer);
+                }
                 for (const option of options) {
                     let label = option.label.replace(/\W/g, '');
                     if (!label.charAt(0).match(/^[a-zA-Z]/)) {

diff --git a/src/generator/Model.ts b/src/generator/Model.ts
@@ -176,7 +176,7 @@ export class Model {
     // https://docs.microsoft.com/en-us/dotnet/api/microsoft.xrm.sdk.metadata.attributemetadata?view=dynamics-general-ce-9
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     private async getInterfaceType(attribute: any): Promise<string> {
-        const {AttributeType: attributeType, SchemaName: schemaName} = attribute;
+        const {AttributeType: attributeType, SchemaName: schemaName, AttributeTypeName: attributeTypeName} = attribute;
         if (['String', 'Memo', 'DateTime', 'Lookup', 'Customer', 'Owner', 'Uniqueidentifier'].includes(attributeType)) {
             return 'string';
         } else if (['Boolean'].includes(attributeType)) {
@@ -193,6 +193,8 @@ export class Model {
         } else if (['State'].includes(attributeType)) {
             const options = await NodeApi.getStateOptionSet(this.entityLogicalName, this.bearer);
             return options.map(option => option.value).join(' | ');
+        } else if (attributeTypeName.Value === 'MultiSelectPicklistType') {
+            return 'number[]';
         }
     }
 

diff --git a/src/root/tools/AttributeMetadata.ts b/src/root/tools/AttributeMetadata.ts
@@ -1,5 +1,9 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 interface AttributeMetadata {
     LogicalName: string;
     AttributeType: string;
     SchemaName: string;
+    AttributeTypeName: {
+        Value: string;
+    }
 }
diff --git a/src/root/tools/NodeApi/NodeApi.ts b/src/root/tools/NodeApi/NodeApi.ts
@@ -119,6 +119,23 @@ export class NodeApi {
         });
     }
 
+    public static async getMultiSelectPicklistAttributeMetadata(entityLogicalName: string, attribute: string, bearer: string): Promise<OptionSetOption[]> {
+        const {crm} = NodeApi.getSettings(),
+            {url, version} = crm,
+            // eslint-disable-next-line max-len
+            uri = `${url}/api/data/v${version}/EntityDefinitions(LogicalName='${entityLogicalName}')/Attributes(LogicalName='${attribute}')/Microsoft.Dynamics.CRM.MultiSelectPicklistAttributeMetadata?$select=LogicalName&$expand=OptionSet($select=Options)`,
+            {body} = await NodeApi.request('GET', uri, null, {
+                'Authorization': `Bearer ${bearer}`
+            });
+        return body.OptionSet.Options.map((option: {Value: number; ExternalValue: number; Label: {UserLocalizedLabel: {Label: string}}}) => {
+            return {
+                value: option.Value,
+                externalValue: option.ExternalValue,
+                label: option.Label.UserLocalizedLabel.Label
+            };
+        });
+    }
+
     public static async getPicklistOptionSet(entityLogicalName: string, attribute: string, bearer: string): Promise<OptionSetOption[]> {
         const {crm} = NodeApi.getSettings(),
             {url, version} = crm,