@saltcorn/server 0.8.7 → 0.8.8-beta.1

package/routes/diagram.js

@@ -102,228 +102,243 @@ router.get(
             title: req.__(`Application diagram`),
             contents: [
               div(
-                { class: "btn-group" },
-                // New dropdown
-                button(
-                  {
-                    type: "button",
-                    class: "btn btn-primary m-2 rounded",
-                    "data-bs-toggle": "dropdown",
-                    "aria-expanded": false,
-                  },
-                  "New",
-                  i({ class: "fas fa-plus-square ms-2" })
-                ),
-
+                { class: "d-flex justify-content-between" },
                 div(
-                  {
-                    class: "dropdown-menu",
-                  },
-                  // New View
-                  div(
-                    { class: "m-3" },
-
-                    a(
-                      {
-                        href: "/viewedit/new?on_done_redirect=diagram",
-                      },
-                      req.__("View")
-                    )
+                  { class: "btn-group" },
+                  // New dropdown
+                  button(
+                    {
+                      type: "button",
+                      class: "btn btn-primary m-2 rounded",
+                      "data-bs-toggle": "dropdown",
+                      "aria-expanded": false,
+                    },
+                    "New",
+                    i({ class: "fas fa-plus-square ms-2" })
                   ),
-                  // New Page
+
                   div(
-                    { class: "m-3" },
-                    a(
-                      {
-                        href: "/pageedit/new?on_done_redirect=diagram",
-                      },
-                      req.__("Page")
+                    {
+                      class: "dropdown-menu",
+                    },
+                    // New View
+                    div(
+                      { class: "m-3" },
+
+                      a(
+                        {
+                          href: "/viewedit/new?on_done_redirect=diagram",
+                        },
+                        req.__("View")
+                      )
+                    ),
+                    // New Page
+                    div(
+                      { class: "m-3" },
+                      a(
+                        {
+                          href: "/pageedit/new?on_done_redirect=diagram",
+                        },
+                        req.__("Page")
+                      )
+                    ),
+                    // New Table
+                    div(
+                      { class: "m-3" },
+                      a(
+                        {
+                          href: "/table/new",
+                        },
+                        req.__("Table")
+                      )
+                    ),
+                    // New Trigger
+                    div(
+                      { class: "m-3" },
+                      a(
+                        {
+                          href: "/actions/new?on_done_redirect=diagram",
+                        },
+                        req.__("Trigger")
+                      )
                     )
                   ),
-                  // New Table
-                  div(
-                    { class: "m-3" },
-                    a(
-                      {
-                        href: "/table/new",
-                      },
-                      req.__("Table")
-                    )
+                  // Entity type filter dropdown
+                  button(
+                    {
+                      type: "button",
+                      class: "btn btn-primary m-2 rounded",
+                      "data-bs-toggle": "dropdown",
+                      "aria-expanded": false,
+                    },
+                    req.__("All entities")
                   ),
-                  // New Trigger
                   div(
-                    { class: "m-3" },
-                    a(
-                      {
-                        href: "/actions/new?on_done_redirect=diagram",
-                      },
-                      req.__("Trigger")
-                    )
-                  )
-                ),
-                // Entity type filter dropdown
-                button(
-                  {
-                    type: "button",
-                    class: "btn btn-primary m-2 rounded",
-                    "data-bs-toggle": "dropdown",
-                    "aria-expanded": false,
-                  },
-                  req.__("All entities")
-                ),
-                div(
-                  {
-                    class: "dropdown-menu",
-                  },
-                  // Views checkbox
-                  div(
-                    { class: "m-3 form-check" },
-                    label(
-                      { class: "form-check-label", for: "showViewsId" },
-                      req.__("Views")
+                    {
+                      class: "dropdown-menu",
+                    },
+                    // Views checkbox
+                    div(
+                      { class: "m-3 form-check" },
+                      label(
+                        { class: "form-check-label", for: "showViewsId" },
+                        req.__("Views")
+                      ),
+                      input({
+                        type: "checkbox",
+                        class: "form-check-input",
+                        id: "showViewsId",
+                        checked: true,
+                        name: "show_views",
+                        value: "true",
+                        onclick: "toggleEntityFilter('views'); reloadCy();",
+                        autocomplete: "off",
+                      })
                     ),
-                    input({
-                      type: "checkbox",
-                      class: "form-check-input",
-                      id: "showViewsId",
-                      checked: true,
-                      name: "show_views",
-                      value: "true",
-                      onclick: "toggleEntityFilter('views'); reloadCy();",
-                      autocomplete: "off",
-                    })
-                  ),
-                  // Pages checkbox
-                  div(
-                    { class: "m-3 form-check" },
-                    label(
-                      { class: "form-check-label", for: "showPagesId" },
-                      req.__("Pages")
+                    // Pages checkbox
+                    div(
+                      { class: "m-3 form-check" },
+                      label(
+                        { class: "form-check-label", for: "showPagesId" },
+                        req.__("Pages")
+                      ),
+                      input({
+                        type: "checkbox",
+                        class: "form-check-input",
+                        id: "showPagesId",
+                        name: "show_pages",
+                        value: "true",
+                        checked: true,
+                        onclick: "toggleEntityFilter('pages'); reloadCy();",
+                        autocomplete: "off",
+                      })
                     ),
-                    input({
-                      type: "checkbox",
-                      class: "form-check-input",
-                      id: "showPagesId",
-                      name: "show_pages",
-                      value: "true",
-                      checked: true,
-                      onclick: "toggleEntityFilter('pages'); reloadCy();",
-                      autocomplete: "off",
-                    })
-                  ),
-                  // Tables checkbox
-                  div(
-                    { class: "m-3 form-check" },
-                    label(
-                      { class: "form-check-label", for: "showTablesId" },
-                      req.__("Tables")
+                    // Tables checkbox
+                    div(
+                      { class: "m-3 form-check" },
+                      label(
+                        { class: "form-check-label", for: "showTablesId" },
+                        req.__("Tables")
+                      ),
+                      input({
+                        type: "checkbox",
+                        class: "form-check-input",
+                        id: "showTablesId",
+                        name: "show_tables",
+                        value: "true",
+                        checked: true,
+                        onclick: "toggleEntityFilter('tables'); reloadCy();",
+                        autocomplete: "off",
+                      })
                     ),
-                    input({
-                      type: "checkbox",
-                      class: "form-check-input",
-                      id: "showTablesId",
-                      name: "show_tables",
-                      value: "true",
-                      checked: true,
-                      onclick: "toggleEntityFilter('tables'); reloadCy();",
-                      autocomplete: "off",
-                    })
+                    // Trigger checkbox
+                    div(
+                      { class: "m-3 form-check" },
+                      label(
+                        { class: "form-check-label", for: "showTriggerId" },
+                        req.__("Triggers")
+                      ),
+                      input({
+                        type: "checkbox",
+                        class: "form-check-input",
+                        id: "showTriggerId",
+                        name: "show_trigger",
+                        value: "true",
+                        checked: true,
+                        onclick: "toggleEntityFilter('trigger'); reloadCy();",
+                        autocomplete: "off",
+                      })
+                    )
                   ),
-                  // Trigger checkbox
-                  div(
-                    { class: "m-3 form-check" },
-                    label(
-                      { class: "form-check-label", for: "showTriggerId" },
-                      req.__("Triggers")
-                    ),
-                    input({
-                      type: "checkbox",
-                      class: "form-check-input",
-                      id: "showTriggerId",
-                      name: "show_trigger",
-                      value: "true",
-                      checked: true,
-                      onclick: "toggleEntityFilter('trigger'); reloadCy();",
-                      autocomplete: "off",
-                    })
-                  )
-                ),
-                // Tags filter dropdown
-                button(
-                  {
-                    type: "button",
-                    class: "btn btn-primary m-2 rounded",
-                    "data-bs-toggle": "dropdown",
-                    "aria-expanded": false,
-                  },
-                  req.__("Tags")
-                ),
-                div(
-                  {
-                    class: "dropdown-menu",
-                  },
-                  // no tags checkbox
-                  div(
-                    { class: "m-3 form-check" },
-                    label(
-                      { class: "form-check-label", for: "noTagsId" },
-                      req.__("no tags")
-                    ),
-                    input({
-                      type: "checkbox",
-                      class: "form-check-input",
-                      id: "noTagsId",
-                      name: "no_tags",
-                      value: "true",
-                      checked: true,
-                      onclick: "toggleTagFilterMode(); reloadCy();",
-                      autocomplete: "off",
-                    })
+                  // Tags filter dropdown
+                  button(
+                    {
+                      type: "button",
+                      class: "btn btn-primary m-2 rounded",
+                      "data-bs-toggle": "dropdown",
+                      "aria-expanded": false,
+                    },
+                    req.__("Tags")
                   ),
-                  tags.map((tag) => {
-                    const inputId = `tagFilter_box_${tag.name}_id`;
-                    return div(
+                  div(
+                    {
+                      class: "dropdown-menu",
+                    },
+                    // no tags checkbox
+                    div(
                       { class: "m-3 form-check" },
                       label(
-                        {
-                          class: "form-check-label",
-                          id: `tagFilter_label_${tag.name}`,
-                          style: "opacity: 0.5;",
-                          for: inputId,
-                        },
-                        tag.name
+                        { class: "form-check-label", for: "noTagsId" },
+                        req.__("no tags")
                       ),
                       input({
                         type: "checkbox",
                         class: "form-check-input",
-                        id: inputId,
-                        name: "choice",
-                        value: tag.id,
-                        checked: false,
-                        onclick: `toggleTagFilter(${tag.id});  reloadCy();`,
+                        id: "noTagsId",
+                        name: "no_tags",
+                        value: "true",
+                        checked: true,
+                        onclick: "toggleTagFilterMode(); reloadCy();",
                         autocomplete: "off",
                       })
-                    );
-                  }),
-                  div(
-                    { class: "m-3" },
-                    a(
-                      {
-                        href: "/tag/new",
-                      },
-                      req.__("Add tag"),
-                      i({ class: "fas fa-plus ms-2" })
+                    ),
+                    tags.map((tag) => {
+                      const inputId = `tagFilter_box_${tag.name}_id`;
+                      return div(
+                        { class: "m-3 form-check" },
+                        label(
+                          {
+                            class: "form-check-label",
+                            id: `tagFilter_label_${tag.name}`,
+                            style: "opacity: 0.5;",
+                            for: inputId,
+                          },
+                          tag.name
+                        ),
+                        input({
+                          type: "checkbox",
+                          class: "form-check-input",
+                          id: inputId,
+                          name: "choice",
+                          value: tag.id,
+                          checked: false,
+                          onclick: `toggleTagFilter(${tag.id});  reloadCy();`,
+                          autocomplete: "off",
+                        })
+                      );
+                    }),
+                    div(
+                      { class: "m-3" },
+                      a(
+                        {
+                          href: "/tag/new",
+                        },
+                        req.__("Add tag"),
+                        i({ class: "fas fa-plus ms-2" })
+                      )
                     )
+                  ),
+                  // refresh button
+                  button(
+                    {
+                      type: "button",
+                      class: "btn btn-primary m-2 rounded",
+                      onclick: "reloadCy(true);",
+                    },
+                    i({ class: "fas fa-sync-alt" })
                   )
                 ),
-                // refresh button
-                button(
-                  {
-                    type: "button",
-                    class: "btn btn-primary m-2 rounded",
-                    onclick: "reloadCy(true);",
-                  },
-                  i({ class: "fas fa-sync-alt" })
+                // screenshot button
+                div(
+                  { class: "ad-screenshot-panel" },
+                  button(
+                    {
+                      type: "button",
+                      class: "btn btn-primary m-2 rounded",
+                      onclick: "takePicture()",
+                    },
+                    i({ class: "fas fa-camera" })
+                  )
                 )
               ),
               div({ id: "cy" }),

package/routes/fields.js

@@ -65,6 +65,10 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
       isPrimary = !!field.primary_key;
     }
   }
+  const roleOptions = (await User.get_roles()).map((r) => ({
+    value: r.id,
+    label: r.role,
+  }));
   return new Form({
     action: "/field",
     validator: (vs) => {
@@ -140,6 +144,13 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
         showIf: { calculated: false },
         type: "Bool",
       }),
+      new Field({
+        label: req.__("Error message"),
+        name: "unique_error_msg",
+        sublabel: req.__("Error shown to user if uniqueness is violated"),
+        showIf: { calculated: false, is_unique: true },
+        type: "String",
+      }),
 
       new Field({
         label: req.__("Stored"),
@@ -149,6 +160,22 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
         disabled: !!id,
         showIf: { calculated: true },
       }),
+      new Field({
+        label: req.__("Protected"),
+        name: "protected",
+        sublabel: req.__("Set role to access"),
+        type: "Bool",
+      }),
+      {
+        label: req.__("Minimum role to write"),
+        name: "min_role_write",
+        input_type: "select",
+        sublabel: req.__(
+          "User must have this role or higher to update or create field values"
+        ),
+        options: roleOptions,
+        showIf: { protected: true },
+      },
     ],
   });
 };
@@ -199,6 +226,9 @@ const fieldFlow = (req) =>
       attributes.include_fts = context.include_fts;
       attributes.on_delete_cascade = context.on_delete_cascade;
       attributes.on_delete = context.on_delete;
+      attributes.unique_error_msg = context.unique_error_msg;
+      if (context.protected) attributes.min_role_write = context.min_role_write;
+      else attributes.min_role_write = undefined;
       const {
         table_id,
         name,
@@ -206,10 +236,18 @@ const fieldFlow = (req) =>
         required,
         is_unique,
         calculated,
-        expression,
         stored,
         description,
       } = context;
+      let expression = context.expression;
+      if (context.expression_type === "Model prediction") {
+        const { model, model_instance, model_output } = context;
+        expression = `${model}(${
+          model_instance && model_instance !== "Default"
+            ? `"${model_instance}",`
+            : ""
+        }row).${model_output}`;
+      }
       const { reftable_name, type } = calcFieldType(context.type);
       const fldRow = {
         table_id,
@@ -280,6 +318,7 @@ const fieldFlow = (req) =>
           if (context.type === "Key" && context.reftable_name) {
             form.values.type = `Key to ${context.reftable_name}`;
           }
+          if (context.min_role_write) context.protected = true;
           return form;
         },
       },
@@ -360,9 +399,72 @@ const fieldFlow = (req) =>
         form: async (context) => {
           const table = Table.findOne({ id: context.table_id });
           const fields = table.getFields();
+          const models = await table.get_models();
+          const instance_options = {};
+          const output_options = {};
+          for (const model of models) {
+            instance_options[model.name] = ["Default"];
+            const instances = await model.get_instances();
+            instance_options[model.name].push(...instances.map((i) => i.name));
+
+            const outputs = await applyAsync(
+              model.templateObj.prediction_outputs || [],
+              { table, configuration: model.configuration }
+            );
+            output_options[model.name] = outputs.map((o) => o.name);
+          }
           return new Form({
-            blurb: expressionBlurb(context.type, context.stored, fields, req),
             fields: [
+              {
+                name: "expression_type",
+                label: "Formula type",
+                input_type: "select",
+                options: [
+                  "JavaScript expression",
+                  ...(models.length ? ["Model prediction"] : []),
+                ],
+              },
+              {
+                name: "model",
+                label: req.__("Model"),
+                input_type: "select",
+                options: models.map((m) => m.name),
+                showIf: { expression_type: "Model prediction" },
+              },
+              {
+                name: "model_instance",
+                label: req.__("Model instance"),
+                type: "String",
+                required: true,
+                attributes: {
+                  calcOptions: ["model", instance_options],
+                },
+                showIf: { expression_type: "Model prediction" },
+              },
+              {
+                name: "model_output",
+                label: req.__("Prediction output"),
+                type: "String",
+                required: true,
+                attributes: {
+                  calcOptions: ["model", output_options],
+                },
+                showIf: { expression_type: "Model prediction" },
+              },
+              {
+                input_type: "custom_html",
+                name: "expr_blurb",
+                label: " ",
+                showIf: { expression_type: "JavaScript expression" },
+                attributes: {
+                  html: expressionBlurb(
+                    context.type,
+                    context.stored,
+                    fields,
+                    req
+                  ),
+                },
+              },
               new Field({
                 name: "expression",
                 label: req.__("Formula"),
@@ -370,10 +472,12 @@ const fieldFlow = (req) =>
                 type: "String",
                 class: "validate-expression",
                 validator: expressionValidator,
+                showIf: { expression_type: "JavaScript expression" },
               }),
               new Field({
                 name: "test_btn",
                 label: req.__("Test"),
+                showIf: { expression_type: "JavaScript expression" },
                 // todo sublabel
                 input_type: "custom_html",
                 attributes: {
@@ -455,10 +559,12 @@ const fieldFlow = (req) =>
                 attributes: {
                   explainers: {
                     Fail: req.__("Prevent any deletion of parent rows"),
-                    Cascade:
-                        req.__("If the parent row is deleted, automatically delete the child rows."),
-                    "Set null":
-                        req.__("If the parent row is deleted, set key fields on child rows to null"),
+                    Cascade: req.__(
+                      "If the parent row is deleted, automatically delete the child rows."
+                    ),
+                    "Set null": req.__(
+                      "If the parent row is deleted, set key fields on child rows to null"
+                    ),
                   },
                 },
                 sublabel: req.__(
@@ -720,6 +826,7 @@ router.post(
         } is: <pre>${JSON.stringify(result)}</pre>`
       );
     } catch (e) {
+      console.error(e);
       return res.send(
         `Error on running on row with id=${rows[0].id}: ${e.message}`
       );
@@ -956,7 +1063,11 @@ router.post(
       res.send("");
       return;
     }
-    const firefox = /firefox/i.test(req.headers["user-agent"]);
+    //const firefox = /firefox/i.test(req.headers["user-agent"]);
+
+    //Chrome 116 changes its behaviour to align with firefox
+    // - disabled inputs do not dispactch click events
+    const firefox = true;
     const fv = fieldviews[fieldview];
     if (!fv && field.type === "Key" && fieldview === "select")
       res.send(

package/routes/index.js

@@ -17,6 +17,7 @@ const eventlog = require("./eventlog");
 const infoarch = require("./infoarch");
 const events = require("./events");
 const tenant = require("./tenant");
+const models = require("./models");
 const library = require("./library");
 const settings = require("./settings");
 const plugins = require("./plugins");
@@ -54,6 +55,7 @@ module.exports =
     app.use("/crashlog", crashlog);
     app.use("/events", events);
     app.use("/page", page);
+    app.use("/models", models);
     app.use("/settings", settings);
     app.use("/pageedit", pageedit);
     app.use("/actions", actions);