bruce-models 6.7.2 → 6.7.4

package/dist/bruce-models.umd.js

@@ -4190,6 +4190,7 @@
          * @returns
          */
         function CalculateName(params) {
+            var _a, _b;
             const { entity, type, defaultToId = true } = params;
             const attrStr = type.DisplayNameAttributePath;
             if (attrStr) {
@@ -4198,7 +4199,7 @@
                     const pathStr = attrPaths[i];
                     const path = exports.PathUtils.Parse(pathStr);
                     const name = Entity.GetValue({
-                        entity: entity,
+                        entity: entity || {},
                         path
                     });
                     if (name && typeof name != "object") {
@@ -4206,6 +4207,9 @@
                     }
                 }
             }
+            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;
@@ -10778,8 +10782,8 @@
         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 = exports.ENVIRONMENT.Api().GetBruceApi();
@@ -10791,7 +10795,14 @@
                 }
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
-                        const data = yield api.GET(`ui.view/${viewId}/slide/${bookmarkId}`, exports.Api.PrepReqParams(reqParams));
+                        let url;
+                        if (viewId) {
+                            url = `ui.view/${viewId}/slide/${bookmarkId}`;
+                        }
+                        else {
+                            url = `slide/${bookmarkId}`;
+                        }
+                        const data = yield api.GET(url, exports.Api.PrepReqParams(reqParams));
                         res({
                             bookmark: data
                         });
@@ -10929,7 +10940,10 @@
          * @returns
          */
         function GetCacheKey(viewId, bookmarkId) {
-            return `${exports.Api.ECacheKey.ProjectViewBookmark}${exports.Api.ECacheKey.Id}${viewId}${exports.Api.ECacheKey.Id}${bookmarkId}`;
+            if (viewId) {
+                return `${exports.Api.ECacheKey.ProjectViewBookmark}${exports.Api.ECacheKey.Id}${viewId}${exports.Api.ECacheKey.Id}${bookmarkId}`;
+            }
+            return `${exports.Api.ECacheKey.ProjectViewBookmark}${exports.Api.ECacheKey.Id}${bookmarkId}`;
         }
         ProjectViewBookmark.GetCacheKey = GetCacheKey;
     })(exports.ProjectViewBookmark || (exports.ProjectViewBookmark = {}));
@@ -16104,7 +16118,7 @@
     })(exports.Tracking || (exports.Tracking = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "6.7.2";
+    const VERSION = "6.7.4";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;