bruce-models 1.7.5 → 1.7.7

package/dist/bruce-models.umd.js

@@ -820,14 +820,14 @@
         Account.Create = Create;
         function GetDbRegions(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { api, req: reqParams } = params;
+                const { api, req: reqParams, key } = params;
                 const cacheData = api.GetCacheItem(GetDbRegionListCacheKey(), reqParams);
                 if (cacheData) {
                     return cacheData;
                 }
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
-                        const data = yield api.GET("config/regions", exports.Api.PrepReqParams(reqParams));
+                        const data = yield api.GET(`config/regions${key ? "?Key=" + key : ""}`, exports.Api.PrepReqParams(reqParams));
                         res(data);
                     }
                     catch (e) {
@@ -1108,29 +1108,31 @@
                             throw ("Specified Environment is not valid. SuppliedEnv=" + env);
                     }
                     this.baseUrl = url;
-                    if (cam && loadRegionalUrl) {
-                        // Attempt to load an account specific base url.
-                        // This could be one with a region specific endpoint.
-                        try {
-                            const settings = (yield exports.Account.GetAppSettings({
-                                api: cam,
-                                accountId: this.accountId,
-                                appId: exports.Account.EAppId.BruceApi
-                            })).settings;
-                            if (this.loadCancelled) {
-                                console.warn("BruceApi: Loading was cancelled due to SetBaseUrl being called, not setting regional base url.");
-                                return;
-                            }
-                            let endpoint = (_a = settings.BruceAPIURL) === null || _a === void 0 ? void 0 : _a[env];
-                            if (typeof endpoint == "string") {
-                                if (!endpoint.endsWith("/")) {
-                                    endpoint += "/";
+                    if (cam) {
+                        if (loadRegionalUrl) {
+                            // Attempt to load an account specific base url.
+                            // This could be one with a region specific endpoint.
+                            try {
+                                const settings = (yield exports.Account.GetAppSettings({
+                                    api: cam,
+                                    accountId: this.accountId,
+                                    appId: exports.Account.EAppId.BruceApi
+                                })).settings;
+                                if (this.loadCancelled) {
+                                    console.warn("BruceApi: Loading was cancelled due to SetBaseUrl being called, not setting regional base url.");
+                                    return;
+                                }
+                                let endpoint = (_a = settings.BruceAPIURL) === null || _a === void 0 ? void 0 : _a[env];
+                                if (typeof endpoint == "string") {
+                                    if (!endpoint.endsWith("/")) {
+                                        endpoint += "/";
+                                    }
+                                    this.baseUrl = endpoint;
                                 }
-                                this.baseUrl = endpoint;
                             }
-                        }
-                        catch (e) {
-                            console.error(e);
+                            catch (e) {
+                                console.error(e);
+                            }
                         }
                     }
                     try {
@@ -1849,7 +1851,7 @@
         Entity.CalculateName = CalculateName;
         function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { api, filter, req: reqParams } = params;
+                const { api, filter, req: reqParams, viaCdn, viaCdnCacheToken } = params;
                 let requestFilter = {};
                 if (filter.entityTypeConditions) {
                     requestFilter = Object.assign({}, filter.entityTypeConditions);
@@ -1878,17 +1880,50 @@
                     PageIndex: filter.pageIndex,
                     PageSize: filter.pageSize
                 };
-                const data = yield api.POST("entities", body, exports.Api.PrepReqParams(reqParams));
-                const entities = data.Items;
-                for (let i = 0; i < entities.length; i++) {
-                    const entity = entities[i];
-                    const id = entity.Bruce.ID;
-                    api.Cache.Set(GetCacheKey(id), {
-                        entity: entity
-                    }, exports.Api.DEFAULT_CACHE_DURATION);
+                let entities = [];
+                if (viaCdn && api.EntityCdnUrl) {
+                    const url = new URL(api.EntityCdnUrl);
+                    const urlParams = new URLSearchParams(url.search);
+                    urlParams.set("cacheToken", String(viaCdnCacheToken ? viaCdnCacheToken : 0));
+                    if (body.SortOrder) {
+                        urlParams.set("SortOrder", body.SortOrder);
+                    }
+                    if (body.OrderBy) {
+                        urlParams.set("OrderBy", body.OrderBy);
+                    }
+                    if (body.Filter) {
+                        urlParams.set("Filter", JSON.stringify(body.Filter));
+                    }
+                    if (body.LODType) {
+                        urlParams.set("LODType", body.LODType);
+                    }
+                    if (body.BruceEntityType) {
+                        urlParams.set("BruceEntityType", body.BruceEntityType);
+                    }
+                    if (body.PageIndex) {
+                        urlParams.set("PageIndex", String(body.PageIndex));
+                    }
+                    if (body.PageSize) {
+                        urlParams.set("PageSize", String(body.PageSize));
+                    }
+                    const urlStr = url.toString() + "?" + urlParams.toString();
+                    const data = yield api.get(urlStr, exports.Api.PrepReqParams(reqParams));
+                    entities = data.Items;
+                }
+                else {
+                    const data = yield api.POST("entities", body, exports.Api.PrepReqParams(reqParams));
+                    entities = data.Items;
+                    // Only caching when non-CDN.
+                    for (let i = 0; i < entities.length; i++) {
+                        const entity = entities[i];
+                        const id = entity.Bruce.ID;
+                        api.Cache.Set(GetCacheKey(id), {
+                            entity: entity
+                        }, exports.Api.DEFAULT_CACHE_DURATION);
+                    }
                 }
                 return {
-                    entities: entities
+                    entities
                 };
             });
         }
@@ -3998,7 +4033,7 @@
             EStatus["Loading"] = "LOADING";
         })(EStatus = EntityFilterGetter.EStatus || (EntityFilterGetter.EStatus = {}));
         class Getter {
-            constructor(api, viewPort, typeId, batchSize, attrFilter) {
+            constructor(api, viewPort, typeId, batchSize, attrFilter, viaCdn) {
                 this.onUpdate = null;
                 this.LastStateUpdates = {};
                 this.onStateUpdate = null;
@@ -4014,7 +4049,8 @@
                 this.viewCenter = null;
                 this.api = api;
                 this.typeId = typeId;
-                this.batchSize = batchSize;
+                this.viaCdn = Boolean(viaCdn);
+                this.batchSize = isNaN(batchSize) ? 300 : batchSize;
                 this.viewPort = viewPort;
                 this.attrFilter = attrFilter;
                 this.updateBounds();
@@ -4191,7 +4227,8 @@
                                     bounds: curCell.GetBounds(),
                                     sortOrder: exports.Api.ESortOrder.Asc,
                                     entityTypeConditions: this.attrFilter
-                                }
+                                },
+                                viaCdn: this.viaCdn
                             });
                             const integrity = this.getIntegrityId();
                             if (loopIntegrity == integrity && entities) {