@saltcorn/server 0.9.1-beta.0 → 0.9.1-beta.10

package/routes/fields.js

@@ -996,6 +996,30 @@ router.post(
         result = row[field.name];
       } else if (field.stored) {
         const f = get_async_expression_function(formula, fields);
+        //are there join fields in formula?
+        const joinFields = {};
+        add_free_variables_to_joinfields(
+          freeVariables(formula),
+          joinFields,
+          table.fields
+        );
+        for (const { target, ref, through, rename_object } of Object.values(
+          joinFields
+        )) {
+          const jf = table.getField(ref);
+          const jtable = Table.findOne(jf.reftable_name);
+          const jrow = await jtable.getRow({ [jtable.pk_name]: row[ref] });
+          row[ref] = jrow;
+          if (through) {
+            const jf2 = jtable.getField(through);
+            const jtable2 = Table.findOne(jf2.reftable_name);
+            const jrow2 = await jtable2.getRow({
+              [jtable2.pk_name]: jrow[through],
+            });
+            row[ref][through] = jrow2;
+          }
+        }
+
         result = await f(row);
       } else {
         const f = get_expression_function(formula, fields);
@@ -1145,7 +1169,10 @@ router.post(
     }
 
     const field = table.getField(fieldName);
-
+    if (!field) {
+      res.send("");
+      return;
+    }
     const fieldViewConfigForms = await calcfldViewConfig([field], false, 0);
     const formFields = fieldViewConfigForms[field.name][fv_name];
     if (!formFields) {

package/routes/homepage.js

@@ -12,8 +12,9 @@ const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
 const File = require("@saltcorn/data/models/file");
 const Page = require("@saltcorn/data/models/page");
+const Plugin = require("@saltcorn/data/models/plugin");
 const { link, mkTable } = require("@saltcorn/markup");
-const { div, a, p, i } = require("@saltcorn/markup/tags");
+const { div, a, p, i, h5, span } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const { get_cached_packs } = require("@saltcorn/admin-models/models/pack");
 // const { restore_backup } = require("../markup/admin");
@@ -21,7 +22,7 @@ const { get_latest_npm_version } = require("@saltcorn/data/models/config");
 const packagejson = require("../package.json");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { fileUploadForm } = require("../markup/forms");
-const { get_base_url } = require("./utils.js");
+const { get_base_url, sendHtmlFile } = require("./utils.js");
 
 /**
  * Tables List
@@ -310,10 +311,80 @@ const packTab = (req, packlist) =>
       { noHeader: true }
     ),
     a(
-      { href: `/plugins?set=packs`, class: "btn btn-primary" },
+      { href: `/plugins?set=packs`, class: "btn btn-sm btn-primary" },
       req.__("Go to pack store »")
     )
   );
+
+const themeCard = (req, roleMap) => {
+  const state_layouts = getState().layouts;
+  const state_layout_names = Object.keys(state_layouts);
+  const layout_by_role = getState().getConfig("layout_by_role");
+  const used_layout_by_role = {};
+  Object.keys(roleMap).forEach((role_id) => {
+    used_layout_by_role[role_id] =
+      layout_by_role[role_id] ||
+      state_layout_names[state_layout_names.length - 1];
+  });
+  const themes_available = Plugin.get_cached_plugins().filter(
+    (p) => p.has_theme && !state_layout_names.includes(p.name)
+  );
+  const layouts = Object.entries(getState().layouts)
+    .filter(([nm, v]) => nm !== "emergency")
+    .map(([name, layout]) => {
+      let plugin = getState().plugins[name];
+      const for_role = Object.entries(used_layout_by_role)
+        .filter(([role, rname]) => rname === name)
+        .map(([role, rname]) =>
+          span({ class: "badge bg-info" }, roleMap[role])
+        );
+
+      return {
+        name,
+        layout,
+        plugin,
+        for_role,
+        edit_cfg_link: plugin?.configuration_workflow
+          ? a(
+              {
+                href: `/plugins/configure/${encodeURIComponent(name)}`,
+              },
+              i({ class: "fa fa-cog ms-2" })
+            )
+          : "",
+      };
+    });
+  const show_installable = themes_available.length > 0 || layouts.length == 1;
+  return div(
+    { class: "pb-3 pt-2 pe-4" },
+    mkTable(
+      [
+        {
+          label: req.__("Installed theme"),
+          key: ({ name, edit_cfg_link }) => `${name}${edit_cfg_link}`,
+        },
+        {
+          label: req.__("Theme for role"),
+          key: ({ for_role }) => for_role.join(" "),
+        },
+      ],
+      layouts
+    ),
+    a({ href: "/roleadmin" }, req.__("Set theme for each user role »")),
+    show_installable && h5({ class: "mt-2" }, req.__("Available themes")),
+    show_installable &&
+      div(
+        themes_available
+          .map((p) => span({ class: "badge bg-secondary" }, p.name))
+          .join(" ")
+      ),
+    show_installable &&
+      a(
+        { href: `/plugins?set=themes`, class: "mt-2" },
+        req.__("Install more themes »")
+      )
+  );
+};
 /**
  * Help Card
  * @param req
@@ -412,10 +483,12 @@ const welcome_page = async (req) => {
               users.length > 4
                 ? {
                     Users: await usersTab(req, users, roleMap),
+                    Theme: themeCard(req, roleMap),
                     Help: helpCard(req),
                   }
                 : {
                     Help: helpCard(req),
+                    Theme: themeCard(req, roleMap),
                     Users: await usersTab(req, users, roleMap),
                   },
           },
@@ -480,15 +553,16 @@ const get_config_response = async (role_id, res, req) => {
 
     if (db_page) {
       const contents = await db_page.run(req.query, { res, req });
-
-      res.sendWrap(
-        {
-          title: db_page.title,
-          description: db_page.description,
-          bodyClass: "page_" + db.sqlsanitize(homeCfg),
-        },
-        contents
-      );
+      if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
+      else
+        res.sendWrap(
+          {
+            title: db_page.title,
+            description: db_page.description,
+            bodyClass: "page_" + db.sqlsanitize(homeCfg),
+          },
+          contents
+        );
     } else res.redirect(homeCfg);
     return true;
   }

package/routes/page.js

@@ -8,12 +8,15 @@ const Router = require("express-promise-router");
 
 const Page = require("@saltcorn/data/models/page");
 const Trigger = require("@saltcorn/data/models/trigger");
+const File = require("@saltcorn/data/models/file");
 const { getState } = require("@saltcorn/data/db/state");
 const {
   error_catcher,
   scan_for_page_title,
   isAdmin,
+  sendHtmlFile,
 } = require("../routes/utils.js");
+const { isTest } = require("@saltcorn/data/utils");
 const { add_edit_bar } = require("../markup/admin.js");
 const { traverseSync } = require("@saltcorn/data/models/layout");
 const { run_action_column } = require("@saltcorn/data/plugin-helper");
@@ -50,27 +53,30 @@ router.get(
       const title = scan_for_page_title(contents, db_page.title);
       const tock = new Date();
       const ms = tock.getTime() - tic.getTime();
-      Trigger.emitEvent("PageLoad", null, req.user, {
-        text: req.__("Page '%s' was loaded", pagename),
-        type: "page",
-        name: pagename,
-        render_time: ms,
-      });
-      res.sendWrap(
-        {
-          title,
-          description: db_page.description,
-          bodyClass: "page_" + db.sqlsanitize(pagename),
-          no_menu: db_page.attributes?.no_menu,
-        } || `${pagename} page`,
-        add_edit_bar({
-          role,
-          title: db_page.name,
-          what: req.__("Page"),
-          url: `/pageedit/edit/${encodeURIComponent(db_page.name)}`,
-          contents,
-        })
-      );
+      if (!isTest())
+        Trigger.emitEvent("PageLoad", null, req.user, {
+          text: req.__("Page '%s' was loaded", pagename),
+          type: "page",
+          name: pagename,
+          render_time: ms,
+        });
+      if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
+      else
+        res.sendWrap(
+          {
+            title,
+            description: db_page.description,
+            bodyClass: "page_" + db.sqlsanitize(pagename),
+            no_menu: db_page.attributes?.no_menu,
+          } || `${pagename} page`,
+          add_edit_bar({
+            role,
+            title: db_page.name,
+            what: req.__("Page"),
+            url: `/pageedit/edit/${encodeURIComponent(db_page.name)}`,
+            contents,
+          })
+        );
     } else {
       if (db_page && !req.user) {
         res.redirect(`/auth/login?dest=${encodeURIComponent(req.originalUrl)}`);

package/routes/pageedit.js

@@ -9,7 +9,7 @@ const View = require("@saltcorn/data/models/view");
 const Field = require("@saltcorn/data/models/field");
 const Table = require("@saltcorn/data/models/table");
 const Page = require("@saltcorn/data/models/page");
-const { div, a } = require("@saltcorn/markup/tags");
+const { div, a, iframe, script } = require("@saltcorn/markup/tags");
 const { getState } = require("@saltcorn/data/db/state");
 const User = require("@saltcorn/data/models/user");
 const Workflow = require("@saltcorn/data/models/workflow");
@@ -27,6 +27,7 @@ const {
   addOnDoneRedirect,
   is_relative_url,
 } = require("./utils.js");
+const { asyncMap } = require("@saltcorn/data/utils");
 const {
   mkTable,
   renderForm,
@@ -39,6 +40,8 @@ const {
 } = require("@saltcorn/markup");
 const { getActionConfigFields } = require("@saltcorn/data/plugin-helper");
 const Library = require("@saltcorn/data/models/library");
+const path = require("path");
+const fsp = require("fs").promises;
 
 /**
  * @type {object}
@@ -58,6 +61,20 @@ module.exports = router;
 const pagePropertiesForm = async (req, isNew) => {
   const roles = await User.get_roles();
   const pages = (await Page.find()).map((p) => p.name);
+  const htmlFiles = await File.find(
+    {
+      mime_super: "text",
+      mime_sub: "html",
+    },
+    { recursive: true }
+  );
+  const htmlOptions = await asyncMap(htmlFiles, async (f) => {
+    return {
+      label: path.join(f.current_folder, f.filename),
+      value: File.absPathToServePath(f.location),
+    };
+  });
+
   const form = new Form({
     action: addOnDoneRedirect("/pageedit/edit-properties", req),
     fields: [
@@ -92,6 +109,24 @@ const pagePropertiesForm = async (req, isNew) => {
         input_type: "select",
         options: roles.map((r) => ({ value: r.id, label: r.role })),
       },
+      ...(htmlOptions.length > 0
+        ? [
+            {
+              name: "html_file",
+              label: req.__("HTML file"),
+              sublabel: req.__("HTML file to use as page content"),
+              input_type: "select",
+
+              options: [
+                {
+                  label: req.__("None - use drag and drop builder"),
+                  value: "",
+                },
+                ...htmlOptions,
+              ],
+            },
+          ]
+        : []),
       {
         name: "no_menu",
         label: req.__("No menu"),
@@ -367,23 +402,146 @@ router.post(
         wrap(renderForm(form, req.csrfToken()), false, req)
       );
     } else {
-      const { id, columns, no_menu, ...pageRow } = form.values;
+      const { id, columns, no_menu, html_file, ...pageRow } = form.values;
       pageRow.min_role = +pageRow.min_role;
       pageRow.attributes = { no_menu };
+      if (html_file) {
+        pageRow.layout = {
+          html_file: html_file,
+        };
+      }
       if (+id) {
+        const dbPage = Page.findOne({ id: id });
+        if (dbPage.layout?.html_file && !html_file) {
+          pageRow.layout = {};
+        }
         await Page.update(+id, pageRow);
         res.redirect(`/pageedit/`);
       } else {
-        if (!pageRow.fixed_states) pageRow.fixed_states = {};
         if (!pageRow.layout) pageRow.layout = {};
+        if (!pageRow.fixed_states) pageRow.fixed_states = {};
         await Page.create(pageRow);
-        res.redirect(addOnDoneRedirect(`/pageedit/edit/${pageRow.name}`, req));
+        if (!html_file)
+          res.redirect(
+            addOnDoneRedirect(`/pageedit/edit/${pageRow.name}`, req)
+          );
+        else res.redirect(`/pageedit/`);
       }
     }
   })
 );
 
 /**
+ * open the builder
+ * @param {*} req
+ * @param {*} res
+ * @param {*} page
+ */
+const getEditNormalPage = async (req, res, page) => {
+  // set fixed states in page directly for legacy builds
+  traverseSync(page.layout, {
+    view(s) {
+      if (s.state === "fixed" && !s.configuration) {
+        const fs = page.fixed_states[s.name];
+        if (fs) s.configuration = fs;
+      }
+    },
+  });
+  const options = await pageBuilderData(req, page);
+  const builderData = {
+    options,
+    context: page,
+    layout: page.layout,
+    mode: "page",
+    version_tag: db.connectObj.version_tag,
+  };
+  res.sendWrap(
+    req.__(`%s configuration`, page.name),
+    wrap(renderBuilder(builderData, req.csrfToken()), true, req, page)
+  );
+};
+
+/**
+ * open a file editor with an iframe preview
+ * @param {*} req
+ * @param {*} res
+ * @param {*} page
+ */
+const getEditPageWithHtmlFile = async (req, res, page) => {
+  const htmlFile = page.html_file;
+  const iframeId = "page_preview_iframe";
+  const updateBttnId = "addnUpdBtn";
+  const file = await File.findOne(htmlFile);
+  if (!file) {
+    req.flash("error", req.__("File not found"));
+    return res.redirect(`/pageedit`);
+  }
+  const editForm = new Form({
+    action: `/pageedit/edit/${encodeURIComponent(page.name)}`,
+    fields: [
+      {
+        name: "code",
+        form_name: "code",
+        label: "Code",
+        input_type: "code",
+        attributes: { mode: "text/html" },
+        validator(s) {
+          return true;
+        },
+      },
+    ],
+    values: {
+      code: await fsp.readFile(file.location, "utf8"),
+    },
+    onChange: `document.getElementById('${updateBttnId}').disabled = false;`,
+    additionalButtons: [
+      {
+        label: req.__("Update"),
+        id: updateBttnId,
+        class: "btn btn-primary",
+        onclick: `saveAndContinue(this, () => {
+          document.getElementById('${iframeId}').contentWindow.location.reload();
+          document.getElementById('${updateBttnId}').disabled = true;
+        })`,
+        disabled: true,
+      },
+    ],
+    submitLabel: req.__("Finish") + " »",
+  });
+  res.sendWrap(req.__("Edit %s", page.title), {
+    above: [
+      {
+        type: "card",
+        title: "Edit",
+        titleAjaxIndicator: true,
+        contents: [renderForm(editForm, req.csrfToken())],
+      },
+      {
+        type: "card",
+        title: "Preview",
+        contents: [
+          iframe({
+            id: iframeId,
+            src: `/files/serve/${encodeURIComponent(htmlFile)}`,
+          }),
+          script(`
+            const iframe = document.getElementById("${iframeId}");
+            iframe.onload = () => {
+              const _iframe = document.getElementById("${iframeId}");
+              if (_iframe.contentWindow.document.body) {
+                _iframe.width = _iframe.contentWindow.document.body.scrollWidth;
+                _iframe.height = _iframe.contentWindow.document.body.scrollHeight;
+              }
+            }`),
+        ],
+      },
+    ],
+  });
+};
+
+/**
+ * for normal pages, open the builder
+ * for pages with a fixed html file, open a file editor with an iframe preview
  * @name get/edit/:pagename
  * @function
  * @memberof module:routes/pageedit~pageeditRouter
@@ -399,27 +557,8 @@ router.get(
       req.flash("error", req.__(`Page %s not found`, pagename));
       res.redirect(`/pageedit`);
     } else {
-      // set fixed states in page directly for legacy builds
-      traverseSync(page.layout, {
-        view(s) {
-          if (s.state === "fixed" && !s.configuration) {
-            const fs = page.fixed_states[s.name];
-            if (fs) s.configuration = fs;
-          }
-        },
-      });
-      const options = await pageBuilderData(req, page);
-      const builderData = {
-        options,
-        context: page,
-        layout: page.layout,
-        mode: "page",
-        version_tag: db.connectObj.version_tag,
-      };
-      res.sendWrap(
-        req.__(`%s configuration`, page.name),
-        wrap(renderBuilder(builderData, req.csrfToken()), true, req, page)
-      );
+      if (!page.html_file) await getEditNormalPage(req, res, page);
+      else await getEditPageWithHtmlFile(req, res, page);
     }
   })
 );
@@ -448,13 +587,33 @@ router.post(
       await Page.update(page.id, {
         layout: decodeURIComponent(req.body.layout),
       });
-
       req.flash("success", req.__(`Page %s saved`, pagename));
       res.redirect(redirectTarget);
+    } else if (req.body.code) {
+      try {
+        if (!page.html_file) throw new Error(req.__("File not found"));
+        const file = await File.findOne(page.html_file);
+        if (!file) throw new Error(req.__("File not found"));
+        await fsp.writeFile(file.location, req.body.code);
+        if (!req.xhr) {
+          req.flash("success", req.__(`Page %s saved`, pagename));
+          res.redirect(redirectTarget);
+        } else res.json({ okay: true });
+      } catch (error) {
+        getState().log(2, `POST /edit/${pagename}: '${error.message}'`);
+        req.flash(
+          "error",
+          `${req.__("Error")}: ${error.message || req.__("An error occurred")}`
+        );
+        if (!req.xhr) res.redirect(redirectTarget);
+        else res.json({ error: error.message });
+      }
     } else {
+      getState().log(2, `POST /edit/${pagename}: '${req.body}'`);
       req.flash("error", req.__(`Error processing page`));
       res.redirect(redirectTarget);
     }
+    getState().log(5, `POST /edit/${pagename}: Success`);
   })
 );
 

package/routes/utils.js

@@ -18,6 +18,7 @@ const cookieSession = require("cookie-session");
 const is = require("contractis/is");
 const { validateHeaderName, validateHeaderValue } = require("http");
 const Crash = require("@saltcorn/data/models/crash");
+const File = require("@saltcorn/data/models/file");
 const si = require("systeminformation");
 const {
   config_fields_form,
@@ -25,6 +26,8 @@ const {
   check_if_restart_required,
   flash_restart,
 } = require("../markup/admin.js");
+const path = require("path");
+
 const get_sys_info = async () => {
   const disks = await si.fsSize();
   let size = 0;
@@ -380,6 +383,38 @@ const admin_config_route = ({
   );
 };
 
+/**
+ * Send HTML file to client without any menu
+ * @param {any} req
+ * @param {any} res
+ * @param {string} file
+ * @returns
+ */
+const sendHtmlFile = async (req, res, file) => {
+  const fullPath = path.join((await File.rootFolder()).location, file);
+  const role = req.user && req.user.id ? req.user.role_id : 100;
+  try {
+    const scFile = await File.from_file_on_disk(
+      path.basename(fullPath),
+      path.dirname(fullPath)
+    );
+    if (scFile && role <= scFile.min_role_read) {
+      res.sendFile(fullPath);
+    } else {
+      return res
+        .status(404)
+        .sendWrap(req.__("An error occurred"), req.__("File not found"));
+    }
+  } catch (e) {
+    return res
+      .status(404)
+      .sendWrap(
+        req.__("An error occurred"),
+        e.message || req.__("An error occurred")
+      );
+  }
+};
+
 module.exports = {
   sqlsanitize,
   csrfField,
@@ -396,4 +431,5 @@ module.exports = {
   is_relative_url,
   get_sys_info,
   admin_config_route,
+  sendHtmlFile,
 };

package/routes/view.js

@@ -18,7 +18,7 @@ const {
   setTenant,
 } = require("../routes/utils.js");
 const { add_edit_bar } = require("../markup/admin.js");
-const { InvalidConfiguration } = require("@saltcorn/data/utils");
+const { InvalidConfiguration, isTest } = require("@saltcorn/data/utils");
 const { getState } = require("@saltcorn/data/db/state");
 
 /**
@@ -88,12 +88,13 @@ router.get(
       res.set("SaltcornModalLinkOut", `true`);
     const tock = new Date();
     const ms = tock.getTime() - tic.getTime();
-    Trigger.emitEvent("PageLoad", null, req.user, {
-      text: req.__("View '%s' was loaded", viewname),
-      type: "view",
-      name: viewname,
-      render_time: ms,
-    });
+    if (!isTest())
+      Trigger.emitEvent("PageLoad", null, req.user, {
+        text: req.__("View '%s' was loaded", viewname),
+        type: "view",
+        name: viewname,
+        render_time: ms,
+      });
     if (typeof contents === "object" && contents.goto)
       res.redirect(contents.goto);
     else

package/s3storage.js

@@ -1,5 +1,4 @@
-require("aws-sdk/lib/maintenance_mode_message").suppress = true;
-const aws = require("aws-sdk");
+const { S3 } = require("@aws-sdk/client-s3");
 const multer = require("multer");
 const multerS3 = require("multer-s3");
 const { getState } = require("@saltcorn/data/db/state");
@@ -8,9 +7,11 @@ const { v4: uuidv4 } = require("uuid");
 const contentDisposition = require("content-disposition");
 const fs = require("fs");
 function createS3Client() {
-  return new aws.S3({
-    secretAccessKey: getState().getConfig("storage_s3_access_secret"),
-    accessKeyId: getState().getConfig("storage_s3_access_key"),
+  return new S3({
+    credentials: {
+      secretAccessKey: getState().getConfig("storage_s3_access_secret"),
+      accessKeyId: getState().getConfig("storage_s3_access_key"),
+    },
     region: getState().getConfig("storage_s3_region"),
     endpoint: getState().getConfig("storage_s3_endpoint"),
   });