@oneuptime/common 12.0.33 → 12.0.34

package/build/dist/UI/Components/Charts/Line/LineChart.js.map

@@ -1 +1 @@
-{"version":3,"file":"LineChart.js","sourceRoot":"","sources":["../../../../../../UI/Components/Charts/Line/LineChart.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"LineChart.js","sourceRoot":"","sources":["../../../../../../UI/Components/Charts/Line/LineChart.tsx"],"names":[],"mappings":"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"}

package/build/dist/UI/Components/Charts/Types/XAxis/XAxis.js.map

@@ -1 +1 @@
-{"version":3,"file":"XAxis.js","sourceRoot":"","sources":["../../../../../../../UI/Components/Charts/Types/XAxis/XAxis.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,yCAAmB,CAAA;IACnB,iCAAW,CAAA;IACX,iCAAW,CAAA;IACX,iCAAW,CAAA;AACb,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B"}
+{"version":3,"file":"XAxis.js","sourceRoot":"","sources":["../../../../../../../UI/Components/Charts/Types/XAxis/XAxis.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,yCAAmB,CAAA;IACnB,iCAAW,CAAA;IACX,iCAAW,CAAA;IACX,iCAAW,CAAA;AACb,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B"}

package/build/dist/UI/Components/Charts/Utils/DataPoint.js

@@ -12,21 +12,33 @@ import { XAxisAggregateType } from "../Types/XAxis/XAxis";
 import XAxisUtil from "./XAxis";
 export default class DataPointUtil {
     static getChartDataPoints(data) {
-        const { intervals, formatter } = this.initializeXAxisData(data.xAxis);
+        const { intervals, formatter } = this.initializeXAxisData(data.xAxis, data.seriesPoints);
         const arrayOfData = this.initializeArrayOfData(intervals, formatter);
         this.processSeriesData(data.seriesPoints, arrayOfData, formatter, data.xAxis.options.aggregateType);
         return arrayOfData;
     }
-    static initializeXAxisData(xAxis) {
+    static initializeXAxisData(xAxis, seriesPoints) {
         const xAxisMax = xAxis.options.max;
         const xAxisMin = xAxis.options.min;
-        const intervals = XAxisUtil.getPrecisionIntervals({
+        const precision = xAxis.options.precision;
+        /*
+         * Renderable, not raw: the grid's final slot is the bucket holding the
+         * window end, which the query only partly covered and which therefore
+         * comes back empty whenever the window ends on or just past a bucket
+         * boundary. XAxisUtil drops that one slot (and only that one, and only
+         * when nothing landed in it) so the axis stops at the last point there
+         * is data for instead of a bucket beyond it.
+         */
+        const intervals = XAxisUtil.getRenderableIntervals({
             xAxisMax,
             xAxisMin,
+            precision,
+            seriesPoints,
         });
         const formatter = XAxisUtil.getFormatter({
             xAxisMax,
             xAxisMin,
+            precision,
         });
         return { xAxisMax, xAxisMin, intervals, formatter };
     }

package/build/dist/UI/Components/Charts/Utils/DataPoint.js.map

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

package/build/dist/UI/Components/Charts/Utils/TimeAnnotation.js

@@ -1,13 +1,26 @@
 import XAxisUtil from "./XAxis";
 export default class TimeAnnotationUtil {
-    static getAxisBuckets(xAxis) {
-        const intervals = XAxisUtil.getPrecisionIntervals({
+    /*
+     * `seriesPoints` is not used to place anything — it is what lets this
+     * rebuild the SAME slot array DataPointUtil built. XAxisUtil drops an
+     * unfillable trailing slot, and whether it does depends on the series, so
+     * an annotation resolved against a grid built without them would index
+     * into an array one longer than the chart's rows: every marker in the
+     * final bucket would land past the end of the axis. Chart wrappers pass
+     * the series they are drawing; callers that pass none get the raw grid,
+     * which is what DataPointUtil gives them too.
+     */
+    static getAxisBuckets(xAxis, seriesPoints) {
+        const intervals = XAxisUtil.getRenderableIntervals({
             xAxisMin: xAxis.options.min,
             xAxisMax: xAxis.options.max,
+            precision: xAxis.options.precision,
+            seriesPoints: seriesPoints,
         });
         const formatter = XAxisUtil.getFormatter({
             xAxisMin: xAxis.options.min,
             xAxisMax: xAxis.options.max,
+            precision: xAxis.options.precision,
         });
         const labels = intervals.map((interval) => {
             return formatter(interval);
@@ -19,13 +32,28 @@ export default class TimeAnnotationUtil {
                 labelToIndex.set(label, index);
             }
         }
-        return { intervals, labels, labelToIndex, formatter };
+        return {
+            intervals,
+            labels,
+            labelToIndex,
+            formatter,
+            xAxisMax: xAxis.options.max,
+        };
     }
     /*
      * End of the charted window: last bucket start plus one bucket width
      * (buckets extend past their start date).
+     *
+     * Held up to the axis's own maximum, because the grid can legitimately
+     * stop SHORT of it — XAxisUtil drops a trailing slot no data could land
+     * in. Reconstructing the window from the slots alone would then pull this
+     * bound backwards by a bucket and start rejecting the very markers that
+     * sit at the window edge as "outside the charted window": on an alert the
+     * declared-at marker is at the window end exactly, and it would vanish
+     * from the chart it exists to annotate. Such a marker resolves instead to
+     * the last bucket that is still on the axis, which is where its data is.
      */
-    static getWindowEndInMs(intervals) {
+    static getWindowEndInMs(intervals, xAxisMax) {
         const lastInterval = intervals[intervals.length - 1];
         if (!lastInterval) {
             return Number.NEGATIVE_INFINITY;
@@ -34,7 +62,9 @@ export default class TimeAnnotationUtil {
         const bucketWidthInMs = secondToLastInterval
             ? lastInterval.getTime() - secondToLastInterval.getTime()
             : 0;
-        return lastInterval.getTime() + bucketWidthInMs;
+        const gridEndInMs = lastInterval.getTime() + bucketWidthInMs;
+        const axisMaxInMs = typeof xAxisMax === "number" ? xAxisMax : xAxisMax.getTime();
+        return Math.max(gridEndInMs, axisMaxInMs);
     }
     /*
      * Largest interval index whose bucket start is <= date, or null when
@@ -84,7 +114,8 @@ export default class TimeAnnotationUtil {
         if (!firstInterval || data.date.getTime() < firstInterval.getTime()) {
             return null;
         }
-        if (data.date.getTime() > this.getWindowEndInMs(intervals)) {
+        if (data.date.getTime() >
+            this.getWindowEndInMs(intervals, data.buckets.xAxisMax)) {
             return null;
         }
         const formattedIndex = labelToIndex.get(formatter(data.date));
@@ -94,7 +125,7 @@ export default class TimeAnnotationUtil {
         return this.getBucketIndexForDate(intervals, data.date);
     }
     static formatTimeReferenceLines(data) {
-        const buckets = this.getAxisBuckets(data.xAxis);
+        const buckets = this.getAxisBuckets(data.xAxis, data.seriesPoints);
         const formatted = [];
         for (const timeReferenceLine of data.timeReferenceLines) {
             const bucketIndex = this.resolveBucketIndex({
@@ -114,14 +145,14 @@ export default class TimeAnnotationUtil {
     }
     static formatReferenceRegions(data) {
         var _a, _b;
-        const buckets = this.getAxisBuckets(data.xAxis);
+        const buckets = this.getAxisBuckets(data.xAxis, data.seriesPoints);
         const firstInterval = buckets.intervals[0];
         const lastIndex = buckets.labels.length - 1;
         const lastLabel = buckets.labels[lastIndex];
         if (!firstInterval || lastLabel === undefined) {
             return [];
         }
-        const windowEndInMs = this.getWindowEndInMs(buckets.intervals);
+        const windowEndInMs = this.getWindowEndInMs(buckets.intervals, buckets.xAxisMax);
         const formatted = [];
         for (const referenceRegion of data.referenceRegions) {
             const startInMs = Math.min(referenceRegion.startDate.getTime(), referenceRegion.endDate.getTime());

package/build/dist/UI/Components/Charts/Utils/TimeAnnotation.js.map

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

package/build/dist/UI/Components/Charts/Utils/XAxis.js

@@ -1,3 +1,4 @@
+import AggregationInterval from "../../../../Types/BaseDatabase/AggregationInterval";
 import OneUptimeDate from "../../../../Types/Date";
 import NotImplementedException from "../../../../Types/Exception/NotImplementedException";
 import XAxisPrecision from "../Types/XAxis/XAxisPrecision";
@@ -5,6 +6,46 @@ class XAxisUtil {
     static cloneDate(value) {
         return new Date(value.getTime());
     }
+    /*
+     * The grid step a caller should pin when its points are buckets the
+     * analytics backend produced, rather than raw samples.
+     *
+     * This is the bridge between the two ladders. AggregationInterval is what
+     * the server was asked to bucket by (AggregationIntervalUtil owns that
+     * decision, and the server compiles it into `toStartOfInterval`);
+     * XAxisPrecision is the step this file walks the axis at. Pinning the
+     * translation of one to the other is what makes "one slot == one backend
+     * bucket" a fact rather than a coincidence of two duration ladders
+     * agreeing.
+     *
+     * `Total` is the one interval with no grid at all — it collapses the whole
+     * window into a single aggregate whose timestamp is the earliest sample,
+     * not a bucket start — so it pins nothing and the duration ladder applies.
+     */
+    static getPrecisionForAggregationInterval(interval) {
+        switch (interval) {
+            case AggregationInterval.Minute:
+                return XAxisPrecision.EVERY_MINUTE;
+            case AggregationInterval.FiveMinutes:
+                return XAxisPrecision.EVERY_FIVE_MINUTES;
+            case AggregationInterval.FifteenMinutes:
+                return XAxisPrecision.EVERY_FIFTEEN_MINUTES;
+            case AggregationInterval.ThirtyMinutes:
+                return XAxisPrecision.EVERY_THIRTY_MINUTES;
+            case AggregationInterval.Hour:
+                return XAxisPrecision.EVERY_HOUR;
+            case AggregationInterval.Day:
+                return XAxisPrecision.EVERY_DAY;
+            case AggregationInterval.Week:
+                return XAxisPrecision.EVERY_WEEK;
+            case AggregationInterval.Month:
+                return XAxisPrecision.EVERY_MONTH;
+            case AggregationInterval.Year:
+                return XAxisPrecision.EVERY_YEAR;
+            default:
+                return undefined;
+        }
+    }
     /**
      * How much a wall-clock label has to say before it names exactly one
      * instant inside this window.
@@ -71,6 +112,15 @@ class XAxisUtil {
         return `${base} ${OneUptimeDate.getLocalZoneAbbr(value)}`;
     }
     static getPrecision(data) {
+        /*
+         * An explicit pin wins outright — see XAxisOptions.precision for why a
+         * caller that knows the bucket size must not have it re-guessed from the
+         * window duration. Checked before the Date guard so a pinned axis stays
+         * pinned regardless of how its bounds are expressed.
+         */
+        if (data.precision) {
+            return data.precision;
+        }
         if (typeof data.xAxisMax === "number" ||
             typeof data.xAxisMin === "number") {
             // number not yet supported.
@@ -222,6 +272,117 @@ class XAxisUtil {
         }
         return intervals;
     }
+    /*
+     * The intervals a chart should actually RENDER, which is the raw grid
+     * minus a trailing slot that no data could ever land in.
+     *
+     * getPrecisionIntervals walks inclusively to the window end, so the final
+     * slot is the start of whichever bucket CONTAINS that end. That bucket
+     * runs past the end of the window, so the query never covered all of it —
+     * and when the window ends at or just after a bucket boundary it covered
+     * essentially none of it. The backend returns rows only for buckets that
+     * had samples, so such a slot comes back empty every time; and because the
+     * recharts x-axis is categorical over exactly these slots, an empty one at
+     * the end is not a rounding detail — it stretches the axis a whole bucket
+     * past the last plotted point. On a 5-minute alert snapshot that is a
+     * fifth of the chart left blank.
+     *
+     * Only ever ONE slot is dropped, and only when BOTH hold:
+     *
+     *  - it carries no data, so a live in-progress bucket keeps rendering
+     *    (dropping populated trailing buckets would make every now-anchored
+     *    chart lag by a bucket — the opposite complaint), and
+     *  - the window covers less than half of it, so an empty bucket that the
+     *    window really does span stays on the axis.
+     *
+     * Dropping at most one is what keeps a genuine outage visible: a source
+     * that stopped reporting three buckets before the window end still leaves
+     * two blank slots on the axis, which is the truth. Callers with no series
+     * to check get the raw grid unchanged.
+     */
+    static getRenderableIntervals(data) {
+        const intervals = XAxisUtil.getPrecisionIntervals(data);
+        if (!data.seriesPoints || intervals.length < 2) {
+            return intervals;
+        }
+        const lastInterval = intervals[intervals.length - 1];
+        const previousInterval = intervals[intervals.length - 2];
+        /*
+         * Bucket width read off the grid itself rather than recomputed from the
+         * precision: the walk steps in wall-clock time, so a month, a year or a
+         * daylight-saving day is exactly as wide as the grid says it is.
+         */
+        const bucketWidthInMs = lastInterval.getTime() - previousInterval.getTime();
+        if (bucketWidthInMs <= 0) {
+            return intervals;
+        }
+        /*
+         * Emptiness — and the bucket boundary below — are decided with the SAME
+         * formatter that DataPointUtil uses to place a datapoint on a row.
+         * Anything else would let the two disagree about which bucket the last
+         * slot IS, and the whole point of trimming here rather than in
+         * DataPointUtil is that the rows, the categorical axis and the
+         * annotation indexes are built from one array.
+         */
+        const formatter = XAxisUtil.getFormatter(data);
+        const lastLabel = formatter(lastInterval);
+        /*
+         * A slot's DATE and the bucket it collects into are not the same thing.
+         * The walk starts at the window's own start, so on most charts the grid
+         * is anchored mid-bucket: a "last 7 days" axis stepping a day from
+         * 28 Aug 14:42 ends on a slot dated 4 Sep 14:42, which the formatter
+         * floors to the label "4 Sep" — the bucket [4 Sep 00:00, 5 Sep 00:00),
+         * of which the window covers nearly fifteen hours.
+         *
+         * Coverage can therefore only be measured off the slot's date when the
+         * slot IS its bucket's start, which is what this asks: a slot on a
+         * boundary has a different label one millisecond before it. When the
+         * grid is anchored mid-bucket the window necessarily spans everything
+         * from the bucket's real start up to the window end, which is most of
+         * it, so the slot stays — the conservative answer, and the one that
+         * keeps an empty "today" bar on a daily count chart.
+         *
+         * The alert snapshot is the aligned case (MetricView floors the window
+         * start onto the bucket grid), which is exactly when the slot date is
+         * the bucket start and the coverage measured below is the real one.
+         */
+        const isSlotOnBucketBoundary = formatter(new Date(lastInterval.getTime() - 1)) !== lastLabel;
+        if (!isSlotOnBucketBoundary) {
+            return intervals;
+        }
+        const windowEndInMs = typeof data.xAxisMax === "number"
+            ? data.xAxisMax
+            : OneUptimeDate.fromString(data.xAxisMax).getTime();
+        const coverage = (windowEndInMs - lastInterval.getTime()) / bucketWidthInMs;
+        if (coverage >= XAxisUtil.MIN_TRAILING_BUCKET_COVERAGE) {
+            return intervals;
+        }
+        const slotLabels = new Set(intervals.map((interval) => {
+            return formatter(interval);
+        }));
+        let hasAnyData = false;
+        for (const series of data.seriesPoints) {
+            for (const point of series.data) {
+                const label = formatter(point.x);
+                if (label === lastLabel) {
+                    // The trailing bucket is populated — it stays.
+                    return intervals;
+                }
+                if (!hasAnyData && slotLabels.has(label)) {
+                    hasAnyData = true;
+                }
+            }
+        }
+        /*
+         * A chart with nothing on it anywhere keeps its full grid, so an empty
+         * chart still draws an axis spanning the window the user asked for
+         * instead of one silently a bucket short.
+         */
+        if (!hasAnyData) {
+            return intervals;
+        }
+        return intervals.slice(0, intervals.length - 1);
+    }
     static getFormatter(data) {
         const precision = XAxisUtil.getPrecision(data);
         /*
@@ -444,5 +605,30 @@ class XAxisUtil {
  * this reason. These two helpers decide when the finer tiers must too.
  */
 XAxisUtil.MILLISECONDS_IN_A_DAY = 24 * 60 * 60 * 1000;
+/*
+ * How much of the LAST slot's bucket has to lie inside the window before
+ * an empty slot is worth an axis position. Half.
+ *
+ * The bound has to sit somewhere between the two ends it separates, and
+ * both ends are real:
+ *
+ *  - Near zero coverage means the bucket is not in the window in any
+ *    meaningful sense. The alert snapshot that prompted this covered
+ *    243 MILLISECONDS of a 60-second bucket (its window ends at the
+ *    instant the alert was declared, which fell just past a minute
+ *    boundary); a window that ends exactly on a boundary covers none of
+ *    the next bucket at all. Those slots cannot carry data, and an
+ *    unfillable slot at the right-hand edge is the reported gap.
+ *  - Most-of-the-bucket coverage means an empty slot is INFORMATION.
+ *    "Last 7 days" ends mid-afternoon, so today's bucket is ~60% inside
+ *    the window; if a count chart has nothing in it, that empty final bar
+ *    says "nothing today", and dropping the tick would hide it.
+ *
+ * A half-covered bucket is the natural line between "barely touched" and
+ * "genuinely part of this window", and it keeps every rolling window
+ * anchored at `now` — where the in-progress bucket is on average half
+ * elapsed — on the safe side.
+ */
+XAxisUtil.MIN_TRAILING_BUCKET_COVERAGE = 0.5;
 export default XAxisUtil;
 //# sourceMappingURL=XAxis.js.map

package/build/dist/UI/Components/Charts/Utils/XAxis.js.map

@@ -1 +1 @@
-{"version":3,"file":"XAxis.js","sourceRoot":"","sources":["../../../../../../UI/Components/Charts/Utils/XAxis.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"XAxis.js","sourceRoot":"","sources":["../../../../../../UI/Components/Charts/Utils/XAxis.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,oDAAoD,CAAC;AACrF,OAAO,aAAa,MAAM,wBAAwB,CAAC;AACnD,OAAO,uBAAuB,MAAM,qDAAqD,CAAC;AAG1F,OAAO,cAAc,MAAM,+BAA+B,CAAC;AAE3D,MAAqB,SAAS;IACpB,MAAM,CAAC,SAAS,CAAC,KAAW;QAClC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACnC,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACI,MAAM,CAAC,kCAAkC,CAC9C,QAA6B;QAE7B,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,mBAAmB,CAAC,MAAM;gBAC7B,OAAO,cAAc,CAAC,YAAY,CAAC;YACrC,KAAK,mBAAmB,CAAC,WAAW;gBAClC,OAAO,cAAc,CAAC,kBAAkB,CAAC;YAC3C,KAAK,mBAAmB,CAAC,cAAc;gBACrC,OAAO,cAAc,CAAC,qBAAqB,CAAC;YAC9C,KAAK,mBAAmB,CAAC,aAAa;gBACpC,OAAO,cAAc,CAAC,oBAAoB,CAAC;YAC7C,KAAK,mBAAmB,CAAC,IAAI;gBAC3B,OAAO,cAAc,CAAC,UAAU,CAAC;YACnC,KAAK,mBAAmB,CAAC,GAAG;gBAC1B,OAAO,cAAc,CAAC,SAAS,CAAC;YAClC,KAAK,mBAAmB,CAAC,IAAI;gBAC3B,OAAO,cAAc,CAAC,UAAU,CAAC;YACnC,KAAK,mBAAmB,CAAC,KAAK;gBAC5B,OAAO,cAAc,CAAC,WAAW,CAAC;YACpC,KAAK,mBAAmB,CAAC,IAAI;gBAC3B,OAAO,cAAc,CAAC,UAAU,CAAC;YACnC;gBACE,OAAO,SAAS,CAAC;QACrB,CAAC;IACH,CAAC;IAiBD;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACK,MAAM,CAAC,uBAAuB,CAAC,IAGtC;QACC,IACE,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ;YACjC,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,EACjC,CAAC;YACD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAC9C,CAAC;QAED,MAAM,SAAS,GAAS,IAAI,CAAC,QAAQ,CAAC;QACtC,MAAM,OAAO,GAAS,IAAI,CAAC,QAAQ,CAAC;QAEpC,MAAM,aAAa,GACjB,OAAO,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE;YACvC,SAAS,CAAC,qBAAqB,CAAC;QAElC;;;;;;;WAOG;QACH,MAAM,YAAY,GAChB,aAAa,CAAC,0BAA0B,CAAC,OAAO,CAAC;YACjD,aAAa,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;QAEtD,OAAO;YACL,QAAQ,EAAE,aAAa,IAAI,YAAY;YACvC,QAAQ,EAAE,YAAY;SACvB,CAAC;IACJ,CAAC;IAED;;;OAGG;IACK,MAAM,CAAC,iBAAiB,CAC9B,KAAW,EACX,MAAgD,EAChD,OAAkD;;QAElD,MAAM,cAAc,GAAY,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,mCAAI,KAAK,CAAC;QAEjE,MAAM,IAAI,GAAW,MAAM,CAAC,QAAQ;YAClC,CAAC,CAAC,aAAa,CAAC,gCAAgC,CAAC,KAAK,EAAE;gBACpD,cAAc;aACf,CAAC;YACJ,CAAC,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QAEhE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,GAAG,IAAI,IAAI,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;IAC5D,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,IAI1B;QACC;;;;;WAKG;QACH,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;QAED,IACE,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ;YACjC,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,EACjC,CAAC;YACD,4BAA4B;YAC5B,MAAM,IAAI,uBAAuB,EAAE,CAAC;QACtC,CAAC;QAED,MAAM,SAAS,GAAS,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,QAAgB,CAAC,CAAC;QACxE,MAAM,OAAO,GAAS,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,QAAgB,CAAC,CAAC;QAEtE,MAAM,iBAAiB,GAAW,OAAO,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;QAC1E,MAAM,YAAY,GAAW,iBAAiB,GAAG,IAAI,CAAC;QACtD,MAAM,YAAY,GAAW,YAAY,GAAG,EAAE,CAAC;QAC/C,MAAM,UAAU,GAAW,YAAY,GAAG,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAW,UAAU,GAAG,EAAE,CAAC;QAC1C,MAAM,UAAU,GAAW,SAAS,GAAG,CAAC,CAAC;QACzC,MAAM,WAAW,GAAW,SAAS,GAAG,EAAE,CAAC;QAE3C;;;;;;;;;;;WAWG;QACH,IAAI,YAAY,IAAI,EAAE,EAAE,CAAC;YACvB,OAAO,cAAc,CAAC,YAAY,CAAC;QACrC,CAAC;QACD,IAAI,YAAY,IAAI,EAAE,EAAE,CAAC;YACvB,OAAO,cAAc,CAAC,kBAAkB,CAAC;QAC3C,CAAC;QACD,IAAI,YAAY,IAAI,GAAG,EAAE,CAAC;YACxB,OAAO,cAAc,CAAC,iBAAiB,CAAC;QAC1C,CAAC;QACD,IAAI,YAAY,IAAI,GAAG,EAAE,CAAC;YACxB,OAAO,cAAc,CAAC,oBAAoB,CAAC;QAC7C,CAAC;QACD,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC;YACpB,OAAO,cAAc,CAAC,YAAY,CAAC;QACrC,CAAC;QACD,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;YACrB,OAAO,cAAc,CAAC,kBAAkB,CAAC;QAC3C,CAAC;QACD,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;YACrB,OAAO,cAAc,CAAC,qBAAqB,CAAC;QAC9C,CAAC;QACD,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;YACnB,OAAO,cAAc,CAAC,oBAAoB,CAAC;QAC7C,CAAC;QACD,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;YACnB,OAAO,cAAc,CAAC,UAAU,CAAC;QACnC,CAAC;QACD,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC;YACpB,OAAO,cAAc,CAAC,SAAS,CAAC;QAClC,CAAC;QACD,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;YACrB,OAAO,cAAc,CAAC,UAAU,CAAC;QACnC,CAAC;QACD,IAAI,WAAW,IAAI,EAAE,EAAE,CAAC;YACtB,OAAO,cAAc,CAAC,WAAW,CAAC;QACpC,CAAC;QACD,OAAO,cAAc,CAAC,UAAU,CAAC;IACnC,CAAC;IAEM,MAAM,CAAC,qBAAqB,CAAC,IAInC;QACC,MAAM,SAAS,GAAmB,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE/D,IACE,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ;YACjC,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,EACjC,CAAC;YACD,4BAA4B;YAC5B,MAAM,IAAI,uBAAuB,EAAE,CAAC;QACtC,CAAC;QAED,MAAM,SAAS,GAAS,IAAI,IAAI,CAAC,IAAI,CAAC,QAAgB,CAAC,CAAC;QACxD,MAAM,OAAO,GAAS,IAAI,IAAI,CAAC,IAAI,CAAC,QAAgB,CAAC,CAAC;QACtD,MAAM,SAAS,GAAgB,EAAE,CAAC;QAElC,MAAM,WAAW,GAAS,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QAE9C,OAAO,WAAW,IAAI,OAAO,EAAE,CAAC;YAC9B,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;YAEtC,QAAQ,SAAS,EAAE,CAAC;gBAClB,KAAK,cAAc,CAAC,YAAY;oBAC9B,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;oBACrD,MAAM;gBACR,KAAK,cAAc,CAAC,kBAAkB;oBACpC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;oBACrD,MAAM;gBACR,KAAK,cAAc,CAAC,iBAAiB;oBACnC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;oBACtD,MAAM;gBACR,KAAK,cAAc,CAAC,oBAAoB;oBACtC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;oBACtD,MAAM;gBACR,KAAK,cAAc,CAAC,YAAY;oBAC9B,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;oBACrD,MAAM;gBACR,KAAK,cAAc,CAAC,kBAAkB;oBACpC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;oBACrD,MAAM;gBACR,KAAK,cAAc,CAAC,iBAAiB;oBACnC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;oBACtD,MAAM;gBACR,KAAK,cAAc,CAAC,qBAAqB;oBACvC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;oBACtD,MAAM;gBACR,KAAK,cAAc,CAAC,oBAAoB;oBACtC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;oBACtD,MAAM;gBACR,KAAK,cAAc,CAAC,UAAU;oBAC5B,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,cAAc,CAAC,eAAe;oBACjC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,cAAc,CAAC,iBAAiB;oBACnC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,cAAc,CAAC,eAAe;oBACjC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,cAAc,CAAC,kBAAkB;oBACpC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;oBAClD,MAAM;gBACR,KAAK,cAAc,CAAC,SAAS;oBAC3B,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;oBAC/C,MAAM;gBACR,KAAK,cAAc,CAAC,cAAc;oBAChC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;oBAC/C,MAAM;gBACR,KAAK,cAAc,CAAC,UAAU;oBAC5B,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;oBAC/C,MAAM;gBACR,KAAK,cAAc,CAAC,eAAe;oBACjC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;oBAChD,MAAM;gBACR,KAAK,cAAc,CAAC,WAAW;oBAC7B,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,cAAc,CAAC,gBAAgB;oBAClC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,cAAc,CAAC,kBAAkB;oBACpC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,cAAc,CAAC,gBAAgB;oBAClC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,cAAc,CAAC,UAAU;oBAC5B,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;oBACvD,MAAM;YACV,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IA4BD;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACI,MAAM,CAAC,sBAAsB,CAAC,IAKpC;QACC,MAAM,SAAS,GAAgB,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAErE,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/C,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,YAAY,GAAS,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;QAC5D,MAAM,gBAAgB,GAAS,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;QAEhE;;;;WAIG;QACH,MAAM,eAAe,GACnB,YAAY,CAAC,OAAO,EAAE,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC;QACtD,IAAI,eAAe,IAAI,CAAC,EAAE,CAAC;YACzB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED;;;;;;;WAOG;QACH,MAAM,SAAS,GAA4B,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACxE,MAAM,SAAS,GAAW,SAAS,CAAC,YAAY,CAAC,CAAC;QAElD;;;;;;;;;;;;;;;;;;;WAmBG;QACH,MAAM,sBAAsB,GAC1B,SAAS,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;QAChE,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC5B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,aAAa,GACjB,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ;YAC/B,CAAC,CAAC,IAAI,CAAC,QAAQ;YACf,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;QACxD,MAAM,QAAQ,GACZ,CAAC,aAAa,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC,GAAG,eAAe,CAAC;QAC7D,IAAI,QAAQ,IAAI,SAAS,CAAC,4BAA4B,EAAE,CAAC;YACvD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,UAAU,GAAgB,IAAI,GAAG,CACrC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAc,EAAE,EAAE;YAC/B,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,UAAU,GAAY,KAAK,CAAC;QAChC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChC,MAAM,KAAK,GAAW,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACzC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,+CAA+C;oBAC/C,OAAO,SAAS,CAAC;gBACnB,CAAC;gBACD,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzC,UAAU,GAAG,IAAI,CAAC;gBACpB,CAAC;YACH,CAAC;QACH,CAAC;QAED;;;;WAIG;QACH,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAClD,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,IAI1B;QACC,MAAM,SAAS,GAAmB,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE/D;;;WAGG;QACH,MAAM,WAAW,GACf,SAAS,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAE1C,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,cAAc,CAAC,YAAY;gBAC9B,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,OAAO,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,WAAW,EAAE;wBACrD,cAAc,EAAE,IAAI;qBACrB,CAAC,CAAC;gBACL,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,kBAAkB;gBACpC,kCAAkC;gBAClC,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,OAAO,GAAW,YAAY,CAAC,UAAU,EAAE,CAAC;oBAClD,MAAM,cAAc,GAAW,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;oBAC3D,YAAY,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;oBAE3C,OAAO,SAAS,CAAC,iBAAiB,CAAC,YAAY,EAAE,WAAW,EAAE;wBAC5D,cAAc,EAAE,IAAI;qBACrB,CAAC,CAAC;gBACL,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,iBAAiB;gBACnC,mCAAmC;gBACnC,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,OAAO,GAAW,YAAY,CAAC,UAAU,EAAE,CAAC;oBAClD,MAAM,cAAc,GAAW,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC7D,YAAY,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;oBAE3C,OAAO,SAAS,CAAC,iBAAiB,CAAC,YAAY,EAAE,WAAW,EAAE;wBAC5D,cAAc,EAAE,IAAI;qBACrB,CAAC,CAAC;gBACL,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,oBAAoB;gBACtC,mCAAmC;gBACnC,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,OAAO,GAAW,YAAY,CAAC,UAAU,EAAE,CAAC;oBAClD,MAAM,cAAc,GAAW,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC7D,YAAY,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;oBAE3C,OAAO,SAAS,CAAC,iBAAiB,CAAC,YAAY,EAAE,WAAW,EAAE;wBAC5D,cAAc,EAAE,IAAI;qBACrB,CAAC,CAAC;gBACL,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,YAAY;gBAC9B,+BAA+B;gBAC/B,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,OAAO,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;gBACzD,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,kBAAkB;gBACpC,kCAAkC;gBAClC,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,OAAO,GAAW,YAAY,CAAC,UAAU,EAAE,CAAC;oBAClD,MAAM,cAAc,GAAW,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;oBAC3D,YAAY,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBAE9C,OAAO,SAAS,CAAC,iBAAiB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;gBAChE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,iBAAiB;gBACnC,mCAAmC;gBACnC,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,OAAO,GAAW,YAAY,CAAC,UAAU,EAAE,CAAC;oBAClD,MAAM,cAAc,GAAW,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC7D,YAAY,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBAE9C,OAAO,SAAS,CAAC,iBAAiB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;gBAChE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,qBAAqB;gBACvC,mCAAmC;gBACnC,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,OAAO,GAAW,YAAY,CAAC,UAAU,EAAE,CAAC;oBAClD,MAAM,cAAc,GAAW,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC7D,YAAY,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBAE9C,OAAO,SAAS,CAAC,iBAAiB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;gBAChE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,oBAAoB;gBACtC,mCAAmC;gBACnC,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,OAAO,GAAW,YAAY,CAAC,UAAU,EAAE,CAAC;oBAClD,MAAM,cAAc,GAAW,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC7D,YAAY,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBAE9C,OAAO,SAAS,CAAC,iBAAiB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;gBAChE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,UAAU;gBAC5B;;;mBAGG;gBACH,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBACjC,OAAO,aAAa,CAAC,gCAAgC,CAAC,YAAY,CAAC,CAAC;gBACtE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,eAAe;gBACjC,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,KAAK,GAAW,YAAY,CAAC,QAAQ,EAAE,CAAC;oBAC9C,MAAM,YAAY,GAAW,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;oBACvD,YAAY,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBAE7C,OAAO,aAAa,CAAC,gCAAgC,CAAC,YAAY,CAAC,CAAC;gBACtE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,iBAAiB;gBACnC,gCAAgC;gBAChC,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,KAAK,GAAW,YAAY,CAAC,QAAQ,EAAE,CAAC;oBAC9C,MAAM,YAAY,GAAW,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;oBACvD,YAAY,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBAE7C,OAAO,aAAa,CAAC,gCAAgC,CAAC,YAAY,CAAC,CAAC;gBACtE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,eAAe;gBACjC,gDAAgD;gBAChD,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,KAAK,GAAW,YAAY,CAAC,QAAQ,EAAE,CAAC;oBAC9C,MAAM,YAAY,GAAW,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;oBACvD,YAAY,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBAE7C,OAAO,aAAa,CAAC,gCAAgC,CAAC,YAAY,CAAC,CAAC;gBACtE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,kBAAkB;gBACpC,mDAAmD;gBACnD,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,KAAK,GAAW,YAAY,CAAC,QAAQ,EAAE,CAAC;oBAC9C,MAAM,YAAY,GAAW,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;oBACzD,YAAY,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBAE7C,OAAO,aAAa,CAAC,gCAAgC,CAAC,YAAY,CAAC,CAAC;gBACtE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,SAAS;gBAC3B,4BAA4B;gBAC5B,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,OAAO,aAAa,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;gBAC3D,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,cAAc;gBAChC,+BAA+B;gBAC/B,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,IAAI,GAAW,YAAY,CAAC,OAAO,EAAE,CAAC;oBAC5C,MAAM,WAAW,GAAW,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;oBACrD,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;oBAElC,OAAO,aAAa,CAAC,4BAA4B,CAAC,YAAY,CAAC,CAAC;gBAClE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,UAAU;gBAC5B;;;;;mBAKG;gBACH,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,OAAO,aAAa,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;gBAC3D,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,eAAe;gBACjC,2CAA2C;gBAC3C,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,IAAI,GAAW,YAAY,CAAC,OAAO,EAAE,CAAC;oBAC5C,MAAM,WAAW,GAAW,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;oBACrD,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;oBAElC,6DAA6D;oBAC7D,OAAO,aAAa,CAAC,4BAA4B,CAAC,YAAY,CAAC,CAAC;gBAClE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,WAAW;gBAC7B,yCAAyC;gBACzC,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,OAAO,aAAa,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC;gBAC5D,CAAC,CAAC;YAEJ,KAAK,cAAc,CAAC,gBAAgB;gBAClC,4CAA4C;gBAC5C,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,MAAM,GAAW,YAAY,CAAC,QAAQ,EAAE,CAAC;oBAC/C,MAAM,aAAa,GAAW,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;oBACzD,YAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;oBAErC,OAAO,aAAa,CAAC,6BAA6B,CAAC,YAAY,CAAC,CAAC;gBACnE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,kBAAkB;gBACpC,4CAA4C;gBAC5C,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,MAAM,GAAW,YAAY,CAAC,QAAQ,EAAE,CAAC;oBAC/C,MAAM,aAAa,GAAW,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;oBACzD,YAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;oBAErC,OAAO,aAAa,CAAC,6BAA6B,CAAC,YAAY,CAAC,CAAC;gBACnE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,gBAAgB;gBAClC,4CAA4C;gBAC5C,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,MAAM,YAAY,GAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM,MAAM,GAAW,YAAY,CAAC,QAAQ,EAAE,CAAC;oBAC/C,MAAM,aAAa,GAAW,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;oBACzD,YAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;oBAErC,OAAO,aAAa,CAAC,6BAA6B,CAAC,YAAY,CAAC,CAAC;gBACnE,CAAC,CAAC;YACJ,KAAK,cAAc,CAAC,UAAU;gBAC5B,qCAAqC;gBACrC,OAAO,CAAC,KAAW,EAAE,EAAE;oBACrB,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC;gBACxC,CAAC,CAAC;YACJ;gBACE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;;AAlqBD;;;;;;;;;;;GAWG;AAEqB,+BAAqB,GAAW,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AA+Q5E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACqB,sCAA4B,GAAW,GAAG,CAAC;eApWhD,SAAS"}

package/build/dist/UI/Components/CustomFields/CustomFieldsDetail.js

@@ -9,6 +9,7 @@ import ErrorMessage from "../ErrorMessage/ErrorMessage";
 import BasicFormModal from "../FormModal/BasicFormModal";
 import CustomFieldType from "../../../Types/CustomField/CustomFieldType";
 import { parseCustomFieldDropdownOptions, } from "../../../Types/CustomField/CustomFieldDropdownOption";
+import { getCustomFieldMappingRelationSelect, getCustomFieldMappingSources, hasCustomFieldMappingSource, } from "../../../Types/CustomField/CustomFieldMappingCatalog";
 import Color from "../../../Types/Color";
 import { LIMIT_PER_PROJECT } from "../../../Types/Database/LimitMax";
 import IconProp from "../../../Types/Icon/IconProp";
@@ -42,6 +43,42 @@ const CustomFieldsDetail = (props) => {
     const [isLoading, setIsLoading] = useState(false);
     const [model, setModel] = useState(null);
     const [showModelForm, setShowModelForm] = useState(false);
+    /*
+     * Which related resources this resource's custom fields may inherit from.
+     * Empty for most of them, in which case everything below behaves exactly as
+     * it did before mapping existed.
+     */
+    const mappingSources = getCustomFieldMappingSources(new props.customFieldType().tableName);
+    const isMappedAndInherited = (schemaItem) => {
+        const resource = schemaItem
+            .mapFromResourceType;
+        const fieldName = schemaItem
+            .mapFromCustomFieldName;
+        if (!resource || !fieldName) {
+            return false;
+        }
+        const source = mappingSources.find((candidate) => {
+            return candidate.resource === resource;
+        });
+        if (!source) {
+            return false;
+        }
+        return hasCustomFieldMappingSource({
+            source: source,
+            record: model,
+        });
+    };
+    const getMappedDescription = (schemaItem) => {
+        const description = schemaItem.description;
+        if (!isMappedAndInherited(schemaItem)) {
+            return description;
+        }
+        const source = mappingSources.find((candidate) => {
+            return candidate.resource === schemaItem.mapFromResourceType;
+        });
+        const note = `Copied from the ${source === null || source === void 0 ? void 0 : source.title} custom field "${schemaItem.mapFromCustomFieldName}".`;
+        return description ? `${description} ${note}` : note;
+    };
     const onLoad = async () => {
         try {
             // load schema.
@@ -59,15 +96,30 @@ const CustomFieldsDetail = (props) => {
                     customFieldType: true,
                     description: true,
                     dropdownOptions: true,
+                    mapFromResourceType: true,
+                    mapFromCustomFieldName: true,
                 },
                 sort: {},
             });
+            /*
+             * The relation a mapped field would inherit through is read alongside
+             * the values, so the card can tell "this field is mapped and this record
+             * has a monitor" (show it, read-only) from "this field is mapped but
+             * this record has none" (leave it editable — an SLO or security-event
+             * alert has no monitor and would otherwise be locked out of the field
+             * entirely). Nothing extra is selected for the six resources that have
+             * no mapping sources at all.
+             */
+            const itemSelect = {
+                customFields: true,
+            };
+            for (const source of mappingSources) {
+                Object.assign(itemSelect, getCustomFieldMappingRelationSelect(source));
+            }
             const item = await ModelAPI.getItem({
                 modelType: props.modelType,
                 id: props.modelId,
-                select: {
-                    customFields: true,
-                },
+                select: itemSelect,
             });
             setSchemaList(schemaList.data);
             setModel(item);
@@ -129,7 +181,15 @@ const CustomFieldsDetail = (props) => {
      * take the button away, or the error message is telling the operator to
      * retry something they can no longer reach.
      */
-    const canEdit = isEditable && !isLoading && schemaList.length > 0 && Boolean(model);
+    /*
+     * A field whose value is copied from a related resource is not one the
+     * modal offers, so a card where EVERY field is mapped has nothing to edit
+     * and the button would open an empty form.
+     */
+    const editableSchemaCount = schemaList.filter((schemaItem) => {
+        return !isMappedAndInherited(schemaItem);
+    }).length;
+    const canEdit = isEditable && !isLoading && editableSchemaCount > 0 && Boolean(model);
     /*
      * Custom field values live on the record itself, so editing them is an
      * update of that record. Without the permission the button stays put and
@@ -168,7 +228,7 @@ const CustomFieldsDetail = (props) => {
                     return {
                         key: schemaItem.name,
                         title: schemaItem.name,
-                        description: schemaItem.description,
+                        description: getMappedDescription(schemaItem),
                         fieldType: schemaItem.customFieldType,
                         placeholder: "No data entered",
                         dropdownOptions: isDropdown
@@ -182,7 +242,21 @@ const CustomFieldsDetail = (props) => {
                     await onSave(data).catch();
                 }, formProps: {
                     initialValues: (model === null || model === void 0 ? void 0 : model["customFields"]) || {},
-                    fields: schemaList.map((schemaItem) => {
+                    /*
+                     * Mapped fields are left OUT of the form rather than rendered
+                     * disabled: `Field.disabled` is honoured by only three of the
+                     * form's input branches, so a disabled Dropdown, multi-select or
+                     * toggle stays fully editable and the value would silently snap
+                     * back on the next sync. Their stored values still survive the
+                     * save — this form submits its whole values object, which starts
+                     * from the record's existing bag — and the server re-applies the
+                     * mapping on update either way.
+                     */
+                    fields: schemaList
+                        .filter((schemaItem) => {
+                        return !isMappedAndInherited(schemaItem);
+                    })
+                        .map((schemaItem) => {
                         const isDropdown = schemaItem.customFieldType ===
                             CustomFieldType.Dropdown ||
                             schemaItem.customFieldType ===