@oneuptime/common 10.8.2 → 11.0.1

package/build/dist/Types/Telemetry/EntityRelationshipType.js

@@ -0,0 +1,32 @@
+/*
+ * The relationship taxonomy between OpenTelemetry entities. The upstream
+ * OTel spec deliberately leaves entity relationships unstandardized
+ * ("refined in future specification work"), so OneUptime infers a small,
+ * durable set of directed relationships from resource co-occurrence — the
+ * entities that appear together in one resource are, by construction,
+ * related. See Internal/Docs/OpenTelemetryEntities.md §4.
+ */
+var EntityRelationshipType;
+(function (EntityRelationshipType) {
+    /** e.g. a pod runs on a node; a process runs on a host. */
+    EntityRelationshipType["RunsOn"] = "runs-on";
+    /** e.g. a pod / node / namespace is a member of a cluster. */
+    EntityRelationshipType["MemberOf"] = "member-of";
+    /** e.g. a service is hosted on a host. */
+    EntityRelationshipType["HostedOn"] = "hosted-on";
+    /** e.g. a container is part of a pod; a process is part of a container. */
+    EntityRelationshipType["PartOf"] = "part-of";
+    /** e.g. a service.instance is an instance of a service. */
+    EntityRelationshipType["InstanceOf"] = "instance-of";
+    /**
+     * Service → service dependency (the service map; the resurrected
+     * ServiceDependency capability). Unlike the co-occurrence types above,
+     * this is NOT inferred from one resource's entity set — caller and
+     * callee never share a resource. It is derived from parent/child span
+     * pairs that cross a service boundary (see the
+     * TelemetryEntity:ComputeServiceDependencies worker cron).
+     */
+    EntityRelationshipType["DependsOn"] = "depends-on";
+})(EntityRelationshipType || (EntityRelationshipType = {}));
+export default EntityRelationshipType;
+//# sourceMappingURL=EntityRelationshipType.js.map

package/build/dist/Types/Telemetry/EntityRelationshipType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityRelationshipType.js","sourceRoot":"","sources":["../../../../Types/Telemetry/EntityRelationshipType.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,IAAK,sBAoBJ;AApBD,WAAK,sBAAsB;IACzB,2DAA2D;IAC3D,4CAAkB,CAAA;IAClB,8DAA8D;IAC9D,gDAAsB,CAAA;IACtB,0CAA0C;IAC1C,gDAAsB,CAAA;IACtB,2EAA2E;IAC3E,4CAAkB,CAAA;IAClB,2DAA2D;IAC3D,oDAA0B,CAAA;IAC1B;;;;;;;OAOG;IACH,kDAAwB,CAAA;AAC1B,CAAC,EApBI,sBAAsB,KAAtB,sBAAsB,QAoB1B;AAED,eAAe,sBAAsB,CAAC"}

package/build/dist/Types/Telemetry/EntityType.js

@@ -0,0 +1,34 @@
+/*
+ * The vocabulary of OpenTelemetry-aligned entity types OneUptime can
+ * derive from a resource. One OTLP resource is a *composition* of many
+ * entities — a span can simultaneously belong to a `service`, a `host`,
+ * a `k8s.pod`, a `k8s.node`, a `k8s.cluster`, a `container` and a
+ * `process`. Each value is the entity's immutable `type` per the OTel
+ * entity data model (https://opentelemetry.io/docs/specs/otel/entities/).
+ *
+ * This is the broader *membership* vocabulary used by the `entityKeys`
+ * column on signals and by the `TelemetryEntity` registry. It is distinct
+ * from `ServiceType`, which is the narrower discriminator for a signal's
+ * single *primary* entity (`primaryEntityType`) and additionally covers
+ * OneUptime-specific primary owners (Monitor, RealUserMonitor, Unknown,
+ * ...) that are not OTel resource entities.
+ *
+ * The string values are the semconv-style dotted type names so they read
+ * naturally in stored identity sets and in the registry.
+ */
+var EntityType;
+(function (EntityType) {
+    EntityType["Service"] = "service";
+    EntityType["ServiceInstance"] = "service.instance";
+    EntityType["Host"] = "host";
+    EntityType["Container"] = "container";
+    EntityType["Process"] = "process";
+    EntityType["KubernetesCluster"] = "k8s.cluster";
+    EntityType["KubernetesNamespace"] = "k8s.namespace";
+    EntityType["KubernetesNode"] = "k8s.node";
+    EntityType["KubernetesPod"] = "k8s.pod";
+    EntityType["KubernetesDeployment"] = "k8s.deployment";
+    EntityType["TelemetrySdk"] = "telemetry.sdk";
+})(EntityType || (EntityType = {}));
+export default EntityType;
+//# sourceMappingURL=EntityType.js.map

package/build/dist/Types/Telemetry/EntityType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../../../Types/Telemetry/EntityType.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,IAAK,UAYJ;AAZD,WAAK,UAAU;IACb,iCAAmB,CAAA;IACnB,kDAAoC,CAAA;IACpC,2BAAa,CAAA;IACb,qCAAuB,CAAA;IACvB,iCAAmB,CAAA;IACnB,+CAAiC,CAAA;IACjC,mDAAqC,CAAA;IACrC,yCAA2B,CAAA;IAC3B,uCAAyB,CAAA;IACzB,qDAAuC,CAAA;IACvC,4CAA8B,CAAA;AAChC,CAAC,EAZI,UAAU,KAAV,UAAU,QAYd;AAED,eAAe,UAAU,CAAC"}

package/build/dist/Types/Text.js

@@ -1,4 +1,4 @@
-export default class Text {
+class Text {
     static convertBase64ToHex(textInBase64) {
         if (!textInBase64) {
             return textInBase64;
@@ -9,6 +9,31 @@ export default class Text {
         const hex = Buffer.from(textInBase64, "base64").toString("hex");
         return hex;
     }
+    /**
+     * Convert an OTLP wire id (trace / span / profile id) to lowercase hex.
+     *
+     * OTLP/protobuf carries ids as bytes, which protobuf decoders render
+     * as base64 strings — but OTLP/JSON carries the SAME fields as hex
+     * strings (32 chars for trace ids, 16 for span ids). Hex strings also
+     * satisfy the base64 alphabet, so feeding them to convertBase64ToHex
+     * would silently decode them into garbage bytes. Length disambiguates
+     * safely: the base64 form of an 8/16-byte id is always 12/24 chars,
+     * so a 16- or 32-char hex-only string can never be a base64 id.
+     */
+    static convertOtlpIdToHex(value) {
+        if (!value) {
+            return "";
+        }
+        if (Text.OTLP_HEX_ID_REGEX.test(value)) {
+            return value.toLowerCase();
+        }
+        try {
+            return Text.convertBase64ToHex(value);
+        }
+        catch (_a) {
+            return "";
+        }
+    }
     static getLetterFromAByNumber(number) {
         return String.fromCharCode("a".charCodeAt(0) + number);
     }
@@ -238,4 +263,10 @@ export default class Text {
         return value.length > maxLength ? value.slice(0, maxLength) : value;
     }
 }
+/**
+ * Matches an OTLP id already in hex form: 16 chars (8-byte span id)
+ * or 32 chars (16-byte trace/profile id).
+ */
+Text.OTLP_HEX_ID_REGEX = /^(?:[0-9a-fA-F]{16}|[0-9a-fA-F]{32})$/;
+export default Text;
 //# sourceMappingURL=Text.js.map

package/build/dist/Types/Text.js.map

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

package/build/dist/Types/Trace/TraceAggregationType.js

@@ -9,6 +9,7 @@ var TraceAggregationType;
     TraceAggregationType["ErrorCount"] = "ErrorCount";
     TraceAggregationType["AvgDurationSeconds"] = "AvgDurationSeconds";
     TraceAggregationType["P50DurationSeconds"] = "P50DurationSeconds";
+    TraceAggregationType["P90DurationSeconds"] = "P90DurationSeconds";
     TraceAggregationType["P95DurationSeconds"] = "P95DurationSeconds";
     TraceAggregationType["P99DurationSeconds"] = "P99DurationSeconds";
     TraceAggregationType["MaxDurationSeconds"] = "MaxDurationSeconds";

package/build/dist/Types/Trace/TraceAggregationType.js.map

@@ -1 +1 @@
-{"version":3,"file":"TraceAggregationType.js","sourceRoot":"","sources":["../../../../Types/Trace/TraceAggregationType.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,IAAK,oBASJ;AATD,WAAK,oBAAoB;IACvB,uCAAe,CAAA;IACf,iDAAyB,CAAA;IACzB,iEAAyC,CAAA;IACzC,iEAAyC,CAAA;IACzC,iEAAyC,CAAA;IACzC,iEAAyC,CAAA;IACzC,iEAAyC,CAAA;IACzC,iEAAyC,CAAA;AAC3C,CAAC,EATI,oBAAoB,KAApB,oBAAoB,QASxB;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"TraceAggregationType.js","sourceRoot":"","sources":["../../../../Types/Trace/TraceAggregationType.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,IAAK,oBAUJ;AAVD,WAAK,oBAAoB;IACvB,uCAAe,CAAA;IACf,iDAAyB,CAAA;IACzB,iEAAyC,CAAA;IACzC,iEAAyC,CAAA;IACzC,iEAAyC,CAAA;IACzC,iEAAyC,CAAA;IACzC,iEAAyC,CAAA;IACzC,iEAAyC,CAAA;IACzC,iEAAyC,CAAA;AAC3C,CAAC,EAVI,oBAAoB,KAApB,oBAAoB,QAUxB;AAED,eAAe,oBAAoB,CAAC"}

package/build/dist/Types/Trace/TraceRecordingRuleDefinition.js

@@ -33,6 +33,11 @@ export class TraceRecordingRuleDefinitionUtil {
                 label: "p50 Duration (s)",
                 description: "Median span duration.",
             },
+            {
+                value: TraceAggregationType.P90DurationSeconds,
+                label: "p90 Duration (s)",
+                description: "90th percentile span duration.",
+            },
             {
                 value: TraceAggregationType.P95DurationSeconds,
                 label: "p95 Duration (s)",
@@ -65,6 +70,32 @@ export class TraceRecordingRuleDefinitionUtil {
             { value: "SPAN_KIND_INTERNAL", label: "Internal" },
         ];
     }
+    /*
+     * Combined attribute filters for a source: the multi-filter array plus the
+     * legacy single pair (deduplicated by key, array entries win).
+     */
+    static getSourceAttributeFilters(source) {
+        const filters = [];
+        const seenKeys = new Set();
+        for (const filter of source.filterAttributes || []) {
+            if (!filter || typeof filter !== "object") {
+                continue;
+            }
+            const key = (filter.key || "").trim();
+            const value = (filter.value || "").trim();
+            if (!key || !value || seenKeys.has(key)) {
+                continue;
+            }
+            seenKeys.add(key);
+            filters.push({ key, value });
+        }
+        const legacyKey = (source.filterAttributeKey || "").trim();
+        const legacyValue = (source.filterAttributeValue || "").trim();
+        if (legacyKey && legacyValue && !seenKeys.has(legacyKey)) {
+            filters.push({ key: legacyKey, value: legacyValue });
+        }
+        return filters;
+    }
     static getNextAlias(sources) {
         const used = new Set((sources || []).map((s) => {
             return s.alias;
@@ -89,7 +120,7 @@ export class TraceRecordingRuleDefinitionUtil {
         };
     }
     static getValidationError(definition) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (!definition) {
             return "Definition is required.";
         }
@@ -103,6 +134,10 @@ export class TraceRecordingRuleDefinitionUtil {
         const aliases = new Set();
         for (let i = 0; i < sources.length; i++) {
             const source = sources[i];
+            // Definitions arrive as JSON (deep links, API writes) — never throw.
+            if (!source || typeof source !== "object") {
+                return `Source #${i + 1}: Invalid source.`;
+            }
             const prefix = `Source ${source.alias || `#${i + 1}`}: `;
             if (!source.alias || !ALIAS_REGEX.test(source.alias)) {
                 return `${prefix}Alias must be a single uppercase letter A-Z.`;
@@ -119,6 +154,20 @@ export class TraceRecordingRuleDefinitionUtil {
             if (hasFilterKey !== hasFilterValue) {
                 return `${prefix}Attribute filter needs both a key and a value (or leave both empty).`;
             }
+            if (source.filterAttributes !== undefined &&
+                !Array.isArray(source.filterAttributes)) {
+                return `${prefix}Invalid attribute filters.`;
+            }
+            for (const filter of source.filterAttributes || []) {
+                if (!filter || typeof filter !== "object") {
+                    return `${prefix}Invalid attribute filter row.`;
+                }
+                const hasKey = Boolean((_c = filter.key) === null || _c === void 0 ? void 0 : _c.trim());
+                const hasValue = Boolean((_d = filter.value) === null || _d === void 0 ? void 0 : _d.trim());
+                if (hasKey !== hasValue) {
+                    return `${prefix}Attribute filter needs both a key and a value (or remove the row).`;
+                }
+            }
         }
         const expression = (definition.expression || "").trim();
         if (!expression) {

package/build/dist/Types/Trace/TraceRecordingRuleDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"TraceRecordingRuleDefinition.js","sourceRoot":"","sources":["../../../../Types/Trace/TraceRecordingRuleDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAqC1D,iEAAiE;AACjE,MAAM,CAAC,MAAM,gCAAgC,GAAW,CAAC,CAAC;AAE1D,kEAAkE;AAClE,MAAM,CAAC,MAAM,0CAA0C,GAAW,GAAG,CAAC;AAEtE;;;GAGG;AACH,MAAM,cAAc,GAAW,4BAA4B,CAAC;AAE5D,MAAM,WAAW,GAAW,SAAS,CAAC;AAEtC,MAAM,gBAAgB,GAAW,uBAAuB,CAAC;AAEzD,MAAM,OAAO,gCAAgC;IACpC,MAAM,CAAC,qBAAqB;QAKjC,OAAO;YACL;gBACE,KAAK,EAAE,oBAAoB,CAAC,KAAK;gBACjC,KAAK,EAAE,OAAO;gBACd,WAAW,EAAE,2BAA2B;aACzC;YACD;gBACE,KAAK,EAAE,oBAAoB,CAAC,UAAU;gBACtC,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,4BAA4B;aAC1C;YACD;gBACE,KAAK,EAAE,oBAAoB,CAAC,kBAAkB;gBAC9C,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,mCAAmC;aACjD;YACD;gBACE,KAAK,EAAE,oBAAoB,CAAC,kBAAkB;gBAC9C,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,uBAAuB;aACrC;YACD;gBACE,KAAK,EAAE,oBAAoB,CAAC,kBAAkB;gBAC9C,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,gCAAgC;aAC9C;YACD;gBACE,KAAK,EAAE,oBAAoB,CAAC,kBAAkB;gBAC9C,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,gCAAgC;aAC9C;YACD;gBACE,KAAK,EAAE,oBAAoB,CAAC,kBAAkB;gBAC9C,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,6BAA6B;aAC3C;YACD;gBACE,KAAK,EAAE,oBAAoB,CAAC,kBAAkB;gBAC9C,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,8BAA8B;aAC5C;SACF,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,kBAAkB;QAC9B,OAAO;YACL,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;YAC3B,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,QAAQ,EAAE;YAC9C,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,QAAQ,EAAE;YAC9C,EAAE,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,UAAU,EAAE;YAClD,EAAE,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,UAAU,EAAE;YAClD,EAAE,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,UAAU,EAAE;SACnD,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,YAAY,CACxB,OAAoD;QAEpD,MAAM,IAAI,GAAgB,IAAI,GAAG,CAC/B,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAA2B,EAAE,EAAE;YAClD,OAAO,CAAC,CAAC,KAAK,CAAC;QACjB,CAAC,CAAC,CACH,CAAC;QACF,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBACtB,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,MAAM,CAAC,kBAAkB;QAC9B,OAAO;YACL,OAAO,EAAE;gBACP;oBACE,KAAK,EAAE,GAAG;oBACV,eAAe,EAAE,oBAAoB,CAAC,KAAK;iBAC5C;aACF;YACD,UAAU,EAAE,GAAG;YACf,gBAAgB,EAAE,EAAE;SACrB,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAC9B,UAAoD;;QAEpD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,yBAAyB,CAAC;QACnC,CAAC;QAED,MAAM,OAAO,GAAoC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC;QAE1E,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,0BAA0B,CAAC;QACpC,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,GAAG,gCAAgC,EAAE,CAAC;YACtD,OAAO,gCAAgC,gCAAgC,WAAW,CAAC;QACrF,CAAC;QAED,MAAM,OAAO,GAAgB,IAAI,GAAG,EAAU,CAAC;QAC/C,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,MAAM,MAAM,GAA6B,OAAO,CAAC,CAAC,CAAE,CAAC;YACrD,MAAM,MAAM,GAAW,UAAU,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC;YAEjE,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACrD,OAAO,GAAG,MAAM,8CAA8C,CAAC;YACjE,CAAC;YAED,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9B,OAAO,GAAG,MAAM,yDAAyD,CAAC;YAC5E,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAE1B,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;gBAC5B,OAAO,GAAG,MAAM,+BAA+B,CAAC;YAClD,CAAC;YAED,MAAM,YAAY,GAAY,OAAO,CAAC,MAAA,MAAM,CAAC,kBAAkB,0CAAE,IAAI,EAAE,CAAC,CAAC;YACzE,MAAM,cAAc,GAAY,OAAO,CACrC,MAAA,MAAM,CAAC,oBAAoB,0CAAE,IAAI,EAAE,CACpC,CAAC;YAEF,IAAI,YAAY,KAAK,cAAc,EAAE,CAAC;gBACpC,OAAO,GAAG,MAAM,sEAAsE,CAAC;YACzF,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAW,CAAC,UAAU,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAEhE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,yBAAyB,CAAC;QACnC,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,GAAG,0CAA0C,EAAE,CAAC;YACnE,OAAO,sBAAsB,0CAA0C,uBAAuB,CAAC;QACjG,CAAC;QAED,MAAM,iBAAiB,GAAgB,IAAI,GAAG,CAC5C,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CACjC,CAAC;QACF,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;YACtC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxB,OAAO,gCAAgC,KAAK,oCAAoC,CAAC;YACnF,CAAC;QACH,CAAC;QAED,IAAI,iBAAiB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,kEAAkE,CAAC;QAC5E,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACvC,OAAO,mGAAmG,CAAC;QAC7G,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"TraceRecordingRuleDefinition.js","sourceRoot":"","sources":["../../../../Types/Trace/TraceRecordingRuleDefinition.ts"],"names":[],"mappings":"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"}

package/build/dist/UI/Components/ImportExport/ExportModelCard.js

@@ -0,0 +1,50 @@
+import IconProp from "../../../Types/Icon/IconProp";
+import API from "../../Utils/API/API";
+import ModelImportExportUtil from "../../Utils/ModelImportExport";
+import { ButtonStyleType } from "../Button/Button";
+import Card from "../Card/Card";
+import ConfirmModal from "../Modal/ConfirmModal";
+import React, { useState } from "react";
+const ExportModelCard = (props) => {
+    const model = new props.modelType();
+    const singularName = model.singularName || "Resource";
+    const [isLoading, setIsLoading] = useState(false);
+    const [error, setError] = useState("");
+    const exportItem = async () => {
+        setIsLoading(true);
+        try {
+            const item = await ModelImportExportUtil.fetchItemForExport({
+                modelType: props.modelType,
+                modelId: props.modelId,
+                modelAPI: props.modelAPI,
+            });
+            ModelImportExportUtil.downloadExportFile({
+                modelType: props.modelType,
+                items: [item],
+            });
+        }
+        catch (err) {
+            setError(API.getFriendlyMessage(err));
+        }
+        setIsLoading(false);
+    };
+    return (React.createElement(React.Fragment, null,
+        React.createElement(Card, { title: `Export ${singularName} as JSON`, description: `Download this ${singularName.toLowerCase()} as a JSON file. You can import it later to re-create this ${singularName.toLowerCase()}. Only this ${singularName.toLowerCase()}'s own settings are included - related resources (like owners, labels, or other linked resources) are not exported, and references to resources from this project may need to be re-selected after importing into another project.`, buttons: [
+                {
+                    title: `Export ${singularName}`,
+                    buttonStyle: ButtonStyleType.NORMAL,
+                    onClick: () => {
+                        exportItem().catch((err) => {
+                            setError(API.getFriendlyMessage(err));
+                        });
+                    },
+                    isLoading: isLoading,
+                    icon: IconProp.Download,
+                },
+            ] }),
+        error ? (React.createElement(ConfirmModal, { description: error, title: `Export Error`, onSubmit: () => {
+                setError("");
+            }, submitButtonText: `Close`, submitButtonType: ButtonStyleType.NORMAL })) : (React.createElement(React.Fragment, null))));
+};
+export default ExportModelCard;
+//# sourceMappingURL=ExportModelCard.js.map

package/build/dist/UI/Components/ImportExport/ExportModelCard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExportModelCard.js","sourceRoot":"","sources":["../../../../../UI/Components/ImportExport/ExportModelCard.tsx"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,8BAA8B,CAAC;AAEpD,OAAO,GAAG,MAAM,qBAAqB,CAAC;AAEtC,OAAO,qBAAqB,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,IAAI,MAAM,cAAc,CAAC;AAChC,OAAO,YAAY,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,EAAgB,QAAQ,EAAE,MAAM,OAAO,CAAC;AAQtD,MAAM,eAAe,GAED,CAClB,KAAiC,EACnB,EAAE;IAChB,MAAM,KAAK,GAAe,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;IAChD,MAAM,YAAY,GAAW,KAAK,CAAC,YAAY,IAAI,UAAU,CAAC;IAE9D,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAU,KAAK,CAAC,CAAC;IAC3D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAS,EAAE,CAAC,CAAC;IAI/C,MAAM,UAAU,GAAuB,KAAK,IAAmB,EAAE;QAC/D,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnB,IAAI,CAAC;YACH,MAAM,IAAI,GACR,MAAM,qBAAqB,CAAC,kBAAkB,CAAa;gBACzD,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ;aACzB,CAAC,CAAC;YAEL,qBAAqB,CAAC,kBAAkB,CAAC;gBACvC,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,KAAK,EAAE,CAAC,IAAI,CAAC;aACd,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;QACxC,CAAC;QAED,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,OAAO,CACL;QACE,oBAAC,IAAI,IACH,KAAK,EAAE,UAAU,YAAY,UAAU,EACvC,WAAW,EAAE,iBAAiB,YAAY,CAAC,WAAW,EAAE,8DAA8D,YAAY,CAAC,WAAW,EAAE,eAAe,YAAY,CAAC,WAAW,EAAE,oOAAoO,EAC7Z,OAAO,EAAE;gBACP;oBACE,KAAK,EAAE,UAAU,YAAY,EAAE;oBAC/B,WAAW,EAAE,eAAe,CAAC,MAAM;oBACnC,OAAO,EAAE,GAAG,EAAE;wBACZ,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;4BAChC,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;wBACxC,CAAC,CAAC,CAAC;oBACL,CAAC;oBACD,SAAS,EAAE,SAAS;oBACpB,IAAI,EAAE,QAAQ,CAAC,QAAQ;iBACxB;aACF,GACD;QAED,KAAK,CAAC,CAAC,CAAC,CACP,oBAAC,YAAY,IACX,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,GAAG,EAAE;gBACb,QAAQ,CAAC,EAAE,CAAC,CAAC;YACf,CAAC,EACD,gBAAgB,EAAE,OAAO,EACzB,gBAAgB,EAAE,eAAe,CAAC,MAAM,GACxC,CACH,CAAC,CAAC,CAAC,CACF,yCAAK,CACN,CACA,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/build/dist/UI/Components/ImportExport/ImportModelsModal.js

@@ -0,0 +1,115 @@
+import CodeType from "../../../Types/Code/CodeType";
+import API from "../../Utils/API/API";
+import ModelImportExportUtil from "../../Utils/ModelImportExport";
+import Alert, { AlertType } from "../Alerts/Alert";
+import { ButtonStyleType } from "../Button/Button";
+import CodeEditor from "../CodeEditor/CodeEditor";
+import Modal, { ModalWidth } from "../Modal/Modal";
+import ProgressBar from "../ProgressBar/ProgressBar";
+import React, { useState } from "react";
+var ImportPhase;
+(function (ImportPhase) {
+    ImportPhase["Edit"] = "Edit";
+    ImportPhase["Importing"] = "Importing";
+    ImportPhase["Done"] = "Done";
+})(ImportPhase || (ImportPhase = {}));
+const ImportModelsModal = (props) => {
+    const model = new props.modelType();
+    const singularName = model.singularName || "Resource";
+    const pluralName = model.pluralName || "Resources";
+    const [phase, setPhase] = useState(ImportPhase.Edit);
+    const [fileText, setFileText] = useState("");
+    const [error, setError] = useState("");
+    const [completedCount, setCompletedCount] = useState(0);
+    const [totalCount, setTotalCount] = useState(0);
+    const [result, setResult] = useState(null);
+    const onFileSelected = (event) => {
+        var _a;
+        const file = (_a = event.target.files) === null || _a === void 0 ? void 0 : _a[0];
+        if (!file) {
+            return;
+        }
+        const reader = new FileReader();
+        reader.onload = () => {
+            setFileText(reader.result || "");
+            setError("");
+        };
+        reader.onerror = () => {
+            setError("Could not read the selected file. Please try again.");
+        };
+        reader.readAsText(file);
+        // allow re-selecting the same file after editing.
+        event.target.value = "";
+    };
+    const startImport = async () => {
+        setError("");
+        let itemJsons = [];
+        try {
+            itemJsons = ModelImportExportUtil.parseImportFileText({
+                modelType: props.modelType,
+                fileText: fileText,
+            });
+        }
+        catch (err) {
+            setError(API.getFriendlyMessage(err));
+            return;
+        }
+        setPhase(ImportPhase.Importing);
+        setCompletedCount(0);
+        setTotalCount(itemJsons.length);
+        try {
+            const importResult = await ModelImportExportUtil.importItems({
+                modelType: props.modelType,
+                itemJsons: itemJsons,
+                modelAPI: props.modelAPI,
+                onProgress: (completed, total) => {
+                    setCompletedCount(completed);
+                    setTotalCount(total);
+                },
+            });
+            setResult(importResult);
+            setPhase(ImportPhase.Done);
+            props.onImportComplete(importResult);
+        }
+        catch (err) {
+            // never trap the user in the importing phase - return to the editor.
+            setError(API.getFriendlyMessage(err));
+            setPhase(ImportPhase.Edit);
+        }
+    };
+    if (phase === ImportPhase.Importing) {
+        return (React.createElement(Modal, { title: `Importing ${pluralName}`, description: `Please wait while your ${pluralName.toLowerCase()} are being imported.`, isBodyLoading: false, onSubmit: () => { }, disableSubmitButton: true, submitButtonText: "Importing..." },
+            React.createElement("div", { className: "mt-5 mb-5" },
+                React.createElement(ProgressBar, { count: completedCount, totalCount: totalCount, suffix: pluralName }))));
+    }
+    if (phase === ImportPhase.Done && result) {
+        return (React.createElement(Modal, { title: `Import Complete`, onSubmit: () => {
+                props.onClose();
+            }, submitButtonText: "Close", submitButtonStyleType: ButtonStyleType.NORMAL },
+            React.createElement("div", { className: "mt-5 mb-5 space-y-3" },
+                result.successCount > 0 ? (React.createElement(Alert, { type: AlertType.SUCCESS, strongTitle: `${result.successCount} ${result.successCount === 1 ? singularName : pluralName} imported successfully.` })) : (React.createElement(React.Fragment, null)),
+                result.failures.length > 0 ? (React.createElement("div", null,
+                    React.createElement(Alert, { type: AlertType.DANGER, strongTitle: `${result.failures.length} ${result.failures.length === 1 ? singularName : pluralName} could not be imported.` }),
+                    React.createElement("ul", { className: "mt-3 list-disc pl-5 text-sm text-gray-600" }, result.failures.map((failure, index) => {
+                        return (React.createElement("li", { key: index, className: "mt-1" },
+                            React.createElement("span", { className: "font-medium" }, failure.itemName),
+                            ":",
+                            " ",
+                            failure.errorMessage));
+                    })))) : (React.createElement(React.Fragment, null)))));
+    }
+    return (React.createElement(Modal, { title: `Import ${pluralName}`, description: `Upload a ${singularName.toLowerCase()} JSON export file, or paste its contents below. New ${pluralName.toLowerCase()} will be created in this project. Related resources (like owners, labels, or other linked resources) are not part of export files, and references to resources from another project may need to be re-selected after import.`, modalWidth: ModalWidth.Large, onClose: props.onClose, onSubmit: async () => {
+            await startImport();
+        }, disableSubmitButton: !fileText.trim(), submitButtonText: `Import`, error: error || undefined },
+        React.createElement("div", { className: "mt-5 mb-5" },
+            React.createElement("label", { htmlFor: "import-file-input", className: "block text-sm font-medium text-gray-700" }, "Select export file"),
+            React.createElement("input", { id: "import-file-input", "data-testid": "import-file-input", type: "file", accept: ".json,application/json", onChange: onFileSelected, className: "mt-2 block w-full text-sm text-gray-600 file:mr-4 file:rounded-md file:border-0 file:bg-indigo-50 file:py-2 file:px-4 file:text-sm file:font-semibold file:text-indigo-700 hover:file:bg-indigo-100" }),
+            React.createElement("div", { className: "mt-4" },
+                React.createElement("label", { className: "block text-sm font-medium text-gray-700 mb-2" }, "Or paste the export JSON"),
+                React.createElement(CodeEditor, { type: CodeType.JSON, value: fileText, onChange: (value) => {
+                        setFileText(value);
+                        setError("");
+                    }, placeholder: `Paste your ${singularName.toLowerCase()} export JSON here.` })))));
+};
+export default ImportModelsModal;
+//# sourceMappingURL=ImportModelsModal.js.map

package/build/dist/UI/Components/ImportExport/ImportModelsModal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImportModelsModal.js","sourceRoot":"","sources":["../../../../../UI/Components/ImportExport/ImportModelsModal.tsx"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,8BAA8B,CAAC;AAEpD,OAAO,GAAG,MAAM,qBAAqB,CAAC;AAEtC,OAAO,qBAGN,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,WAAW,MAAM,4BAA4B,CAAC;AACrD,OAAO,KAAK,EAAE,EAAgB,QAAQ,EAAE,MAAM,OAAO,CAAC;AAStD,IAAK,WAIJ;AAJD,WAAK,WAAW;IACd,4BAAa,CAAA;IACb,sCAAuB,CAAA;IACvB,4BAAa,CAAA;AACf,CAAC,EAJI,WAAW,KAAX,WAAW,QAIf;AAED,MAAM,iBAAiB,GAEH,CAClB,KAAiC,EACnB,EAAE;IAChB,MAAM,KAAK,GAAe,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;IAChD,MAAM,YAAY,GAAW,KAAK,CAAC,YAAY,IAAI,UAAU,CAAC;IAC9D,MAAM,UAAU,GAAW,KAAK,CAAC,UAAU,IAAI,WAAW,CAAC;IAE3D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAc,WAAW,CAAC,IAAI,CAAC,CAAC;IAClE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAS,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAS,EAAE,CAAC,CAAC;IAC/C,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAS,CAAC,CAAC,CAAC;IAChE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAS,CAAC,CAAC,CAAC;IACxD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAsB,IAAI,CAAC,CAAC;IAMhE,MAAM,cAAc,GAA2B,CAC7C,KAA0C,EACpC,EAAE;;QACR,MAAM,IAAI,GAAqB,MAAA,KAAK,CAAC,MAAM,CAAC,KAAK,0CAAG,CAAC,CAAC,CAAC;QAEvD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAe,IAAI,UAAU,EAAE,CAAC;QAE5C,MAAM,CAAC,MAAM,GAAG,GAAS,EAAE;YACzB,WAAW,CAAE,MAAM,CAAC,MAAiB,IAAI,EAAE,CAAC,CAAC;YAC7C,QAAQ,CAAC,EAAE,CAAC,CAAC;QACf,CAAC,CAAC;QAEF,MAAM,CAAC,OAAO,GAAG,GAAS,EAAE;YAC1B,QAAQ,CAAC,qDAAqD,CAAC,CAAC;QAClE,CAAC,CAAC;QAEF,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAExB,kDAAkD;QAClD,KAAK,CAAC,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC;IAC1B,CAAC,CAAC;IAIF,MAAM,WAAW,GAAwB,KAAK,IAAmB,EAAE;QACjE,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEb,IAAI,SAAS,GAAsB,EAAE,CAAC;QAEtC,IAAI,CAAC;YACH,SAAS,GAAG,qBAAqB,CAAC,mBAAmB,CAAC;gBACpD,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;YACtC,OAAO;QACT,CAAC;QAED,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAChC,iBAAiB,CAAC,CAAC,CAAC,CAAC;QACrB,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEhC,IAAI,CAAC;YACH,MAAM,YAAY,GAChB,MAAM,qBAAqB,CAAC,WAAW,CAAC;gBACtC,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,SAAS,EAAE,SAAS;gBACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,UAAU,EAAE,CAAC,SAAiB,EAAE,KAAa,EAAE,EAAE;oBAC/C,iBAAiB,CAAC,SAAS,CAAC,CAAC;oBAC7B,aAAa,CAAC,KAAK,CAAC,CAAC;gBACvB,CAAC;aACF,CAAC,CAAC;YAEL,SAAS,CAAC,YAAY,CAAC,CAAC;YACxB,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAC3B,KAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,qEAAqE;YACrE,QAAQ,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;YACtC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,KAAK,KAAK,WAAW,CAAC,SAAS,EAAE,CAAC;QACpC,OAAO,CACL,oBAAC,KAAK,IACJ,KAAK,EAAE,aAAa,UAAU,EAAE,EAChC,WAAW,EAAE,0BAA0B,UAAU,CAAC,WAAW,EAAE,sBAAsB,EACrF,aAAa,EAAE,KAAK,EACpB,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC,EAClB,mBAAmB,EAAE,IAAI,EACzB,gBAAgB,EAAE,cAAc;YAEhC,6BAAK,SAAS,EAAC,WAAW;gBACxB,oBAAC,WAAW,IACV,KAAK,EAAE,cAAc,EACrB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,UAAU,GAClB,CACE,CACA,CACT,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,KAAK,WAAW,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;QACzC,OAAO,CACL,oBAAC,KAAK,IACJ,KAAK,EAAE,iBAAiB,EACxB,QAAQ,EAAE,GAAG,EAAE;gBACb,KAAK,CAAC,OAAO,EAAE,CAAC;YAClB,CAAC,EACD,gBAAgB,EAAE,OAAO,EACzB,qBAAqB,EAAE,eAAe,CAAC,MAAM;YAE7C,6BAAK,SAAS,EAAC,qBAAqB;gBACjC,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,CACzB,oBAAC,KAAK,IACJ,IAAI,EAAE,SAAS,CAAC,OAAO,EACvB,WAAW,EAAE,GAAG,MAAM,CAAC,YAAY,IACjC,MAAM,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAC7C,yBAAyB,GACzB,CACH,CAAC,CAAC,CAAC,CACF,yCAAK,CACN;gBAEA,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAC5B;oBACE,oBAAC,KAAK,IACJ,IAAI,EAAE,SAAS,CAAC,MAAM,EACtB,WAAW,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAChD,yBAAyB,GACzB;oBACF,4BAAI,SAAS,EAAC,2CAA2C,IACtD,MAAM,CAAC,QAAQ,CAAC,GAAG,CAClB,CAAC,OAAsB,EAAE,KAAa,EAAE,EAAE;wBACxC,OAAO,CACL,4BAAI,GAAG,EAAE,KAAK,EAAE,SAAS,EAAC,MAAM;4BAC9B,8BAAM,SAAS,EAAC,aAAa,IAAE,OAAO,CAAC,QAAQ,CAAQ;;4BAAE,GAAG;4BAC3D,OAAO,CAAC,YAAY,CAClB,CACN,CAAC;oBACJ,CAAC,CACF,CACE,CACD,CACP,CAAC,CAAC,CAAC,CACF,yCAAK,CACN,CACG,CACA,CACT,CAAC;IACJ,CAAC;IAED,OAAO,CACL,oBAAC,KAAK,IACJ,KAAK,EAAE,UAAU,UAAU,EAAE,EAC7B,WAAW,EAAE,YAAY,YAAY,CAAC,WAAW,EAAE,uDAAuD,UAAU,CAAC,WAAW,EAAE,8NAA8N,EAChW,UAAU,EAAE,UAAU,CAAC,KAAK,EAC5B,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,QAAQ,EAAE,KAAK,IAAI,EAAE;YACnB,MAAM,WAAW,EAAE,CAAC;QACtB,CAAC,EACD,mBAAmB,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EACrC,gBAAgB,EAAE,QAAQ,EAC1B,KAAK,EAAE,KAAK,IAAI,SAAS;QAEzB,6BAAK,SAAS,EAAC,WAAW;YACxB,+BACE,OAAO,EAAC,mBAAmB,EAC3B,SAAS,EAAC,yCAAyC,yBAG7C;YACR,+BACE,EAAE,EAAC,mBAAmB,iBACV,mBAAmB,EAC/B,IAAI,EAAC,MAAM,EACX,MAAM,EAAC,wBAAwB,EAC/B,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAC,qMAAqM,GAC/M;YAEF,6BAAK,SAAS,EAAC,MAAM;gBACnB,+BAAO,SAAS,EAAC,8CAA8C,+BAEvD;gBACR,oBAAC,UAAU,IACT,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,KAAK,EAAE,QAAQ,EACf,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;wBAC1B,WAAW,CAAC,KAAK,CAAC,CAAC;wBACnB,QAAQ,CAAC,EAAE,CAAC,CAAC;oBACf,CAAC,EACD,WAAW,EAAE,cAAc,YAAY,CAAC,WAAW,EAAE,oBAAoB,GACzE,CACE,CACF,CACA,CACT,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/build/dist/UI/Components/LogsViewer/LogsViewer.js

@@ -268,7 +268,7 @@ const LogsViewer = (props) => {
              * Logs without a service.name are tagged with the projectId
              * (ServiceType.Unknown) and have no Service row. Register a
              * synthetic "Unknown Service" keyed by the projectId so the
-             * serviceId -> name resolution and the serviceId facet render
+             * primaryEntityId -> name resolution and the service facet render
              * "Unknown Service" instead of a raw id. Harmless when no logs
              * are unattributed — nothing resolves against it.
              */
@@ -399,12 +399,12 @@ const LogsViewer = (props) => {
     const handleSearchSubmit = useCallback(() => {
         const queryFilter = queryStringToFilter(searchQuery);
         // Resolve human-readable service name to UUID if needed
-        if (queryFilter["serviceId"] &&
-            typeof queryFilter["serviceId"] === "string") {
-            const serviceName = queryFilter["serviceId"];
+        if (queryFilter["primaryEntityId"] &&
+            typeof queryFilter["primaryEntityId"] === "string") {
+            const serviceName = queryFilter["primaryEntityId"];
             const resolvedId = resolveServiceNameToId(serviceName, serviceMap);
             if (resolvedId) {
-                queryFilter["serviceId"] = resolvedId;
+                queryFilter["primaryEntityId"] = resolvedId;
             }
         }
         const mergedFilter = Object.assign(Object.assign({}, filterData), queryFilter);
@@ -551,7 +551,7 @@ const LogsViewer = (props) => {
             return [];
         }
         return props.activeFilters.map((filter) => {
-            if (filter.facetKey === "serviceId" && serviceMap[filter.value]) {
+            if (filter.facetKey === "primaryEntityId" && serviceMap[filter.value]) {
                 const service = serviceMap[filter.value];
                 return Object.assign(Object.assign({}, filter), { displayValue: (service === null || service === void 0 ? void 0 : service.name) || filter.value });
             }
@@ -578,7 +578,7 @@ const LogsViewer = (props) => {
         kubernetesClusterMap,
     ]);
     /*
-     * Replace serviceId UUIDs with human-readable names in value suggestions,
+     * Replace primaryEntityId UUIDs with human-readable names in value suggestions,
      * and merge in the lazily-fetched attribute value suggestions.
      * Must be before early returns to maintain consistent hook call order.
      */
@@ -589,8 +589,9 @@ const LogsViewer = (props) => {
             return undefined;
         }
         const suggestions = Object.assign(Object.assign({}, (props.valueSuggestions || {})), attributeValueSuggestions);
-        if (suggestions["serviceId"] && Object.keys(serviceMap).length > 0) {
-            suggestions["serviceId"] = suggestions["serviceId"].map((id) => {
+        if (suggestions["primaryEntityId"] &&
+            Object.keys(serviceMap).length > 0) {
+            suggestions["primaryEntityId"] = suggestions["primaryEntityId"].map((id) => {
                 const service = serviceMap[id];
                 return (service === null || service === void 0 ? void 0 : service.name) || id;
             });