@saltcorn/server 0.8.6-beta.4 → 0.8.6-beta.6

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.6-beta.4",
+  "version": "0.8.6-beta.6",
   "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.6-beta.4",
-    "@saltcorn/builder": "0.8.6-beta.4",
-    "@saltcorn/data": "0.8.6-beta.4",
-    "@saltcorn/admin-models": "0.8.6-beta.4",
-    "@saltcorn/filemanager": "0.8.6-beta.4",
-    "@saltcorn/markup": "0.8.6-beta.4",
-    "@saltcorn/sbadmin2": "0.8.6-beta.4",
+    "@saltcorn/base-plugin": "0.8.6-beta.6",
+    "@saltcorn/builder": "0.8.6-beta.6",
+    "@saltcorn/data": "0.8.6-beta.6",
+    "@saltcorn/admin-models": "0.8.6-beta.6",
+    "@saltcorn/filemanager": "0.8.6-beta.6",
+    "@saltcorn/markup": "0.8.6-beta.6",
+    "@saltcorn/sbadmin2": "0.8.6-beta.6",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -435,6 +435,7 @@ function reload_on_init() {
   localStorage.setItem("reload_on_init", true);
 }
 function initialize_page() {
+  const isNode = typeof parent?.saltcorn?.data?.state === "undefined";
   //console.log("init page");
   $(".blur-on-enter-keypress").bind("keyup", function (e) {
     if (e.keyCode === 13) e.target.blur();
@@ -480,7 +481,9 @@ function initialize_page() {
     if ($(this).find(".editicon").length === 0) {
       var current = $(this).html();
       $(this).html(
-        `<span class="current">${current}</span><i class="editicon fas fa-edit ms-1"></i>`
+        `<span class="current">${current}</span><i class="editicon ${
+          !isNode ? "visible" : ""
+        } fas fa-edit ms-1"></i>`
       );
     }
   });
@@ -546,12 +549,20 @@ function initialize_page() {
     } else
       $(this).replaceWith(
         `<form method="post" action="${url}" ${
-          ajax ? `onsubmit="inline_ajax_submit(event, '${opts}')"` : ""
+          ajax
+            ? `onsubmit="inline_${
+                isNode ? "ajax" : "local"
+              }_submit(event, '${opts}')"`
+            : ""
         }>
-      <input type="hidden" name="_csrf" value="${_sc_globalCsrf}">
-      <input type="${
-        type === "Integer" || type === "Float" ? "number" : "text"
-      }" name="${key}" value="${escapeHtml(current)}">
+        ${
+          isNode
+            ? `<input type="hidden" name="_csrf" value="${_sc_globalCsrf}"></input>`
+            : ""
+        }
+        <input type="${
+          type === "Integer" || type === "Float" ? "number" : "text"
+        }" name="${key}" value="${escapeHtml(current)}">
       <button type="submit" class="btn btn-sm btn-primary">OK</button>
       <button onclick="cancel_inline_edit(event, '${opts}')" type="button" class="btn btn-sm btn-danger"><i class="fas fa-times"></i></button>
       </form>`
@@ -641,6 +652,7 @@ function initialize_page() {
 $(initialize_page);
 
 function cancel_inline_edit(e, opts1) {
+  const isNode = typeof parent?.saltcorn?.data?.state === "undefined";
   var opts = JSON.parse(decodeURIComponent(opts1 || "") || "{}");
   var form = $(e.target).closest("form");
   var json_fk_opt;
@@ -668,17 +680,47 @@ function cancel_inline_edit(e, opts1) {
     <span class="current">${
       json_fk_opt || opts.current_label || opts.current
     }</span>
-    <i class="editicon fas fa-edit ms-1"></i>
+    <i class="editicon ${!isNode ? "visible" : ""} fas fa-edit ms-1"></i>
   </div>`);
   initialize_page();
 }
 
+function inline_submit_success(e, form, opts) {
+  const isNode = typeof parent?.saltcorn?.data?.state === "undefined";
+  const formDataArray = form.serializeArray();
+  if (opts) {
+    let rawVal = formDataArray.find((f) => f.name == opts.key).value;
+    let val =
+      opts.is_key || (opts.schema && opts.schema.type.startsWith("Key to "))
+        ? form.find("select").find("option:selected").text()
+        : rawVal;
+
+    $(e.target).replaceWith(`<div 
+  data-inline-edit-field="${opts.key}" 
+  ${opts.ajax ? `data-inline-edit-ajax="true"` : ""}
+  ${opts.type ? `data-inline-edit-type="${opts.type}"` : ""}
+  ${opts.current ? `data-inline-edit-current="${rawVal}"` : ""}
+  ${
+    opts.schema
+      ? `data-inline-edit-schema="${encodeURIComponent(
+          JSON.stringify(opts.schema)
+        )}"`
+      : ""
+  }
+  ${opts.current_label ? `data-inline-edit-current-label="${val}"` : ""}
+  data-inline-edit-dest-url="${opts.url}">
+    <span class="current">${val}</span>
+    <i class="editicon ${!isNode ? "visible" : ""} fas fa-edit ms-1"></i>
+  </div>`);
+    initialize_page();
+  } else location.reload();
+}
+
 function inline_ajax_submit(e, opts1) {
   var opts = JSON.parse(decodeURIComponent(opts1 || "") || "{}");
   e.preventDefault();
   var form = $(e.target).closest("form");
   var form_data = form.serialize();
-  var formDataArray = form.serializeArray();
   var url = form.attr("action");
   $.ajax(url, {
     type: "POST",
@@ -687,32 +729,7 @@ function inline_ajax_submit(e, opts1) {
     },
     data: form_data,
     success: function (res) {
-      if (opts) {
-        let rawVal = formDataArray.find((f) => f.name == opts.key).value;
-        let val =
-          opts.is_key || (opts.schema && opts.schema.type.startsWith("Key to "))
-            ? form.find("select").find("option:selected").text()
-            : rawVal;
-
-        $(e.target).replaceWith(`<div 
-      data-inline-edit-field="${opts.key}" 
-      ${opts.ajax ? `data-inline-edit-ajax="true"` : ""}
-      ${opts.type ? `data-inline-edit-type="${opts.type}"` : ""}
-      ${opts.current ? `data-inline-edit-current="${rawVal}"` : ""}
-      ${
-        opts.schema
-          ? `data-inline-edit-schema="${encodeURIComponent(
-              JSON.stringify(opts.schema)
-            )}"`
-          : ""
-      }
-      ${opts.current_label ? `data-inline-edit-current-label="${val}"` : ""}
-      data-inline-edit-dest-url="${opts.url}">
-        <span class="current">${val}</span>
-        <i class="editicon fas fa-edit ms-1"></i>
-      </div>`);
-        initialize_page();
-      } else location.reload();
+      inline_submit_success(e, form, opts);
     },
     error: function (e) {
       ajax_done(

package/public/saltcorn.css

@@ -402,3 +402,20 @@ table.table-inner-grid td {
 div.unread-notify {
   border-left: 4px solid green;
 }
+
+.mobile-data-inline-edit {
+  position: relative;
+}
+
+.mobile-data-inline-edit::after {
+  content: "";
+  position: absolute;
+  top: -25%;
+  left: 0%;
+  width: 100%;
+  height: 150%;
+}
+
+.mt-6 {
+  margin-top: 5rem;
+}

package/routes/admin.js

@@ -990,6 +990,9 @@ router.post(
       child.stdout.on("data", (data) => {
         res.write(data);
       });
+      child.stderr.on("data", (data) => {
+        res.write(data);
+      });
       child.on("exit", function (code, signal) {
         res.end(
           req.__(

package/routes/api.js

@@ -19,6 +19,7 @@ const Router = require("express-promise-router");
 const { error_catcher } = require("./utils.js");
 //const { mkTable, renderForm, link, post_btn } = require("@saltcorn/markup");
 const { getState } = require("@saltcorn/data/db/state");
+const { prepare_update_row } = require("@saltcorn/data/web-mobile-commons");
 const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
 //const Field = require("@saltcorn/data/models/field");
@@ -460,39 +461,15 @@ router.post(
       return;
     }
     await passport.authenticate(
-      "api-bearer",
+      ["api-bearer", "jwt"],
       { session: false },
       async function (err, user, info) {
         if (accessAllowedWrite(req, user, table)) {
           const { _versions, ...row } = req.body;
           const fields = table.getFields();
           readState(row, fields, req);
-          let errors = [];
-          let hasErrors = false;
-          for (const k of Object.keys(row)) {
-            const field = fields.find((f) => f.name === k);
-            if (!field && k.includes(".")) {
-              const [fnm, jkey] = k.split(".");
-              const jfield = fields.find((f) => f.name === fnm);
-              if (jfield?.type?.name === "JSON") {
-                if (typeof row[fnm] === "undefined") {
-                  const dbrow = await table.getRow({ [table.pk_name]: id });
-                  row[fnm] = dbrow[fnm] || {};
-                }
-                row[fnm][jkey] = row[k];
-                delete row[k];
-              }
-            } else if (!field || field.calculated) {
-              delete row[k];
-            } else if (field?.type && field.type.validate) {
-              const vres = field.type.validate(field.attributes || {})(row[k]);
-              if (vres.error) {
-                hasErrors = true;
-                errors.push(`${k}: ${vres.error}`);
-              }
-            }
-          }
-          if (hasErrors) {
+          const errors = await prepare_update_row(table, row, id);
+          if (errors.length > 0) {
             getState().log(
               2,
               `API POST ${table.name} error: ${errors.join(", ")}`

package/routes/viewedit.js

@@ -493,14 +493,22 @@ router.post(
  * @param {object} res
  * @returns {void}
  */
-const respondWorkflow = (view, wf, wfres, req, res) => {
+const respondWorkflow = (view, wf, wfres, req, res, table) => {
   const wrap = (contents, noCard, previewURL) => ({
     above: [
       {
         type: "breadcrumbs",
         crumbs: [
           { text: req.__("Views"), href: "/viewedit" },
-          { href: `/view/${view.name}`, text: view.name },
+          {
+            href: `/view/${view.name}`,
+            text: view.name,
+            postLinkText: `[${view.viewtemplate}${
+              table
+                ? ` on ${a({ href: `/table/` + table.name }, table.name)}`
+                : ""
+            }]`,
+          },
           { workflow: wf, step: wfres },
         ],
       },
@@ -584,6 +592,9 @@ router.get(
     (view.configuration?.columns || []).forEach((c) => {
       c._columndef = JSON.stringify(c);
     });
+    let table;
+    if (view.table_id) table = Table.findOne({ id: view.table_id });
+    if (view.exttable_name) table = Table.findOne({ name: view.exttable_name });
     const configFlow = await view.get_config_flow(req);
     const hasConfig =
       view.configuration && Object.keys(view.configuration).length > 0;
@@ -598,7 +609,7 @@ router.get(
       },
       req
     );
-    respondWorkflow(view, configFlow, wfres, req, res);
+    respondWorkflow(view, configFlow, wfres, req, res, table);
   })
 );
 
@@ -617,7 +628,11 @@ router.post(
     const view = await View.findOne({ name });
     const configFlow = await view.get_config_flow(req);
     const wfres = await configFlow.run(req.body, req);
-    respondWorkflow(view, configFlow, wfres, req, res);
+
+    let table;
+    if (view.table_id) table = Table.findOne({ id: view.table_id });
+    if (view.exttable_name) table = Table.findOne({ name: view.exttable_name });
+    respondWorkflow(view, configFlow, wfres, req, res, table);
   })
 );