@saltcorn/server 1.6.0-beta.8 → 1.6.0-rc.1

package/routes/admin.js

@@ -81,7 +81,10 @@ const {
   restore,
   auto_backup_now,
 } = require("@saltcorn/admin-models/models/backup");
-const { install_pack } = require("@saltcorn/admin-models/models/pack");
+const {
+  install_pack,
+  filter_pack,
+} = require("@saltcorn/admin-models/models/pack");
 const Snapshot = require("@saltcorn/admin-models/models/snapshot");
 const {
   runConfigurationCheck,
@@ -303,6 +306,7 @@ admin_config_route({
     { section_header: "Custom code" },
     "page_custom_css",
     "page_custom_html",
+    "suppress_toasts",
     { section_header: "Updates and module store" },
     "airgap",
     "plugins_store_endpoint",
@@ -699,35 +703,14 @@ router.get(
                 { href: "/admin/snapshot-list" },
                 req.__("List/download snapshots »")
               ),
-              form(
+              a(
                 {
-                  method: "post",
-                  action: "/admin/snapshot-restore-full",
-                  encType: "multipart/form-data",
+                  onclick: "ajax_modal('/admin/snapshot-restore-full')",
+                  class: "d-block",
+                  href: `javascript:void(0)`,
                 },
-                input({
-                  type: "hidden",
-                  name: "_csrf",
-                  value: req.csrfToken(),
-                }),
-                label(
-                  {
-                    class: "btn-link",
-                    for: "upload_to_snapshot",
-                    style: { cursor: "pointer" },
-                  },
-                  i({ class: "fas fa-upload me-2 mt-2" }),
-                  req.__("Restore a snapshot")
-                ),
-                input({
-                  id: "upload_to_snapshot",
-                  class: "d-none",
-                  name: "file",
-                  type: "file",
-                  accept: ".json,application/json",
-                  onchange:
-                    "notifyAlert('Restoring snapshot...', true);this.form.submit();",
-                })
+                i({ class: "fas fa-upload me-2 mt-2" }),
+                req.__("Restore a snapshot")
               )
             ),
           },
@@ -1002,6 +985,69 @@ router.post(
   })
 );
 
+router.get(
+  "/snapshot-restore-full",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const snapForm = new Form({
+      action: "/admin/snapshot-restore-full",
+      formStyle: "vert",
+      fields: [
+        {
+          name: "file",
+          label: req.__("Snapshot file"),
+          class: "form-control",
+          default: true,
+          type: "File",
+        },
+        {
+          name: "configuration",
+          label: req.__("Configuration"),
+          default: true,
+          type: "Bool",
+        },
+        {
+          name: "site_name",
+          label: req.__("Site name"),
+          type: "Bool",
+          default: true,
+          showIf: { configuration: true },
+        },
+        {
+          name: "base_url",
+          label: req.__("Base URL"),
+          type: "Bool",
+          default: true,
+          showIf: { configuration: true },
+        },
+        {
+          name: "email_settings",
+          label: req.__("Email settings"),
+          type: "Bool",
+          default: true,
+          showIf: { configuration: true },
+        },
+        {
+          name: "ssl_settings",
+          label: req.__("SSL settings"),
+          type: "Bool",
+          default: true,
+          showIf: { configuration: true },
+        },
+        {
+          name: "modules",
+          label: req.__("Modules"),
+          default: true,
+          type: "Bool",
+        },
+      ],
+    });
+    res.sendWrap(`Restore snapshot`, {
+      above: [renderForm(snapForm, req.csrfToken())],
+    });
+  })
+);
+
 /**
  * @name post/restore
  * @function
@@ -1015,6 +1061,7 @@ router.post(
     if (req.files?.file?.tempFilePath) {
       try {
         const pack = JSON.parse(fs.readFileSync(req.files?.file?.tempFilePath));
+        filter_pack(pack, req.body);
         await db.withTransaction(async () => {
           await install_pack(pack, undefined, (p) =>
             Plugin.loadAndSaveNewPlugin(p)
@@ -5310,7 +5357,7 @@ declare var console: Console;
 function setTimeout(f:Function, timeout?:number)
 declare const page_load_tag: string
 function emit_to_client(message: object, to_user_ids?: number | number[] | null)
-function emitEvent(eventType: ${Trigger.when_options.map(o=>`"${o}"`).join(" | ")}, channel?: string, payload?: any)
+function emitEvent(eventType: ${Trigger.when_options.map((o) => `"${o}"`).join(" | ")}, channel?: string, payload?: any)
 async function sleep(milliseconds: number)
 function interpolate(s: string,
   row: Row,
@@ -5414,7 +5461,7 @@ async function refreshSystemCache(entities?: "codepages" | "tables" | "views" |
         const addTsFields = (table, path, nrecurse) => {
           table.fields.forEach((f) => {
             tsFields.push(`${path}${f.name}: ${scTypeToTsType(f.type, f)};`);
-            if (f.is_fkey && nrecurse >= 0) {
+            if (!req.query.nojoins && f.is_fkey && nrecurse >= 0) {
               const reftable = Table.findOne(f.reftable_name);
               if (reftable)
                 addTsFields(reftable, `${path}${f.name}Ⱶ`, nrecurse - 1);
@@ -5480,9 +5527,9 @@ async function refreshSystemCache(entities?: "codepages" | "tables" | "views" |
 
     for (const [nm, f] of Object.entries(getState().codepage_context)) {
       if (exclude_cp_ids.has(nm)) continue;
-      if (f.constructor?.name === "AsyncFunction")
+      if (f?.constructor?.name === "AsyncFunction")
         ds.push(`declare var ${nm}: AsyncFunction;`);
-      else if (f.constructor?.name === "Function")
+      else if (f?.constructor?.name === "Function")
         ds.push(`declare var ${nm}: Function;`);
       else ds.push(`declare var ${nm}: ${typeof f};`);
     }
@@ -5689,8 +5736,11 @@ router.post(
       //ignore
     }
     try {
-      res.json({ success: true, code: stripTypes(`async () =>{${code}
-}`) });
+      res.json({
+        success: true,
+        code: stripTypes(`async () =>{${code}
+}`),
+      });
     } catch (error) {
       res.json({ success: false, error: error.message });
     }

package/routes/api.js

@@ -671,9 +671,7 @@ router.all(
               });
               delete resp.__wf_run_id;
             } else {
-              const action = getState().actions[trigger.action];
-              resp = await action.run({
-                configuration: trigger.configuration,
+              resp = await trigger.runWithoutRow({
                 body: req.body || {},
                 row,
                 req,

package/routes/fields.js

@@ -588,7 +588,9 @@ const fieldFlow = (req) =>
                 label: req.__("Where"),
                 required: false,
                 showIf: { expression_type: "Aggregation" },
-                sublabel: req.__(`Formula evaluating to boolean. Example: <code>status === "Active"</code>`),
+                sublabel: req.__(
+                  `Formula evaluating to boolean. Example: <code>status === "Active"</code>`
+                ),
                 class: "validate-expression",
                 type: "String",
                 help: { topic: "Aggregation where formula" },
@@ -1104,7 +1106,10 @@ router.post(
     let result;
     try {
       if (stored) {
-        const f = get_async_expression_function(formula, fields);
+        const f = get_async_expression_function(formula, [
+          ...fields,
+          ...Object.keys(joinFields).map((k) => ({ name: k })),
+        ]);
         result = await f(rows[0], req.user);
       } else {
         const f = get_expression_function(formula, fields);
@@ -1475,7 +1480,10 @@ router.post(
       );
     else if (field.type === "File") {
       res.send(fv.run(value, "filename.ext"));
-    } else res.send(fv.run(value, req, configuration));
+    } else
+      res.send(
+        `<span style="display:inline-block;min-height:1.5em;min-width:1.875em">${fv.run(value, req, configuration)}</span>`
+      );
   })
 );
 

package/routes/homepage.js

@@ -26,7 +26,12 @@ const {
 const packagejson = require("../package.json");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { fileUploadForm } = require("../markup/forms");
-const { get_base_url, sendHtmlFile, getEligiblePage } = require("./utils.js");
+const {
+  get_base_url,
+  sendHtmlFile,
+  sendHtmlStringWithGlobals,
+  getEligiblePage,
+} = require("./utils.js");
 const semver = require("semver");
 const { add_results_to_contents } = require("../markup/admin.js");
 
@@ -622,8 +627,7 @@ const get_config_response = async (role_id, res, req) => {
 
     if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
     else if (contents.html_string) {
-      res.set("Content-Type", "text/html");
-      await res.send(contents.html_string);
+      await sendHtmlStringWithGlobals(req, res, contents.html_string);
     } else
       res.sendWrap(
         {

package/routes/list.js

@@ -294,6 +294,7 @@ router.get(
       hozAlign: "center",
       headerSort: false,
       clipboard: false,
+      frozen: true,
       cellClick: "__delete_tabulator_row",
     });
     const isDark = getState().getLightDarkMode(req.user) === "dark";
@@ -458,10 +459,29 @@ router.get(
                   paginationMode:"remote",
                   paginationSize: tabulator_calc_page_size(),
                   clipboard:true,
+                  /*clipboardCopyRowRange:"range",
+                  clipboardPasteParser:"range",
+                  clipboardPasteAction:"range",
+                  clipboardCopyConfig:{
+                      rowHeaders:false, //do not include row headers in clipboard output
+                      columnHeaders:false, //do not include column headers in clipboard output
+                  },*/
+                  clipboardCopyStyled:false,
                   movableColumns: true,
                   ajaxContentType:"json",
                   sortMode:"remote",
                   resizableColumnGuide:true,
+                  /*editTriggerEvent:"dblclick",
+                  selectableRange:1,
+                  selectableRangeRows:true,
+                  selectableRangeClearCells:true,*/
+                   persistence:{
+                      columns: [],
+                      sort: true,
+                  }, 
+                  persistenceID:"scadmintable${encodeURIComponent(
+                    table.id || table.name
+                  )}",
                   columnDefaults:{
                       resizable:true,
                       maxWidth:500

package/routes/page.js

@@ -15,6 +15,7 @@ const {
   scan_for_page_title,
   isAdmin,
   sendHtmlFile,
+  sendHtmlStringWithGlobals,
   getEligiblePage,
   getRandomPage,
 } = require("../routes/utils.js");
@@ -74,8 +75,7 @@ const runPage = async (page, req, res, tic) => {
     }
     if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
     else if (contents.html_string) {
-      res.set("Content-Type", "text/html");
-      await res.send(contents.html_string);
+      await sendHtmlStringWithGlobals(req, res, contents.html_string);
     } else
       res.sendWrap(
         {
@@ -92,7 +92,11 @@ const runPage = async (page, req, res, tic) => {
                 role,
                 title: page.name,
                 what: req.__("Page"),
-                url: `/pageedit/edit/${encodeURIComponent(page.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}&${objectToQueryString(req.query)}`,
+                url: `/pageedit/edit/${encodeURIComponent(
+                  page.name
+                )}?on_done_redirect=${encodeURIComponent(
+                  req.originalUrl.replace("/", "")
+                )}&${objectToQueryString(req.query)}`,
                 contents,
               }),
           resultCollector

package/routes/pageedit.js

@@ -71,6 +71,7 @@ const pagePropertiesForm = async (req, isNew) => {
     {
       mime_super: "text",
       mime_sub: "html",
+      ext: "html",
     },
     { recursive: true }
   );
@@ -193,6 +194,7 @@ const pageBuilderData = async (req, context) => {
     apiNeverTriggers: true,
   });
   const actionConfigForms = {};
+  const actionDescriptions = {};
   for (const name of actions) {
     const action = stateActions[name];
     if (action && action.configFields) {
@@ -201,6 +203,7 @@ const pageBuilderData = async (req, context) => {
         req,
       });
     }
+    if (action && action.description) actionDescriptions[name] = action.description;
   }
   const workflowActions = Trigger.trigger_actions({
     apiNeverTriggers: true,
@@ -230,6 +233,7 @@ const pageBuilderData = async (req, context) => {
     const table = Table.findOne(view.table_id || view.exttable_name);
     if (table) view.table_name = table.name;
     const fs = await view.get_state_fields();
+    let added_fields = new Set();
     for (const frec of fs) {
       const f = new Field(frec);
       if (f.input_type === "hidden") continue;
@@ -239,7 +243,9 @@ const pageBuilderData = async (req, context) => {
       if (f.type && f.type.name === "Bool") f.fieldview = "tristate";
 
       //await f.fill_fkey_options(true);
-      fixed_state_fields[view.name].push(f);
+      if (added_fields.has(f.name)) continue;
+      added_fields.add(f.name);
+      fixed_state_fields[view.name].push(f.toBuilder);
       if (table.name === "users" && f.primary_key)
         fixed_state_fields[view.name].push(
           new Field({
@@ -247,7 +253,7 @@ const pageBuilderData = async (req, context) => {
             label: req.__("Preset %s", f.label),
             type: "String",
             attributes: { options: ["LoggedIn"] },
-          })
+          }).toBuilder
         );
       if (f.presets) {
         fixed_state_fields[view.name].push(
@@ -256,7 +262,7 @@ const pageBuilderData = async (req, context) => {
             label: req.__("Preset %s", f.label),
             type: "String",
             attributes: { options: Object.keys(f.presets) },
-          })
+          }).toBuilder
         );
       }
     }
@@ -280,6 +286,7 @@ const pageBuilderData = async (req, context) => {
     library,
     min_role: context.min_role,
     actionConfigForms,
+    actionDescriptions,
     allowMultiStepAction: true,
     page_name: context.name,
     page_id: context.id,
@@ -790,7 +797,7 @@ router.post(
  */
 router.post(
   "/savebuilder/:id",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_pages"),
   error_catcher(async (req, res) => {
     const { id } = req.params;
 
@@ -812,6 +819,25 @@ router.post(
   })
 );
 
+router.get(
+  "/getlayout/:id",
+  isAdminOrHasConfigMinRole("min_role_edit_pages"),
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+
+    if (id) {
+      const page = await Page.findOne({ id });
+      if (!page) {
+        res.json({ error: req.__("No page") });
+        return;
+      }
+      res.json({ success: "ok", layout: page.layout });
+    } else {
+      res.json({ error: req.__("No view") });
+    }
+  })
+);
+
 /**
  * @name post/delete/:id
  * @function