bruce-models 6.7.2 → 6.7.4

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;
@@ -10972,8 +10976,8 @@ var ProjectViewBookmark;
     function Get(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let { api, viewId, bookmarkId, req: reqParams } = params;
-            if (!viewId || !bookmarkId) {
-                throw ("View ID and Bookmark ID are required.");
+            if (!bookmarkId) {
+                throw ("Bookmark ID is required.");
             }
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
@@ -10985,7 +10989,14 @@ var ProjectViewBookmark;
             }
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const data = yield api.GET(`ui.view/${viewId}/slide/${bookmarkId}`, Api.PrepReqParams(reqParams));
+                    let url;
+                    if (viewId) {
+                        url = `ui.view/${viewId}/slide/${bookmarkId}`;
+                    }
+                    else {
+                        url = `slide/${bookmarkId}`;
+                    }
+                    const data = yield api.GET(url, Api.PrepReqParams(reqParams));
                     res({
                         bookmark: data
                     });
@@ -11123,7 +11134,10 @@ var ProjectViewBookmark;
      * @returns
      */
     function GetCacheKey(viewId, bookmarkId) {
-        return `${Api.ECacheKey.ProjectViewBookmark}${Api.ECacheKey.Id}${viewId}${Api.ECacheKey.Id}${bookmarkId}`;
+        if (viewId) {
+            return `${Api.ECacheKey.ProjectViewBookmark}${Api.ECacheKey.Id}${viewId}${Api.ECacheKey.Id}${bookmarkId}`;
+        }
+        return `${Api.ECacheKey.ProjectViewBookmark}${Api.ECacheKey.Id}${bookmarkId}`;
     }
     ProjectViewBookmark.GetCacheKey = GetCacheKey;
 })(ProjectViewBookmark || (ProjectViewBookmark = {}));
@@ -16419,7 +16433,7 @@ var Tracking;
 })(Tracking || (Tracking = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "6.7.2";
+const VERSION = "6.7.4";
 
 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