bruce-models 4.9.6 → 4.9.8

package/dist/bruce-models.umd.js

@@ -2266,6 +2266,8 @@
             EType["Geometry"] = "Geometry";
             // True/false attribute.
             EType["Boolean"] = "Boolean";
+            // String User ID.
+            EType["User"] = "User";
         })(EType = EntityAttribute.EType || (EntityAttribute.EType = {}));
         /**
          * Returns an attribute from a provided hierarchy of attributes.
@@ -2421,11 +2423,16 @@
          */
         function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { entityTypeIds, api, req: reqParams, parentTypeId } = params;
+                let { entityTypeIds, api, req: reqParams, parentTypeId, expandSettings, search } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = parentTypeId ? null : yield api.GetCacheItem(GetListCacheKey(entityTypeIds), reqParams);
+                const cache = yield api.GetCacheItem(GetListCacheKey({
+                    typeIds: entityTypeIds,
+                    parentTypeId,
+                    expandSettings,
+                    search
+                }), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -2444,6 +2451,12 @@
                                 if (parentTypeId) {
                                     urlParams.append("parentEntityTypeID", parentTypeId);
                                 }
+                                if (expandSettings) {
+                                    urlParams.append("expandSettings", "true");
+                                }
+                                if (search) {
+                                    urlParams.append("search", search);
+                                }
                                 reqs.push(api.GET("entitytypes?" + urlParams.toString(), exports.Api.PrepReqParams(reqParams)));
                             }
                         }
@@ -2452,6 +2465,12 @@
                             if (parentTypeId) {
                                 urlParams.append("parentEntityTypeID", parentTypeId);
                             }
+                            if (expandSettings) {
+                                urlParams.append("expandSettings", "true");
+                            }
+                            if (search) {
+                                urlParams.append("search", search);
+                            }
                             reqs.push(api.GET("entitytypes?" + urlParams.toString(), exports.Api.PrepReqParams(reqParams)));
                         }
                         const data = yield Promise.all(reqs);
@@ -2475,7 +2494,12 @@
                 }));
                 if (!parentTypeId) {
                     yield api.SetCacheItem({
-                        key: GetListCacheKey(entityTypeIds),
+                        key: GetListCacheKey({
+                            typeIds: entityTypeIds,
+                            parentTypeId,
+                            expandSettings,
+                            search
+                        }),
                         value: req,
                         req: reqParams,
                         duration: 60 * 5 // 5 minutes.
@@ -2589,11 +2613,24 @@
          * @param typeIds
          * @returns
          */
-        function GetListCacheKey(typeIds) {
+        function GetListCacheKey(params) {
+            if (!params) {
+                params = {};
+            }
+            let { typeIds, expandSettings, parentTypeId, search } = params;
+            let key = exports.Api.ECacheKey.EntityType;
             if (!typeIds) {
                 typeIds = [];
             }
-            return exports.Api.ECacheKey.EntityType + (typeIds.length ? exports.Api.ECacheKey.Id : "") + typeIds.join(",");
+            key += (typeIds.length ? exports.Api.ECacheKey.Id : "") + typeIds.join(",");
+            if (parentTypeId) {
+                key += "_PARENT_" + parentTypeId;
+            }
+            if (!expandSettings) {
+                expandSettings = false;
+            }
+            key += "_EXPAND_" + expandSettings;
+            return key;
         }
         EntityType.GetListCacheKey = GetListCacheKey;
     })(exports.EntityType || (exports.EntityType = {}));
@@ -14084,7 +14121,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.9.6";
+    const VERSION = "4.9.8";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;