npm - @oneuptime/common - Versions diffs - 13.0.1 → 13.0.3 - Mend

@oneuptime/common 13.0.1 → 13.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (769) hide show

package/build/dist/Server/Services/ProjectCallSMSConfigService.js CHANGED Viewed

@@ -17,6 +17,8 @@ import QueryHelper from "../Types/Database/QueryHelper";
 import IncomingCallPolicyService from "./IncomingCallPolicyService";
 import releaseIncomingCallPhoneNumber from "../Utils/IncomingCallPhoneNumber";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import IncomingCallPolicyPhoneNumberService from "./IncomingCallPolicyPhoneNumberService";
+import ModelPermission from "../Types/Database/Permissions/Index";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -86,6 +88,12 @@ export class Service extends DatabaseService {
         return { updateBy, carryForward: null };
     }
     async onBeforeDelete(deleteBy) {
+        /*
+         * This hook releases provider resources before DatabaseService reaches its
+         * usual delete permission check. Scope the query first so a denied config
+         * delete cannot release or clear another tenant's phone numbers.
+         */
+        deleteBy.query = await ModelPermission.checkDeleteQueryPermission(Model, deleteBy.query, deleteBy.props);
         /*
          * When a Call/SMS config is deleted, release any incoming-call numbers
          * provisioned through it (so they don't keep billing on the provider) and
@@ -97,17 +105,34 @@ export class Service extends DatabaseService {
             select: {
                 _id: true,
             },
-            limit: LIMIT_MAX,
-            skip: 0,
+            limit: deleteBy.limit,
+            skip: deleteBy.skip,
             props: {
                 isRoot: true,
             },
         });
+        const configIds = configs
+            .map((config) => {
+            return config.id;
+        })
+            .filter((configId) => {
+            return Boolean(configId);
+        });
+        /*
+         * Freeze the caller's offset/limit window before provider side effects.
+         * The original window could otherwise select different rows when
+         * DatabaseService evaluates it again after the releases complete.
+         */
+        deleteBy.query = {
+            _id: QueryHelper.any(configIds),
+        };
+        deleteBy.skip = 0;
+        deleteBy.limit = configIds.length;
         for (const config of configs) {
             if (!config.id) {
                 continue;
             }
-            const policies = await IncomingCallPolicyService.findBy({
+            const phoneNumbers = await IncomingCallPolicyPhoneNumberService.findAllBy({
                 query: {
                     projectCallSMSConfigId: config.id,
                 },
@@ -116,21 +141,105 @@ export class Service extends DatabaseService {
                     callProviderPhoneNumberId: true,
                     projectCallSMSConfigId: true,
                 },
-                limit: LIMIT_MAX,
-                skip: 0,
                 props: {
                     isRoot: true,
                 },
             });
+            /*
+             * Snapshot scalar-only attachments before deleting child rows. The child
+             * delete hook updates the compatibility mirror and can otherwise erase
+             * an unmatched legacy SID before it is released from the provider.
+             */
+            const policies = await IncomingCallPolicyService.findAllBy({
+                query: {
+                    projectCallSMSConfigId: config.id,
+                },
+                select: {
+                    _id: true,
+                    callProviderPhoneNumberId: true,
+                    projectCallSMSConfigId: true,
+                },
+                props: {
+                    isRoot: true,
+                },
+            });
+            const releasedProviderPhoneNumberIds = new Set();
+            for (const phoneNumber of phoneNumbers) {
+                if (!phoneNumber.callProviderPhoneNumberId ||
+                    !phoneNumber.projectCallSMSConfigId) {
+                    continue;
+                }
+                if (releasedProviderPhoneNumberIds.has(phoneNumber.callProviderPhoneNumberId)) {
+                    continue;
+                }
+                await releaseIncomingCallPhoneNumber({
+                    projectCallSMSConfigId: phoneNumber.projectCallSMSConfigId,
+                    callProviderPhoneNumberId: phoneNumber.callProviderPhoneNumberId,
+                });
+                releasedProviderPhoneNumberIds.add(phoneNumber.callProviderPhoneNumberId);
+            }
             for (const policy of policies) {
                 if (!policy.callProviderPhoneNumberId ||
-                    !policy.projectCallSMSConfigId) {
+                    !policy.projectCallSMSConfigId ||
+                    releasedProviderPhoneNumberIds.has(policy.callProviderPhoneNumberId)) {
                     continue;
                 }
                 await releaseIncomingCallPhoneNumber({
                     projectCallSMSConfigId: policy.projectCallSMSConfigId,
                     callProviderPhoneNumberId: policy.callProviderPhoneNumberId,
                 });
+                releasedProviderPhoneNumberIds.add(policy.callProviderPhoneNumberId);
+            }
+            /*
+             * Delete through the child service before the config itself is removed.
+             * Its hooks re-select the oldest remaining number for each affected
+             * policy and update the legacy compatibility fields accordingly.
+             */
+            const phoneNumberIds = phoneNumbers
+                .map((phoneNumber) => {
+                return phoneNumber.id;
+            })
+                .filter((phoneNumberId) => {
+                return Boolean(phoneNumberId);
+            });
+            /*
+             * deleteBy is intentionally bounded, so delete the exact snapshotted
+             * child ids in batches. This covers configs with more than LIMIT_MAX
+             * attached numbers and keeps the explicit cleanup bound to the rows
+             * whose provider resources were released above.
+             */
+            for (let offset = 0; offset < phoneNumberIds.length; offset += LIMIT_MAX) {
+                const phoneNumberIdBatch = phoneNumberIds.slice(offset, offset + LIMIT_MAX);
+                await IncomingCallPolicyPhoneNumberService.deleteBy({
+                    query: {
+                        _id: QueryHelper.any(phoneNumberIdBatch),
+                    },
+                    limit: phoneNumberIdBatch.length,
+                    skip: 0,
+                    props: {
+                        isRoot: true,
+                    },
+                });
+            }
+            for (const policy of policies) {
+                if (!policy.id) {
+                    continue;
+                }
+                const remainingPhoneNumber = await IncomingCallPolicyPhoneNumberService.findOneBy({
+                    query: {
+                        incomingCallPolicyId: policy.id,
+                    },
+                    select: {
+                        _id: true,
+                    },
+                    props: {
+                        isRoot: true,
+                    },
+                });
+                if (remainingPhoneNumber) {
+                    await IncomingCallPolicyPhoneNumberService.syncPrimaryPhoneNumberToPolicy(policy.id);
+                    continue;
+                }
                 await IncomingCallPolicyService.updateOneById({
                     id: policy.id,
                     data: {

package/build/dist/Server/Services/ProjectCallSMSConfigService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ProjectCallSMSConfigService.js","sourceRoot":"","sources":["../../../../Server/Services/ProjectCallSMSConfigService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,KAAK,MAAM,kDAAkD,CAAC;AACrE,OAAO,KAAK,MAAM,mBAAmB,CAAC;AAKtC,OAAO,SAAS,MAAM,+BAA+B,CAAC;AACtD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,WAAW,MAAM,+BAA+B,CAAC;AACxD,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AAEpE,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAC9E,OAAO,WAAW,MAAM,gCAAgC,CAAC;~~AAEzD~~,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,IAAI,QAAQ,CAAC,IAAI,CAAC,gBAAgB,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAC9D,MAAM,IAAI,CAAC,QAAQ,CAAC;gBAClB,KAAK,EAAE;oBACL,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS;oBAClC,gBAAgB,EAAE,IAAI;iBACvB;gBACD,IAAI,EAAE;oBACJ,gBAAgB,EAAE,KAAK;iBACxB;gBACD,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;gBACD,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,CAAC;aACR,CAAC,CAAC;QACL,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IACxC,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,IAAI,QAAQ,CAAC,IAAI,CAAC,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAC5C,MAAM,aAAa,GAAiB,MAAM,IAAI,CAAC,MAAM,CAAC;gBACpD,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,MAAM,EAAE;oBACN,GAAG,EAAE,IAAI;oBACT,SAAS,EAAE,IAAI;iBAChB;gBACD,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;gBACD,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,CAAC;aACR,CAAC,CAAC;YAEH,MAAM,UAAU,GAAgB,IAAI,GAAG,EAAE,CAAC;YAC1C,MAAM,OAAO,GAAgB,IAAI,GAAG,EAAE,CAAC;YACvC,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;gBACjC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;oBACnB,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC5C,CAAC;gBACD,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;oBACb,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACxB,CAAC;YACH,CAAC;YAED,KAAK,MAAM,YAAY,IAAI,UAAU,EAAE,CAAC;gBACtC,MAAM,SAAS,GAAa,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAC;gBACvD,MAAM,IAAI,CAAC,QAAQ,CAAC;oBAClB,KAAK,EAAE;wBACL,SAAS,EAAE,SAAS;wBACpB,gBAAgB,EAAE,IAAI;wBACtB,GAAG,EAAE,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;qBAClD;oBACD,IAAI,EAAE;wBACJ,gBAAgB,EAAE,KAAK;qBACxB;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;oBACD,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,CAAC;iBACR,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB;;;;;WAKG;QACH,MAAM,OAAO,GAAiB,MAAM,IAAI,CAAC,MAAM,CAAC;YAC9C,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;aACV;YACD,KAAK,EAAE,~~SAAS~~;~~YAChB~~,IAAI,EAAE,CAAC;~~YACP~~,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,SAAS;YACX,CAAC;YAED,MAAM,~~QAAQ~~,~~GACZ~~,MAAM,~~yBAAyB~~,CAAC,~~MAAM~~,CAAC;~~gBACrC~~,KAAK,EAAE;oBACL,sBAAsB,EAAE,MAAM,CAAC,EAAE;iBAClC;gBACD,MAAM,EAAE;oBACN,GAAG,EAAE,IAAI;oBACT,yBAAyB,EAAE,IAAI;oBAC/B,sBAAsB,EAAE,IAAI;iBAC7B;gBACD,KAAK,EAAE,SAAS;~~gBAChB~~,~~IAAI~~,EAAE,CAAC;~~gBACP~~,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;aACF,CAAC,CAAC;YAEL,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;gBAC9B,IACE,CAAC,MAAM,CAAC,yBAAyB;oBACjC,CAAC,MAAM,CAAC,sBAAsB,~~EAC9B~~,CAAC;oBACD,SAAS;gBACX,CAAC;gBAED,MAAM,8BAA8B,CAAC;oBACnC,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;oBACrD,yBAAyB,EAAE,MAAM,CAAC,yBAAyB;iBAC5D,CAAC,CAAC;gBAEH,MAAM,yBAAyB,CAAC,aAAa,CAAC;oBAC5C,EAAE,EAAE,MAAM,CAAC,~~EAAG~~;~~oBACd~~,IAAI,EAAE;wBACJ,kBAAkB,EAAE,IAAI;wBACxB,yBAAyB,EAAE,IAAI;wBAC/B,sBAAsB,EAAE,IAAI;wBAC5B,mBAAmB,EAAE,IAAI;wBACzB,sBAAsB,EAAE,IAAI;wBAC5B,8DAA8D;qBACxD;oBACR,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAGY,AAAN,KAAK,CAAC,6BAA6B,CACxC,SAA+B;QAE/B,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,MAAM,GAAiB,MAAM,IAAI,CAAC,SAAS,CAAC;YAChD,KAAK,EAAE;gBACL,SAAS,EAAE,SAAS;gBACpB,gBAAgB,EAAE,IAAI;aACvB;YACD,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;gBACT,gBAAgB,EAAE,IAAI;gBACtB,eAAe,EAAE,IAAI;gBACrB,wBAAwB,EAAE,IAAI;gBAC9B,2BAA2B,EAAE,IAAI;aAClC;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC;QAAC,WAAM,CAAC;YACP,mFAAmF;YACnF,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAEM,cAAc,CACnB,oBAAuC;QAEvC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,EAAE,EAAE,CAAC;YAC7B,MAAM,IAAI,gBAAgB,CAAC,2CAA2C,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,CAAC;YAC3C,MAAM,IAAI,gBAAgB,CACxB,2DAA2D,CAC5D,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,EAAE,CAAC;YACnD,MAAM,IAAI,gBAAgB,CACxB,4DAA4D,CAC7D,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,CAAC;YAC1C,MAAM,IAAI,gBAAgB,CACxB,0DAA0D,CAC3D,CAAC;QACJ,CAAC;QAED,OAAO;YACL,UAAU,EAAE,oBAAoB,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YAC5D,SAAS,EAAE,oBAAoB,CAAC,eAAe,CAAC,QAAQ,EAAE;YAC1D,kBAAkB,EAAE,oBAAoB,CAAC,wBAAwB;YACjE,qBAAqB,EACnB,oBAAoB,CAAC,2BAA2B;gBAChD,oBAAoB,CAAC,2BAA2B,CAAC,MAAM,GAAG,CAAC;gBACzD,CAAC,CAAC,oBAAoB,CAAC,2BAA2B;qBAC7C,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE;oBACrB,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC1B,CAAC,CAAC;gBACN,CAAC,CAAC,EAAE;SACT,CAAC;IACJ,CAAC;CACF;~~AAzO0B~~;IADxB,WAAW,EAAE;;;;6CAsBb;AAGwB;IADxB,WAAW,EAAE;;;;6CAkDb;AAGwB;IADxB,WAAW,EAAE;;;;~~6CA2Eb~~;AAGY;IADZ,WAAW,EAAE;;;;4DAmCb;AA+CH,eAAe,IAAI,OAAO,EAAE,CAAC"}
1	+ {"version":3,"file":"ProjectCallSMSConfigService.js","sourceRoot":"","sources":["../../../../Server/Services/ProjectCallSMSConfigService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/ProxmoxClusterLabelRuleEngineService.js CHANGED Viewed

@@ -18,6 +18,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class ProxmoxClusterLabelRuleEngineServiceClass {
     /**
@@ -40,6 +41,7 @@ class ProxmoxClusterLabelRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     proxmoxClusterLabels: { _id: true },
                     proxmoxClusterNamePattern: true,
                     proxmoxClusterDescriptionPattern: true,
@@ -146,6 +148,20 @@ class ProxmoxClusterLabelRuleEngineServiceClass {
         }
     }
     doesProxmoxClusterMatchRule(proxmoxCluster, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "proxmoxClusterLabels",
+                "proxmoxClusterNamePattern",
+                "proxmoxClusterDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (proxmoxClusterRule) => {
+                return this.doesProxmoxClusterMatchRuleLegacy(proxmoxCluster, proxmoxClusterRule);
+            },
+        });
+    }
+    doesProxmoxClusterMatchRuleLegacy(proxmoxCluster, rule) {
         if (rule.proxmoxClusterLabels && rule.proxmoxClusterLabels.length > 0) {
             if (!proxmoxCluster.labels || proxmoxCluster.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/ProxmoxClusterLabelRuleEngineService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ProxmoxClusterLabelRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/ProxmoxClusterLabelRuleEngineService.ts"],"names":[],"mappings":"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~~AA1Nc~~;IADZ,WAAW,EAAE;;qCAEI,cAAc;;~~2FAoJ~~/B;~~AAuEH~~,eAAe,IAAI,yCAAyC,EAAE,CAAC"}
1	+ {"version":3,"file":"ProxmoxClusterLabelRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/ProxmoxClusterLabelRuleEngineService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,mCAAmC,CAAC;AACtD,OAAO,cAAc,MAAM,4CAA4C,CAAC;AAExE,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAC9E,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAC5D,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gDAAgD,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,MAAyB,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,+BAA+B,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,yBAAyB,MAAM,mCAAmC,CAAC;AAE1E,MAAM,yCAAyC;IAC7C;;;;OAIG;IAEU,AAAN,KAAK,CAAC,0BAA0B,CACrC,cAA8B;;QAE9B,IAAI,CAAC,cAAc,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC;YACpD,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GACT,MAAM,8BAA8B,CAAC,MAAM,CAAC;gBAC1C,KAAK,EAAE;oBACL,SAAS,EAAE,cAAc,CAAC,SAAS;oBACnC,SAAS,EAAE,IAAI;iBAChB;gBACD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;gBACvB,MAAM,EAAE;oBACN,GAAG,EAAE,IAAI;oBACT,IAAI,EAAE,IAAI;oBACV,QAAQ,EAAE,IAAI;oBACd,oBAAoB,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;oBACnC,yBAAyB,EAAE,IAAI;oBAC/B,gCAAgC,EAAE,IAAI;oBACtC,WAAW,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;iBAC3B;gBACD,KAAK,EAAE,+BAA+B;gBACtC,IAAI,EAAE,CAAC;aACR,CAAC,CAAC;YAEL,yBAAyB,CAAC;gBACxB,QAAQ,EAAE,yBAAyB;gBACnC,SAAS,EAAE,cAAc,CAAC,SAAS;gBACnC,SAAS,EAAE,KAAK,CAAC,MAAM;aACxB,CAAC,CAAC;YAEH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,OAAO;YACT,CAAC;YAED,MAAM,yBAAyB,GAC7B,MAAM,qBAAqB,CAAC,WAAW,CAAC;gBACtC,EAAE,EAAE,cAAc,CAAC,EAAE;gBACrB,MAAM,EAAE;oBACN,IAAI,EAAE,IAAI;oBACV,WAAW,EAAE,IAAI;oBACjB,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;iBACtB;gBACD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;aACxB,CAAC,CAAC;YAEL,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBAC/B,OAAO;YACT,CAAC;YAED,MAAM,aAAa,GAAgB,IAAI,GAAG,EAAE,CAAC;YAC7C,MAAM,gBAAgB,GAAkB,EAAE,CAAC;YAE3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAY,IAAI,CAAC,2BAA2B,CACvD,yBAAyB,EACzB,IAAI,CACL,CAAC;gBACF,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,SAAS;gBACX,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACxC,gBAAgB,CAAC,IAAI,CACnB,IAAI,CAAC,IAAI,KAAI,MAAA,IAAI,CAAC,EAAE,0CAAE,QAAQ,EAAE,CAAA,IAAI,cAAc,CACnD,CAAC;gBACJ,CAAC;gBACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;oBAC3C,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;wBACb,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACzC,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO;YACT,CAAC;YAED,MAAM,gBAAgB,GAAgB,IAAI,GAAG,CAC3C,CAAC,yBAAyB,CAAC,MAAM,IAAI,EAAE,CAAC;iBACrC,GAAG,CAAC,CAAC,CAAQ,EAAE,EAAE;;gBAChB,OAAO,CAAA,MAAA,CAAC,CAAC,EAAE,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;YAChC,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,EAAU,EAAE,EAAE;gBACrB,OAAO,EAAE,KAAK,EAAE,CAAC;YACnB,CAAC,CAAC,CACL,CAAC;YAEF,MAAM,WAAW,GAAkB,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CACjE,CAAC,EAAU,EAAE,EAAE;gBACb,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnC,CAAC,CACF,CAAC;YACF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO;YACT,CAAC;YAED,MAAM,qBAAqB,CAAC,aAAa,EAAE;iBACxC,kBAAkB,EAAE;iBACpB,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC;iBAClC,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;iBAChC,GAAG,CAAC,WAAW,CAAC,CAAC;YAEpB;;;eAGG;YACH,MAAM,cAAc,GAAgB,IAAI,GAAG,CAAC;gBAC1C,GAAG,gBAAgB;gBACnB,GAAG,WAAW;aACf,CAAC,CAAC;YACH,cAAc,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,EAAU,EAAE,EAAE;gBACpE,MAAM,KAAK,GAAU,IAAI,KAAK,EAAE,CAAC;gBACjC,KAAK,CAAC,EAAE,GAAG,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC5B,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,KAAK,CACV,0CAA0C,WAAW,CAAC,MAAM,8BAA8B,cAAc,CAAC,EAAE,EAAE,EAC7G,EAAE,SAAS,EAAE,cAAc,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAmB,CACpE,CAAC;YACF;;;;eAIG;YACH,MAAM,yBAAyB,CAAC,4BAA4B,CAAC;gBAC3D,gBAAgB,EAAE,cAAc,CAAC,EAAE;gBACnC,SAAS,EAAE,cAAc,CAAC,SAAS;gBACnC,2BAA2B,EACzB,2BAA2B,CAAC,iBAAiB;gBAC/C,YAAY,EAAE,SAAS;gBACvB,kBAAkB,EAAE,OAAO,WAAW,CAAC,MAAM,8BAA8B,MAAM,qBAAqB,CAAC,6BAA6B,CAClI,cAAc,CAAC,SAAS,EACxB,cAAc,CAAC,EAAE,CAClB,aAAa,gBAAgB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,GAAG;gBACjE,yBAAyB,EAAE,iCAAiC,gBAAgB;qBACzE,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;oBACpB,OAAO,KAAK,IAAI,IAAI,CAAC;gBACvB,CAAC,CAAC;qBACD,IAAI,CAAC,IAAI,CAAC,EAAE;aAChB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,+CAA+C,KAAK,EAAE,EAAE;gBACnE,SAAS,EAAE,MAAA,cAAc,CAAC,SAAS,0CAAE,QAAQ,EAAE;gBAC/C,gBAAgB,EAAE,MAAA,cAAc,CAAC,EAAE,0CAAE,QAAQ,EAAE;aAC/B,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAEO,2BAA2B,CACjC,cAA8B,EAC9B,IAA6B;QAE7B,OAAO,mBAAmB,CAAC,qBAAqB,CAAC;YAC/C,IAAI,EAAE,IAAI;YACV,YAAY,EAAE;gBACZ,sBAAsB;gBACtB,2BAA2B;gBAC3B,kCAAkC;aACnC;YACD,WAAW,EAAE,IAAI;YACjB,iBAAiB,EAAE,CACjB,kBAA2C,EAClC,EAAE;gBACX,OAAO,IAAI,CAAC,iCAAiC,CAC3C,cAAc,EACd,kBAAkB,CACnB,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAEO,iCAAiC,CACvC,cAA8B,EAC9B,IAA6B;QAE7B,IAAI,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtE,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjE,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,YAAY,GAAkB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAC/D,CAAC,CAAQ,EAAE,EAAE;;gBACX,OAAO,CAAA,MAAA,CAAC,CAAC,EAAE,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;YAChC,CAAC,CACF,CAAC;YACF,MAAM,QAAQ,GAAkB,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAQ,EAAE,EAAE;;gBACrE,OAAO,CAAA,MAAA,CAAC,CAAC,EAAE,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC;YACH,IACE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAU,EAAE,EAAE;gBAChC,OAAO,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC/B,CAAC,CAAC,EACF,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,IACE,IAAI,CAAC,yBAAyB;YAC9B,CAAC,CAAC,cAAc,CAAC,IAAI;gBACnB,CAAC,IAAI,CAAC,SAAS,CACb,IAAI,CAAC,yBAAyB,EAC9B,cAAc,CAAC,IAAI,EACnB,IAAI,CACL,CAAC,EACJ,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IACE,IAAI,CAAC,gCAAgC;YACrC,CAAC,CAAC,cAAc,CAAC,WAAW;gBAC1B,CAAC,IAAI,CAAC,SAAS,CACb,IAAI,CAAC,gCAAgC,EACrC,cAAc,CAAC,WAAW,EAC1B,IAAI,CACL,CAAC,EACJ,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,SAAS,CACf,OAAe,EACf,KAAa,EACb,IAA6B;QAE7B,IAAI,CAAC;YACH,MAAM,KAAK,GAAW,IAAI,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QAAC,WAAM,CAAC;YACP,MAAM,CAAC,IAAI,CACT,+CAA+C,IAAI,CAAC,EAAE,KAAK,OAAO,EAAE,CACrE,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CACF;AAlPc;IADZ,WAAW,EAAE;;qCAEI,cAAc;;2FAqJ/B;AA8FH,eAAe,IAAI,yCAAyC,EAAE,CAAC"}

package/build/dist/Server/Services/ProxmoxClusterOwnerRuleEngineService.js CHANGED Viewed

@@ -21,6 +21,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class ProxmoxClusterOwnerRuleEngineServiceClass {
     /**
@@ -44,6 +45,7 @@ class ProxmoxClusterOwnerRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     notifyOwners: true,
                     proxmoxClusterLabels: { _id: true },
                     proxmoxClusterNamePattern: true,
@@ -163,6 +165,20 @@ class ProxmoxClusterOwnerRuleEngineServiceClass {
         }
     }
     doesProxmoxClusterMatchRule(proxmoxCluster, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "proxmoxClusterLabels",
+                "proxmoxClusterNamePattern",
+                "proxmoxClusterDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (proxmoxClusterRule) => {
+                return this.doesProxmoxClusterMatchRuleLegacy(proxmoxCluster, proxmoxClusterRule);
+            },
+        });
+    }
+    doesProxmoxClusterMatchRuleLegacy(proxmoxCluster, rule) {
         if (rule.proxmoxClusterLabels && rule.proxmoxClusterLabels.length > 0) {
             if (!proxmoxCluster.labels || proxmoxCluster.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/ProxmoxClusterOwnerRuleEngineService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ProxmoxClusterOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/ProxmoxClusterOwnerRuleEngineService.ts"],"names":[],"mappings":"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~~AAjOc~~;IADZ,WAAW,EAAE;;qCAEI,cAAc;;~~2FA2J~~/B;~~AAuEH~~,eAAe,IAAI,yCAAyC,EAAE,CAAC"}
1	+ {"version":3,"file":"ProxmoxClusterOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/ProxmoxClusterOwnerRuleEngineService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/RumApplicationLabelRuleEngineService.js CHANGED Viewed

@@ -15,6 +15,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class RumApplicationLabelRuleEngineServiceClass {
     /**
@@ -37,6 +38,7 @@ class RumApplicationLabelRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     matchLabels: { _id: true },
                     nameRegexPattern: true,
                     descriptionRegexPattern: true,
@@ -116,6 +118,20 @@ class RumApplicationLabelRuleEngineServiceClass {
         }
     }
     doesMatchRule(rumApplication, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "matchLabels",
+                "nameRegexPattern",
+                "descriptionRegexPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (rumApplicationRule) => {
+                return this.doesMatchRuleLegacy(rumApplication, rumApplicationRule);
+            },
+        });
+    }
+    doesMatchRuleLegacy(rumApplication, rule) {
         if (rule.matchLabels && rule.matchLabels.length > 0) {
             if (!rumApplication.labels || rumApplication.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/RumApplicationLabelRuleEngineService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RumApplicationLabelRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/RumApplicationLabelRuleEngineService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,mCAAmC,CAAC;AACtD,OAAO,cAAc,MAAM,4CAA4C,CAAC;AAExE,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAC9E,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAC5D,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,MAAyB,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,+BAA+B,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,yBAAyB,MAAM,mCAAmC,CAAC;AAE1E,MAAM,yCAAyC;IAC7C;;;;OAIG;IAEU,AAAN,KAAK,CAAC,0BAA0B,CACrC,cAA8B;;QAE9B,IAAI,CAAC,cAAc,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC;YACpD,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GACT,MAAM,8BAA8B,CAAC,MAAM,CAAC;gBAC1C,KAAK,EAAE;oBACL,SAAS,EAAE,cAAc,CAAC,SAAS;oBACnC,SAAS,EAAE,IAAI;iBAChB;gBACD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;gBACvB,MAAM,EAAE;oBACN,GAAG,EAAE,IAAI;oBACT,IAAI,EAAE,IAAI;oBACV,WAAW,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;oBAC1B,gBAAgB,EAAE,IAAI;oBACtB,uBAAuB,EAAE,IAAI;oBAC7B,WAAW,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;iBAC3B;gBACD,KAAK,EAAE,+BAA+B;gBACtC,IAAI,EAAE,CAAC;aACR,CAAC,CAAC;YAEL,yBAAyB,CAAC;gBACxB,QAAQ,EAAE,yBAAyB;gBACnC,SAAS,EAAE,cAAc,CAAC,SAAS;gBACnC,SAAS,EAAE,KAAK,CAAC,MAAM;aACxB,CAAC,CAAC;YAEH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,OAAO;YACT,CAAC;YAED,MAAM,cAAc,GAClB,MAAM,qBAAqB,CAAC,WAAW,CAAC;gBACtC,EAAE,EAAE,cAAc,CAAC,EAAE;gBACrB,MAAM,EAAE;oBACN,IAAI,EAAE,IAAI;oBACV,WAAW,EAAE,IAAI;oBACjB,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;iBACtB;gBACD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;aACxB,CAAC,CAAC;YAEL,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,OAAO;YACT,CAAC;YAED,MAAM,aAAa,GAAgB,IAAI,GAAG,EAAE,CAAC;YAE7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE,CAAC;oBAC9C,SAAS;gBACX,CAAC;gBACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;oBAC3C,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;wBACb,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACzC,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO;YACT,CAAC;YAED,MAAM,gBAAgB,GAAgB,IAAI,GAAG,CAC3C,CAAC,cAAc,CAAC,MAAM,IAAI,EAAE,CAAC;iBAC1B,GAAG,CAAC,CAAC,CAAQ,EAAE,EAAE;;gBAChB,OAAO,CAAA,MAAA,CAAC,CAAC,EAAE,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;YAChC,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,EAAU,EAAE,EAAE;gBACrB,OAAO,EAAE,KAAK,EAAE,CAAC;YACnB,CAAC,CAAC,CACL,CAAC;YAEF,MAAM,WAAW,GAAkB,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CACjE,CAAC,EAAU,EAAE,EAAE;gBACb,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnC,CAAC,CACF,CAAC;YACF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO;YACT,CAAC;YAED,MAAM,qBAAqB,CAAC,aAAa,EAAE;iBACxC,kBAAkB,EAAE;iBACpB,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC;iBAClC,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;iBAChC,GAAG,CAAC,WAAW,CAAC,CAAC;YAEpB,MAAM,cAAc,GAAgB,IAAI,GAAG,CAAC;gBAC1C,GAAG,gBAAgB;gBACnB,GAAG,WAAW;aACf,CAAC,CAAC;YACH,cAAc,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,EAAU,EAAE,EAAE;gBACpE,MAAM,KAAK,GAAU,IAAI,KAAK,EAAE,CAAC;gBACjC,KAAK,CAAC,EAAE,GAAG,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC5B,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,+CAA+C,KAAK,EAAE,EAAE;gBACnE,SAAS,EAAE,MAAA,cAAc,CAAC,SAAS,0CAAE,QAAQ,EAAE;gBAC/C,gBAAgB,EAAE,MAAA,cAAc,CAAC,EAAE,0CAAE,QAAQ,EAAE;aAC/B,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAEO,aAAa,CACnB,cAA8B,EAC9B,IAA6B;QAE7B,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjE,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,YAAY,GAAkB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAQ,EAAE,EAAE;;gBACpE,OAAO,CAAA,MAAA,CAAC,CAAC,EAAE,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC;YACH,MAAM,QAAQ,GAAkB,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAQ,EAAE,EAAE;;gBACrE,OAAO,CAAA,MAAA,CAAC,CAAC,EAAE,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC;YACH,IACE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAU,EAAE,EAAE;gBAChC,OAAO,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC/B,CAAC,CAAC,EACF,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,IACE,IAAI,CAAC,gBAAgB;YACrB,CAAC,CAAC,cAAc,CAAC,IAAI;gBACnB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,EAC9D,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IACE,IAAI,CAAC,uBAAuB;YAC5B,CAAC,CAAC,cAAc,CAAC,WAAW;gBAC1B,CAAC,IAAI,CAAC,SAAS,CACb,IAAI,CAAC,uBAAuB,EAC5B,cAAc,CAAC,WAAW,CAC3B,CAAC,EACJ,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,SAAS,CAAC,OAAe,EAAE,KAAa;QAC9C,IAAI,CAAC;YACH,MAAM,KAAK,GAAW,IAAI,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QAAC,WAAM,CAAC;YACP,MAAM,CAAC,IAAI,CAAC,gDAAgD,OAAO,EAAE,CAAC,CAAC;YACvE,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CACF;~~AArKc~~;IADZ,WAAW,EAAE;;qCAEI,cAAc;;~~2FA4G~~/B;~~AA0DH~~,eAAe,IAAI,yCAAyC,EAAE,CAAC"}
1	+ {"version":3,"file":"RumApplicationLabelRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/RumApplicationLabelRuleEngineService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/RumApplicationOwnerRuleEngineService.js CHANGED Viewed

@@ -18,6 +18,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class RumApplicationOwnerRuleEngineServiceClass {
     /**
@@ -40,6 +41,7 @@ class RumApplicationOwnerRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     notifyOwners: true,
                     matchLabels: { _id: true },
                     nameRegexPattern: true,
@@ -135,6 +137,20 @@ class RumApplicationOwnerRuleEngineServiceClass {
         }
     }
     doesMatchRule(rumApplication, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "matchLabels",
+                "nameRegexPattern",
+                "descriptionRegexPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (rumApplicationRule) => {
+                return this.doesMatchRuleLegacy(rumApplication, rumApplicationRule);
+            },
+        });
+    }
+    doesMatchRuleLegacy(rumApplication, rule) {
         if (rule.matchLabels && rule.matchLabels.length > 0) {
             if (!rumApplication.labels || rumApplication.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/RumApplicationOwnerRuleEngineService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RumApplicationOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/RumApplicationOwnerRuleEngineService.ts"],"names":[],"mappings":"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~~AAlLc~~;IADZ,WAAW,EAAE;;qCAEI,cAAc;;~~2FAyH~~/B;~~AA0DH~~,eAAe,IAAI,yCAAyC,EAAE,CAAC"}
1	+ {"version":3,"file":"RumApplicationOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/RumApplicationOwnerRuleEngineService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/RunbookLabelRuleEngineService.js CHANGED Viewed

@@ -15,6 +15,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class RunbookLabelRuleEngineServiceClass {
     /**
@@ -37,6 +38,7 @@ class RunbookLabelRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     runbookLabels: { _id: true },
                     runbookNamePattern: true,
                     runbookDescriptionPattern: true,
@@ -122,6 +124,20 @@ class RunbookLabelRuleEngineServiceClass {
         }
     }
     doesRunbookMatchRule(runbook, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "runbookLabels",
+                "runbookNamePattern",
+                "runbookDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (runbookRule) => {
+                return this.doesRunbookMatchRuleLegacy(runbook, runbookRule);
+            },
+        });
+    }
+    doesRunbookMatchRuleLegacy(runbook, rule) {
         if (rule.runbookLabels && rule.runbookLabels.length > 0) {
             if (!runbook.labels || runbook.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/RunbookLabelRuleEngineService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RunbookLabelRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/RunbookLabelRuleEngineService.ts"],"names":[],"mappings":"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~~AArLc~~;IADZ,WAAW,EAAE;;qCAC4B,OAAO;;~~6EAwHhD~~;~~AA+DH~~,eAAe,IAAI,kCAAkC,EAAE,CAAC"}
1	+ {"version":3,"file":"RunbookLabelRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/RunbookLabelRuleEngineService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/RunbookOwnerRuleEngineService.js CHANGED Viewed

@@ -18,6 +18,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class RunbookOwnerRuleEngineServiceClass {
     /**
@@ -41,6 +42,7 @@ class RunbookOwnerRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     notifyOwners: true,
                     runbookLabels: { _id: true },
                     runbookNamePattern: true,
@@ -142,6 +144,20 @@ class RunbookOwnerRuleEngineServiceClass {
         }
     }
     doesRunbookMatchRule(runbook, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "runbookLabels",
+                "runbookNamePattern",
+                "runbookDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (runbookRule) => {
+                return this.doesRunbookMatchRuleLegacy(runbook, runbookRule);
+            },
+        });
+    }
+    doesRunbookMatchRuleLegacy(runbook, rule) {
         if (rule.runbookLabels && rule.runbookLabels.length > 0) {
             if (!runbook.labels || runbook.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/RunbookOwnerRuleEngineService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RunbookOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/RunbookOwnerRuleEngineService.ts"],"names":[],"mappings":"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~~AAlMc~~;IADZ,WAAW,EAAE;;qCAC4B,OAAO;;~~6EAqIhD~~;~~AA+DH~~,eAAe,IAAI,kCAAkC,EAAE,CAAC"}
1	+ {"version":3,"file":"RunbookOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/RunbookOwnerRuleEngineService.ts"],"names":[],"mappings":"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"}