bruce-models 6.6.0 → 6.6.2

package/dist/bruce-models.umd.js

@@ -9888,15 +9888,22 @@
          */
         function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, req: reqParams, assertLocation, expandSettings, type, pageIndex, pageSize, search } = params;
+                let { api, req: reqParams, assertLocation, expandSettings, type, pageIndex, pageSize, search, orderBy, sortOrder, tilesetIds } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = pageSize ? null : api.GetCacheItem(GetListCacheKey({
-                    assertLocation: assertLocation,
-                    expandSettings: expandSettings,
-                    type: type
-                }), reqParams);
+                let cacheKey = null;
+                if (!(tilesetIds === null || tilesetIds === void 0 ? void 0 : tilesetIds.length) && !pageSize) {
+                    cacheKey = GetListCacheKey({
+                        assertLocation: assertLocation,
+                        expandSettings: expandSettings,
+                        type: type,
+                        orderBy: orderBy,
+                        sortOrder: sortOrder,
+                        search: search
+                    });
+                }
+                const cache = cacheKey ? api.GetCacheItem(cacheKey, reqParams) : null;
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -9921,6 +9928,15 @@
                         if (pageIndex != null) {
                             urlParams.append("PageIndex", String(pageIndex));
                         }
+                        if (orderBy) {
+                            urlParams.append("OrderBy", orderBy);
+                        }
+                        if (sortOrder) {
+                            urlParams.append("SortOrder", sortOrder);
+                        }
+                        if (tilesetIds === null || tilesetIds === void 0 ? void 0 : tilesetIds.length) {
+                            urlParams.append("ID", tilesetIds.join(","));
+                        }
                         const data = yield api.GET("tileset/getList?" + urlParams.toString(), reqParams);
                         // Convert legacy records.
                         // Commented out because it spams :)
@@ -9941,13 +9957,9 @@
                         rej(e);
                     }
                 }));
-                if (!pageSize) {
+                if (cacheKey) {
                     api.SetCacheItem({
-                        key: GetListCacheKey({
-                            assertLocation: assertLocation,
-                            expandSettings: expandSettings,
-                            type: type
-                        }),
+                        key: cacheKey,
                         value: req,
                         req: reqParams
                     });
@@ -10513,14 +10525,20 @@
             if (!params) {
                 params = {};
             }
-            let { expandSettings, assertLocation, type } = params;
+            let { expandSettings, assertLocation, type, orderBy, search, sortOrder } = params;
             if (expandSettings == null) {
                 expandSettings = false;
             }
             if (assertLocation == null) {
                 assertLocation = false;
             }
-            return exports.Api.ECacheKey.Tileset + String(expandSettings) + String(assertLocation) + (type ? type : "");
+            if (!search) {
+                search = "";
+            }
+            if (!orderBy) {
+                orderBy = "";
+            }
+            return exports.Api.ECacheKey.Tileset + String(expandSettings) + String(assertLocation) + (type ? type : "") + String(orderBy) + String(sortOrder) + exports.Api.ECacheKey.Id + search;
         }
         Tileset.GetListCacheKey = GetListCacheKey;
     })(exports.Tileset || (exports.Tileset = {}));
@@ -16060,7 +16078,7 @@
     })(exports.Tracking || (exports.Tracking = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "6.6.0";
+    const VERSION = "6.6.2";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;