bruce-models 4.3.1 → 4.3.3

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 = {}));
@@ -3750,7 +3759,8 @@
                     const { entity: data } = yield Get({
                         api,
                         entityId,
-                        entityTypeId: typeId
+                        entityTypeId: typeId,
+                        migrated: true
                     });
                     entity = data;
                 }
@@ -7499,7 +7509,8 @@
                         pageIndex: filter.index == null ? 0 : filter.index,
                         entityTypeConditions: reqFilter,
                         orderBy: "lastUpdateTime"
-                    }
+                    },
+                    migrated: true
                 })).entities;
                 return {
                     comments: records
@@ -13073,7 +13084,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.3.1";
+    const VERSION = "4.3.3";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;