@oneuptime/common 13.0.1 → 13.0.3

package/build/dist/Server/Services/CloudResourceOwnerRuleEngineService.js

@@ -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 CloudResourceOwnerRuleEngineServiceClass {
     /**
@@ -43,6 +44,7 @@ class CloudResourceOwnerRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     notifyOwners: true,
                     matchLabels: { _id: true },
                     nameRegexPattern: true,
@@ -160,6 +162,20 @@ class CloudResourceOwnerRuleEngineServiceClass {
         }
     }
     doesMatchRule(cloudResource, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule,
+            legacyFields: [
+                "matchLabels",
+                "nameRegexPattern",
+                "descriptionRegexPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (legacyRule) => {
+                return this.doesMatchLegacyRule(cloudResource, legacyRule);
+            },
+        });
+    }
+    doesMatchLegacyRule(cloudResource, rule) {
         if (rule.matchLabels && rule.matchLabels.length > 0) {
             if (!cloudResource.labels || cloudResource.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/CloudResourceOwnerRuleEngineService.js.map

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

package/build/dist/Server/Services/DashboardLabelRuleEngineService.js

@@ -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 DashboardLabelRuleEngineServiceClass {
     /**
@@ -37,6 +38,7 @@ class DashboardLabelRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     dashboardLabels: { _id: true },
                     dashboardNamePattern: true,
                     dashboardDescriptionPattern: true,
@@ -122,6 +124,20 @@ class DashboardLabelRuleEngineServiceClass {
         }
     }
     doesDashboardMatchRule(dashboard, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule,
+            legacyFields: [
+                "dashboardLabels",
+                "dashboardNamePattern",
+                "dashboardDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (legacyRule) => {
+                return this.doesDashboardMatchLegacyRule(dashboard, legacyRule);
+            },
+        });
+    }
+    doesDashboardMatchLegacyRule(dashboard, rule) {
         if (rule.dashboardLabels && rule.dashboardLabels.length > 0) {
             if (!dashboard.labels || dashboard.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/DashboardLabelRuleEngineService.js.map

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

package/build/dist/Server/Services/DashboardOwnerRuleEngineService.js

@@ -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 DashboardOwnerRuleEngineServiceClass {
     /**
@@ -41,6 +42,7 @@ class DashboardOwnerRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     notifyOwners: true,
                     dashboardLabels: { _id: true },
                     dashboardNamePattern: true,
@@ -142,6 +144,20 @@ class DashboardOwnerRuleEngineServiceClass {
         }
     }
     doesDashboardMatchRule(dashboard, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule,
+            legacyFields: [
+                "dashboardLabels",
+                "dashboardNamePattern",
+                "dashboardDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (legacyRule) => {
+                return this.doesDashboardMatchLegacyRule(dashboard, legacyRule);
+            },
+        });
+    }
+    doesDashboardMatchLegacyRule(dashboard, rule) {
         if (rule.dashboardLabels && rule.dashboardLabels.length > 0) {
             if (!dashboard.labels || dashboard.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/DashboardOwnerRuleEngineService.js.map

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

package/build/dist/Server/Services/DatabaseService.js

@@ -31,6 +31,8 @@ import logger from "../Utils/Logger";
 import ConfigLogLevel from "../Types/ConfigLogLevel";
 import BaseService from "./BaseService";
 import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
+import RelationOnlyRuleBaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/RelationOnlyRuleBaseModel";
+import RuleBaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/RuleBaseModel";
 import { WorkflowRoute } from "../../ServiceRoute";
 import Protocol from "../../Types/API/Protocol";
 import Route from "../../Types/API/Route";
@@ -52,10 +54,18 @@ import Text from "../../Types/Text";
 import Typeof from "../../Types/Typeof";
 import API from "../../Utils/API";
 import Slug from "../../Utils/Slug";
+import { getRuleCriteriaValidationError } from "../../Utils/Rules/RuleCriteriaMatcher";
+import { RULE_CRITERIA_LEGACY_NEVER_MATCH_PATTERN, RuleCriteriaOperator, } from "../../Types/Rules/RuleCriteria";
+import { getRuleCriteriaFieldsForModel } from "../../Types/Rules/RuleCriteriaFieldRegistry";
 import { EntityManager, } from "typeorm";
 import Realtime from "../Utils/Realtime";
 import ModelEventType from "../../Types/Realtime/ModelEventType";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+const RULE_CRITERIA_RELATION_OPERATORS = new Set([
+    RuleCriteriaOperator.HasAnyOf,
+    RuleCriteriaOperator.HasAllOf,
+    RuleCriteriaOperator.HasNoneOf,
+]);
 class DatabaseService extends BaseService {
     get hardDeleteItemByColumnName() {
         return this._hardDeleteItemByColumnName;
@@ -478,8 +488,163 @@ class DatabaseService extends BaseService {
         const columnType = (_a = this.model.getTableColumnMetadata(columnName)) === null || _a === void 0 ? void 0 : _a.type;
         return columnType ? getMaxLengthFromTableColumnType(columnType) : undefined;
     }
+    validateRuleCriteriaForModel(criteria) {
+        const allowedFields = getRuleCriteriaFieldsForModel(this.modelName);
+        if (!allowedFields) {
+            throw new BadDataException(`Rule criteria fields are not registered for ${this.modelName}.`);
+        }
+        if (criteria.isEnabled !== undefined &&
+            !(this.model instanceof RelationOnlyRuleBaseModel)) {
+            throw new BadDataException(`Rule criteria isEnabled is only supported for relation-only rules.`);
+        }
+        for (const filter of criteria.filters) {
+            if (!allowedFields.includes(filter.field)) {
+                throw new BadDataException(`Rule criteria field "${filter.field}" is not supported for ${this.modelName}.`);
+            }
+            const metadata = this.model.getTableColumnMetadata(filter.field);
+            if (!metadata) {
+                throw new BadDataException(`Rule criteria field "${filter.field}" is not a column on ${this.modelName}.`);
+            }
+            const isRelationField = metadata.type === TableColumnType.EntityArray;
+            const isRelationOperator = RULE_CRITERIA_RELATION_OPERATORS.has(filter.operator);
+            if (isRelationOperator && !isRelationField) {
+                throw new BadDataException(`Rule criteria field "${filter.field}" does not support relation operators.`);
+            }
+            if (!isRelationOperator && isRelationField) {
+                throw new BadDataException(`Rule criteria field "${filter.field}" requires a relation operator.`);
+            }
+            if (isRelationOperator &&
+                filter.value.some((value) => {
+                    return !ObjectID.isValidUUID(value);
+                })) {
+                throw new BadDataException(`Rule criteria field "${filter.field}" requires valid resource IDs.`);
+            }
+        }
+    }
+    getRuleCriteriaEffectiveEnabledQuery(query) {
+        if (!(this.model instanceof RelationOnlyRuleBaseModel)) {
+            return query;
+        }
+        const requestedEnabledState = query["isEnabled"];
+        if (typeof requestedEnabledState !== "boolean") {
+            return query;
+        }
+        return Object.assign(Object.assign({}, query), { isEnabled: QueryHelper.booleanForCriteriaBackedRule("criteria", requestedEnabledState) });
+    }
+    addRuleCriteriaEffectiveEnabledToSelect(select) {
+        if (!(this.model instanceof RelationOnlyRuleBaseModel) ||
+            !select ||
+            !select["isEnabled"]) {
+            return false;
+        }
+        const criteriaWasSelected = Boolean(select["criteria"]);
+        select["criteria"] = true;
+        return !criteriaWasSelected;
+    }
+    applyRuleCriteriaEffectiveEnabledToItem(item, mapEffectiveEnabled = true, removeInternallySelectedCriteria = false) {
+        if (!(this.model instanceof RelationOnlyRuleBaseModel)) {
+            return;
+        }
+        const relationOnlyRule = item;
+        if (mapEffectiveEnabled &&
+            relationOnlyRule.criteria !== undefined &&
+            relationOnlyRule.criteria !== null) {
+            item["isEnabled"] =
+                item["isEnabled"] === null;
+        }
+        if (removeInternallySelectedCriteria) {
+            delete item["criteria"];
+        }
+    }
+    applyRelationOnlyRuleRolloutState(data, options) {
+        if (!(this.model instanceof RelationOnlyRuleBaseModel)) {
+            return;
+        }
+        if (!options.hasConfiguredCriteria) {
+            return;
+        }
+        const record = data;
+        const criteria = record["criteria"];
+        const requestedEnabledState = typeof criteria.isEnabled === "boolean"
+            ? criteria.isEnabled
+            : record["isEnabled"];
+        if (options.isUpdate && typeof requestedEnabledState !== "boolean") {
+            throw new BadDataException("isEnabled must be supplied when updating criteria for this rule.");
+        }
+        const logicalEnabledState = typeof requestedEnabledState === "boolean" ? requestedEnabledState : true;
+        record["criteria"] = Object.assign(Object.assign({}, criteria), { isEnabled: logicalEnabledState });
+        record["isEnabled"] = logicalEnabledState ? null : false;
+    }
+    applyLegacyRuleCriteriaSafetyShadow(data) {
+        const allowedFields = getRuleCriteriaFieldsForModel(this.modelName);
+        if (!allowedFields) {
+            return;
+        }
+        if (this.model instanceof RelationOnlyRuleBaseModel) {
+            /*
+             * Omit legacy many-to-many fields from the server-side write. An empty
+             * array would clear existing junction rows and route updates through
+             * repository.save(), whose upsert semantics can resurrect a deleted row.
+             * The fail-closed isEnabled shadow keeps these rules hidden from older
+             * workers without touching their legacy relations.
+             */
+            for (const field of allowedFields) {
+                delete data[field];
+            }
+            return;
+        }
+        /*
+         * Scalar rule families can expose a never-matching regular expression to
+         * older workers. Relation-only criteria rules encode enabled as null and
+         * disabled as false; older workers query true and therefore see neither.
+         */
+        const safetyPatternField = allowedFields.find((field) => {
+            const metadata = this.model.getTableColumnMetadata(field);
+            return ((metadata === null || metadata === void 0 ? void 0 : metadata.type) !== TableColumnType.EntityArray &&
+                field.match(/(pattern|regex)/i) !== null);
+        });
+        if (!safetyPatternField) {
+            return;
+        }
+        for (const field of allowedFields) {
+            const metadata = this.model.getTableColumnMetadata(field);
+            if (!metadata) {
+                continue;
+            }
+            if (metadata.type === TableColumnType.EntityArray) {
+                // Preserve existing junction rows and keep this on repository.update().
+                delete data[field];
+            }
+            else {
+                data[field] = null;
+            }
+        }
+        data[safetyPatternField] =
+            RULE_CRITERIA_LEGACY_NEVER_MATCH_PATTERN;
+    }
     async sanitizeCreateOrUpdate(data, props, isUpdate = false) {
         var _a;
+        const criteriaValue = data["criteria"];
+        const hasConfiguredCriteria = criteriaValue !== undefined && criteriaValue !== null;
+        if (this.model instanceof RelationOnlyRuleBaseModel &&
+            isUpdate &&
+            criteriaValue === null) {
+            throw new BadDataException("Configured criteria cannot be cleared from this rule. Save an empty criteria set to match every resource.");
+        }
+        if (this.model instanceof RuleBaseModel && hasConfiguredCriteria) {
+            const validationError = getRuleCriteriaValidationError(criteriaValue);
+            if (validationError) {
+                throw new BadDataException(validationError);
+            }
+            this.validateRuleCriteriaForModel(criteriaValue);
+        }
+        this.applyRelationOnlyRuleRolloutState(data, {
+            hasConfiguredCriteria: hasConfiguredCriteria,
+            isUpdate: isUpdate,
+        });
+        if (this.model instanceof RuleBaseModel && hasConfiguredCriteria) {
+            this.applyLegacyRuleCriteriaSafetyShadow(data);
+        }
         data = this.checkMaxLengthOfFields(data);
         const columns = this.model.getTableColumns();
         for (const columnName of columns.columns) {
@@ -769,6 +934,7 @@ class DatabaseService extends BaseService {
         createBy.data = (await this.sanitizeCreateOrUpdate(createBy.data, createBy.props));
         try {
             createBy.data = await this.getRepository().save(createBy.data);
+            this.applyRuleCriteriaEffectiveEnabledToItem(createBy.data);
             // Seed telemetry context with projectId + <model>Id for this create.
             this.setTelemetryContextFromItem(createBy.data);
             if (!createBy.props.ignoreHooks) {
@@ -1026,6 +1192,7 @@ class DatabaseService extends BaseService {
             if (!(limit instanceof PositiveNumber)) {
                 limit = new PositiveNumber(limit);
             }
+            query = this.getRuleCriteriaEffectiveEnabledQuery(query);
             const findBy = {
                 query,
                 skip,
@@ -1115,7 +1282,7 @@ class DatabaseService extends BaseService {
             for (const order of aggregateBy.orderBy || []) {
                 DatabaseService.assertSafeAggregateExpression(order.expression);
             }
-            const checkReadPermissionType = await ModelPermission.checkReadQueryPermission(this.modelType, aggregateBy.query, null, aggregateBy.props);
+            const checkReadPermissionType = await ModelPermission.checkReadQueryPermission(this.modelType, this.getRuleCriteriaEffectiveEnabledQuery(aggregateBy.query), null, aggregateBy.props);
             const queryBuilder = this.buildAggregateScope(checkReadPermissionType.query);
             let isFirstColumn = true;
             for (const column of selectColumns) {
@@ -1315,6 +1482,7 @@ class DatabaseService extends BaseService {
                 ? { deleteBy, carryForward: [] }
                 : await this.onBeforeDelete(deleteBy);
             const beforeDeleteBy = onDelete.deleteBy;
+            beforeDeleteBy.query = this.getRuleCriteriaEffectiveEnabledQuery(beforeDeleteBy.query);
             beforeDeleteBy.query = await ModelPermission.checkDeleteQueryPermission(this.modelType, beforeDeleteBy.query, deleteBy.props);
             if (!(beforeDeleteBy.skip instanceof PositiveNumber)) {
                 beforeDeleteBy.skip = new PositiveNumber(beforeDeleteBy.skip);
@@ -1357,6 +1525,7 @@ class DatabaseService extends BaseService {
                 : await this.onBeforeDelete(deleteBy);
             const beforeDeleteBy = onDelete.deleteBy;
             const carryForward = onDelete.carryForward;
+            beforeDeleteBy.query = this.getRuleCriteriaEffectiveEnabledQuery(beforeDeleteBy.query);
             beforeDeleteBy.query = await ModelPermission.checkDeleteQueryPermission(this.modelType, beforeDeleteBy.query, deleteBy.props);
             if (!(beforeDeleteBy.skip instanceof PositiveNumber)) {
                 beforeDeleteBy.skip = new PositiveNumber(beforeDeleteBy.skip);
@@ -1505,6 +1674,7 @@ class DatabaseService extends BaseService {
         return await this._findBy(findBy);
     }
     async _findBy(findBy, withDeleted) {
+        var _a;
         try {
             this.setTelemetryContextFromProps(findBy.props);
             if (!findBy.sort || Object.keys(findBy.sort).length === 0) {
@@ -1524,9 +1694,12 @@ class DatabaseService extends BaseService {
             if (!onBeforeFind.select["_id"]) {
                 onBeforeFind.select["_id"] = true;
             }
+            onBeforeFind.query = this.getRuleCriteriaEffectiveEnabledQuery(onBeforeFind.query);
             const result = await ModelPermission.checkReadQueryPermission(this.modelType, onBeforeFind.query, onBeforeFind.select || null, onBeforeFind.props);
             onBeforeFind.query = result.query;
             onBeforeFind.select = result.select || undefined;
+            const mapEffectiveEnabled = Boolean((_a = onBeforeFind.select) === null || _a === void 0 ? void 0 : _a["isEnabled"]);
+            const removeInternallySelectedCriteria = this.addRuleCriteriaEffectiveEnabledToSelect(onBeforeFind.select);
             const sortColumnsAddedToSelect = this.addSortColumnsToSelect(onBeforeFind);
             if (!(onBeforeFind.skip instanceof PositiveNumber)) {
                 onBeforeFind.skip = new PositiveNumber(onBeforeFind.skip);
@@ -1573,6 +1746,7 @@ class DatabaseService extends BaseService {
             });
             let decryptedItems = [];
             for (const item of items) {
+                this.applyRuleCriteriaEffectiveEnabledToItem(item, mapEffectiveEnabled, removeInternallySelectedCriteria);
                 decryptedItems.push(await this.decrypt(item));
             }
             decryptedItems = this.sanitizeFindByItems(decryptedItems, onBeforeFind);
@@ -1781,6 +1955,7 @@ class DatabaseService extends BaseService {
             updateBy.data = (await this.encrypt(updateBy.data));
             const beforeUpdateBy = onUpdate.updateBy;
             const carryForward = onUpdate.carryForward;
+            beforeUpdateBy.query = this.getRuleCriteriaEffectiveEnabledQuery(beforeUpdateBy.query);
             beforeUpdateBy.query = await ModelPermission.checkUpdateQueryPermissions(this.modelType, beforeUpdateBy.query, beforeUpdateBy.data, beforeUpdateBy.props);
             const data = (await this.sanitizeCreateOrUpdate(beforeUpdateBy.data, updateBy.props, true));
             if (!(updateBy.skip instanceof PositiveNumber)) {
@@ -1806,6 +1981,11 @@ class DatabaseService extends BaseService {
              * columns are used for checking if the update causes a change in values.
              */
             const selectColumns = Object.assign({ _id: true }, Object.fromEntries(dataColumns));
+            if (this.model instanceof RelationOnlyRuleBaseModel &&
+                typeof data["isEnabled"] === "boolean" &&
+                data["criteria"] === undefined) {
+                selectColumns["criteria"] = true;
+            }
             if (this.getModel().getTenantColumn()) {
                 selectColumns[this.getModel().getTenantColumn().toString()] =
                     true;
@@ -1890,7 +2070,38 @@ class DatabaseService extends BaseService {
                  * primary key, INSERTs instead of updating, and dies on the first
                  * NOT NULL column.
                  */
-                const updatedItem = Object.assign(Object.assign({}, data), { _id: item._id });
+                const dataForItem = Object.assign({}, data);
+                if (this.model instanceof RelationOnlyRuleBaseModel &&
+                    data["criteria"] === undefined &&
+                    typeof data["isEnabled"] === "boolean" &&
+                    item.criteria !==
+                        undefined &&
+                    item.criteria !== null) {
+                    const logicalEnabled = data["isEnabled"];
+                    const existingCriteria = item.criteria;
+                    /*
+                     * Keep the transport shadow synchronized with the physical state.
+                     * Otherwise a later criteria edit that round-trips this JSON without
+                     * a top-level isEnabled value can restore a stale enabled state.
+                     */
+                    dataForItem["criteria"] = Object.assign(Object.assign({}, existingCriteria), { isEnabled: logicalEnabled });
+                    dataForItem["isEnabled"] = logicalEnabled
+                        ? null
+                        : false;
+                }
+                const updatedItem = Object.assign(Object.assign({}, dataForItem), { _id: item._id });
+                const updatedItemForComparison = Object.assign({}, updatedItem);
+                const updateCriteriaValue = data["criteria"];
+                const existingCriteriaValue = item.criteria;
+                const isCriteriaBackedComparison = (updateCriteriaValue !== undefined && updateCriteriaValue !== null) ||
+                    (updateCriteriaValue === undefined &&
+                        existingCriteriaValue !== undefined &&
+                        existingCriteriaValue !== null);
+                if (this.model instanceof RelationOnlyRuleBaseModel &&
+                    typeof data["isEnabled"] === "boolean" &&
+                    isCriteriaBackedComparison) {
+                    updatedItemForComparison.isEnabled = data["isEnabled"];
+                }
                 if (isDebugLogEnabled) {
                     logger.debug("Updated Item", {
                         projectId: (_b = updateBy.props.tenantId) === null || _b === void 0 ? void 0 : _b.toString(),
@@ -1927,7 +2138,7 @@ class DatabaseService extends BaseService {
                 // hit workflow.
                 if (((_d = this.getModel().enableWorkflowOn) === null || _d === void 0 ? void 0 : _d.update) &&
                     // Only trigger workflow if there's a change in values
-                    !this.hasSameValues({ item, updatedItem })) {
+                    !this.hasSameValues({ item, updatedItem: updatedItemForComparison })) {
                     let tenantId = updateBy.props.tenantId;
                     if (!tenantId && this.getModel().getTenantColumn()) {
                         tenantId = item.getValue(this.getModel().getTenantColumn());
@@ -1940,7 +2151,10 @@ class DatabaseService extends BaseService {
                     }
                 }
                 if (((_e = this.getModel().enableAuditLogOn) === null || _e === void 0 ? void 0 : _e.update) &&
-                    !this.hasSameValues({ item, updatedItem }) &&
+                    !this.hasSameValues({
+                        item,
+                        updatedItem: updatedItemForComparison,
+                    }) &&
                     item.id) {
                     const auditLogService = 
                     // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
@@ -1986,17 +2200,28 @@ class DatabaseService extends BaseService {
         }
     }
     hasSameValues(data) {
-        var _a, _b;
+        var _a;
         const { item, updatedItem } = data;
         const columns = Object.keys(updatedItem);
         for (const column of columns) {
-            if (
+            const currentValue = item.getColumnValue(column);
+            const updatedValue = updatedItem[column];
+            const isJSONColumn = ((_a = item.getTableColumnMetadata(column)) === null || _a === void 0 ? void 0 : _a.type) === TableColumnType.JSON;
             /*
-             * `toString()` is necessary so we can compare wrapped values
-             * (e.g. `ObjectID`) with raw values (e.g. `string`)
+             * Plain JSON objects all stringify through Object.toString as
+             * "[object Object]". Compare their contents instead, while ignoring
+             * insignificant object-key ordering.
              */
-            ((_a = item.getColumnValue(column)) === null || _a === void 0 ? void 0 : _a.toString()) !==
-                ((_b = updatedItem[column]) === null || _b === void 0 ? void 0 : _b.toString())) {
+            if (isJSONColumn &&
+                !JSONFunctions.deepEqual(currentValue, updatedValue)) {
+                return false;
+            }
+            if (!isJSONColumn &&
+                /*
+                 * `toString()` is necessary so we can compare wrapped values
+                 * (e.g. `ObjectID`) with raw values (e.g. `string`)
+                 */
+                (currentValue === null || currentValue === void 0 ? void 0 : currentValue.toString()) !== (updatedValue === null || updatedValue === void 0 ? void 0 : updatedValue.toString())) {
                 return false;
             }
         }