bruce-models 0.1.8 → 0.2.0

package/dist/bruce-models.es5.js

@@ -4247,8 +4247,8 @@ var ProjectViewBookmark;
         return "" + Api.ECacheKey.ProjectViewBookmark + Api.ECacheKey.Id + viewId + Api.ECacheKey.Id + bookmarkId;
     }
     ProjectViewBookmark.GetCacheKey = GetCacheKey;
-    function GetListCacheKey() {
-        return Api.ECacheKey.ProjectViewBookmark;
+    function GetListCacheKey(viewId) {
+        return "" + Api.ECacheKey.ProjectViewBookmark + Api.ECacheKey.Id + viewId;
     }
     ProjectViewBookmark.GetListCacheKey = GetListCacheKey;
     function Get(api, viewId, bookmarkId) {
@@ -4282,7 +4282,7 @@ var ProjectViewBookmark;
                     case 1:
                         _a.sent();
                         api.Cache.Remove(GetCacheKey(viewId, bookmarkId));
-                        api.Cache.Remove(GetListCacheKey());
+                        api.Cache.Remove(GetListCacheKey(viewId));
                         return [2 /*return*/];
                 }
             });
@@ -4297,7 +4297,7 @@ var ProjectViewBookmark;
                 if (!viewId) {
                     throw ("View ID is required.");
                 }
-                cacheData = api.Cache.Get(GetListCacheKey());
+                cacheData = api.Cache.Get(GetListCacheKey(viewId));
                 if (cacheData) {
                     return [2 /*return*/, cacheData];
                 }
@@ -4320,7 +4320,7 @@ var ProjectViewBookmark;
                         }
                     });
                 }); });
-                api.Cache.Set(GetListCacheKey(), req, Api.DEFAULT_CACHE_DURATION);
+                api.Cache.Set(GetListCacheKey(viewId), req, Api.DEFAULT_CACHE_DURATION);
                 return [2 /*return*/, req];
             });
         });
@@ -4341,7 +4341,7 @@ var ProjectViewBookmark;
                     case 1:
                         data = _a.sent();
                         api.Cache.Remove(GetCacheKey(viewId, data.ID));
-                        api.Cache.Remove(GetListCacheKey());
+                        api.Cache.Remove(GetListCacheKey(viewId));
                         return [2 /*return*/, data];
                 }
             });
@@ -4817,7 +4817,7 @@ var Session;
     Session.Get = Get;
     function Login(api, username, password, accountId) {
         return __awaiter(this, void 0, void 0, function () {
-            var data, ssid;
+            var data, session, ssid;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4831,10 +4831,11 @@ var Session;
                             })];
                     case 1:
                         data = _a.sent();
-                        ssid = data === null || data === void 0 ? void 0 : data.ID;
+                        session = data === null || data === void 0 ? void 0 : data.Session;
+                        ssid = session === null || session === void 0 ? void 0 : session.ID;
                         api.SetSessionId(ssid);
                         api.Cache.Remove(GetCacheKey(ssid));
-                        return [2 /*return*/, data];
+                        return [2 /*return*/, session];
                 }
             });
         });