bruce-models 7.1.68 → 7.1.70

package/dist/bruce-models.umd.js

@@ -84,6 +84,7 @@
             ECacheKey["DatabaseRegion"] = "databaseregion";
             ECacheKey["CustomForm"] = "customform";
             ECacheKey["ImportedFile"] = "importedfile";
+            ECacheKey["UIMarkup"] = "uimarkup";
             ECacheKey["Plugin"] = "plugin";
             ECacheKey["PluginIndexFile"] = "pluginindexfile";
             ECacheKey["EntityHistoricData"] = "entityhistoricdata";
@@ -353,6 +354,7 @@
             EConcept["TILESET"] = "ts";
             EConcept["UI_DASHBOARD_VIEW"] = "dbv";
             EConcept["UI_ENTITY_DISPLAY_SETTING"] = "s";
+            EConcept["UI_MARKUP"] = "um";
             EConcept["UI_PLUGIN"] = "pg";
             EConcept["UI_SLIDE"] = "pvs";
             EConcept["UI_SLIDE_GROUP"] = "sg";
@@ -418,6 +420,7 @@
             { concept: EConcept.TILESET, label: "Tileset", description: undefined },
             { concept: EConcept.UI_DASHBOARD_VIEW, label: "Dashboard View", description: undefined },
             { concept: EConcept.UI_ENTITY_DISPLAY_SETTING, label: "Style", description: undefined },
+            { concept: EConcept.UI_MARKUP, label: "Markup", description: undefined },
             { concept: EConcept.UI_PLUGIN, label: "Plugin", description: undefined },
             { concept: EConcept.UI_SLIDE, label: "Bookmark", description: undefined },
             { concept: EConcept.UI_SLIDE_GROUP, label: "Bookmark Group", description: undefined },
@@ -655,6 +658,8 @@
                     return [exports.Api.ECacheKey.Tileset, exports.Api.ECacheKey.PublishTileset, exports.Api.ECacheKey.TilesetAccess];
                 case exports.AccountConcept.EConcept.UI_ENTITY_DISPLAY_SETTING:
                     return [exports.Api.ECacheKey.Style];
+                case exports.AccountConcept.EConcept.UI_MARKUP:
+                    return [exports.Api.ECacheKey.UIMarkup];
                 case exports.AccountConcept.EConcept.UI_PLUGIN:
                     return [exports.Api.ECacheKey.Plugin, exports.Api.ECacheKey.PluginIndexFile];
                 case exports.AccountConcept.EConcept.UI_SLIDE:
@@ -5290,13 +5295,18 @@
                         }
                         const data = yield Promise.all(reqs);
                         // Populate array, while checking for already added types.
+                        // Batched ID requests can overlap.
                         const types = [];
+                        const seenIds = new Set();
                         for (const item of data) {
                             for (const type of item.Items) {
-                                appendInternalAttrSchema(type);
-                                if (!types.find(x => x.ID == type.ID)) {
-                                    types.push(type);
+                                const key = String(type.ID);
+                                if (seenIds.has(key)) {
+                                    continue;
                                 }
+                                seenIds.add(key);
+                                appendInternalAttrSchema(type);
+                                types.push(type);
                             }
                         }
                         res({
@@ -6287,13 +6297,22 @@
                 const reqs = [];
                 if (reqIds.length > 0) {
                     const req = api.POST(url, reqData, exports.Api.PrepReqParams(reqParams));
+                    const itemsById = req.then(data => {
+                        const map = new Map();
+                        for (const item of data.Items) {
+                            const id = String(item.Bruce.ID);
+                            if (!map.has(id)) {
+                                map.set(id, item);
+                            }
+                        }
+                        return map;
+                    });
                     for (let i = 0; i < reqIds.length; i++) {
                         const entityId = reqIds[i];
                         const key = GetCacheKey(Object.assign(Object.assign({}, cacheKeyData), { entityId }));
                         const prom = new Promise((res) => __awaiter(this, void 0, void 0, function* () {
                             try {
-                                const data = yield req;
-                                const item = data.Items.find(x => x.Bruce.ID == entityId);
+                                const item = (yield itemsById).get(String(entityId));
                                 res({
                                     entity: item
                                 });
@@ -13183,11 +13202,19 @@
                             rej(e);
                         }
                     }));
+                    const sourcesByKey = prom.then((sources) => {
+                        const map = new Map();
+                        for (const s of sources) {
+                            if (!map.has(s["SourceRecord.Key"])) {
+                                map.set(s["SourceRecord.Key"], s);
+                            }
+                        }
+                        return map;
+                    });
                     for (let i = 0; i < reqKeys.length; i++) {
                         const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                             try {
-                                const sources = yield prom;
-                                res(sources.find((s) => s["SourceRecord.Key"] === reqKeys[i]));
+                                res((yield sourcesByKey).get(reqKeys[i]));
                             }
                             catch (e) {
                                 rej(e);
@@ -13447,12 +13474,20 @@
                             rej(e);
                         }
                     }));
+                    const tagsById = prom.then((tags) => {
+                        const map = new Map();
+                        for (const t of tags) {
+                            if (!map.has(t.ID)) {
+                                map.set(t.ID, t);
+                            }
+                        }
+                        return map;
+                    });
                     for (let i = 0; i < reqIds.length; i++) {
                         const id = reqIds[i];
                         const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                             try {
-                                const tags = yield prom;
-                                const tag = tags.find((t) => t.ID === id);
+                                const tag = (yield tagsById).get(id);
                                 res({
                                     tag: tag
                                 });
@@ -14529,6 +14564,148 @@
         })(Circle = Markup.Circle || (Markup.Circle = {}));
     })(exports.Markup || (exports.Markup = {}));
 
+    (function (UIMarkup) {
+        /**
+         * Returns a UI.Markup record.
+         * @param params
+         */
+        function Get(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                let { api, markupId, req: reqParams } = params;
+                if (markupId == null || markupId <= 0) {
+                    throw ("Markup ID is required.");
+                }
+                if (!api) {
+                    api = exports.ENVIRONMENT.Api().GetBruceApi();
+                }
+                const key = GetCacheKey(markupId);
+                const cache = api.GetCacheItem(key, reqParams);
+                if (cache === null || cache === void 0 ? void 0 : cache.found) {
+                    return cache.data;
+                }
+                const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`ui.markup/${markupId}`, exports.Api.PrepReqParams(reqParams));
+                        res({
+                            markup: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.SetCacheItem({
+                    key,
+                    value: req,
+                    req: reqParams
+                });
+                return req;
+            });
+        }
+        UIMarkup.Get = Get;
+        /**
+         * Returns the list of UI.Markup records.
+         * @param params
+         */
+        function GetList(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (!params) {
+                    params = {};
+                }
+                let { api, req: reqParams } = params;
+                if (!api) {
+                    api = exports.ENVIRONMENT.Api().GetBruceApi();
+                }
+                const key = GetListCacheKey();
+                const cache = api.GetCacheItem(key, reqParams);
+                if (cache === null || cache === void 0 ? void 0 : cache.found) {
+                    return cache.data;
+                }
+                const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    try {
+                        const data = yield api.GET("ui.markups", exports.Api.PrepReqParams(reqParams));
+                        res({
+                            markups: (_a = data === null || data === void 0 ? void 0 : data.Items) !== null && _a !== void 0 ? _a : []
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                api.SetCacheItem({
+                    key,
+                    value: req,
+                    req: reqParams
+                });
+                return req;
+            });
+        }
+        UIMarkup.GetList = GetList;
+        /**
+         * Creates or updates a UI.Markup record.
+         * @param params
+         */
+        function Update(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                let { markup, api, req: reqParams } = params;
+                if (!api) {
+                    api = exports.ENVIRONMENT.Api().GetBruceApi();
+                }
+                if (!markup) {
+                    markup = {};
+                }
+                const markupId = markup.ID && markup.ID > 0 ? markup.ID : 0;
+                const res = yield api.POST(`ui.markup/${markupId}`, markup, exports.Api.PrepReqParams(reqParams));
+                if (markup.ID && markup.ID > 0) {
+                    api.Cache.Remove(GetCacheKey(markup.ID));
+                }
+                if ((res === null || res === void 0 ? void 0 : res.ID) && res.ID > 0) {
+                    api.Cache.Remove(GetCacheKey(res.ID));
+                }
+                api.Cache.RemoveByStartsWith(GetListCacheKey());
+                return {
+                    markup: res
+                };
+            });
+        }
+        UIMarkup.Update = Update;
+        /**
+         * Deletes a UI.Markup record.
+         * @param params
+         */
+        function Delete(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                let { markupId, api, req: reqParams } = params;
+                if (markupId == null || markupId <= 0) {
+                    throw ("Markup ID is required.");
+                }
+                if (!api) {
+                    api = exports.ENVIRONMENT.Api().GetBruceApi();
+                }
+                yield api.DELETE(`ui.markup/${markupId}`, exports.Api.PrepReqParams(reqParams));
+                api.Cache.Remove(GetCacheKey(markupId));
+                api.Cache.RemoveByStartsWith(GetListCacheKey());
+            });
+        }
+        UIMarkup.Delete = Delete;
+        /**
+         * Returns cache identifier for a UI.Markup record.
+         * @param id
+         */
+        function GetCacheKey(id) {
+            return `${exports.Api.ECacheKey.UIMarkup}${exports.Api.ECacheKey.Id}${id}`;
+        }
+        UIMarkup.GetCacheKey = GetCacheKey;
+        /**
+         * Returns cache identifier for the UI.Markup list.
+         */
+        function GetListCacheKey() {
+            return exports.Api.ECacheKey.UIMarkup;
+        }
+        UIMarkup.GetListCacheKey = GetListCacheKey;
+    })(exports.UIMarkup || (exports.UIMarkup = {}));
+
     const DEFAULT_JOB_POLL_INTERVAL_MS = 1000;
     const DEFAULT_JOB_POLL_TIMEOUT_MS = 10 * 60 * 1000; // match server timeout (10 minutes)
     const NAVIGATOR_CHAT_EVENT_ENTITY_HIGHLIGHT_APPLIED = "entity_highlight_applied";
@@ -15625,8 +15802,9 @@
                 }
                 else if (tilesetIds.length > 1) {
                     const tilesets = yield api.GET("ui.tilesets", exports.Api.PrepReqParams(reqParams));
+                    const tilesetIdsSet = new Set(tilesetIds);
                     for (const tileset of tilesets) {
-                        if (tilesetIds.indexOf(tileset.ID) >= 0) {
+                        if (tilesetIdsSet.has(tileset.ID)) {
                             mapping[tileset.ID] = tileset.Type;
                         }
                     }
@@ -19258,7 +19436,7 @@
     })(exports.UrlUtils || (exports.UrlUtils = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "7.1.68";
+    const VERSION = "7.1.70";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;