@saltcorn/server 0.8.0-beta.0 → 0.8.0-beta.2

package/locales/en.json

@@ -960,7 +960,7 @@
 	"Remove From Tag": "Remove From Tag",
 	"Add tables": "Add tables",
 	"Add views": "Add views",
-	"Add tages": "Add tages",
+	"Add tags": "Add tags",
 	"Trigger": "Trigger",
 	"Add %s to tag": "Add %s to tag",
 	"Tag %s deleted": "Tag %s deleted",
@@ -1035,5 +1035,17 @@
 	"Provide your own create warning text if need": "Provide your own create warning text if need",
 	"Specify some description for tenant if need": "Specify some description for tenant if need",
 	"Created": "Created",
-	"First user E-mail": "First user E-mail"
-}
+	"First user E-mail": "First user E-mail",
+	"HTTP settings": "HTTP settings",
+	"HTTP": "HTTP",
+	"Login and Signup": "Login and Signup",
+	"Rights": "Rights",
+	"Rights settings": "Rights settings",
+	"Database name": "Database name",
+	"Database schema": "Database schema",
+	"<p>You have views with a role to access lower than the table role to read, \n      with no table ownership. In the next version of Saltcorn, this may cause a\n      denial of access. Users will need to have table read access to any data displayed.</p> \n      Views potentially affected: %s": "<p>You have views with a role to access lower than the table role to read, \n      with no table ownership. In the next version of Saltcorn, this may cause a\n      denial of access. Users will need to have table read access to any data displayed.</p> \n      Views potentially affected: %s",
+	"If the parent row is deleted, do this to the child rows.": "If the parent row is deleted, do this to the child rows.",
+	"On delete": "On delete",
+	"Database name": "Database name",
+	"Database schema": "Database schema"
+}

package/locales/it.json

@@ -479,5 +479,10 @@
 	"Two-factor authentication": "Two-factor authentication",
 	"Two-factor authentication is disabled": "Two-factor authentication is disabled",
 	"Enable TWA": "Enable TWA",
-	"Modules": "Modules"
+	"Modules": "Modules",
+	"Login and Signup": "Login and Signup",
+	"Table access": "Table access",
+	"HTTP": "HTTP",
+	"Rights": "Rights",
+	"Table access": "Table access"
 }

package/locales/ru.json

@@ -676,7 +676,7 @@
 	"No triggers": "Нет триггеров",
 	"No files": "Нет файлов",
 	"Home Timezone": "Домашняя Timezone",
-	"2FA policy": "2FA policy",
+	"2FA policy": "Политика 2FA",
 	"Role to generate API keys": "Роль для API keys",
 	"User should have this role or higher to generate API keys in their user settings": "Минимальная роль для генерации API key",
 	"Cookie duration (hours)": "Срок действия Cookie (в часах)",
@@ -835,7 +835,7 @@
 	"Add tables": "Добавить таблицы",
 	"Add views": "Добавить представления",
 	"Remove From Tag": "Удалить из тега",
-	"Add tages": "Добавить теги",
+	"Add tags": "Добавить теги",
 	"Trigger": "Триггер",
 	"Tag": "Тег",
 	"Download snapshots": "Скачать снепшоты",
@@ -898,7 +898,7 @@
 	"Discover tables that are already in the Database, but not known to Saltcorn": "Обнаружить таблицы, уже созданные в Базе Данных, но пока не подключенные к Saltcorn",
 	"Users already present": "Пользователи уже созданы",
 	"Database type": "Тип БД",
-	"Database name": "Database name",
+	"Database name": "Название БД",
 	"Database host": "Хост БД",
 	"Database port": "Порт БД",
 	"Database schema": "Схема БД",
@@ -909,5 +909,15 @@
 	"Development settings": "Настройки для разработчиков",
 	"Creator email": "Email создателя",
 	"Created": "Создано",
-	"Views display data from tables. A view is a view pattern applied to a table, with configuration.": "Представления отображают данные из таблиц. Представление - это конфигурируемый визуальный паттерн, применяемый к таблице."
+	"Views display data from tables. A view is a view pattern applied to a table, with configuration.": "Представления отображают данные из таблиц. Представление - это конфигурируемый визуальный паттерн, применяемый к таблице.",
+	"HTTP settings": "Настройки HTTP",
+	"HTTP": "HTTP",
+	"Rights settings": "Настройки прав",
+	"Login and Signup": "Авторизация и Регистрация",
+	"Rights": "Права",
+	"<p>You have views with a role to access lower than the table role to read, \n      with no table ownership. In the next version of Saltcorn, this may cause a\n      denial of access. Users will need to have table read access to any data displayed.</p> \n      Views potentially affected: %s": "<p>Найдены представления с ролью доступа ниже уровня роли для чтения из соответствующей таблицы, без указания владельца таблицы. В следующих версиях Saltcorn это может привести к запрету на доступ. Пользователи должны будут иметь права на чтение, чтобы данные были отображены. </p> \n     Потенциально затронутые представления: %s</p>",
+	"File not found": "Файл не найден",
+	"Permissions settings": "Настройки разрешений",
+	"Permissions": "Разрешения",
+	"Permissions settings updated": "Настройки разрешений обновлены"
 }

package/markup/admin.js

@@ -223,9 +223,11 @@ const send_users_page = (args) => {
     sub_sections: [
       { text: "Users", href: "/useradmin" },
       { text: "Roles", href: "/roleadmin" },
-      { text: "Settings", href: "/useradmin/settings" },
+      { text: "Login and Signup", href: "/useradmin/settings" },
       { text: "Table access", href: "/useradmin/table-access" },
       ...(isRoot ? [{ text: "SSL", href: "/useradmin/ssl" }] : []),
+      { text: "HTTP", href: "/useradmin/http" },
+      { text: "Permissions", href: "/useradmin/permissions" },
     ],
     ...args,
   });
@@ -282,7 +284,7 @@ const send_events_page = (args) => {
  * @returns {void}
  */
 const send_admin_page = (args) => {
-  const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+  //const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
   return send_settings_page({
     main_section: "About application",
     main_section_href: "/admin",
@@ -436,7 +438,7 @@ const save_config_from_form = async (form) => {
 
 /**
  * Get Base Domain
- * @returns {string} base domain
+ * @returns {string|null} base domain
  */
 const getBaseDomain = () => {
   const base_url = getState().getConfig("base_url");
@@ -457,7 +459,7 @@ const hostname_matches_baseurl = (req, domain) => domain === req.hostname;
 
 /**
  * @param {string} domain
- * @returns {string[]}
+ * @returns {string[]|boolean}
  */
 const is_hsts_tld = (domain) => {
   if (!domain) return false;

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.0-beta.0",
+  "version": "0.8.0-beta.2",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.0-beta.0",
-    "@saltcorn/builder": "0.8.0-beta.0",
-    "@saltcorn/data": "0.8.0-beta.0",
-    "@saltcorn/admin-models": "0.8.0-beta.0",
-    "@saltcorn/filemanager": "0.7.4",
-    "@saltcorn/markup": "0.8.0-beta.0",
-    "@saltcorn/sbadmin2": "0.8.0-beta.0",
+    "@saltcorn/base-plugin": "0.8.0-beta.2",
+    "@saltcorn/builder": "0.8.0-beta.2",
+    "@saltcorn/data": "0.8.0-beta.2",
+    "@saltcorn/admin-models": "0.8.0-beta.2",
+    "@saltcorn/filemanager": "0.8.0-beta.2",
+    "@saltcorn/markup": "0.8.0-beta.2",
+    "@saltcorn/sbadmin2": "0.8.0-beta.2",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",

package/public/blockly.js

@@ -1,3 +1,4 @@
+// todo replace var with let / const
 function activate_blockly({ events, actions, tables }) {
   // https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#arpfmx
 
@@ -21,8 +22,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `console.log(${value_string});\n`;
-    return code;
+    return `console.log(${value_string});\n`;
   };
 
   Blockly.Blocks["emit_event"] = {
@@ -58,9 +58,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `emitEvent("${dropdown_event}", ${value_channel}, ${value_payload});\n`;
-
-    return code;
+    return `emitEvent("${dropdown_event}", ${value_channel}, ${value_payload});\n`;
   };
 
   Blockly.Blocks["row"] = {
@@ -75,7 +73,7 @@ function activate_blockly({ events, actions, tables }) {
 
   Blockly.JavaScript["row"] = function (block) {
     // TODO: Assemble JavaScript into code variable.
-    var code = "row";
+    const code = "row";
     // TODO: Change ORDER_NONE to the correct strength.
     return [code, Blockly.JavaScript.ORDER_NONE];
   };
@@ -91,7 +89,7 @@ function activate_blockly({ events, actions, tables }) {
   };
   Blockly.JavaScript["current_channel"] = function (block) {
     // TODO: Assemble JavaScript into code variable.
-    var code = "channel";
+    const code = "channel";
     // TODO: Change ORDER_NONE to the correct strength.
     return [code, Blockly.JavaScript.ORDER_NONE];
   };
@@ -106,7 +104,7 @@ function activate_blockly({ events, actions, tables }) {
   };
   Blockly.JavaScript["empty"] = function (block) {
     // TODO: Assemble JavaScript into code variable.
-    var code = "{}";
+    const code = "{}";
     // TODO: Change ORDER_NONE to the correct strength.
     return [code, Blockly.JavaScript.ORDER_NONE];
   };
@@ -170,8 +168,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `${value_row}.${text_key}=${value_value};\n`;
-    return code;
+    return `${value_row}.${text_key}=${value_value};\n`;
   };
   Blockly.Blocks["insert_table"] = {
     init: function () {
@@ -196,8 +193,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `await Table.findOne({name: '${dropdown_table}'})\n           .tryInsertRow(${value_row});\n`;
-    return code;
+    return `await Table.findOne({name: '${dropdown_table}'})\n           .tryInsertRow(${value_row});\n`;
   };
   Blockly.Blocks["query_table"] = {
     init: function () {
@@ -281,8 +277,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `await Table.findOne({name: '${dropdown_table}'})\n           .deleteRows({id: ${value_id}});\n`;
-    return code;
+    return `await Table.findOne({name: '${dropdown_table}'})\n           .deleteRows({id: ${value_id}});\n`;
   };
 
   Blockly.Blocks["delete_table_where"] = {
@@ -309,9 +304,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `await Table.findOne({name: '${dropdown_table}'})\n           .deleteRows(${value_where});\n`;
-
-    return code;
+    return `await Table.findOne({name: '${dropdown_table}'})\n           .deleteRows(${value_where});\n`;
   };
   Blockly.Blocks["update_table"] = {
     init: function () {
@@ -342,8 +335,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `await Table.findOne({name: '${dropdown_table}'})\n           .tryUpdateRow(${value_row}, ${value_id});\n`;
-    return code;
+    return `await Table.findOne({name: '${dropdown_table}'})\n           .tryUpdateRow(${value_row}, ${value_id});\n`;
   };
 
   Blockly.Blocks["sleep"] = {
@@ -363,10 +355,9 @@ function activate_blockly({ events, actions, tables }) {
     },
   };
   Blockly.JavaScript["sleep"] = function (block) {
-    var number_sleep_ms = block.getFieldValue("SLEEP_MS");
+    const number_sleep_ms = block.getFieldValue("SLEEP_MS");
     // TODO: Assemble JavaScript into code variable.
-    var code = `await sleep(${number_sleep_ms});\n`;
-    return code;
+    return `await sleep(${number_sleep_ms});\n`;
   };
 
   Blockly.Blocks["http_request"] = {
@@ -439,7 +430,7 @@ function activate_blockly({ events, actions, tables }) {
       "POPUP",
       Blockly.JavaScript.ORDER_ATOMIC
     );
-    var checkbox_reload = block.getFieldValue("RELOAD") == "TRUE";
+    var checkbox_reload = block.getFieldValue("RELOAD") === "TRUE";
     var value_notify = Blockly.JavaScript.valueToCode(
       block,
       "NOTIFY",
@@ -451,8 +442,7 @@ function activate_blockly({ events, actions, tables }) {
     if (value_popup) s += `popup: ${value_popup},`;
     if (value_notify) s += `notify: ${value_notify},`;
     if (checkbox_reload) s += `reload_page: true,`;
-    var code = `return {${s}};\n`;
-    return code;
+    return `return {${s}};\n`;
   };
   Blockly.Blocks["push_to_list"] = {
     init: function () {
@@ -480,8 +470,7 @@ function activate_blockly({ events, actions, tables }) {
       Blockly.JavaScript.ORDER_ATOMIC
     );
     // TODO: Assemble JavaScript into code variable.
-    var code = `${value_list}.push(${value_name});\n`;
-    return code;
+    return `${value_list}.push(${value_name});\n`;
   };
   if (actions.length > 0) {
     Blockly.Blocks["action"] = {
@@ -501,12 +490,11 @@ function activate_blockly({ events, actions, tables }) {
     };
 
     Blockly.JavaScript["action"] = function (block) {
-      var dropdown_name = block.getFieldValue("NAME");
+      const dropdown_name = block.getFieldValue("NAME");
       // TODO: Assemble JavaScript into code variable.
-      var code = dropdown_name.includes(" ")
+      return dropdown_name.includes(" ")
         ? `Actions['${dropdown_name}']();\n`
         : `Actions.${dropdown_name}();\n`;
-      return code;
     };
   }
   Blockly.Blocks["unit_row"] = {
@@ -577,7 +565,7 @@ function activate_blockly({ events, actions, tables }) {
     $("#blocklyForm").submit();
   });
   function myUpdateFunction(event) {
-    var code = Blockly.JavaScript.workspaceToCode(workspace);
+    const code = Blockly.JavaScript.workspaceToCode(workspace);
     $("#blockly_js_output").html(code);
   }
   workspace.addChangeListener(myUpdateFunction);

package/routes/actions.js

@@ -8,7 +8,6 @@ const Router = require("express-promise-router");
 const {
   isAdmin,
   error_catcher,
-  get_base_url,
   addOnDoneRedirect,
 } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
@@ -25,17 +24,9 @@ const { getTriggerList } = require("./common_lists");
 const router = new Router();
 module.exports = router;
 const {
-  mkTable,
   renderForm,
   link,
-  //  post_btn,
-  //  settingsDropdown,
-  //  post_dropdown_item,
-  post_delete_btn,
-  localeDateTime,
-  //  localeDateTime,
 } = require("@saltcorn/markup");
-const actions = require("@saltcorn/data/base-plugin/actions");
 const Form = require("@saltcorn/data/models/form");
 const {
   div,
@@ -52,14 +43,11 @@ const {
   h6,
   pre,
   text,
-  hr,
 } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const { getActionConfigFields } = require("@saltcorn/data/plugin-helper");
 const { send_events_page } = require("../markup/admin.js");
-const EventLog = require("@saltcorn/data/models/eventlog");
 const User = require("@saltcorn/data/models/user");
-const form = require("@saltcorn/markup/form");
 const {
   blocklyImportScripts,
   blocklyToolbox,
@@ -587,7 +575,7 @@ router.get(
     };
     let table, row;
     if (trigger.table_id) {
-      table = await Table.findOne(trigger.table_id);
+      table = await Table.findOne( { id: trigger.table_id } );
       row = await table.getRow({});
     }
     try {

package/routes/delete.js

@@ -6,7 +6,7 @@
 
 const Router = require("express-promise-router");
 
-const { loggedIn, error_catcher } = require("./utils.js");
+const { error_catcher } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
 
 /**
@@ -28,17 +28,18 @@ module.exports = router;
  * @function
  */
 router.post(
-  "/:name/:id",
+  "/:tableName/:id",
   error_catcher(async (req, res) => {
-    const { name, id } = req.params;
+    const { tableName, id } = req.params;
     const { redirect } = req.query;
-    const table = await Table.findOne({ name });
+    // todo check that works after where change
+    const table = await Table.findOne({ name : tableName });
     const role = req.user && req.user.id ? req.user.role_id : 10;
     try {
       if (role <= table.min_role_write) await table.deleteRows({ id });
       else if (table.ownership_field_id && req.user) {
         const row = await table.getRow({ id });
-        if (row && (await table.is_owner(req.user, row)))
+        if (row && (table.is_owner(req.user, row)))
           await table.deleteRows({ id });
         else req.flash("error", req.__("Not authorized"));
       } else

package/routes/edit.js

@@ -6,14 +6,8 @@
 
 const Router = require("express-promise-router");
 
-const Field = require("@saltcorn/data/models/field");
-const File = require("@saltcorn/data/models/file");
-const Form = require("@saltcorn/data/models/form");
-const { loggedIn, error_catcher } = require("./utils.js");
+const { error_catcher } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
-const pluralize = require("pluralize");
-
-const { renderForm } = require("@saltcorn/markup");
 
 /**
  * @type {object}
@@ -32,11 +26,12 @@ module.exports = router;
  * @function
  */
 router.post(
-  "/toggle/:name/:id/:field_name",
+  "/toggle/:tableName/:id/:field_name",
   error_catcher(async (req, res) => {
-    const { name, id, field_name } = req.params;
+    const { tableName, id, field_name } = req.params;
     const { redirect } = req.query;
-    const table = await Table.findOne({ name });
+    // todo check that works after where change
+    const table = await Table.findOne({ name : tableName });
     const role = req.user && req.user.id ? req.user.role_id : 10;
     if (role <= table.min_role_write) await table.toggleBool(+id, field_name);
     else

package/routes/fields.js

@@ -25,7 +25,10 @@ const db = require("@saltcorn/data/db");
 
 const { isAdmin, error_catcher } = require("./utils.js");
 const expressionBlurb = require("../markup/expression_blurb");
-const { readState, add_free_variables_to_joinfields } = require("@saltcorn/data/plugin-helper");
+const {
+  readState,
+  add_free_variables_to_joinfields,
+} = require("@saltcorn/data/plugin-helper");
 const { wizardCardTitle } = require("../markup/forms.js");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
 const { applyAsync } = require("@saltcorn/data/utils");
@@ -185,6 +188,7 @@ const fieldFlow = (req) =>
       attributes.summary_field = context.summary_field;
       attributes.include_fts = context.include_fts;
       attributes.on_delete_cascade = context.on_delete_cascade;
+      attributes.on_delete = context.on_delete;
       const {
         table_id,
         name,
@@ -350,12 +354,13 @@ const fieldFlow = (req) =>
                 // todo sublabel
                 input_type: "custom_html",
                 attributes: {
-                  html: `<button type="button" id="test_formula_btn" onclick="test_formula('${table.name
-                    }', ${JSON.stringify(
-                      context.stored
-                    )})" class="btn btn-outline-secondary">${req.__(
-                      "Test"
-                    )}</button>
+                  html: `<button type="button" id="test_formula_btn" onclick="test_formula('${
+                    table.name
+                  }', ${JSON.stringify(
+                    context.stored
+                  )})" class="btn btn-outline-secondary">${req.__(
+                    "Test"
+                  )}</button>
                   <div id="test_formula_output"></div>`,
                 },
               }),
@@ -400,13 +405,32 @@ const fieldFlow = (req) =>
                 type: "Bool",
                 showIf: { summary_field: textfields },
               }),
-              new Field({
+              /*new Field({
                 name: "on_delete_cascade",
                 label: req.__("On delete cascade"),
                 type: "Bool",
                 sublabel: req.__(
                   "If the parent row is deleted, automatically delete the child rows."
                 ),
+              }),*/
+              new Field({
+                name: "on_delete",
+                label: req.__("On delete"),
+                input_type: "select",
+                options: ["Fail", "Cascade", "Set null"],
+                required: true,
+                attributes: {
+                  explainers: {
+                    Fail: "Prevent any deletion of parent rows",
+                    Cascade:
+                      "If the parent row is deleted, automatically delete the child rows.",
+                    "Set null":
+                      "If the parent row is deleted, set key fields on child rows to null",
+                  },
+                },
+                sublabel: req.__(
+                  "If the parent row is deleted, do this to the child rows."
+                ),
               }),
             ],
           });
@@ -622,14 +646,17 @@ router.post(
     const { formula, tablename, stored } = req.body;
     const table = await Table.findOne({ name: tablename });
     const fields = await table.getFields();
-    const freeVars = freeVariables(formula)
-    const joinFields = {}
-    if (stored)
-      add_free_variables_to_joinfields(freeVars, joinFields, fields)
-    const rows = await table.getJoinedRows({ joinFields, orderBy: "RANDOM()", limit: 1 });
+    const freeVars = freeVariables(formula);
+    const joinFields = {};
+    if (stored) add_free_variables_to_joinfields(freeVars, joinFields, fields);
+    const rows = await table.getJoinedRows({
+      joinFields,
+      orderBy: "RANDOM()",
+      limit: 1,
+    });
     if (rows.length < 1) {
       res.send("No rows in table");
-      return
+      return;
     }
     let result;
     try {
@@ -641,7 +668,8 @@ router.post(
         result = f(rows[0]);
       }
       res.send(
-        `Result of running on row with id=${rows[0].id
+        `Result of running on row with id=${
+          rows[0].id
         } is: <pre>${JSON.stringify(result)}</pre>`
       );
     } catch (e) {
@@ -671,10 +699,9 @@ router.post(
     const fields = await table.getFields();
     let row = { ...req.body };
     if (!row || Object.keys(row).length === 0) {
-      const { id } = req.query
-      if (id) row = await table.getRow({ id })
-    } else
-      readState(row, fields);
+      const { id } = req.query;
+      if (id) row = await table.getRow({ id });
+    } else readState(row, fields);
 
     if (fieldName.includes(".")) {
       //join field
@@ -694,12 +721,18 @@ router.post(
         const refRow = await reftable.getRow(q);
         let fv;
         if (targetField.type === "Key") {
-          fv = getState().keyFieldviews[fieldview]
+          fv = getState().keyFieldviews[fieldview];
           if (!fv) {
-            const reftable2 = Table.findOne({ name: targetField.reftable_name })
-            const refRow2 = await reftable2.getRow({ [reftable2.pk_name]: refRow[kpath[1]] })
+            const reftable2 = Table.findOne({
+              name: targetField.reftable_name,
+            });
+            const refRow2 = await reftable2.getRow({
+              [reftable2.pk_name]: refRow[kpath[1]],
+            });
             if (refRow2) {
-              res.send(text(`${refRow2[targetField.attributes.summary_field]}`));
+              res.send(
+                text(`${refRow2[targetField.attributes.summary_field]}`)
+              );
             } else {
               res.send("");
             }
@@ -711,7 +744,6 @@ router.post(
             fv =
               targetField.type.fieldviews.show ||
               targetField.type.fieldviews.as_text;
-
         }
 
         const configuration = req.query;
@@ -756,7 +788,7 @@ router.post(
     let result;
     try {
       if (!field.calculated) {
-        result = row[field.name]
+        result = row[field.name];
       } else if (field.stored) {
         const f = get_async_expression_function(formula, fields);
         result = await f(row);
@@ -765,8 +797,7 @@ router.post(
         result = f(row);
       }
       const fv = field.type.fieldviews[fieldview];
-      if (!fv)
-        res.send(text(result));
+      if (!fv) res.send(text(result));
       else res.send(fv.run(result));
     } catch (e) {
       return res.status(400).send(`Error: ${e.message}`);
@@ -819,8 +850,8 @@ router.post(
       field.type === "Key"
         ? getState().keyFieldviews
         : field.type === "File"
-          ? getState().fileviews
-          : field.type.fieldviews;
+        ? getState().fileviews
+        : field.type.fieldviews;
     if (!field.type || !fieldviews) {
       res.send("");
       return;