@oneuptime/common 11.7.3 → 11.7.4

package/build/dist/Utils/StatusPage/GroupTree.js

@@ -0,0 +1,214 @@
+/*
+ * Status page groups form a tree: a group may be nested under another group
+ * (Corporate Unit -> Region -> Market -> Site), and each level rolls up the
+ * status and uptime of everything below it.
+ *
+ * Everything here is defensive about the shape of the data it is handed. The
+ * parent pointer lives in a plain nullable column, so rows written directly to
+ * the database (or a group whose parent the caller did not fetch) can point at
+ * a missing parent, at themselves, or around a cycle. None of those may make a
+ * group disappear from the status page or hang the render, so every walk is
+ * bounded by a visited set and every group ends up in the tree exactly once.
+ */
+class StatusPageGroupTreeUtil {
+    static getParentId(statusPageGroup) {
+        var _a, _b;
+        const parentId = ((_a = statusPageGroup.parentStatusPageGroupId) === null || _a === void 0 ? void 0 : _a.toString()) || null;
+        if (!parentId) {
+            return null;
+        }
+        // a group that points at itself is a root, not an infinite loop.
+        if (parentId === ((_b = statusPageGroup._id) === null || _b === void 0 ? void 0 : _b.toString())) {
+            return null;
+        }
+        return parentId;
+    }
+    static getChildGroups(data) {
+        const children = data.statusPageGroups.filter((group) => {
+            return this.getParentId(group) === data.statusPageGroupId;
+        });
+        return this.sortByOrder(children);
+    }
+    /*
+     * Top level groups: no parent, or a parent that is not part of the supplied
+     * list (an orphan still has to render somewhere).
+     */
+    static getRootGroups(data) {
+        const idsInList = this.getIdSet(data.statusPageGroups);
+        const roots = data.statusPageGroups.filter((group) => {
+            const parentId = this.getParentId(group);
+            return !parentId || !idsInList.has(parentId);
+        });
+        return this.sortByOrder(roots);
+    }
+    /*
+     * The full tree, in render order. Every supplied group appears exactly once:
+     * orphans are promoted to roots, and groups that are only reachable through a
+     * cycle are promoted too (rather than being silently dropped).
+     */
+    static buildTree(data) {
+        var _a;
+        const visited = new Set();
+        const buildNode = (group, depth) => {
+            var _a;
+            const groupId = ((_a = group._id) === null || _a === void 0 ? void 0 : _a.toString()) || "";
+            visited.add(groupId);
+            const children = this.getChildGroups({
+                statusPageGroupId: groupId,
+                statusPageGroups: data.statusPageGroups,
+            })
+                .filter((child) => {
+                var _a;
+                return !visited.has(((_a = child._id) === null || _a === void 0 ? void 0 : _a.toString()) || "");
+            })
+                .map((child) => {
+                return buildNode(child, depth + 1);
+            });
+            return {
+                group: group,
+                depth: depth,
+                children: children,
+            };
+        };
+        const tree = this.getRootGroups({
+            statusPageGroups: data.statusPageGroups,
+        }).map((root) => {
+            return buildNode(root, 0);
+        });
+        /*
+         * Anything left unvisited is inside a cycle that no root points into. Pull
+         * each one up to the top level so the page still shows it.
+         */
+        for (const group of this.sortByOrder(data.statusPageGroups)) {
+            if (!visited.has(((_a = group._id) === null || _a === void 0 ? void 0 : _a.toString()) || "")) {
+                tree.push(buildNode(group, 0));
+            }
+        }
+        return tree;
+    }
+    /*
+     * Every group below this one, at any depth. Excludes the group itself.
+     */
+    static getDescendantGroups(data) {
+        var _a, _b, _c;
+        const descendants = [];
+        const visited = new Set([
+            ((_a = data.statusPageGroup._id) === null || _a === void 0 ? void 0 : _a.toString()) || "",
+        ]);
+        let frontier = this.getChildGroups({
+            statusPageGroupId: ((_b = data.statusPageGroup._id) === null || _b === void 0 ? void 0 : _b.toString()) || "",
+            statusPageGroups: data.statusPageGroups,
+        });
+        while (frontier.length > 0) {
+            const nextFrontier = [];
+            for (const group of frontier) {
+                const groupId = ((_c = group._id) === null || _c === void 0 ? void 0 : _c.toString()) || "";
+                if (visited.has(groupId)) {
+                    continue;
+                }
+                visited.add(groupId);
+                descendants.push(group);
+                nextFrontier.push(...this.getChildGroups({
+                    statusPageGroupId: groupId,
+                    statusPageGroups: data.statusPageGroups,
+                }));
+            }
+            frontier = nextFrontier;
+        }
+        return descendants;
+    }
+    /*
+     * The group itself followed by all of its descendants - the set of groups a
+     * rolled up number has to cover.
+     */
+    static getGroupAndDescendants(data) {
+        return [
+            data.statusPageGroup,
+            ...this.getDescendantGroups({
+                statusPageGroup: data.statusPageGroup,
+                statusPageGroups: data.statusPageGroups,
+            }),
+        ];
+    }
+    /*
+     * Ancestors, closest parent first. Stops at a cycle instead of looping.
+     */
+    static getAncestorGroups(data) {
+        var _a;
+        const byId = this.getGroupsById(data.statusPageGroups);
+        const ancestors = [];
+        const visited = new Set([
+            ((_a = data.statusPageGroup._id) === null || _a === void 0 ? void 0 : _a.toString()) || "",
+        ]);
+        let parentId = this.getParentId(data.statusPageGroup);
+        while (parentId && !visited.has(parentId)) {
+            const parent = byId.get(parentId);
+            if (!parent) {
+                break;
+            }
+            ancestors.push(parent);
+            visited.add(parentId);
+            parentId = this.getParentId(parent);
+        }
+        return ancestors;
+    }
+    /*
+     * 0 for a top level group, 1 for its children, and so on.
+     */
+    static getDepth(data) {
+        return this.getAncestorGroups({
+            statusPageGroup: data.statusPageGroup,
+            statusPageGroups: data.statusPageGroups,
+        }).length;
+    }
+    static isDescendantOf(data) {
+        return this.getAncestorGroups({
+            statusPageGroup: data.statusPageGroup,
+            statusPageGroups: data.statusPageGroups,
+        }).some((ancestor) => {
+            var _a;
+            return ((_a = ancestor._id) === null || _a === void 0 ? void 0 : _a.toString()) === data.possibleAncestorId;
+        });
+    }
+    static getGroupsById(statusPageGroups) {
+        var _a;
+        const byId = new Map();
+        for (const group of statusPageGroups) {
+            const groupId = (_a = group._id) === null || _a === void 0 ? void 0 : _a.toString();
+            if (groupId) {
+                byId.set(groupId, group);
+            }
+        }
+        return byId;
+    }
+    static getIdSet(statusPageGroups) {
+        var _a;
+        const ids = new Set();
+        for (const group of statusPageGroups) {
+            const groupId = (_a = group._id) === null || _a === void 0 ? void 0 : _a.toString();
+            if (groupId) {
+                ids.add(groupId);
+            }
+        }
+        return ids;
+    }
+    /*
+     * Siblings render in `order`. Groups without an order keep their incoming
+     * position, after the ordered ones.
+     */
+    static sortByOrder(statusPageGroups) {
+        return [...statusPageGroups].sort((a, b) => {
+            const orderA = typeof a.order === "number" ? a.order : Number.MAX_SAFE_INTEGER;
+            const orderB = typeof b.order === "number" ? b.order : Number.MAX_SAFE_INTEGER;
+            return orderA - orderB;
+        });
+    }
+}
+/*
+ * How deep a group may be nested. Enforced on write (see
+ * StatusPageGroupService) - reads never drop levels beyond it, they only
+ * refuse to loop.
+ */
+StatusPageGroupTreeUtil.MaxNestingDepth = 10;
+export default StatusPageGroupTreeUtil;
+//# sourceMappingURL=GroupTree.js.map

package/build/dist/Utils/StatusPage/GroupTree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GroupTree.js","sourceRoot":"","sources":["../../../../Utils/StatusPage/GroupTree.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;GAWG;AACH,MAAqB,uBAAuB;IAQnC,MAAM,CAAC,WAAW,CAAC,eAAgC;;QACxD,MAAM,QAAQ,GACZ,CAAA,MAAA,eAAe,CAAC,uBAAuB,0CAAE,QAAQ,EAAE,KAAI,IAAI,CAAC;QAE9D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC;QAED,iEAAiE;QACjE,IAAI,QAAQ,MAAK,MAAA,eAAe,CAAC,GAAG,0CAAE,QAAQ,EAAE,CAAA,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,IAG5B;QACC,MAAM,QAAQ,GAA2B,IAAI,CAAC,gBAAgB,CAAC,MAAM,CACnE,CAAC,KAAsB,EAAE,EAAE;YACzB,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,iBAAiB,CAAC;QAC5D,CAAC,CACF,CAAC;QAEF,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,aAAa,CAAC,IAE3B;QACC,MAAM,SAAS,GAAgB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAEpE,MAAM,KAAK,GAA2B,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAChE,CAAC,KAAsB,EAAE,EAAE;YACzB,MAAM,QAAQ,GAAkB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACxD,OAAO,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/C,CAAC,CACF,CAAC;QAEF,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,SAAS,CAAC,IAEvB;;QACC,MAAM,OAAO,GAAgB,IAAI,GAAG,EAAU,CAAC;QAE/C,MAAM,SAAS,GAGgB,CAC7B,KAAsB,EACtB,KAAa,EACY,EAAE;;YAC3B,MAAM,OAAO,GAAW,CAAA,MAAA,KAAK,CAAC,GAAG,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;YACpD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAErB,MAAM,QAAQ,GAAmC,IAAI,CAAC,cAAc,CAAC;gBACnE,iBAAiB,EAAE,OAAO;gBAC1B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;aACxC,CAAC;iBACC,MAAM,CAAC,CAAC,KAAsB,EAAE,EAAE;;gBACjC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA,MAAA,KAAK,CAAC,GAAG,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC,CAAC;YACnD,CAAC,CAAC;iBACD,GAAG,CAAC,CAAC,KAAsB,EAAE,EAAE;gBAC9B,OAAO,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;YAEL,OAAO;gBACL,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,KAAK;gBACZ,QAAQ,EAAE,QAAQ;aACnB,CAAC;QACJ,CAAC,CAAC;QAEF,MAAM,IAAI,GAAmC,IAAI,CAAC,aAAa,CAAC;YAC9D,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;SACxC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAqB,EAAE,EAAE;YAC/B,OAAO,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH;;;WAGG;QACH,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC5D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA,MAAA,KAAK,CAAC,GAAG,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC,EAAE,CAAC;gBAC9C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,mBAAmB,CAAC,IAGjC;;QACC,MAAM,WAAW,GAA2B,EAAE,CAAC;QAC/C,MAAM,OAAO,GAAgB,IAAI,GAAG,CAAS;YAC3C,CAAA,MAAA,IAAI,CAAC,eAAe,CAAC,GAAG,0CAAE,QAAQ,EAAE,KAAI,EAAE;SAC3C,CAAC,CAAC;QAEH,IAAI,QAAQ,GAA2B,IAAI,CAAC,cAAc,CAAC;YACzD,iBAAiB,EAAE,CAAA,MAAA,IAAI,CAAC,eAAe,CAAC,GAAG,0CAAE,QAAQ,EAAE,KAAI,EAAE;YAC7D,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;SACxC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,YAAY,GAA2B,EAAE,CAAC;YAEhD,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;gBAC7B,MAAM,OAAO,GAAW,CAAA,MAAA,KAAK,CAAC,GAAG,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;gBAEpD,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;oBACzB,SAAS;gBACX,CAAC;gBAED,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACrB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAExB,YAAY,CAAC,IAAI,CACf,GAAG,IAAI,CAAC,cAAc,CAAC;oBACrB,iBAAiB,EAAE,OAAO;oBAC1B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;iBACxC,CAAC,CACH,CAAC;YACJ,CAAC;YAED,QAAQ,GAAG,YAAY,CAAC;QAC1B,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,sBAAsB,CAAC,IAGpC;QACC,OAAO;YACL,IAAI,CAAC,eAAe;YACpB,GAAG,IAAI,CAAC,mBAAmB,CAAC;gBAC1B,eAAe,EAAE,IAAI,CAAC,eAAe;gBACrC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;aACxC,CAAC;SACH,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,iBAAiB,CAAC,IAG/B;;QACC,MAAM,IAAI,GAAiC,IAAI,CAAC,aAAa,CAC3D,IAAI,CAAC,gBAAgB,CACtB,CAAC;QAEF,MAAM,SAAS,GAA2B,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAgB,IAAI,GAAG,CAAS;YAC3C,CAAA,MAAA,IAAI,CAAC,eAAe,CAAC,GAAG,0CAAE,QAAQ,EAAE,KAAI,EAAE;SAC3C,CAAC,CAAC;QAEH,IAAI,QAAQ,GAAkB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAErE,OAAO,QAAQ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1C,MAAM,MAAM,GAAgC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAE/D,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM;YACR,CAAC;YAED,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACtB,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,QAAQ,CAAC,IAGtB;QACC,OAAO,IAAI,CAAC,iBAAiB,CAAC;YAC5B,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;SACxC,CAAC,CAAC,MAAM,CAAC;IACZ,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,IAI5B;QACC,OAAO,IAAI,CAAC,iBAAiB,CAAC;YAC5B,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;SACxC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAyB,EAAE,EAAE;;YACpC,OAAO,CAAA,MAAA,QAAQ,CAAC,GAAG,0CAAE,QAAQ,EAAE,MAAK,IAAI,CAAC,kBAAkB,CAAC;QAC9D,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,aAAa,CAC1B,gBAAwC;;QAExC,MAAM,IAAI,GAAiC,IAAI,GAAG,EAG/C,CAAC;QAEJ,KAAK,MAAM,KAAK,IAAI,gBAAgB,EAAE,CAAC;YACrC,MAAM,OAAO,GAAuB,MAAA,KAAK,CAAC,GAAG,0CAAE,QAAQ,EAAE,CAAC;YAE1D,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,MAAM,CAAC,QAAQ,CACrB,gBAAwC;;QAExC,MAAM,GAAG,GAAgB,IAAI,GAAG,EAAU,CAAC;QAE3C,KAAK,MAAM,KAAK,IAAI,gBAAgB,EAAE,CAAC;YACrC,MAAM,OAAO,GAAuB,MAAA,KAAK,CAAC,GAAG,0CAAE,QAAQ,EAAE,CAAC;YAE1D,IAAI,OAAO,EAAE,CAAC;gBACZ,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;OAGG;IACK,MAAM,CAAC,WAAW,CACxB,gBAAwC;QAExC,OAAO,CAAC,GAAG,gBAAgB,CAAC,CAAC,IAAI,CAC/B,CAAC,CAAkB,EAAE,CAAkB,EAAE,EAAE;YACzC,MAAM,MAAM,GACV,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC;YAClE,MAAM,MAAM,GACV,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC;YAElE,OAAO,MAAM,GAAG,MAAM,CAAC;QACzB,CAAC,CACF,CAAC;IACJ,CAAC;;AA5RD;;;;GAIG;AACoB,uCAAe,GAAW,EAAE,CAAC;eANjC,uBAAuB"}

package/build/dist/Utils/StatusPage/ResourceUptime.js

@@ -1,6 +1,7 @@
 import { Green } from "../../Types/BrandColors";
 import MonitorStatus from "../../Models/DatabaseModels/MonitorStatus";
 import UptimePrecision from "../../Types/StatusPage/UptimePrecision";
+import StatusPageGroupTreeUtil from "./GroupTree";
 import UptimeUtil from "../Uptime/UptimeUtil";
 export default class StatusPageResourceUptimeUtil {
     static getWorstMonitorStatus(data) {
@@ -44,9 +45,10 @@ export default class StatusPageResourceUptimeUtil {
         let currentStatus = new MonitorStatus();
         currentStatus.name = "Operational";
         currentStatus.color = Green;
-        const resourcesInGroup = this.getResourcesInStatusPageGroup({
+        const resourcesInGroup = this.getResourcesInStatusPageGroupAndDescendants({
             statusPageGroup: data.statusPageGroup,
             statusPageResources: data.statusPageResources,
+            allStatusPageGroups: data.allStatusPageGroups,
         });
         for (const resource of resourcesInGroup) {
             let currentMonitorStatus = undefined;
@@ -95,9 +97,10 @@ export default class StatusPageResourceUptimeUtil {
         if (!data.statusPageGroup.showUptimePercent) {
             return null;
         }
-        const resourcesInGroup = this.getResourcesInStatusPageGroup({
+        const resourcesInGroup = this.getResourcesInStatusPageGroupAndDescendants({
             statusPageGroup: data.statusPageGroup,
             statusPageResources: data.statusPageResources,
+            allStatusPageGroups: data.allStatusPageGroups,
         });
         if (resourcesInGroup.length === 0) {
             return null; // no resources in group.
@@ -145,6 +148,27 @@ export default class StatusPageResourceUptimeUtil {
                 ((_b = data.statusPageGroup._id) === null || _b === void 0 ? void 0 : _b.toString()));
         });
     }
+    /*
+     * Resources attached to this group plus every resource attached to a group
+     * nested under it. This is the set a rolled up number (status, uptime %) for
+     * the group has to be computed from. Without allStatusPageGroups there is no
+     * hierarchy to walk, so it degrades to the group's own resources.
+     */
+    static getResourcesInStatusPageGroupAndDescendants(data) {
+        const groupsToInclude = StatusPageGroupTreeUtil.getGroupAndDescendants({
+            statusPageGroup: data.statusPageGroup,
+            statusPageGroups: data.allStatusPageGroups || [data.statusPageGroup],
+        });
+        const groupIds = new Set(groupsToInclude.map((group) => {
+            var _a;
+            return ((_a = group._id) === null || _a === void 0 ? void 0 : _a.toString()) || "";
+        }));
+        return data.statusPageResources.filter((resource) => {
+            var _a;
+            const resourceGroupId = (_a = resource.statusPageGroupId) === null || _a === void 0 ? void 0 : _a.toString();
+            return Boolean(resourceGroupId) && groupIds.has(resourceGroupId);
+        });
+    }
     static calculateAvgUptimePercentageOfAllResources(data) {
         const showUptimePercentage = Boolean(data.statusPageResources.find((item) => {
             return item.showUptimePercent || item.showStatusHistoryChart;
@@ -153,21 +177,41 @@ export default class StatusPageResourceUptimeUtil {
             return null;
         }
         const allUptimePercent = [];
-        // calculate for groups first.
-        for (const group of data.resourceGroups) {
-            const calculateAvgUptimePercentOfStatusPageGroup = this.calculateAvgUptimePercentOfStatusPageGroup({
-                statusPageGroup: group,
-                monitorStatusTimelines: data.monitorStatusTimelines,
-                precision: data.precision,
-                downtimeMonitorStatuses: data.downtimeMonitorStatuses,
-                statusPageResources: data.statusPageResources,
-                monitorsInGroup: data.monitorsInGroup,
-                uptimeWindow: data.uptimeWindow,
-            });
-            if (calculateAvgUptimePercentOfStatusPageGroup !== null) {
-                allUptimePercent.push(calculateAvgUptimePercentOfStatusPageGroup);
+        /*
+         * Calculate for groups first. Groups nest, and a group that reports uptime
+         * already averages its whole subtree - so descend only until the first
+         * reporting group on each branch, otherwise its children would be counted
+         * twice. Groups that do not report uptime contribute nothing themselves
+         * (unchanged behaviour) but must not hide reporting groups beneath them.
+         */
+        const collectGroupUptime = (groups) => {
+            var _a;
+            for (const group of groups) {
+                if (group.showUptimePercent) {
+                    const groupUptimePercent = this.calculateAvgUptimePercentOfStatusPageGroup({
+                        statusPageGroup: group,
+                        monitorStatusTimelines: data.monitorStatusTimelines,
+                        precision: data.precision,
+                        downtimeMonitorStatuses: data.downtimeMonitorStatuses,
+                        statusPageResources: data.statusPageResources,
+                        monitorsInGroup: data.monitorsInGroup,
+                        uptimeWindow: data.uptimeWindow,
+                        allStatusPageGroups: data.resourceGroups,
+                    });
+                    if (groupUptimePercent !== null) {
+                        allUptimePercent.push(groupUptimePercent);
+                    }
+                    continue;
+                }
+                collectGroupUptime(StatusPageGroupTreeUtil.getChildGroups({
+                    statusPageGroupId: ((_a = group._id) === null || _a === void 0 ? void 0 : _a.toString()) || "",
+                    statusPageGroups: data.resourceGroups,
+                }));
             }
-        }
+        };
+        collectGroupUptime(StatusPageGroupTreeUtil.getRootGroups({
+            statusPageGroups: data.resourceGroups,
+        }));
         // now fetch resources without group.
         const resourcesWithoutGroup = this.getResourcesWithoutStatusPageGroup({
             statusPageResources: data.statusPageResources,

package/build/dist/Utils/StatusPage/ResourceUptime.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneuptime/common",
-  "version": "11.7.3",
+  "version": "11.7.4",
   "description": "",
   "repository": {
     "type": "git",