@oneuptime/common 12.0.5 → 12.0.7

package/build/dist/Server/Types/Workflow/Components/API/Utils.js.map

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

package/build/dist/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.js

@@ -14,6 +14,7 @@ import JSONFunctions from "../../../../../Types/JSONFunctions";
 import Text from "../../../../../Types/Text";
 import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
 import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
+import { applyTenantColumn } from "./ModelArguments";
 export default class CreateManyBaseModel extends ComponentCode {
     constructor(modelService) {
         super();
@@ -57,17 +58,20 @@ export default class CreateManyBaseModel extends ComponentCode {
                 throw options.onError(new BadDataException("json-array is should be of type object."));
             }
             const array = [];
-            if (this.modelService.getModel().getTenantColumn()) {
-                for (const item of args["json-array"]) {
-                    item[this.modelService.getModel().getTenantColumn()] = options.projectId;
-                    array.push((await this.modelService.create({
-                        data: BaseModel.fromJSON(item || {}, this.modelService.modelType),
-                        props: {
-                            isRoot: true,
-                            tenantId: options.projectId,
-                        },
-                    })));
-                }
+            /*
+             * This loop used to sit inside an `if (getTenantColumn())` check that
+             * was only meant to guard the projectId stamping, so a model without a
+             * tenant column created nothing at all and still reported success.
+             */
+            for (const item of args["json-array"]) {
+                const json = applyTenantColumn(item || {}, this.modelService.getModel(), options.projectId);
+                array.push((await this.modelService.create({
+                    data: BaseModel.fromJSON(json, this.modelService.modelType),
+                    props: {
+                        isRoot: true,
+                        tenantId: options.projectId,
+                    },
+                })));
             }
             return {
                 returnValues: {

package/build/dist/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.js.map

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

package/build/dist/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.js

@@ -16,6 +16,7 @@ import JSONFunctions from "../../../../../Types/JSONFunctions";
 import Text from "../../../../../Types/Text";
 import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
 import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
+import { applyTenantColumn } from "./ModelArguments";
 export default class CreateOneBaseModel extends ComponentCode {
     constructor(modelService) {
         super();
@@ -58,9 +59,7 @@ export default class CreateOneBaseModel extends ComponentCode {
             if (typeof args["json"] !== "object") {
                 throw options.onError(new BadDataException("JSON is should be of type object."));
             }
-            if (this.modelService.getModel().getTenantColumn()) {
-                args["json"][this.modelService.getModel().getTenantColumn()] = options.projectId;
-            }
+            args["json"] = applyTenantColumn(args["json"], this.modelService.getModel(), options.projectId);
             const model = (await this.modelService.create({
                 data: BaseModel.fromJSON(args["json"] || {}, this.modelService.modelType),
                 props: {

package/build/dist/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.js.map

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

package/build/dist/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.js

@@ -5,6 +5,8 @@ import JSONFunctions from "../../../../../Types/JSONFunctions";
 import PositiveNumber from "../../../../../Types/PositiveNumber";
 import Text from "../../../../../Types/Text";
 import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
+import { normalizeModelKeys } from "./ModelArguments";
+import logComponentError from "./LogComponentError";
 export default class DeleteManyBaseModel extends ComponentCode {
     constructor(modelService) {
         super();
@@ -22,6 +24,7 @@ export default class DeleteManyBaseModel extends ComponentCode {
         this.modelService = modelService;
     }
     async run(args, options) {
+        var _a;
         const successPort = this.getMetadata().outPorts.find((p) => {
             return p.id === "success";
         });
@@ -65,15 +68,17 @@ export default class DeleteManyBaseModel extends ComponentCode {
                 options.log("Setting the limit to " + LIMIT_PER_PROJECT);
                 args["limit"] = LIMIT_PER_PROJECT;
             }
+            const query = JSONFunctions.deserialize(normalizeModelKeys(args["query"], this.modelService.getModel()));
+            /*
+             * The tenant column goes on the deserialized query, not on args["query"]
+             * - JSONFunctions.deserialize returns a new object, so anything written
+             * to args after it runs never reaches the database.
+             */
             if (this.modelService.getModel().getTenantColumn()) {
-                args["query"][this.modelService.getModel().getTenantColumn()] = options.projectId;
+                query[this.modelService.getModel().getTenantColumn()] = options.projectId;
             }
-            let query = args["query"];
-            if (query) {
-                query = JSONFunctions.deserialize(args["query"]);
-            }
-            await this.modelService.deleteBy({
-                query: query || {},
+            const itemsDeleted = await this.modelService.deleteBy({
+                query: query,
                 limit: new PositiveNumber(args["limit"]),
                 skip: new PositiveNumber(args["skip"]),
                 props: {
@@ -81,14 +86,20 @@ export default class DeleteManyBaseModel extends ComponentCode {
                     tenantId: options.projectId,
                 },
             });
+            options.log(`Deleted ${itemsDeleted} ${this.modelService.getModel().singularName || "record"}(s).`);
             return {
-                returnValues: {},
+                returnValues: {
+                    "items-deleted": itemsDeleted,
+                },
                 executePort: successPort,
             };
         }
         catch (err) {
-            options.log("Error running component");
-            options.log(err.message ? err.message : JSON.stringify(err, null, 2));
+            logComponentError({
+                error: err,
+                model: ((_a = this.modelService) === null || _a === void 0 ? void 0 : _a.getModel()) || null,
+                log: options.log,
+            });
             return {
                 returnValues: {},
                 executePort: errorPort,

package/build/dist/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeleteManyBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DeleteManyBaseModel.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts"],"names":[],"mappings":"AAEA,OAAO,aAA4C,MAAM,qBAAqB,CAAC;AAE/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,gBAAgB,MAAM,iDAAiD,CAAC;AAE/E,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,cAAc,MAAM,qCAAqC,CAAC;AACjE,OAAO,IAAI,MAAM,2BAA2B,CAAC;AAI7C,OAAO,mBAAmB,MAAM,oDAAoD,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,MAAM,CAAC,OAAO,OAAO,mBAEnB,SAAQ,aAAa;IAGrB,YAAmB,YAAyC;QAC1D,KAAK,EAAE,CAAC;QAHF,iBAAY,GAAuC,IAAI,CAAC;QAK9D,MAAM,kBAAkB,GACtB,mBAAmB,CAAC,aAAa,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAC7D,CAAC,CAAoB,EAAE,EAAE;YACvB,OAAO,CACL,CAAC,CAAC,EAAE;gBACJ,GAAG,IAAI,CAAC,kBAAkB,CACxB,YAAY,CAAC,QAAQ,EAAE,CAAC,SAAU,CACnC,cAAc,CAChB,CAAC;QACJ,CAAC,CACF,CAAC;QAEJ,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,MAAM,IAAI,gBAAgB,CACxB,4BAA4B;gBAC1B,YAAY,CAAC,QAAQ,EAAE,CAAC,SAAS;gBACjC,aAAa,CAChB,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;QACrC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEe,KAAK,CAAC,GAAG,CACvB,IAAgB,EAChB,OAAmB;;QAEnB,MAAM,WAAW,GAAqB,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,CACpE,CAAC,CAAO,EAAE,EAAE;YACV,OAAO,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC;QAC5B,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,SAAS,GAAqB,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,CAClE,CAAC,CAAO,EAAE,EAAE;YACV,OAAO,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC;QAC1B,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvB,MAAM,OAAO,CAAC,OAAO,CACnB,IAAI,gBAAgB,CAAC,4BAA4B,CAAC,CACnD,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnB,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,CAAC,CAAC;YACrE,CAAC;YAED,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACtC,IAAI,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAW,CAAC,CAAC;YAC/D,CAAC;YAED,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACtC,MAAM,OAAO,CAAC,OAAO,CACnB,IAAI,gBAAgB,CAAC,oCAAoC,CAAC,CAC3D,CAAC;YACJ,CAAC;YAED,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACrD,IAAI,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACxC,CAAC;YAED,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACvD,IAAI,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1C,CAAC;YAED,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACrC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;YAED,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACtC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YACrB,CAAC;YAED,IACE,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ;gBACjC,IAAI,CAAC,OAAO,CAAC,GAAG,iBAAiB,EACjC,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;gBAChD,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,iBAAiB,CAAC,CAAC;gBACzD,IAAI,CAAC,OAAO,CAAC,GAAG,iBAAiB,CAAC;YACpC,CAAC;YAED,MAAM,KAAK,GAAsB,aAAa,CAAC,WAAW,CACxD,kBAAkB,CAChB,IAAI,CAAC,OAAO,CAAe,EAC3B,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAC7B,CACmB,CAAC;YAEvB;;;;eAIG;YACH,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC;gBAClD,KAAoB,CACnB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,eAAe,EAAY,CACzD,GAAG,OAAO,CAAC,SAAS,CAAC;YACxB,CAAC;YAED,MAAM,YAAY,GAAW,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;gBAC5D,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,CAAW,CAAC;gBAClD,IAAI,EAAE,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAW,CAAC;gBAChD,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;oBACZ,QAAQ,EAAE,OAAO,CAAC,SAAS;iBAC5B;aACF,CAAC,CAAC;YAEH,OAAO,CAAC,GAAG,CACT,WAAW,YAAY,IACrB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,YAAY,IAAI,QAC/C,MAAM,CACP,CAAC;YAEF,OAAO;gBACL,YAAY,EAAE;oBACZ,eAAe,EAAE,YAAY;iBAC9B;gBACD,WAAW,EAAE,WAAW;aACzB,CAAC;QACJ,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,iBAAiB,CAAC;gBAChB,KAAK,EAAE,GAAG;gBACV,KAAK,EAAE,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,QAAQ,EAAE,KAAI,IAAI;gBAC5C,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC,CAAC;YAEH,OAAO;gBACL,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,SAAS;aACvB,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}

package/build/dist/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.js

@@ -13,6 +13,8 @@ import JSONFunctions from "../../../../../Types/JSONFunctions";
 import Text from "../../../../../Types/Text";
 import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
 import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
+import { normalizeModelKeys } from "./ModelArguments";
+import logComponentError from "./LogComponentError";
 export default class DeleteOneBaseModel extends ComponentCode {
     constructor(modelService) {
         super();
@@ -30,6 +32,7 @@ export default class DeleteOneBaseModel extends ComponentCode {
         this.modelService = modelService;
     }
     async run(args, options) {
+        var _a;
         const successPort = this.getMetadata().outPorts.find((p) => {
             return p.id === "success";
         });
@@ -55,28 +58,36 @@ export default class DeleteOneBaseModel extends ComponentCode {
             if (typeof args["query"] !== "object") {
                 throw options.onError(new BadDataException("Query is should be of type object."));
             }
-            let query = args["query"];
-            if (query) {
-                query = JSONFunctions.deserialize(args["query"]);
-            }
+            const query = JSONFunctions.deserialize(normalizeModelKeys(args["query"], this.modelService.getModel()));
+            /*
+             * The tenant column goes on the deserialized query, not on args["query"]
+             * - JSONFunctions.deserialize returns a new object, so anything written
+             * to args after it runs never reaches the database.
+             */
             if (this.modelService.getModel().getTenantColumn()) {
-                args["query"][this.modelService.getModel().getTenantColumn()] = options.projectId;
+                query[this.modelService.getModel().getTenantColumn()] = options.projectId;
             }
-            await this.modelService.deleteOneBy({
-                query: query || {},
+            const itemsDeleted = await this.modelService.deleteOneBy({
+                query: query,
                 props: {
                     isRoot: true,
                     tenantId: options.projectId,
                 },
             });
+            options.log(`Deleted ${itemsDeleted} ${this.modelService.getModel().singularName || "record"}(s).`);
             return {
-                returnValues: {},
+                returnValues: {
+                    "items-deleted": itemsDeleted,
+                },
                 executePort: successPort,
             };
         }
         catch (err) {
-            options.log("Error running component");
-            options.log(err.message ? err.message : JSON.stringify(err, null, 2));
+            logComponentError({
+                error: err,
+                model: ((_a = this.modelService) === null || _a === void 0 ? void 0 : _a.getModel()) || null,
+                log: options.log,
+            });
             return {
                 returnValues: {},
                 executePort: errorPort,

package/build/dist/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.js.map

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

package/build/dist/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.js

@@ -16,6 +16,8 @@ import PositiveNumber from "../../../../../Types/PositiveNumber";
 import Text from "../../../../../Types/Text";
 import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
 import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
+import { normalizeModelKeys } from "./ModelArguments";
+import logComponentError from "./LogComponentError";
 export default class FindManyBaseModel extends ComponentCode {
     constructor(modelService) {
         super();
@@ -33,6 +35,7 @@ export default class FindManyBaseModel extends ComponentCode {
         this.modelService = modelService;
     }
     async run(args, options) {
+        var _a;
         const successPort = this.getMetadata().outPorts.find((p) => {
             return p.id === "success";
         });
@@ -58,9 +61,6 @@ export default class FindManyBaseModel extends ComponentCode {
             if (typeof args["query"] !== "object") {
                 throw options.onError(new BadDataException("Query is should be of type object."));
             }
-            if (this.modelService.getModel().getTenantColumn()) {
-                args["query"][this.modelService.getModel().getTenantColumn()] = options.projectId;
-            }
             if (!args["select"]) {
                 throw options.onError(new BadDataException("Select Fields is undefined."));
             }
@@ -88,16 +88,18 @@ export default class FindManyBaseModel extends ComponentCode {
                 options.log("Setting the limit to " + LIMIT_PER_PROJECT);
                 args["limit"] = LIMIT_PER_PROJECT;
             }
-            let query = args["query"];
-            if (query) {
-                query = JSONFunctions.deserialize(args["query"]);
-            }
-            let select = args["select"];
-            if (select) {
-                select = JSONFunctions.deserialize(args["select"]);
+            const query = JSONFunctions.deserialize(normalizeModelKeys(args["query"], this.modelService.getModel()));
+            /*
+             * The tenant column goes on the deserialized query, not on args["query"]
+             * - JSONFunctions.deserialize returns a new object, so anything written
+             * to args after it runs never reaches the database.
+             */
+            if (this.modelService.getModel().getTenantColumn()) {
+                query[this.modelService.getModel().getTenantColumn()] = options.projectId;
             }
+            const select = JSONFunctions.deserialize(normalizeModelKeys(args["select"], this.modelService.getModel()));
             const models = await this.modelService.findBy({
-                query: query || {},
+                query: query,
                 select: select,
                 limit: new PositiveNumber(args["limit"]),
                 skip: new PositiveNumber(args["skip"]),
@@ -114,8 +116,11 @@ export default class FindManyBaseModel extends ComponentCode {
             };
         }
         catch (err) {
-            options.log("Error running component");
-            options.log(err.message ? err.message : JSON.stringify(err, null, 2));
+            logComponentError({
+                error: err,
+                model: ((_a = this.modelService) === null || _a === void 0 ? void 0 : _a.getModel()) || null,
+                log: options.log,
+            });
             return {
                 returnValues: {},
                 executePort: errorPort,

package/build/dist/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.js.map

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

package/build/dist/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.js

@@ -14,6 +14,8 @@ import JSONFunctions from "../../../../../Types/JSONFunctions";
 import Text from "../../../../../Types/Text";
 import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel";
 import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan";
+import { normalizeModelKeys } from "./ModelArguments";
+import logComponentError from "./LogComponentError";
 export default class FindOneBaseModel extends ComponentCode {
     constructor(modelService) {
         super();
@@ -31,6 +33,7 @@ export default class FindOneBaseModel extends ComponentCode {
         this.modelService = modelService;
     }
     async run(args, options) {
+        var _a;
         const successPort = this.getMetadata().outPorts.find((p) => {
             return p.id === "success";
         });
@@ -56,9 +59,6 @@ export default class FindOneBaseModel extends ComponentCode {
             if (typeof args["query"] !== "object") {
                 throw options.onError(new BadDataException("Query is should be of type object."));
             }
-            if (this.modelService.getModel().getTenantColumn()) {
-                args["query"][this.modelService.getModel().getTenantColumn()] = options.projectId;
-            }
             if (!args["select"]) {
                 throw options.onError(new BadDataException("Select Fields is undefined."));
             }
@@ -68,16 +68,18 @@ export default class FindOneBaseModel extends ComponentCode {
             if (typeof args["select"] !== "object") {
                 throw options.onError(new BadDataException("Select Fields is should be of type object."));
             }
-            let query = args["query"];
-            if (query) {
-                query = JSONFunctions.deserialize(args["query"]);
-            }
-            let select = args["select"];
-            if (select) {
-                select = JSONFunctions.deserialize(args["select"]);
+            const query = JSONFunctions.deserialize(normalizeModelKeys(args["query"], this.modelService.getModel()));
+            /*
+             * The tenant column goes on the deserialized query, not on args["query"]
+             * - JSONFunctions.deserialize returns a new object, so anything written
+             * to args after it runs never reaches the database.
+             */
+            if (this.modelService.getModel().getTenantColumn()) {
+                query[this.modelService.getModel().getTenantColumn()] = options.projectId;
             }
+            const select = JSONFunctions.deserialize(normalizeModelKeys(args["select"], this.modelService.getModel()));
             const model = await this.modelService.findOneBy({
-                query: query || {},
+                query: query,
                 select: select,
                 props: {
                     isRoot: true,
@@ -94,8 +96,11 @@ export default class FindOneBaseModel extends ComponentCode {
             };
         }
         catch (err) {
-            options.log("Error running component");
-            options.log(err.message ? err.message : JSON.stringify(err, null, 2));
+            logComponentError({
+                error: err,
+                model: ((_a = this.modelService) === null || _a === void 0 ? void 0 : _a.getModel()) || null,
+                log: options.log,
+            });
             return {
                 returnValues: {},
                 executePort: errorPort,

package/build/dist/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.js.map

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

package/build/dist/Server/Types/Workflow/Components/BaseModel/LogComponentError.js

@@ -0,0 +1,43 @@
+import logger from "../../../../Utils/Logger";
+import { ID_ARGUMENT_KEY, PRIMARY_KEY_COLUMN, describeModelColumns, } from "./ModelArguments";
+/*
+ * TypeORM's EntityPropertyNotFoundError reads
+ * `Property "foo" was not found in "Monitor". Make sure your query is correct.`
+ * On its own that tells a workflow builder nothing they can act on: it names
+ * neither the argument at fault nor anything they can pick from, and it says
+ * "query" even when the offending key was in Data. Everything the builder
+ * needs is already on the model, so the components append it.
+ */
+const UNKNOWN_PROPERTY_PATTERN = /Property "([^"]+)" was not found in "([^"]+)"/;
+export const buildColumnHint = (message, model) => {
+    const match = message.match(UNKNOWN_PROPERTY_PATTERN);
+    if (!match) {
+        return null;
+    }
+    const property = match[1];
+    const modelName = model.singularName || match[2];
+    if (property === ID_ARGUMENT_KEY) {
+        return `Tip: "${ID_ARGUMENT_KEY}" is not a column on ${modelName}. Use "${PRIMARY_KEY_COLUMN}" instead. Columns you can use: ${describeModelColumns(model)}.`;
+    }
+    return `Tip: "${property}" is not a column on ${modelName}. Check every key in this component's Query, Select and Data arguments. Columns you can use: ${describeModelColumns(model)}.`;
+};
+/*
+ * Every database component failed the same way before this: two lines in the
+ * workflow log and, for all but Create One, nothing at all in the server log.
+ */
+const logComponentError = (data) => {
+    const { error, model, log } = data;
+    logger.error(error);
+    const errorMessage = error === null || error === void 0 ? void 0 : error.message;
+    const message = typeof errorMessage === "string" && errorMessage
+        ? errorMessage
+        : JSON.stringify(error, null, 2);
+    log("Error running component");
+    log(message);
+    const hint = model ? buildColumnHint(message, model) : null;
+    if (hint) {
+        log(hint);
+    }
+};
+export default logComponentError;
+//# sourceMappingURL=LogComponentError.js.map

package/build/dist/Server/Types/Workflow/Components/BaseModel/LogComponentError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LogComponentError.js","sourceRoot":"","sources":["../../../../../../../Server/Types/Workflow/Components/BaseModel/LogComponentError.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;GAOG;AACH,MAAM,wBAAwB,GAC5B,+CAA+C,CAAC;AAOlD,MAAM,CAAC,MAAM,eAAe,GAA4B,CACtD,OAAe,EACf,KAAgB,EACD,EAAE;IACjB,MAAM,KAAK,GAA4B,OAAO,CAAC,KAAK,CAClD,wBAAwB,CACzB,CAAC;IAEF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAW,KAAK,CAAC,CAAC,CAAW,CAAC;IAC5C,MAAM,SAAS,GAAW,KAAK,CAAC,YAAY,IAAK,KAAK,CAAC,CAAC,CAAY,CAAC;IAErE,IAAI,QAAQ,KAAK,eAAe,EAAE,CAAC;QACjC,OAAO,SAAS,eAAe,wBAAwB,SAAS,UAAU,kBAAkB,mCAAmC,oBAAoB,CACjJ,KAAK,CACN,GAAG,CAAC;IACP,CAAC;IAED,OAAO,SAAS,QAAQ,wBAAwB,SAAS,gGAAgG,oBAAoB,CAC3K,KAAK,CACN,GAAG,CAAC;AACP,CAAC,CAAC;AAQF;;;GAGG;AACH,MAAM,iBAAiB,GAA8B,CAAC,IAIrD,EAAQ,EAAE;IACT,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAEnC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAEpB,MAAM,YAAY,GAAa,KAAsC,aAAtC,KAAK,uBAAL,KAAK,CAChC,OAAO,CAAC;IAEZ,MAAM,OAAO,GACX,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY;QAC9C,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAErC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IAC/B,GAAG,CAAC,OAAO,CAAC,CAAC;IAEb,MAAM,IAAI,GAAkB,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE3E,IAAI,IAAI,EAAE,CAAC;QACT,GAAG,CAAC,IAAI,CAAC,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}