bruce-models 6.2.0 → 6.2.2

package/dist/bruce-models.umd.js

@@ -2705,21 +2705,26 @@
          */
         function Get(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, entityTypeId: typeId, req: reqParams } = params;
+                let { api, entityTypeId: typeId, req: reqParams, expandLODs } = params;
                 if (!typeId) {
                     throw ("Type ID is required.");
                 }
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const key = GetCacheKey(typeId);
+                const key = GetCacheKey(typeId, expandLODs);
                 const cache = api.GetCacheItem(key, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
-                        const data = yield api.GET(`entitytype/${typeId}`, exports.Api.PrepReqParams(reqParams));
+                        const urlParams = new URLSearchParams();
+                        if (expandLODs) {
+                            urlParams.append("Expand", "LOD");
+                        }
+                        const url = `entitytype/${typeId}?${urlParams.toString()}`;
+                        const data = yield api.GET(url, exports.Api.PrepReqParams(reqParams));
                         appendInternalAttrSchema(data);
                         res({
                             entityType: data
@@ -2752,7 +2757,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 yield api.DELETE(`entitytype/${typeId}`, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Remove(GetCacheKey(typeId));
+                api.Cache.RemoveByStartsWith(GetCacheKey(typeId));
                 api.Cache.RemoveByStartsWith(GetListCacheKey());
             });
         }
@@ -2764,13 +2769,14 @@
          */
         function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { entityTypeIds, api, req: reqParams, parentTypeId, expandSettings, search } = params;
+                let { entityTypeIds, api, req: reqParams, parentTypeId, expandSettings, search, expandLODs } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 const cache = api.GetCacheItem(GetListCacheKey({
                     typeIds: entityTypeIds,
                     parentTypeId,
+                    expandLODs,
                     expandSettings,
                     search
                 }), reqParams);
@@ -2787,16 +2793,22 @@
                                 const batch = entityTypeIds.slice(i, i + BATCH_SIZE);
                                 const urlParams = new URLSearchParams();
                                 for (const id of batch) {
-                                    urlParams.append("typeId", id);
+                                    urlParams.append("ID", id);
                                 }
                                 if (parentTypeId) {
-                                    urlParams.append("parentEntityTypeID", parentTypeId);
+                                    urlParams.append("ParentTypeID", parentTypeId);
+                                }
+                                if (expandSettings && expandLODs) {
+                                    urlParams.append("Expand", "true");
                                 }
-                                if (expandSettings) {
-                                    urlParams.append("expandSettings", "true");
+                                else if (expandSettings) {
+                                    urlParams.append("Expand", "Schema");
+                                }
+                                else if (expandLODs) {
+                                    urlParams.append("Expand", "LOD");
                                 }
                                 if (search) {
-                                    urlParams.append("search", search);
+                                    urlParams.append("Search", search);
                                 }
                                 reqs.push(api.GET("entitytypes?" + urlParams.toString(), exports.Api.PrepReqParams(reqParams)));
                             }
@@ -2804,13 +2816,19 @@
                         else {
                             const urlParams = new URLSearchParams();
                             if (parentTypeId) {
-                                urlParams.append("parentEntityTypeID", parentTypeId);
+                                urlParams.append("ParentTypeID", parentTypeId);
+                            }
+                            if (expandSettings && expandLODs) {
+                                urlParams.append("Expand", "true");
+                            }
+                            else if (expandSettings) {
+                                urlParams.append("Expand", "Schema");
                             }
-                            if (expandSettings) {
-                                urlParams.append("expandSettings", "true");
+                            else if (expandLODs) {
+                                urlParams.append("Expand", "LOD");
                             }
                             if (search) {
-                                urlParams.append("search", search);
+                                urlParams.append("Search", search);
                             }
                             reqs.push(api.GET("entitytypes?" + urlParams.toString(), exports.Api.PrepReqParams(reqParams)));
                         }
@@ -2839,6 +2857,7 @@
                             typeIds: entityTypeIds,
                             parentTypeId,
                             expandSettings,
+                            expandLODs,
                             search
                         }),
                         value: req,
@@ -2872,7 +2891,7 @@
                 }
                 appendInternalAttrSchema(data);
                 const res = yield api.POST(`entitytype/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
-                api.Cache.Remove(GetCacheKey(data.ID));
+                api.Cache.RemoveByStartsWith(GetCacheKey(data.ID));
                 api.Cache.RemoveByStartsWith(GetListCacheKey());
                 return {
                     entityType: res
@@ -2938,10 +2957,15 @@
          *     api.Cache.Remove(key);
          * }
          * @param typeId
+         * @param expandLODs
          * @returns
          */
-        function GetCacheKey(typeId) {
-            return `${exports.Api.ECacheKey.EntityType}${exports.Api.ECacheKey.Id}${typeId}`;
+        function GetCacheKey(typeId, expandLODs) {
+            let key = `${exports.Api.ECacheKey.EntityType}${exports.Api.ECacheKey.Id}${typeId}`;
+            if (expandLODs) {
+                key += "_LOD_" + expandLODs;
+            }
+            return key;
         }
         EntityType.GetCacheKey = GetCacheKey;
         /**
@@ -2958,7 +2982,7 @@
             if (!params) {
                 params = {};
             }
-            let { typeIds, expandSettings, parentTypeId, search } = params;
+            let { typeIds, expandSettings, parentTypeId, expandLODs, search } = params;
             let key = exports.Api.ECacheKey.EntityType;
             if (!typeIds) {
                 typeIds = [];
@@ -2970,7 +2994,14 @@
             if (!expandSettings) {
                 expandSettings = false;
             }
-            key += "_EXPAND_" + expandSettings;
+            if (!expandLODs) {
+                expandLODs = false;
+            }
+            key += "_SCHEMA_" + expandSettings;
+            key += "_LOD_" + expandLODs;
+            if (search) {
+                key += "_SEARCH_" + search;
+            }
             return key;
         }
         EntityType.GetListCacheKey = GetListCacheKey;
@@ -15593,7 +15624,7 @@
     })(exports.Tracking || (exports.Tracking = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "6.2.0";
+    const VERSION = "6.2.2";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;