bruce-models 5.9.5 → 5.9.7

package/dist/bruce-models.es5.js

@@ -1756,21 +1756,26 @@ var Assembly;
      */
     function Get(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, assemblyId, req: reqParams } = params;
+            let { api, assemblyId, req: reqParams, expand } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
+            if (expand == null) {
+                expand = true;
+            }
             if (!assemblyId) {
                 throw ("Assembly ID is required.");
             }
-            const key = GetCacheKey(assemblyId);
+            const key = GetCacheKey(assemblyId, expand);
             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(`v3/assembly/${assemblyId}`, Api.PrepReqParams(reqParams));
+                    let url = `v3/assembly/${assemblyId}`;
+                    url += "?Expand=" + (expand ? "true" : "false");
+                    const data = yield api.GET(url, Api.PrepReqParams(reqParams));
                     res({
                         assembly: data
                     });
@@ -1857,7 +1862,7 @@ var Assembly;
             }
             const url = `v3/assembly/${data.ID}`;
             const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
-            api.Cache.Remove(GetCacheKey(data.ID));
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Assembly + Api.ECacheKey.Id + data.ID);
             return {
                 assembly: res
             };
@@ -1878,7 +1883,7 @@ var Assembly;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             yield api.DELETE(`v3/assembly/${assemblyId}`, Api.PrepReqParams(reqParams));
-            api.Cache.Remove(GetCacheKey(assemblyId));
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Assembly + Api.ECacheKey.Id + assemblyId);
         });
     }
     Assembly.Delete = Delete;
@@ -1934,8 +1939,8 @@ var Assembly;
      * @param assemblyId
      * @returns
      */
-    function GetCacheKey(assemblyId) {
-        return `${Api.ECacheKey.Assembly}${Api.ECacheKey.Id}${assemblyId}`;
+    function GetCacheKey(assemblyId, expand) {
+        return `${Api.ECacheKey.Assembly}${Api.ECacheKey.Id}${assemblyId}${String(Boolean(expand))}`;
     }
     Assembly.GetCacheKey = GetCacheKey;
 })(Assembly || (Assembly = {}));
@@ -4076,7 +4081,7 @@ var Entity;
                 OrderBy: filter.orderBy,
                 Filter: requestFilter,
                 LODType: filter.lodCategoryId,
-                BruceEntityType: filter.entityTypeId,
+                BruceEntityType: (!filter.entityTypeId ? null : filter.entityTypeId),
                 PageIndex: filter.pageIndex,
                 PageSize: filter.pageSize,
                 historicKey: historicKey,
@@ -4128,7 +4133,7 @@ var Entity;
                     urlParams.set("LODType", body.LODType);
                 }
                 if (body.BruceEntityType) {
-                    urlParams.set("BruceEntityType", body.BruceEntityType);
+                    urlParams.set("BruceEntityType", typeof body.BruceEntityType == "string" ? body.BruceEntityType : body.BruceEntityType.join(","));
                 }
                 if (body.PageIndex) {
                     urlParams.set("PageIndex", String(body.PageIndex));
@@ -4227,7 +4232,7 @@ var Entity;
                                 expandLocation,
                                 expandImports,
                                 expandSources,
-                                entityTypeId: filter.entityTypeId,
+                                entityTypeId: typeof filter.entityTypeId == "string" ? filter.entityTypeId : filter.entityTypeId.join(","),
                                 historicFrom: historicFrom,
                                 historicKey: historicKey,
                                 historicTo: historicTo,
@@ -4246,12 +4251,40 @@ var Entity;
                 nextPage = data.NextPage;
                 nextPageUrl = data.NextPageURL;
             }
+            // Callback to get the next page.
+            let getNextPage;
+            if (nextPage) {
+                getNextPage = () => __awaiter(this, void 0, void 0, function* () {
+                    let urlStr = null;
+                    if (nextPageUrl.startsWith("http")) {
+                        urlStr = nextPageUrl;
+                    }
+                    else {
+                        urlStr = api.ConstructUrl({
+                            cdn: false,
+                            url: nextPageUrl
+                        });
+                    }
+                    const data = yield api.get(urlStr, Api.PrepReqParams(reqParams));
+                    // Update URL so we can re-use the same function instance.
+                    nextPageUrl = data.NextPageURL;
+                    return {
+                        entities: data.Items,
+                        totalCount: data.TotalCount,
+                        imports: data.Imports,
+                        nextPage: data.NextPage,
+                        nextPageUrl: data.NextPageURL,
+                        getNextPage: nextPageUrl ? getNextPage : null
+                    };
+                });
+            }
             return {
                 entities,
                 totalCount,
                 imports,
                 nextPage,
-                nextPageUrl
+                nextPageUrl,
+                getNextPage
             };
         });
     }
@@ -15616,7 +15649,7 @@ var Scenario;
 })(Scenario || (Scenario = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "5.9.5";
+const VERSION = "5.9.7";
 
 export { VERSION, Assembly, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, GeoJson, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityAttribute, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, ProjectViewBookmarkGroup, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, AccountFeatures, AccountLimits, AccountTemplate, AccountType, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, DataLabGroup, ImportAssembly, ImportCad, ImportCsv, ImportJson, ImportGeoJson, ImportKml, ImportedFile, ExportBrz, ExportUsd, Markup, Uploader, Plugin, ENVIRONMENT, DataSource, Scenario };
 //# sourceMappingURL=bruce-models.es5.js.map