Merge branch 'release/2.3.0'

hso-nn · Dec 22, 2017 · a83b723 · a83b723
2 parents 7833f82 + bc4c57b
commit a83b723
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 16 deletions.
diff --git a/dist/CRMSDK.js b/dist/CRMSDK.js
diff --git a/dist/CRMSDK.noBabelPolyfill.js b/dist/CRMSDK.noBabelPolyfill.js
diff --git a/dist/WebAPI.js b/dist/WebAPI.js
diff --git a/dist/WebAPI.noBabelPolyfill.js b/dist/WebAPI.noBabelPolyfill.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crm-sdk",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "author": "Dynamics Software <solutions@dynamicssoftware.com> (http://www.dynamicssoftware.com)",
   "description": "Javasript Software Development Kit for Microsoft Dynamics CRM Web API",
   "main": "dist/CRMSDK.js",

diff --git a/src/metadata/Metadata.js b/src/metadata/Metadata.js
@@ -8,17 +8,28 @@ class Metadata {
         return this.entityDef;
     }
 
+    static get cachedEntityDefinitionsPromises() {
+        if (!this.entityDefProms) {
+            this.entityDefProms = {};
+        }
+        return this.entityDefProms;
+    }
+
     static async getEntityDefinitions(logicalName) {
+        if (typeof logicalName !== "string") {
+            throw Error("Invalid logicalName given");
+        }
         if (this.cachedEntityDefinitions[logicalName]) {
             return this.cachedEntityDefinitions[logicalName];
         }
-        if (typeof logicalName !== "string") {
-            throw Error("Invalid logicalName given");
+        if (!this.cachedEntityDefinitionsPromises[logicalName]) {
+            this.cachedEntityDefinitionsPromises[logicalName] = WebAPI.retrieveEntitySet("EntityDefinitions", null, `$filter=LogicalName eq '${logicalName}'&$expand=Attributes,ManyToOneRelationships`).then(result => {
+                const entityDefinitions = result.value[0];
+                this.cachedEntityDefinitions[logicalName] = entityDefinitions;
+                return entityDefinitions;
+            });
         }
-        const result = await WebAPI.retrieveEntitySet("EntityDefinitions", null, `$filter=LogicalName eq '${logicalName}'&$expand=Attributes,ManyToOneRelationships`),
-            entityDefinitions = result.value[0];
-        this.cachedEntityDefinitions[logicalName] = entityDefinitions;
-        return entityDefinitions;
+        return this.cachedEntityDefinitionsPromises[logicalName];
     }
 
     static getCachedEntityDefinitions(logicalName) {