bruce-models 0.4.8 → 0.5.0

package/dist/bruce-models.es5.js

@@ -1363,7 +1363,7 @@ var Entity;
                                     // Attribute filter.
                                     (!requestFilter ? "" : "&Filter=" + 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 == Api.ESortOrder.Asc ? "ASC" : "DESC") : "");
                                 return [4 /*yield*/, api.GET(url, Api.PrepReqParams())];
                             case 1:
@@ -2673,8 +2673,12 @@ var EntityRelation;
         return Api.ECacheKey.Relation + Api.ECacheKey.Entity + Api.ECacheKey.Id + entityId;
     }
     EntityRelation.GetEntityCacheKey = GetEntityCacheKey;
-    function GetListCacheKey(params) {
-        return Api.ECacheKey.Relation + Api.ECacheKey.RelationType + Api.ECacheKey.Id + params.typeId + Api.ECacheKey.Id + params.oneWayOnly + Api.ECacheKey.Id + params.loadEntityData;
+    function GetListCacheKey(entityId, params) {
+        return Api.ECacheKey.Relation + Api.ECacheKey.RelationType +
+            Api.ECacheKey.Id + params.typeId +
+            Api.ECacheKey.Id + params.oneWayOnly +
+            Api.ECacheKey.Id + params.loadEntityData +
+            Api.ECacheKey.Entity + Api.ECacheKey.Id + entityId;
     }
     EntityRelation.GetListCacheKey = GetListCacheKey;
     function Create(api, data) {
@@ -2739,7 +2743,7 @@ var EntityRelation;
                     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];
                 }
@@ -2767,7 +2771,7 @@ var EntityRelation;
                         }
                     });
                 }); });
-                api.Cache.Set(GetListCacheKey(params), req);
+                api.Cache.Set(GetListCacheKey(entityId, params), req);
                 return [2 /*return*/, req];
             });
         });
@@ -5351,10 +5355,16 @@ var UserGroup;
 var User;
 (function (User) {
     function GetCacheKey(userId, accountId) {
+        if (!accountId) {
+            accountId = "";
+        }
         return Api.ECacheKey.User + Api.ECacheKey.Id + userId + Api.ECacheKey.Id + accountId;
     }
     User.GetCacheKey = GetCacheKey;
     function GetEmailCacheKey(email, accountId) {
+        if (!accountId) {
+            accountId = "";
+        }
         return Api.ECacheKey.User + Api.ECacheKey.UserEmail + email + Api.ECacheKey.Id + accountId;
     }
     User.GetEmailCacheKey = GetEmailCacheKey;