bruce-models 6.7.0 → 6.7.2

package/dist/bruce-models.es5.js

@@ -11018,7 +11018,6 @@ var ProjectViewBookmark;
             }
             yield api.DELETE(`ui.view/${viewId}/slide/${bookmarkId}`, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(viewId, bookmarkId));
-            api.Cache.Remove(GetListCacheKey(viewId));
         });
     }
     ProjectViewBookmark.Delete = Delete;
@@ -11029,23 +11028,23 @@ var ProjectViewBookmark;
      */
     function GetList(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, viewId, req: reqParams } = params;
+            let { api, viewId, req: reqParams, drafts } = params;
             if (!viewId) {
                 throw ("View ID is required.");
             }
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = api.GetCacheItem(GetListCacheKey(viewId), reqParams);
-            if (cache === null || cache === void 0 ? void 0 : cache.found) {
-                return cache.data;
-            }
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const data = yield api.GET(`ui.view/${viewId}/slides`, Api.PrepReqParams(reqParams));
+                    const query = new URLSearchParams();
+                    if (drafts) {
+                        query.set("Drafts", "true");
+                    }
+                    const url = `ui.view/${viewId}/slides?${query.toString()}`;
+                    const data = yield api.GET(url, Api.PrepReqParams(reqParams));
                     const items = data.Items ? data.Items : [];
                     // Cache individual items.
-                    // Maybe better to load list cache when getting 1 slide and seeing if it's in there.
                     // WARNING: Right now the data matches, in the future the list may contain a shortened result.
                     for (let i = 0; i < items.length; i++) {
                         const item = items[i];
@@ -11068,11 +11067,6 @@ var ProjectViewBookmark;
                     rej(e);
                 }
             }));
-            api.SetCacheItem({
-                key: GetListCacheKey(viewId),
-                value: req,
-                req: reqParams
-            });
             return req;
         });
     }
@@ -11093,7 +11087,6 @@ var ProjectViewBookmark;
             }
             const res = yield api.POST(`ui.view/${viewId}/slide/${data.ID ? data.ID : ""}`, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(viewId, data.ID));
-            api.Cache.Remove(GetListCacheKey(viewId));
             return {
                 bookmark: res
             };
@@ -11115,7 +11108,6 @@ var ProjectViewBookmark;
                 "DisplayOrder.Start": 0
             };
             yield api.POST(`ui.view/${viewId}/slides/setOrder`, reqData, Api.PrepReqParams(reqParams));
-            api.Cache.RemoveByStartsWith(GetListCacheKey(viewId));
         });
     }
     ProjectViewBookmark.SetOrder = SetOrder;
@@ -11134,20 +11126,6 @@ var ProjectViewBookmark;
         return `${Api.ECacheKey.ProjectViewBookmark}${Api.ECacheKey.Id}${viewId}${Api.ECacheKey.Id}${bookmarkId}`;
     }
     ProjectViewBookmark.GetCacheKey = GetCacheKey;
-    /**
-     * Returns cache identifier for a list of bookmarks.
-     * Example: {
-     *     const api: BruceApi.Api = ...;
-     *     const key = GetListCacheKey("abc");
-     *     api.Cache.Remove(key);
-     * }
-     * @param viewId
-     * @returns
-     */
-    function GetListCacheKey(viewId) {
-        return `${Api.ECacheKey.ProjectViewBookmark}${Api.ECacheKey.Id}${viewId}`;
-    }
-    ProjectViewBookmark.GetListCacheKey = GetListCacheKey;
 })(ProjectViewBookmark || (ProjectViewBookmark = {}));
 
 /**
@@ -13025,21 +13003,21 @@ var User;
      */
     function GetSettings(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, userId, appId, req } = params;
+            let { api, userId, appId, req, accountId } = params;
             if (!userId || !appId) {
                 throw ("UserId and appId are required.");
             }
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cacheKey = GetSettingsCacheKey(api.GetSessionId(), userId, appId);
+            const cacheKey = GetSettingsCacheKey(api.GetSessionId(), userId, appId, accountId);
             const cache = api.GetCacheItem(cacheKey, req);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const data = yield api.GET(`user/${userId}/application/${appId}/settings`);
+                    const data = yield api.GET(`user/${userId}/application/${appId}/settings${accountId ? "?Account=" + accountId : ""}`);
                     const settings = (data === null || data === void 0 ? void 0 : data.Settings) ? data.Settings : {};
                     res({
                         settings: settings
@@ -13076,21 +13054,24 @@ var User;
      */
     function UpdateSettings(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, accId, userId, appId, settings, req, override } = params;
+            let { api, accId, accountId, userId, appId, settings, req, override } = params;
             if (!userId || !appId) {
                 throw ("UserId and appId are required.");
             }
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
+            if (!accountId) {
+                accountId = accId;
+            }
             const postBody = {
                 Settings: settings == null ? {} : settings,
                 Application: appId,
-                ClientAccountID: accId,
+                ClientAccountID: accountId,
                 UserID: userId
             };
             const prom = api.POST(`user/${userId}/application/${appId}/settings?Override=${override ? "true" : "false"}`, postBody, req);
-            api.Cache.Remove(GetSettingsCacheKey(api.GetSessionId(), userId, appId));
+            api.Cache.Remove(GetSettingsCacheKey(api.GetSessionId(), userId, appId, accountId));
             return prom;
         });
     }
@@ -13582,11 +13563,11 @@ var User;
      * @param appId
      * @returns
      */
-    function GetSettingsCacheKey(sessionId, userId, appId) {
+    function GetSettingsCacheKey(sessionId, userId, appId, accountId) {
         if (!sessionId) {
             sessionId = "anonymous";
         }
-        return Api.ECacheKey.User + Api.ECacheKey.UserSettings + userId + Api.ECacheKey.Id + appId;
+        return Api.ECacheKey.User + Api.ECacheKey.UserSettings + userId + Api.ECacheKey.Id + appId + (accountId ? Api.ECacheKey.Id + accountId : "");
     }
     User$$1.GetSettingsCacheKey = GetSettingsCacheKey;
 })(User || (User = {}));
@@ -16438,7 +16419,7 @@ var Tracking;
 })(Tracking || (Tracking = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "6.7.0";
+const VERSION = "6.7.2";
 
 export { VERSION, Assembly, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, GeoJson, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityAttribute, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, ProjectViewBookmarkGroup, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, UserMfaMethod, Account, AccountInvite, AccountFeatures, AccountLimits, AccountTemplate, AccountType, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, DataLabGroup, ImportAssembly, ImportCad, ImportCsv, ImportJson, ImportGeoJson, ImportKml, ImportedFile, ExportBrz, ExportUsd, Markup, Uploader, Plugin, ENVIRONMENT, DataSource, Scenario, Tracking };
 //# sourceMappingURL=bruce-models.es5.js.map