bruce-models 6.7.1 → 6.7.3

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;
@@ -12757,21 +12761,21 @@
          */
         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 = exports.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
@@ -12808,21 +12812,24 @@
          */
         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 = exports.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;
             });
         }
@@ -13314,11 +13321,11 @@
          * @param appId
          * @returns
          */
-        function GetSettingsCacheKey(sessionId, userId, appId) {
+        function GetSettingsCacheKey(sessionId, userId, appId, accountId) {
             if (!sessionId) {
                 sessionId = "anonymous";
             }
-            return exports.Api.ECacheKey.User + exports.Api.ECacheKey.UserSettings + userId + exports.Api.ECacheKey.Id + appId;
+            return exports.Api.ECacheKey.User + exports.Api.ECacheKey.UserSettings + userId + exports.Api.ECacheKey.Id + appId + (accountId ? exports.Api.ECacheKey.Id + accountId : "");
         }
         User.GetSettingsCacheKey = GetSettingsCacheKey;
     })(exports.User || (exports.User = {}));
@@ -16101,7 +16108,7 @@
     })(exports.Tracking || (exports.Tracking = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "6.7.1";
+    const VERSION = "6.7.3";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;