bruce-models 6.7.1 → 6.7.3

package/dist/bruce-models.es5.js

@@ -4239,6 +4239,7 @@ var Entity;
      * @returns
      */
     function CalculateName(params) {
+        var _a, _b;
         const { entity, type, defaultToId = true } = params;
         const attrStr = type.DisplayNameAttributePath;
         if (attrStr) {
@@ -4247,7 +4248,7 @@ var Entity;
                 const pathStr = attrPaths[i];
                 const path = PathUtils.Parse(pathStr);
                 const name = Entity.GetValue({
-                    entity: entity,
+                    entity: entity || {},
                     path
                 });
                 if (name && typeof name != "object") {
@@ -4255,6 +4256,9 @@ var Entity;
                 }
             }
         }
+        if (((_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.Name) && ((_b = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _b === void 0 ? void 0 : _b.Name) !== "Unnamed Entity") {
+            return entity.Bruce.Name;
+        }
         return defaultToId ? entity.Bruce.ID : null;
     }
     Entity.CalculateName = CalculateName;
@@ -13003,21 +13007,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
@@ -13054,21 +13058,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;
         });
     }
@@ -13560,11 +13567,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 = {}));
@@ -16416,7 +16423,7 @@ var Tracking;
 })(Tracking || (Tracking = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "6.7.1";
+const VERSION = "6.7.3";
 
 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