@oneuptime/common 12.0.31 → 12.0.33

package/build/dist/Utils/NetworkSite/SiteStatusRollupUtil.js

@@ -1,4 +1,5 @@
 import DeviceReachabilityUtil, { NetworkDeviceReachability, } from "../NetworkDevice/DeviceReachabilityUtil";
+import { NetworkDeviceMonitoringMethodUtil } from "../../Types/NetworkDevice/NetworkDeviceMonitoringMethod";
 import SiteHealthRollupPolicy, { DefaultSiteOfflineThresholdPercent, } from "../../Types/NetworkSite/SiteHealthRollupPolicy";
 export class SiteStatusRollupUtil {
     /*
@@ -8,13 +9,13 @@ export class SiteStatusRollupUtil {
      * operational/offline rows) - the caller treats null as "leave the site's
      * status untouched".
      *
-     * Per device: a stamped monitor status (with a known priority) wins;
-     * otherwise the device's SNMP reachability maps Up to the project's
-     * isOperationalState row and Down to its isOfflineState row. A device
-     * that has never been polled contributes nothing at all - it is not
-     * evidence of an outage, and counting it as one used to pin a site red
-     * for as long as it took the first walk to land. Priority ties keep the
-     * first contributor (stable).
+     * Per device: on a monitor-backed device a stamped monitor status (with a
+     * known priority) is the vote; otherwise the device's poll reachability
+     * maps Up to the project's isOperationalState row and Down to its
+     * isOfflineState row. A device that has never been polled contributes
+     * nothing at all - it is not evidence of an outage, and counting it as
+     * one used to pin a site red for as long as it took the first poll to
+     * land. Priority ties keep the first contributor (stable).
      */
     static worstStatus(data) {
         var _a;
@@ -22,7 +23,8 @@ export class SiteStatusRollupUtil {
         let winner = null;
         for (const device of data.deviceStates) {
             let candidate = null;
-            if (device.currentMonitorStatusId &&
+            if (SiteStatusRollupUtil.isStampAuthoritative(device) &&
+                device.currentMonitorStatusId &&
                 typeof device.monitorStatusPriority === "number" &&
                 Number.isFinite(device.monitorStatusPriority)) {
                 candidate = {
@@ -64,12 +66,12 @@ export class SiteStatusRollupUtil {
      * How the subtree splits between operational and not, in DEVICES rather
      * than in buckets.
      *
-     * A device counts as non-operational when its stamped MonitorStatus is not
-     * the operational one, or - for devices no monitor stamps - when its SNMP
-     * reachability is Down. Never-reported devices are excluded from both the
-     * numerator and the denominator, so a region half-way through its first
-     * discovery walk is scored on the half that has answered rather than
-     * marked down for the half that has not.
+     * A monitor-backed device counts as non-operational when its stamped
+     * MonitorStatus is not the operational one; a probe-polled device when its
+     * poll reachability is Down. Never-reported devices are excluded from both
+     * the numerator and the denominator, so a region half-way through its
+     * first discovery walk is scored on the half that has answered rather
+     * than marked down for the half that has not.
      */
     static deviceHealthShare(data) {
         const now = data.now || new Date();
@@ -77,7 +79,8 @@ export class SiteStatusRollupUtil {
         let nonOperational = 0;
         for (const device of data.deviceStates) {
             const count = SiteStatusRollupUtil.deviceCountOf(device);
-            if (device.currentMonitorStatusId &&
+            if (SiteStatusRollupUtil.isStampAuthoritative(device) &&
+                device.currentMonitorStatusId &&
                 typeof device.monitorStatusIsOperational === "boolean") {
                 reporting += count;
                 if (!device.monitorStatusIsOperational) {
@@ -210,6 +213,16 @@ export class SiteStatusRollupUtil {
         }
         return Math.floor(value);
     }
+    /*
+     * Whether this device's stamped MonitorStatus is its vote — true only for
+     * a monitor-backed device. One gate for both policies, so the same fleet
+     * cannot read differently depending on which one a site uses; and the
+     * same gate DeviceHealthStateUtil and the topology map apply, so the site
+     * card, the map and this rollup describe one network.
+     */
+    static isStampAuthoritative(device) {
+        return NetworkDeviceMonitoringMethodUtil.isMonitorBacked(device.monitoringMethod);
+    }
     static deviceCountOf(device) {
         if (typeof device.deviceCount !== "number" ||
             !Number.isFinite(device.deviceCount) ||
@@ -224,6 +237,8 @@ export class SiteStatusRollupUtil {
             lastPolledAt: device.lastPolledAt,
             lastSeenAt: device.lastSeenAt,
             pollingIntervalInMinutes: device.pollingIntervalInMinutes,
+            // See the field docs: decides whether the columns above mean anything.
+            monitoringMethod: device.monitoringMethod,
         }, now);
     }
 }

package/build/dist/Utils/NetworkSite/SiteStatusRollupUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"SiteStatusRollupUtil.js","sourceRoot":"","sources":["../../../../Utils/NetworkSite/SiteStatusRollupUtil.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,EAAE,EAC7B,yBAAyB,GAC1B,MAAM,yCAAyC,CAAC;AACjD,OAAO,sBAAsB,EAAE,EAC7B,kCAAkC,GACnC,MAAM,gDAAgD,CAAC;AA2GxD,MAAM,OAAO,oBAAoB;IAC/B;;;;;;;;;;;;;;OAcG;IACI,MAAM,CAAC,WAAW,CAAC,IAazB;;QACC,MAAM,GAAG,GAAS,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;QAEzC,IAAI,MAAM,GAA8B,IAAI,CAAC;QAE7C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvC,IAAI,SAAS,GAA8B,IAAI,CAAC;YAEhD,IACE,MAAM,CAAC,sBAAsB;gBAC7B,OAAO,MAAM,CAAC,qBAAqB,KAAK,QAAQ;gBAChD,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAC7C,CAAC;gBACD,SAAS,GAAG;oBACV,eAAe,EAAE,MAAM,CAAC,sBAAsB;oBAC9C,QAAQ,EAAE,MAAM,CAAC,qBAAqB;iBACvC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,YAAY,GAChB,oBAAoB,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAEnD,IAAI,YAAY,KAAK,yBAAyB,CAAC,OAAO,EAAE,CAAC;oBACvD,SAAS;gBACX,CAAC;gBAED,SAAS;oBACP,YAAY,KAAK,yBAAyB,CAAC,EAAE;wBAC3C,CAAC,CAAC,IAAI,CAAC,iBAAiB,IAAI,IAAI;wBAChC,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC;YACnC,CAAC;YAED,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,SAAS;YACX,CAAC;YAED,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpD,MAAM,GAAG,SAAS,CAAC;YACrB,CAAC;QACH,CAAC;QAED;;;;;;WAMG;QACH,IACE,CAAC,MAAM;YACP,oBAAoB,CAAC,aAAa,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAClE,CAAC;YACD,OAAO,CAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,eAAe,KAAI,IAAI,CAAC;QACzD,CAAC;QAED,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC;IAChD,CAAC;IAED;;;;;;;;;;OAUG;IACI,MAAM,CAAC,iBAAiB,CAAC,IAmB/B;QACC,MAAM,GAAG,GAAS,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;QAEzC,IAAI,SAAS,GAAW,oBAAoB,CAAC,aAAa,CACxD,IAAI,CAAC,qBAAqB,CAC3B,CAAC;QACF,IAAI,cAAc,GAAW,CAAC,CAAC;QAE/B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvC,MAAM,KAAK,GAAW,oBAAoB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAEjE,IACE,MAAM,CAAC,sBAAsB;gBAC7B,OAAO,MAAM,CAAC,0BAA0B,KAAK,SAAS,EACtD,CAAC;gBACD,SAAS,IAAI,KAAK,CAAC;gBACnB,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,CAAC;oBACvC,cAAc,IAAI,KAAK,CAAC;gBAC1B,CAAC;gBACD,SAAS;YACX,CAAC;YAED,MAAM,YAAY,GAChB,oBAAoB,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAEnD,IAAI,YAAY,KAAK,yBAAyB,CAAC,OAAO,EAAE,CAAC;gBACvD,SAAS;YACX,CAAC;YAED,SAAS,IAAI,KAAK,CAAC;YACnB,IAAI,YAAY,KAAK,yBAAyB,CAAC,IAAI,EAAE,CAAC;gBACpD,cAAc,IAAI,KAAK,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,OAAO;YACL,oBAAoB,EAAE,SAAS;YAC/B,yBAAyB,EAAE,cAAc;YACzC,qBAAqB,EACnB,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,GAAG,SAAS,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;SACzD,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;OAWG;IACI,MAAM,CAAC,oBAAoB,CAChC,YAAsC,EACtC,GAAsB;QAEtB,OAAO,oBAAoB,CAAC,iBAAiB,CAAC;YAC5C,YAAY,EAAE,YAAY;YAC1B,GAAG,EAAE,GAAG;SACT,CAAC,CAAC,oBAAoB,CAAC;IAC1B,CAAC;IAED;;;;;;;;OAQG;IACI,MAAM,CAAC,sBAAsB,CAAC,IAOpC;;QACC,MAAM,KAAK,GAAsB,oBAAoB,CAAC,iBAAiB,CAAC;YACtE,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;YACjD,GAAG,EAAE,IAAI,CAAC,GAAG;SACd,CAAC,CAAC;QAEH,IAAI,KAAK,CAAC,oBAAoB,KAAK,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,KAAK,CAAC,yBAAyB,KAAK,CAAC,EAAE,CAAC;YAC1C,OAAO,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,iBAAiB,0CAAE,eAAe,KAAI,IAAI,CAAC;QAChE,CAAC;QAED,MAAM,SAAS,GAAW,oBAAoB,CAAC,yBAAyB,CACtE,IAAI,CAAC,uBAAuB,CAC7B,CAAC;QAEF,IAAI,KAAK,CAAC,qBAAqB,IAAI,SAAS,EAAE,CAAC;YAC7C;;;;;eAKG;YACH,OAAO,CACL,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,aAAa,0CAAE,eAAe;iBAC1C,MAAA,IAAI,CAAC,MAAM,CAAC,cAAc,0CAAE,eAAe,CAAA;iBAC3C,MAAA,IAAI,CAAC,MAAM,CAAC,iBAAiB,0CAAE,eAAe,CAAA;gBAC9C,IAAI,CACL,CAAC;QACJ,CAAC;QAED;;;;;WAKG;QACH,OAAO,CACL,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,cAAc,0CAAE,eAAe;aAC3C,MAAA,IAAI,CAAC,MAAM,CAAC,aAAa,0CAAE,eAAe,CAAA;aAC1C,MAAA,IAAI,CAAC,MAAM,CAAC,iBAAiB,0CAAE,eAAe,CAAA;YAC9C,IAAI,CACL,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,YAAY,CAAC,IAQ1B;QACC,IAAI,IAAI,CAAC,MAAM,KAAK,sBAAsB,CAAC,gBAAgB,EAAE,CAAC;YAC5D,OAAO,oBAAoB,CAAC,sBAAsB,CAAC;gBACjD,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;gBACrD,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;gBACjD,GAAG,EAAE,IAAI,CAAC,GAAG;aACd,CAAC,CAAC;QACL,CAAC;QAED,OAAO,oBAAoB,CAAC,WAAW,CAAC;YACtC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;YAChD,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;YACxC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;YACjD,GAAG,EAAE,IAAI,CAAC,GAAG;SACd,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,yBAAyB,CACrC,KAAgC;QAEhC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACzD,OAAO,kCAAkC,CAAC;QAC5C,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED;;;;OAIG;IACK,MAAM,CAAC,aAAa,CAAC,KAAgC;QAC3D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACvE,OAAO,CAAC,CAAC;QACX,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAEO,MAAM,CAAC,aAAa,CAAC,MAAyB;QACpD,IACE,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ;YACtC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC;YACpC,MAAM,CAAC,WAAW,IAAI,CAAC,EACvB,CAAC;YACD,OAAO,CAAC,CAAC;QACX,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAEO,MAAM,CAAC,cAAc,CAC3B,MAAyB,EACzB,GAAS;QAET,OAAO,sBAAsB,CAAC,SAAS,CACrC;YACE,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,wBAAwB,EAAE,MAAM,CAAC,wBAAwB;SAC1D,EACD,GAAG,CACJ,CAAC;IACJ,CAAC;CACF;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"SiteStatusRollupUtil.js","sourceRoot":"","sources":["../../../../Utils/NetworkSite/SiteStatusRollupUtil.ts"],"names":[],"mappings":"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"}

package/build/dist/Utils/NetworkSite/TypeHierarchyUtil.js

@@ -0,0 +1,191 @@
+/*
+ * Network site types describe the shape of a project's site tree. Keep the
+ * read-side helpers defensive: a direct database write or a partially applied
+ * migration can still leave an orphan or a cycle, and neither should make a
+ * settings page hang or hide a type from its operator.
+ */
+export default class NetworkSiteTypeHierarchyUtil {
+    static getParentId(networkSiteType) {
+        var _a, _b, _c, _d;
+        const parentId = ((_a = networkSiteType.parentNetworkSiteTypeId) === null || _a === void 0 ? void 0 : _a.toString()) ||
+            ((_c = (_b = networkSiteType.parentNetworkSiteType) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.toString()) ||
+            null;
+        if (parentId &&
+            parentId.toLowerCase() === ((_d = networkSiteType.id) === null || _d === void 0 ? void 0 : _d.toString().toLowerCase())) {
+            return null;
+        }
+        return parentId;
+    }
+    static buildIndex(data) {
+        var _a;
+        const byId = new Map();
+        const childrenByParentId = new Map();
+        for (const networkSiteType of data.networkSiteTypes) {
+            const id = (_a = networkSiteType.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+            if (id) {
+                byId.set(id, networkSiteType);
+            }
+            const parentId = this.getParentId(networkSiteType);
+            const normalizedParentId = parentId
+                ? parentId.toLowerCase()
+                : null;
+            const siblings = childrenByParentId.get(normalizedParentId);
+            if (siblings) {
+                siblings.push(networkSiteType);
+            }
+            else {
+                childrenByParentId.set(normalizedParentId, [networkSiteType]);
+            }
+        }
+        for (const siblings of childrenByParentId.values()) {
+            this.sortInPlace(siblings);
+        }
+        return { byId, childrenByParentId };
+    }
+    static getAncestorNetworkSiteTypes(data) {
+        var _a;
+        const index = data.index || this.buildIndex(data);
+        const ancestors = [];
+        const visited = new Set();
+        const ownId = (_a = data.networkSiteType.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+        if (ownId) {
+            visited.add(ownId);
+        }
+        let parentId = this.getParentId(data.networkSiteType);
+        while (parentId) {
+            const normalizedParentId = parentId.toLowerCase();
+            if (visited.has(normalizedParentId)) {
+                break;
+            }
+            const parent = index.byId.get(normalizedParentId);
+            if (!parent) {
+                break;
+            }
+            ancestors.push(parent);
+            visited.add(normalizedParentId);
+            parentId = this.getParentId(parent);
+        }
+        return ancestors;
+    }
+    static getDescendantNetworkSiteTypes(data) {
+        var _a, _b;
+        const index = data.index || this.buildIndex(data);
+        const descendants = [];
+        const visited = new Set();
+        const ownId = (_a = data.networkSiteType.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+        if (ownId) {
+            visited.add(ownId);
+        }
+        let frontier = ownId
+            ? [...(index.childrenByParentId.get(ownId) || [])]
+            : [];
+        while (frontier.length > 0) {
+            const nextFrontier = [];
+            for (const networkSiteType of frontier) {
+                const id = (_b = networkSiteType.id) === null || _b === void 0 ? void 0 : _b.toString().toLowerCase();
+                if (!id || visited.has(id)) {
+                    continue;
+                }
+                visited.add(id);
+                descendants.push(networkSiteType);
+                nextFrontier.push(...(index.childrenByParentId.get(id) || []));
+            }
+            frontier = nextFrontier;
+        }
+        return descendants;
+    }
+    /*
+     * Parent picker candidates. A leaf/unit type cannot own child types, and a
+     * type cannot be placed under itself or anything already below it.
+     */
+    static getValidParentCandidates(data) {
+        var _a, _b;
+        const index = data.index || this.buildIndex(data);
+        const excludedIds = new Set();
+        const ownId = (_a = data.networkSiteType.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+        if (ownId) {
+            excludedIds.add(ownId);
+        }
+        for (const descendant of this.getDescendantNetworkSiteTypes(Object.assign(Object.assign({}, data), { index }))) {
+            const descendantId = (_b = descendant.id) === null || _b === void 0 ? void 0 : _b.toString().toLowerCase();
+            if (descendantId) {
+                excludedIds.add(descendantId);
+            }
+        }
+        return this.sort(data.networkSiteTypes.filter((candidate) => {
+            var _a;
+            const candidateId = (_a = candidate.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+            return (Boolean(candidateId) &&
+                !excludedIds.has(candidateId) &&
+                candidate.isUnitLevel !== true);
+        }));
+    }
+    static getBreadcrumbLabel(data) {
+        const ancestors = this.getAncestorNetworkSiteTypes(data).reverse();
+        return [...ancestors, data.networkSiteType]
+            .map((networkSiteType) => {
+            return networkSiteType.name || "Unnamed Site Type";
+        })
+            .join(data.separator || " › ");
+    }
+    static buildTree(data) {
+        var _a;
+        const index = data.index || this.buildIndex(data);
+        const visited = new Set();
+        const buildNode = (networkSiteType, depth) => {
+            var _a;
+            const id = (_a = networkSiteType.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+            if (id) {
+                visited.add(id);
+            }
+            const children = id
+                ? (index.childrenByParentId.get(id) || [])
+                    .filter((child) => {
+                    var _a;
+                    const childId = (_a = child.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+                    return Boolean(childId) && !visited.has(childId);
+                })
+                    .map((child) => {
+                    return buildNode(child, depth + 1);
+                })
+                : [];
+            return { networkSiteType, depth, children };
+        };
+        const roots = this.sort(data.networkSiteTypes.filter((networkSiteType) => {
+            const parentId = this.getParentId(networkSiteType);
+            return !parentId || !index.byId.has(parentId.toLowerCase());
+        }));
+        const tree = roots.map((networkSiteType) => {
+            return buildNode(networkSiteType, 0);
+        });
+        /*
+         * A component containing only a cycle has no natural root. Promote one
+         * member so all rows remain visible, and the visited set breaks the loop.
+         */
+        for (const networkSiteType of this.sort(data.networkSiteTypes)) {
+            const id = (_a = networkSiteType.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+            if (!id || visited.has(id)) {
+                continue;
+            }
+            tree.push(buildNode(networkSiteType, 0));
+        }
+        return tree;
+    }
+    static sort(networkSiteTypes) {
+        const copy = [...networkSiteTypes];
+        this.sortInPlace(copy);
+        return copy;
+    }
+    static sortInPlace(networkSiteTypes) {
+        networkSiteTypes.sort((a, b) => {
+            var _a, _b;
+            const aOrder = (_a = a.order) !== null && _a !== void 0 ? _a : Number.MAX_SAFE_INTEGER;
+            const bOrder = (_b = b.order) !== null && _b !== void 0 ? _b : Number.MAX_SAFE_INTEGER;
+            if (aOrder !== bOrder) {
+                return aOrder - bOrder;
+            }
+            return (a.name || "").localeCompare(b.name || "");
+        });
+    }
+}
+//# sourceMappingURL=TypeHierarchyUtil.js.map

package/build/dist/Utils/NetworkSite/TypeHierarchyUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TypeHierarchyUtil.js","sourceRoot":"","sources":["../../../../Utils/NetworkSite/TypeHierarchyUtil.ts"],"names":[],"mappings":"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"}

package/build/dist/Utils/Rules/RulePatternMatchUtil.js

@@ -4,7 +4,7 @@
  *
  * These fields are documented as case-insensitive regular expressions, but
  * the sibling Network Site assignment rules take '*' wildcard globs and the
- * two features sit next to each other under Network > Automation. A user who
+ * two features sit next to each other under Network > Rules. A user who
  * typed `*0664*` into a label rule got silence: `new RegExp("*0664*")` throws
  * "Nothing to repeat", the rule engine swallowed the SyntaxError, and the
  * rule matched nothing forever (OneUptime/oneuptime#2940).

package/build/dist/Utils/Slug.js

@@ -1,7 +1,28 @@
 import Faker from "./Faker";
 import slugify from "slugify";
+/*
+ * The tail every slug carries: a dash plus ten random digits.
+ *
+ * It is what keeps two objects of the same name apart, so it is the half that
+ * survives when a slug has to be cut down to fit its column.
+ */
+export const SLUG_SUFFIX_LENGTH = 11;
 export default class Slug {
-    static getSlug(name) {
+    /*
+     * `maxLength`, when given, is the width of the column the slug is about to
+     * be written to.
+     *
+     * It exists because the create path THROWS on an oversized value rather
+     * than truncating it (DatabaseService.checkMaxLengthOfFields), and a slug
+     * source is routinely wider than the slug column: Incident.title is
+     * varchar(500) against a varchar(100) slug. Without a ceiling, slugifying
+     * such a column turns a long title into a failed insert.
+     *
+     * Only the readable half is trimmed; the random tail is never touched. A
+     * `maxLength` narrower than SLUG_SUFFIX_LENGTH therefore cannot be honoured
+     * -- the tail wins -- but no column is anywhere near that narrow.
+     */
+    static getSlug(name, maxLength) {
         if (name === null) {
             name = Faker.generateName();
         }
@@ -10,6 +31,15 @@ export default class Slug {
             return "";
         }
         let slug = slugify(name, { remove: /[&*+~.,\\/()|'"!:@]+/g });
+        if (maxLength !== undefined) {
+            /*
+             * Cut to what the tail leaves, then drop any dash the cut left
+             * dangling so the result does not read as `something--0123456789`.
+             */
+            slug = slug
+                .substring(0, Math.max(0, maxLength - SLUG_SUFFIX_LENGTH))
+                .replace(/-+$/, "");
+        }
         slug = `${slug}-${Faker.getRandomNumbers(10).toString()}`;
         slug = slug.toLowerCase();
         return slug;

package/build/dist/Utils/Slug.js.map

@@ -1 +1 @@
-{"version":3,"file":"Slug.js","sourceRoot":"","sources":["../../../Utils/Slug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,IAAI;IAChB,MAAM,CAAC,OAAO,CAAC,IAAmB;QACvC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,IAAI,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;QAC9B,CAAC;QAED,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAC1B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,IAAI,GAAW,OAAO,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAC;QACtE,IAAI,GAAG,GAAG,IAAI,IAAI,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;QAC1D,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAE1B,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"Slug.js","sourceRoot":"","sources":["../../../Utils/Slug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAW,EAAE,CAAC;AAE7C,MAAM,CAAC,OAAO,OAAO,IAAI;IACvB;;;;;;;;;;;;;OAaG;IACI,MAAM,CAAC,OAAO,CAAC,IAAmB,EAAE,SAAkB;QAC3D,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,IAAI,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;QAC9B,CAAC;QAED,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAC1B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,IAAI,GAAW,OAAO,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAC;QAEtE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B;;;eAGG;YACH,IAAI,GAAG,IAAI;iBACR,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,kBAAkB,CAAC,CAAC;iBACzD,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACxB,CAAC;QAED,IAAI,GAAG,GAAG,IAAI,IAAI,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;QAC1D,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAE1B,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneuptime/common",
-  "version": "12.0.31",
+  "version": "12.0.33",
   "description": "",
   "repository": {
     "type": "git",
@@ -112,7 +112,7 @@
     "i18next": "^23.16.8",
     "ioredis": "^5.3.2",
     "isolated-vm": "^7.0.0",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.3.2",
     "json2csv": "^5.0.7",
     "json5": "^2.2.3",
     "jsonwebtoken": "^9.0.0",