bruce-models 4.9.7 → 4.9.8

package/dist/bruce-models.es5.js

@@ -2458,11 +2458,16 @@ var EntityType;
      */
     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 = 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;
             }
@@ -2481,6 +2486,12 @@ var EntityType;
                             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(), Api.PrepReqParams(reqParams)));
                         }
                     }
@@ -2489,6 +2500,12 @@ var EntityType;
                         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(), Api.PrepReqParams(reqParams)));
                     }
                     const data = yield Promise.all(reqs);
@@ -2512,7 +2529,12 @@ var EntityType;
             }));
             if (!parentTypeId) {
                 yield api.SetCacheItem({
-                    key: GetListCacheKey(entityTypeIds),
+                    key: GetListCacheKey({
+                        typeIds: entityTypeIds,
+                        parentTypeId,
+                        expandSettings,
+                        search
+                    }),
                     value: req,
                     req: reqParams,
                     duration: 60 * 5 // 5 minutes.
@@ -2626,11 +2648,24 @@ var EntityType;
      * @param typeIds
      * @returns
      */
-    function GetListCacheKey(typeIds) {
+    function GetListCacheKey(params) {
+        if (!params) {
+            params = {};
+        }
+        let { typeIds, expandSettings, parentTypeId, search } = params;
+        let key = Api.ECacheKey.EntityType;
         if (!typeIds) {
             typeIds = [];
         }
-        return Api.ECacheKey.EntityType + (typeIds.length ? Api.ECacheKey.Id : "") + typeIds.join(",");
+        key += (typeIds.length ? Api.ECacheKey.Id : "") + typeIds.join(",");
+        if (parentTypeId) {
+            key += "_PARENT_" + parentTypeId;
+        }
+        if (!expandSettings) {
+            expandSettings = false;
+        }
+        key += "_EXPAND_" + expandSettings;
+        return key;
     }
     EntityType.GetListCacheKey = GetListCacheKey;
 })(EntityType || (EntityType = {}));
@@ -14364,7 +14399,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "4.9.7";
+const VERSION = "4.9.8";
 
 export { VERSION, 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, EntityTypeVisualSettings, EntityAttribute, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, AccountFeatures, AccountLimits, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportAssembly, ImportCad, ImportCsv, ImportJson, ImportGeoJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map