bruce-models 4.3.2 → 4.3.4

package/dist/bruce-models.es5.js

@@ -2836,7 +2836,7 @@ var EntityType;
             }
             yield api.DELETE(`entitytype/${typeId}`, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(typeId));
-            api.Cache.Remove(GetListCacheKey());
+            api.Cache.RemoveByStartsWith(GetListCacheKey());
         });
     }
     EntityType.Delete = Delete;
@@ -2847,11 +2847,11 @@ var EntityType;
      */
     function GetList(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, req: reqParams, parentTypeId } = params;
+            let { entityTypeIds, api, req: reqParams, parentTypeId } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = parentTypeId ? null : yield api.GetCacheItem(GetListCacheKey(), reqParams);
+            const cache = parentTypeId ? null : yield api.GetCacheItem(GetListCacheKey(entityTypeIds), reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
@@ -2861,6 +2861,11 @@ var EntityType;
                     if (parentTypeId) {
                         urlParams.append("parentEntityTypeID", parentTypeId);
                     }
+                    if (entityTypeIds) {
+                        for (const id of entityTypeIds) {
+                            urlParams.append("typeId", id);
+                        }
+                    }
                     const data = yield api.GET("entitytypes?" + urlParams.toString(), Api.PrepReqParams(reqParams));
                     res({
                         entityTypes: data.Items
@@ -2872,7 +2877,7 @@ var EntityType;
             }));
             if (!parentTypeId) {
                 yield api.SetCacheItem({
-                    key: GetListCacheKey(),
+                    key: GetListCacheKey(entityTypeIds),
                     value: req,
                     req: reqParams,
                     duration: 60 * 5 // 5 minutes.
@@ -2904,7 +2909,7 @@ var EntityType;
             }
             const res = yield api.POST(`entitytype/${data.ID}`, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
-            api.Cache.Remove(GetListCacheKey());
+            api.Cache.RemoveByStartsWith(GetListCacheKey());
             return {
                 entityType: res
             };
@@ -2979,10 +2984,14 @@ var EntityType;
      *     const key = GetListCacheKey();
      *     api.Cache.Remove(key);
      * }
+     * @param typeIds
      * @returns
      */
-    function GetListCacheKey() {
-        return Api.ECacheKey.EntityType;
+    function GetListCacheKey(typeIds) {
+        if (!typeIds) {
+            typeIds = [];
+        }
+        return Api.ECacheKey.EntityType + (typeIds.length ? Api.ECacheKey.Id : "") + typeIds.join(",");
     }
     EntityType.GetListCacheKey = GetListCacheKey;
 })(EntityType || (EntityType = {}));
@@ -2993,7 +3002,8 @@ var EntityType;
 var PathUtils;
 (function (PathUtils) {
     /**
-     * Parses a string path into an array of strings.
+     * Parses a Bruce string path into an array of strings.
+     * Example of path: "\"location\"/\"latitude\"" or "location/latitude".
      * @param str
      * @returns
      */
@@ -3001,23 +3011,17 @@ var PathUtils;
         if (!(str === null || str === void 0 ? void 0 : str.length)) {
             return [];
         }
-        const broken = str.split("\"/\"");
-        if (broken.length > 0) {
-            let top = broken[0];
-            if (top.length > 0) {
-                if (top.charAt(0) == "\"") {
-                    top = top.substring(1);
-                }
-                broken[0] = top;
+        const broken = str.split("/");
+        // Remove quotes from the first and last chars.
+        for (let i = 0; i < broken.length; i++) {
+            let piece = broken[i];
+            if (piece.startsWith("\"")) {
+                piece = piece.substring(1);
             }
-            const endIndex = broken.length - 1;
-            let bot = broken[endIndex];
-            if (bot.length > 0) {
-                if (bot.charAt(bot.length - 1) == "\"") {
-                    bot = bot.substring(0, bot.length - 1);
-                }
-                broken[endIndex] = bot;
+            if (piece.endsWith("\"")) {
+                piece = piece.substring(0, piece.length - 1);
             }
+            broken[i] = piece;
         }
         return broken;
     }
@@ -13341,7 +13345,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "4.3.2";
+const VERSION = "4.3.4";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityTypeVisualSettings, EntityAttribute, EntityHistoricData, 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, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map