bruce-models 2.0.9 → 2.1.0

package/dist/bruce-models.umd.js

@@ -4695,24 +4695,34 @@
     })(exports.PathUtils || (exports.PathUtils = {}));
 
     (function (Entity) {
-        function GetCacheKey(entityId, expandLocation) {
-            return `${exports.Api.ECacheKey.Entity}${exports.Api.ECacheKey.Id}${entityId}${String(Boolean(expandLocation))}`;
+        function GetCacheKey(entityId, entityTypeId, expandLocation) {
+            if (!entityTypeId) {
+                entityTypeId = "";
+            }
+            return `${exports.Api.ECacheKey.Entity}${exports.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" : ""}`, exports.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()}`, exports.Api.PrepReqParams(reqParams));
                         res({
                             entity: data
                         });