bruce-models 0.4.8 → 0.5.0

package/dist/bruce-models.umd.js

@@ -1341,7 +1341,7 @@
                                         // Attribute filter.
                                         (!requestFilter ? "" : "&Filter=" + exports.Api.Encode(JSON.stringify(requestFilter))) +
                                         // Order by attribute + sort order.
-                                        (!filter.orderBy ? "" : "&OrderBy=" + JSON.stringify(filter.orderBy)) +
+                                        (!filter.orderBy ? "" : "&OrderBy=" + filter.orderBy) +
                                         (filter.sortOrder ? "&SortOrder=" + (filter.sortOrder == exports.Api.ESortOrder.Asc ? "ASC" : "DESC") : "");
                                     return [4 /*yield*/, api.GET(url, exports.Api.PrepReqParams())];
                                 case 1:
@@ -2602,8 +2602,12 @@
             return exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
         }
         EntityRelation.GetEntityCacheKey = GetEntityCacheKey;
-        function GetListCacheKey(params) {
-            return exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType + exports.Api.ECacheKey.Id + params.typeId + exports.Api.ECacheKey.Id + params.oneWayOnly + exports.Api.ECacheKey.Id + params.loadEntityData;
+        function GetListCacheKey(entityId, params) {
+            return exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType +
+                exports.Api.ECacheKey.Id + params.typeId +
+                exports.Api.ECacheKey.Id + params.oneWayOnly +
+                exports.Api.ECacheKey.Id + params.loadEntityData +
+                exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + entityId;
         }
         EntityRelation.GetListCacheKey = GetListCacheKey;
         function Create(api, data) {
@@ -2668,7 +2672,7 @@
                         throw ("Entity ID is required.");
                     }
                     params = __assign({ typeId: "", oneWayOnly: false, loadEntityData: false }, params);
-                    cacheData = api.Cache.Get(GetListCacheKey(params));
+                    cacheData = api.Cache.Get(GetListCacheKey(entityId, params));
                     if (cacheData) {
                         return [2 /*return*/, cacheData];
                     }
@@ -2696,7 +2700,7 @@
                             }
                         });
                     }); });
-                    api.Cache.Set(GetListCacheKey(params), req);
+                    api.Cache.Set(GetListCacheKey(entityId, params), req);
                     return [2 /*return*/, req];
                 });
             });
@@ -5156,10 +5160,16 @@
 
     (function (User) {
         function GetCacheKey(userId, accountId) {
+            if (!accountId) {
+                accountId = "";
+            }
             return exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + userId + exports.Api.ECacheKey.Id + accountId;
         }
         User.GetCacheKey = GetCacheKey;
         function GetEmailCacheKey(email, accountId) {
+            if (!accountId) {
+                accountId = "";
+            }
             return exports.Api.ECacheKey.User + exports.Api.ECacheKey.UserEmail + email + exports.Api.ECacheKey.Id + accountId;
         }
         User.GetEmailCacheKey = GetEmailCacheKey;