@saltcorn/data 0.9.0-beta.6 → 0.9.0-beta.8

package/dist/web-mobile-commons.js

@@ -5,11 +5,14 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+const table_1 = __importDefault(require("./models/table"));
 const common_types_1 = require("@saltcorn/types/common_types");
 const utils_1 = __importDefault(require("./utils"));
 const expression_1 = __importDefault(require("./models/expression"));
-const { isNode } = utils_1.default;
+const { isNode, applyAsync } = utils_1.default;
+const { text } = require("@saltcorn/markup/tags");
 const { getState } = require("./db/state");
+const { readState, add_free_variables_to_joinfields, calcfldViewConfig, } = require("@saltcorn/data/plugin-helper");
 const disabledMobileMenus = ["Action", "Search"];
 /**
  * Get extra menu
@@ -139,9 +142,210 @@ const prepare_insert_row = async (row, fields) => {
     });
     return errors;
 };
+// TODO use this in the server route as well
+/**
+ * @param req express or mocked mobile requese
+ * @param res express or mocked mobile response
+ * @param param2 table field and fieldview
+ * @returns void and writes to res
+ */
+const show_calculated_fieldview = async (req, res, { tableName, fieldName, fieldview, }) => {
+    // const { tableName, fieldName, fieldview } = req.params;
+    const table = table_1.default.findOne({ name: tableName });
+    if (!table)
+        throw new Error(`Table ${tableName} not found`);
+    const role = req.user && req.user.id ? req.user.role_id : 100;
+    const fields = table.getFields();
+    let row = { ...req.body };
+    if (row && Object.keys(row).length > 0)
+        readState(row, fields);
+    //need to get join fields from ownership into row
+    const joinFields = {};
+    if (table.ownership_formula && role > table.min_role_read) {
+        const freeVars = expression_1.default.freeVariables(table.ownership_formula);
+        add_free_variables_to_joinfields(freeVars, joinFields, fields);
+    }
+    //console.log(joinFields, row);
+    const id = req.query.id || row.id;
+    if (id) {
+        let [dbrow] = await table.getJoinedRows({ where: { id }, joinFields });
+        row = { ...dbrow, ...row };
+        //prevent overwriting ownership field
+        if (table.ownership_field_id) {
+            const ofield = fields.find((f) => f.id === table.ownership_field_id);
+            if (!ofield)
+                throw new Error("ownership field not found");
+            row[ofield.name] = dbrow[ofield.name];
+        }
+    }
+    else {
+        //may need to add joinfields
+        for (const { ref } of Object.values(joinFields)) {
+            if (row[ref]) {
+                const field = fields.find((f) => f.name === ref);
+                if (!field)
+                    throw new Error(`field ${ref} not found`);
+                const reftable = table_1.default.findOne({ name: field.reftable_name });
+                if (!reftable)
+                    throw new Error(`reftable ${field.reftable_name} not found`);
+                const refFields = await reftable.getFields();
+                const joinFields = {};
+                if (reftable.ownership_formula && role > reftable.min_role_read) {
+                    const freeVars = expression_1.default.freeVariables(reftable.ownership_formula);
+                    add_free_variables_to_joinfields(freeVars, joinFields, refFields);
+                }
+                const [refRow] = await reftable.getJoinedRows({
+                    where: { id: row[ref] },
+                    joinFields,
+                });
+                if (role <= reftable.min_role_read ||
+                    (req.user && reftable.is_owner(req.user, refRow))) {
+                    row[ref] = refRow;
+                }
+            }
+        }
+    }
+    if (role > table.min_role_read &&
+        !(req.user && table.is_owner(req.user, row))) {
+        //console.log("not owner", row, table.is_owner(req.user, row));
+        res.status(401).send("");
+        return;
+    }
+    if (fieldName.includes(".")) {
+        //join field
+        const kpath = fieldName.split(".");
+        if (kpath.length === 2 && row[kpath[0]]) {
+            const field = fields.find((f) => f.name === kpath[0]);
+            if (!field)
+                throw new Error(`field ${kpath[0]} not found`);
+            const reftable = table_1.default.findOne({ name: field.reftable_name });
+            if (!reftable)
+                throw new Error(`reftable ${field.reftable_name} not found`);
+            const refFields = await reftable.getFields();
+            const targetField = refFields.find((f) => f.name === kpath[1]);
+            if (!targetField)
+                throw new Error(`field ${kpath[1]} not found`);
+            //console.log({ kpath, fieldview, targetField });
+            const q = { [reftable.pk_name]: row[kpath[0]] };
+            const joinFields = {};
+            if (reftable.ownership_formula && role > reftable.min_role_read) {
+                const freeVars = expression_1.default.freeVariables(reftable.ownership_formula);
+                add_free_variables_to_joinfields(freeVars, joinFields, refFields);
+            }
+            const [refRow] = await reftable.getJoinedRows({ where: q, joinFields });
+            if (role > reftable.min_role_read &&
+                !(req.user && reftable.is_owner(req.user, refRow))) {
+                //console.log("not jointable owner", refRow);
+                res.status(401).send("");
+                return;
+            }
+            let fv;
+            if (targetField.type === "Key") {
+                fv = getState().keyFieldviews[fieldview];
+                if (!fv) {
+                    const reftable2 = table_1.default.findOne({
+                        name: targetField.reftable_name,
+                    });
+                    if (!reftable2)
+                        throw new Error(`reftable ${targetField.reftable_name} not found`);
+                    const refRow2 = await reftable2.getRow({
+                        [reftable2.pk_name]: refRow[kpath[1]],
+                    });
+                    if (refRow2) {
+                        res.send(text(`${refRow2[targetField.attributes.summary_field]}`));
+                    }
+                    else {
+                        res.send("");
+                    }
+                    return;
+                }
+            }
+            else {
+                // @ts-ignore
+                fv = targetField.type.fieldviews[fieldview];
+                if (!fv)
+                    fv =
+                        // @ts-ignore
+                        targetField.type.fieldviews.show ||
+                            // @ts-ignore
+                            targetField.type.fieldviews.as_text;
+            }
+            const configuration = req.query;
+            let configFields = [];
+            if (fv.configFields)
+                configFields = await applyAsync(fv.configFields, targetField);
+            readState(configuration, configFields);
+            res.send(fv.run(refRow[kpath[1]], req, configuration));
+            return;
+        }
+        else if (row[kpath[0]]) {
+            let oldTable = table;
+            let oldRow = row;
+            for (const ref of kpath) {
+                const ofields = await oldTable.getFields();
+                const field = ofields.find((f) => f.name === ref);
+                if (!field)
+                    throw new Error(`field ${ref} not found`);
+                if (field.is_fkey) {
+                    const reftable = table_1.default.findOne({ name: field.reftable_name });
+                    if (!reftable)
+                        throw new Error(`reftable ${field.reftable_name} not found`);
+                    if (!oldRow[ref])
+                        break;
+                    if (role > reftable.min_role_read) {
+                        res.status(401).send("");
+                        return;
+                    }
+                    const q = { [reftable.pk_name]: oldRow[ref] };
+                    oldRow = await reftable.getRow(q);
+                    oldTable = reftable;
+                }
+            }
+            if (oldRow) {
+                const value = oldRow[kpath[kpath.length - 1]];
+                res.send(value);
+                return;
+            }
+        }
+        res.send("");
+        return;
+    }
+    const field = fields.find((f) => f.name === fieldName);
+    if (!field)
+        throw new Error(`field ${fieldName} not found`);
+    const formula = field.expression;
+    let result;
+    try {
+        if (!field.calculated) {
+            result = row[field.name];
+        }
+        else {
+            if (typeof formula !== "string")
+                throw new Error("no formula of type string");
+            if (field.stored) {
+                const f = expression_1.default.get_async_expression_function(formula, fields);
+                result = await f(row);
+            }
+            else {
+                const f = expression_1.default.get_expression_function(formula, fields);
+                result = f(row);
+            }
+        }
+        // @ts-ignore
+        const fv = field.type.fieldviews[fieldview];
+        if (!fv)
+            res.send(text(result));
+        else
+            res.send(fv.run(result));
+    }
+    catch (e) {
+        return res.status(400).send(`Error: ${e.message}`);
+    }
+};
 module.exports = {
     get_extra_menu,
     prepare_update_row,
     prepare_insert_row,
+    show_calculated_fieldview,
 };
 //# sourceMappingURL=web-mobile-commons.js.map

package/dist/web-mobile-commons.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/data",
-  "version": "0.9.0-beta.6",
+  "version": "0.9.0-beta.8",
   "description": "Data models for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -37,14 +37,14 @@
     "!dist/tsconfig.ref.tsbuildinfo"
   ],
   "optionalDependencies": {
-    "@saltcorn/postgres": "0.9.0-beta.6",
-    "@saltcorn/sqlite": "0.9.0-beta.6"
+    "@saltcorn/postgres": "0.9.0-beta.8",
+    "@saltcorn/sqlite": "0.9.0-beta.8"
   },
   "dependencies": {
-    "@saltcorn/types": "0.9.0-beta.6",
-    "@saltcorn/markup": "0.9.0-beta.6",
-    "@saltcorn/db-common": "0.9.0-beta.6",
-    "@saltcorn/sqlite-mobile": "0.9.0-beta.6",
+    "@saltcorn/types": "0.9.0-beta.8",
+    "@saltcorn/markup": "0.9.0-beta.8",
+    "@saltcorn/db-common": "0.9.0-beta.8",
+    "@saltcorn/sqlite-mobile": "0.9.0-beta.8",
     "acorn": "^8.0.3",
     "assert": "^2.0.0",
     "astring": "^1.4.3",