bruce-models 5.4.3 → 5.4.5

package/dist/bruce-models.umd.js

@@ -312,6 +312,19 @@
             return text;
         });
     }
+    /**
+     * Ensuring obvious faults in our session ID storage don't waste DB time.
+     * @param ssid
+     * @returns
+     */
+    const prepSessionId = (ssid) => {
+        let tmp = ssid;
+        if (!tmp || "null" == tmp || "undefined" == tmp) {
+            tmp = "";
+        }
+        // Anonymous SSID will mean Guardian doesn't bother touching the DB.
+        return tmp ? tmp : "anonymous";
+    };
     /**
      * This is a base class for communication with an arbitrary Nextspace API.
      */
@@ -387,14 +400,14 @@
          * @returns
          */
         GetSessionId() {
-            return this.ssid;
+            return prepSessionId(this.ssid);
         }
         /**
          * Sets the session ID.
          * @param value
          */
         SetSessionId(value) {
-            this.ssid = value;
+            this.ssid = prepSessionId(value);
         }
         /**
          * Returns the session header.
@@ -424,8 +437,8 @@
                 }
                 params.headers = params.headers || {};
                 params.headers = Object.assign({ "Content-Type": "application/json;" }, params.headers);
-                if (this.ssidHeader && this.ssid) {
-                    params.headers[this.ssidHeader] = this.ssid;
+                if (this.ssidHeader) {
+                    params.headers[this.ssidHeader] = this.GetSessionId();
                 }
                 const res = yield fetch(url, {
                     headers: params.headers,
@@ -448,8 +461,8 @@
                 }
                 params.headers = params.headers || {};
                 params.headers = Object.assign({ "Content-Type": "application/json;" }, params.headers);
-                if (this.ssidHeader && this.ssid) {
-                    params.headers[this.ssidHeader] = this.ssid;
+                if (this.ssidHeader) {
+                    params.headers[this.ssidHeader] = this.GetSessionId();
                 }
                 const res = yield fetch(url, {
                     headers: params.headers,
@@ -474,8 +487,8 @@
                 }
                 params.headers = params.headers || {};
                 params.headers = Object.assign({ "Content-Type": "application/json;" }, params.headers);
-                if (this.ssidHeader && this.ssid) {
-                    params.headers[this.ssidHeader] = this.ssid;
+                if (this.ssidHeader) {
+                    params.headers[this.ssidHeader] = this.GetSessionId();
                 }
                 if (!data) {
                     data = {};
@@ -507,8 +520,8 @@
                 }
                 params.headers = params.headers || {};
                 params.headers = Object.assign({ "Content-Type": "application/json;" }, params.headers);
-                if (this.ssidHeader && this.ssid) {
-                    params.headers[this.ssidHeader] = this.ssid;
+                if (this.ssidHeader) {
+                    params.headers[this.ssidHeader] = this.GetSessionId();
                 }
                 if (!data) {
                     data = {};
@@ -539,8 +552,8 @@
                     params = {};
                 }
                 params.headers = Object.assign({}, params.headers);
-                if (this.ssidHeader && this.ssid) {
-                    params.headers[this.ssidHeader] = this.ssid;
+                if (this.ssidHeader) {
+                    params.headers[this.ssidHeader] = this.GetSessionId();
                 }
                 const formData = params.formData instanceof FormData ? params.formData : new FormData();
                 if (formData.has("file")) {
@@ -3203,11 +3216,23 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
+                const cacheKeyData = {
+                    expandLocation,
+                    expandRelations,
+                    expandImports,
+                    expandSources,
+                    entityTypeId: null,
+                    historicFrom: historicFrom,
+                    historicKey: historicKey,
+                    historicTo: historicTo,
+                    historicPoint: historicPoint,
+                    schemaId: schemaId
+                };
                 const crashRiskReqs = [];
                 const reqIds = [];
                 for (let i = 0; i < entityIds.length; i++) {
                     const entityId = entityIds[i];
-                    const key = GetCacheKey({ entityId, expandRelations, expandLocation });
+                    const key = GetCacheKey(Object.assign(Object.assign({}, cacheKeyData), { entityId }));
                     const cache = api.GetCacheItem(key, reqParams);
                     if (cache === null || cache === void 0 ? void 0 : cache.found) {
                         crashRiskReqs.push(cache.data);
@@ -3272,19 +3297,7 @@
                     const req = api.POST(url, reqData, exports.Api.PrepReqParams(reqParams));
                     for (let i = 0; i < reqIds.length; i++) {
                         const entityId = reqIds[i];
-                        const key = GetCacheKey({
-                            entityId,
-                            expandLocation,
-                            expandRelations,
-                            expandImports,
-                            expandSources,
-                            entityTypeId: null,
-                            historicFrom: historicFrom,
-                            historicKey: historicKey,
-                            historicTo: historicTo,
-                            historicPoint: historicPoint,
-                            schemaId: schemaId
-                        });
+                        const key = GetCacheKey(Object.assign(Object.assign({}, cacheKeyData), { entityId }));
                         const prom = new Promise((res) => __awaiter(this, void 0, void 0, function* () {
                             try {
                                 const data = yield req;
@@ -14464,7 +14477,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "5.4.3";
+    const VERSION = "5.4.5";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;