bruce-models 2.0.8 → 2.1.0

package/dist/bruce-models.es5.js

@@ -4724,24 +4724,34 @@ var PathUtils;
  */
 var Entity;
 (function (Entity) {
-    function GetCacheKey(entityId, expandLocation) {
-        return `${Api.ECacheKey.Entity}${Api.ECacheKey.Id}${entityId}${String(Boolean(expandLocation))}`;
+    function GetCacheKey(entityId, entityTypeId, expandLocation) {
+        if (!entityTypeId) {
+            entityTypeId = "";
+        }
+        return `${Api.ECacheKey.Entity}${Api.ECacheKey.Id}${entityId}${String(entityTypeId)}${String(Boolean(expandLocation))}`;
     }
     Entity.GetCacheKey = GetCacheKey;
     function Get(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { api, entityId, req: reqParams, expandLocation } = params;
+            const { api, entityId, req: reqParams, expandLocation, entityTypeId } = params;
             if (!entityId) {
                 throw ("Entity ID is required.");
             }
-            const key = GetCacheKey(entityId, expandLocation);
+            const key = GetCacheKey(entityId, entityTypeId, expandLocation);
             const cacheData = yield api.GetCacheItem(key, reqParams);
             if (cacheData) {
                 return cacheData;
             }
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const data = yield api.GET(`entity/${entityId}${expandLocation ? "?$expand=location" : ""}`, Api.PrepReqParams(reqParams));
+                    const urlParams = new URLSearchParams();
+                    if (expandLocation) {
+                        urlParams.append("$expand", "location");
+                    }
+                    if (entityTypeId) {
+                        urlParams.append("BruceEntityType", entityTypeId);
+                    }
+                    const data = yield api.GET(`entity/${entityId}?${urlParams.toString()}`, Api.PrepReqParams(reqParams));
                     res({
                         entity: data
                     });
@@ -7602,7 +7612,10 @@ var EntityFilterGetter;
                                 sortOrder: Api.ESortOrder.Asc,
                                 entityTypeConditions: this.attrFilter
                             },
-                            viaCdn: this.viaCdn
+                            viaCdn: this.viaCdn,
+                            req: {
+                                noCache: true
+                            }
                         });
                         const integrity = this.getIntegrityId();
                         if (loopIntegrity == integrity && entities) {