bruce-models 4.3.2 → 4.3.4

package/dist/bruce-models.umd.js

@@ -2791,7 +2791,7 @@
                 }
                 yield api.DELETE(`entitytype/${typeId}`, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(typeId));
-                api.Cache.Remove(GetListCacheKey());
+                api.Cache.RemoveByStartsWith(GetListCacheKey());
             });
         }
         EntityType.Delete = Delete;
@@ -2802,11 +2802,11 @@
          */
         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 = exports.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;
                 }
@@ -2816,6 +2816,11 @@
                         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(), exports.Api.PrepReqParams(reqParams));
                         res({
                             entityTypes: data.Items
@@ -2827,7 +2832,7 @@
                 }));
                 if (!parentTypeId) {
                     yield api.SetCacheItem({
-                        key: GetListCacheKey(),
+                        key: GetListCacheKey(entityTypeIds),
                         value: req,
                         req: reqParams,
                         duration: 60 * 5 // 5 minutes.
@@ -2859,7 +2864,7 @@
                 }
                 const res = yield api.POST(`entitytype/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
-                api.Cache.Remove(GetListCacheKey());
+                api.Cache.RemoveByStartsWith(GetListCacheKey());
                 return {
                     entityType: res
                 };
@@ -2934,10 +2939,14 @@
          *     const key = GetListCacheKey();
          *     api.Cache.Remove(key);
          * }
+         * @param typeIds
          * @returns
          */
-        function GetListCacheKey() {
-            return exports.Api.ECacheKey.EntityType;
+        function GetListCacheKey(typeIds) {
+            if (!typeIds) {
+                typeIds = [];
+            }
+            return exports.Api.ECacheKey.EntityType + (typeIds.length ? exports.Api.ECacheKey.Id : "") + typeIds.join(",");
         }
         EntityType.GetListCacheKey = GetListCacheKey;
     })(exports.EntityType || (exports.EntityType = {}));
@@ -2947,7 +2956,8 @@
      */
     (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
          */
@@ -2955,23 +2965,17 @@
             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;
         }
@@ -13075,7 +13079,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.3.2";
+    const VERSION = "4.3.4";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;