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

package/routes/list.js

@@ -11,9 +11,8 @@
 const Router = require("express-promise-router");
 
 const db = require("@saltcorn/data/db");
-const { mkTable, h, link, post_btn } = require("@saltcorn/markup");
+const { mkTable, link, post_btn } = require("@saltcorn/markup");
 const {
-  a,
   script,
   domReady,
   div,
@@ -27,7 +26,6 @@ const {
 const Table = require("@saltcorn/data/models/table");
 const { isAdmin, error_catcher } = require("./utils");
 const moment = require("moment");
-const { readState } = require("@saltcorn/data/plugin-helper");
 
 /**
  * @type {object}
@@ -49,11 +47,11 @@ module.exports = router;
  * @function
  */
 router.get(
-  "/_versions/:name/:id",
+  "/_versions/:tableName/:id",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { name, id } = req.params;
-    const table = await Table.findOne({ name });
+    const { tableName, id } = req.params;
+    const table = await Table.findOne({ name : tableName });
 
     const fields = await table.getFields();
     var tfields = fields.map((f) => ({ label: f.label, key: f.listKey }));
@@ -97,11 +95,11 @@ router.get(
  * @function
  */
 router.post(
-  "/_restore/:name/:id/:_version",
+  "/_restore/:tableName/:id/:_version",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { name, id, _version } = req.params;
-    const table = await Table.findOne({ name });
+    const { tableName, id, _version } = req.params;
+    const table = await Table.findOne({ name : tableName });
 
     const fields = await table.getFields();
     const row = await db.selectOne(`${db.sqlsanitize(table.name)}__history`, {
@@ -246,6 +244,7 @@ router.get(
     }
 
     //console.log(fields);
+    // todo remove keyfields - unused
     const keyfields = fields
       .filter((f) => f.type === "Key" || f.type === "File")
       .map((f) => ({ name: f.name, type: f.reftype }));

package/routes/tables.js

@@ -8,7 +8,6 @@ const Router = require("express-promise-router");
 
 const db = require("@saltcorn/data/db");
 const Table = require("@saltcorn/data/models/table");
-const Field = require("@saltcorn/data/models/field");
 const File = require("@saltcorn/data/models/file");
 const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
@@ -16,7 +15,6 @@ const {
   mkTable,
   renderForm,
   link,
-  post_btn,
   settingsDropdown,
   post_delete_btn,
   post_dropdown_item,
@@ -29,10 +27,7 @@ const { isAdmin, error_catcher, setTenant } = require("./utils.js");
 const Form = require("@saltcorn/data/models/form");
 const {
   span,
-  h5,
   h4,
-  h3,
-  nbsp,
   p,
   a,
   div,
@@ -41,7 +36,6 @@ const {
   label,
   input,
   text,
-  tr,
   script,
   domReady,
   code,
@@ -552,14 +546,13 @@ router.get(
       res.redirect(`/table`);
       return;
     }
-    id = table.id;
     const nrows = await table.countRows();
     const fields = await table.getFields();
     const { child_relations } = await table.get_child_relations();
     const inbound_refs = [
       ...new Set(child_relations.map(({ table }) => table.name)),
     ];
-    var fieldCard;
+    let fieldCard;
     if (fields.length === 0) {
       fieldCard = [
         h4(req.__(`No fields defined in %s table`, table.name)),
@@ -866,8 +859,10 @@ router.post(
         res.redirect(`/table/${table.id}`);
       }
     } else if (v.external) {
+      // todo check that works after where change
+      // todo findOne can be have parameter for external table here
       //we can only save min role
-      const table = await Table.findOne(v.name);
+      const table = await Table.findOne( { name : v.name });
       if (table) {
         const exttables_min_role_read = getState().getConfigCopy(
           "exttables_min_role_read",
@@ -1148,6 +1143,7 @@ router.get(
 /**
  * Constraint Fields Edition Form
  * Choosing fields for adding to contrain
+ * @param req
  * @param {string} table_id
  * @param {object[]} fields
  * @returns {Form}

package/routes/tenant.js

@@ -44,7 +44,6 @@ const User = require("@saltcorn/data/models/user");
 const File = require("@saltcorn/data/models/file");
 const {
   send_infoarch_page,
-  //send_admin_page,
   config_fields_form,
   save_config_from_form,
 } = require("../markup/admin.js");
@@ -87,11 +86,6 @@ const tenant_form = (req) =>
         input_type: "text",
         postText: text(req.hostname),
       },
-      {
-        name: "description",
-        label: req.__("Description"),
-        input_type: "text",
-      },
     ],
   });
 
@@ -155,55 +149,56 @@ router.get(
       );
     let create_tenant_warning_text = "";
     if (getState().getConfig("create_tenant_warning")) {
-        create_tenant_warning_text = getState().getConfig("create_tenant_warning_text");
-        if (create_tenant_warning_text && create_tenant_warning_text.length > 0)
-            create_tenant_warning_text = div(
-                {
-                    class: "alert alert-warning alert-dismissible fade show mt-5",
-                    role: "alert",
-                },
-                h4(req.__("Warning")),
-                p( create_tenant_warning_text
-                )
-            );
-        else
-            create_tenant_warning_text = div(
-                {
-                    class: "alert alert-warning alert-dismissible fade show mt-5",
-                    role: "alert",
-                },
-                h4(req.__("Warning")),
-                p(
-                    req.__(
-                        "Hosting on this site is provided for free and with no guarantee of availability or security of your application. "
-                    ) +
-                    " " +
-                    req.__(
-                        "This facility is intended solely for you to evaluate the suitability of Saltcorn. "
-                    ) +
-                    " " +
-                    req.__(
-                        "If you would like to store private information that needs to be secure, please use self-hosted Saltcorn. "
-                    ) +
-                    " " +
-                    req.__(
-                        'See <a href="https://github.com/saltcorn/saltcorn">GitHub repository</a> for instructions<p>'
-                    )
-                )
-            );
+      create_tenant_warning_text = getState().getConfig(
+        "create_tenant_warning_text"
+      );
+      if (create_tenant_warning_text && create_tenant_warning_text.length > 0)
+        create_tenant_warning_text = div(
+          {
+            class: "alert alert-warning alert-dismissible fade show mt-5",
+            role: "alert",
+          },
+          h4(req.__("Warning")),
+          p(create_tenant_warning_text)
+        );
+      else
+        create_tenant_warning_text = div(
+          {
+            class: "alert alert-warning alert-dismissible fade show mt-5",
+            role: "alert",
+          },
+          h4(req.__("Warning")),
+          p(
+            req.__(
+              "Hosting on this site is provided for free and with no guarantee of availability or security of your application. "
+            ) +
+              " " +
+              req.__(
+                "This facility is intended solely for you to evaluate the suitability of Saltcorn. "
+              ) +
+              " " +
+              req.__(
+                "If you would like to store private information that needs to be secure, please use self-hosted Saltcorn. "
+              ) +
+              " " +
+              req.__(
+                'See <a href="https://github.com/saltcorn/saltcorn">GitHub repository</a> for instructions<p>'
+              )
+          )
+        );
     }
 
     res.sendWrap(
       req.__("Create application"),
       create_tenant_warning_text +
-      renderForm(tenant_form(req), req.csrfToken()) +
-      p(
-        { class: "mt-2" },
-        req.__("To login to a previously created application, go to: "),
-        code(`${req.protocol}://`) +
-        i(req.__("Application name")) +
-        code("." + req.hostname)
-      )
+        renderForm(tenant_form(req), req.csrfToken()) +
+        p(
+          { class: "mt-2" },
+          req.__("To login to a previously created application, go to: "),
+          code(`${req.protocol}://`) +
+            i(req.__("Application name")) +
+            code("." + req.hostname)
+        )
     );
   })
 );
@@ -284,7 +279,15 @@ router.post(
         // tenant creator
         const user_email = req.user && req.user.email;
         // switch to tenant
-        await switchToTenant(await insertTenant(subdomain, user_email, description, tenant_template), newurl);
+        await switchToTenant(
+          await insertTenant(
+            subdomain,
+            user_email,
+            description,
+            tenant_template
+          ),
+          newurl
+        );
         // add tenant to global state
         add_tenant(subdomain);
         await create_tenant({
@@ -319,13 +322,13 @@ router.post(
                 " " +
                 hasTemplate
                 ? req.__(
-                  'Use this link: <a href="%s">%s</a> to revisit your application at any time.',
-                  newurl,
-                  newurl
-                )
+                    'Use this link: <a href="%s">%s</a> to revisit your application at any time.',
+                    newurl,
+                    newurl
+                  )
                 : req.__(
-                  "Use this link to revisit your application at any time."
-                )
+                    "Use this link to revisit your application at any time."
+                  )
             )
           )
         );
@@ -508,14 +511,12 @@ const get_tenant_info = async (subdomain) => {
   // get tenant row
   const ten = await Tenant.findOne({ subdomain: saneDomain });
   if (ten) {
-      info.description = ten.description;
-      info.created = ten.created;
+    info.description = ten.description;
+    info.created = ten.created;
   }
 
-
   // get data from tenant schema
   return await db.runWithTenant(saneDomain, async () => {
-
     // TBD fix the first user issue because not always firt user by id is creator of tenant
     const firstUser = await User.find({}, { orderBy: "id", limit: 1 });
     if (firstUser && firstUser.length > 0) {
@@ -673,7 +674,10 @@ router.get(
                       type: "String",
                     },
                   ],
-                  values: { base_url: info.base_url, description: info.description },
+                  values: {
+                    base_url: info.base_url,
+                    description: info.description,
+                  },
                 }),
                 req.csrfToken()
               ),
@@ -731,9 +735,7 @@ router.post(
 
     // save description
     const { description } = req.body;
-    await Tenant.update( saneDomain, {description: description});
-
-
+    await Tenant.update(saneDomain, { description: description });
 
     await db.runWithTenant(saneDomain, async () => {
       await getState().setConfig("base_url", base_url);

package/routes/view.js

@@ -9,8 +9,7 @@ const Router = require("express-promise-router");
 const View = require("@saltcorn/data/models/view");
 const Table = require("@saltcorn/data/models/table");
 
-const { div, text, i, a } = require("@saltcorn/markup/tags");
-const { renderForm, link } = require("@saltcorn/markup");
+const { text } = require("@saltcorn/markup/tags");
 const {
   isAdmin,
   error_catcher,
@@ -104,7 +103,8 @@ router.post(
       if (sf.required && !query[sf.name]) {
         if (!row) {
           if (!table)
-            table = await Table.findOne(view.table_id || view.exttable_name);
+            // todo check after where change
+            table = await Table.findOne(view.table_id ? { id : view.table_id } : {name: view.exttable_name});
           row = await table.getRow({});
         }
         if (row) query[sf.name] = row[sf.name];

package/routes/viewedit.js

@@ -7,30 +7,8 @@
 
 const Router = require("express-promise-router");
 
-const {
-  renderForm,
-  mkTable,
-  link,
-  //post_btn,
-  //post_delete_btn,
-  post_dropdown_item,
-  renderBuilder,
-  settingsDropdown,
-  alert,
-} = require("@saltcorn/markup");
-const {
-  //span,
-  //h5,
-  h4,
-  //nbsp,
-  p,
-  a,
-  div,
-  //button,
-  script,
-  text,
-  domReady,
-} = require("@saltcorn/markup/tags");
+const { renderForm, renderBuilder, alert } = require("@saltcorn/markup");
+const { p, a, div, script, text, domReady } = require("@saltcorn/markup/tags");
 
 const { getState } = require("@saltcorn/data/db/state");
 const { isAdmin, error_catcher, addOnDoneRedirect } = require("./utils.js");
@@ -89,14 +67,15 @@ router.get(
     const accessWarning =
       hasAccessWarning.length > 0
         ? alert(
-          "danger",
-          `<p>You have views with a role to access lower than the table role to read, 
+            "danger",
+            req.__(
+              `<p>You have views with a role to access lower than the table role to read, 
       with no table ownership. In the next version of Saltcorn, this may cause a
       denial of access. Users will need to have table read access to any data displayed.</p> 
-      Views potentially affected: ${hasAccessWarning
-            .map((v) => v.name)
-            .join(", ")}`
-        )
+      Views potentially affected: %s`,
+              hasAccessWarning.map((v) => v.name).join(", ")
+            )
+          )
         : "";
     res.sendWrap(req.__(`Views`), {
       above: [
@@ -113,14 +92,14 @@ router.get(
             viewMarkup,
             tables.length > 0
               ? a(
-                { href: `/viewedit/new`, class: "btn btn-primary" },
-                req.__("Create view")
-              )
-              : p(
-                req.__(
-                  "You must create at least one table before you can create views."
+                  { href: `/viewedit/new`, class: "btn btn-primary" },
+                  req.__("Create view")
                 )
-              ),
+              : p(
+                  req.__(
+                    "You must create at least one table before you can create views."
+                  )
+                ),
           ],
         },
       ],
@@ -232,15 +211,15 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
       }),
       ...(isEdit
         ? [
-          new Field({
-            name: "viewtemplate",
-            input_type: "hidden",
-          }),
-          new Field({
-            name: "table_name",
-            input_type: "hidden",
-          }),
-        ]
+            new Field({
+              name: "viewtemplate",
+              input_type: "hidden",
+            }),
+            new Field({
+              name: "table_name",
+              input_type: "hidden",
+            }),
+          ]
         : []),
     ],
     values,
@@ -259,7 +238,7 @@ router.get(
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
 
-    var viewrow = await View.findOne({ name: viewname });
+    const viewrow = await View.findOne({ name: viewname });
     if (!viewrow) {
       req.flash("error", `View not found: ${text(viewname)}`);
       res.redirect("/viewedit");
@@ -387,8 +366,8 @@ router.post(
         sendForm(form);
       } else {
         const existing_view = await View.findOne({ name: result.success.name });
-        if (typeof existing_view !== "undefined")
-          if (req.body.id != existing_view.id) {
+        if (existing_view)
+          if (+req.body.id !== existing_view.id) {
             // may be need !== but doesnt work
             form.errors.name = req.__("A view with this name already exists");
             form.hasErrors = true;
@@ -409,7 +388,7 @@ router.post(
           const slug = slugOptions.find((so) => so.label === v.slug);
           v.slug = slug || null;
         }
-        const table = await Table.findOne({ name: v.table_name });
+        //const table = await Table.findOne({ name: v.table_name });
         delete v.table_name;
         if (req.body.id) {
           await View.update(v, +req.body.id);
@@ -457,12 +436,18 @@ const respondWorkflow = (view, wf, wfres, req, res) => {
         title: wfres.title,
         contents,
       },
-      ...previewURL ? [{
-        type: "card",
-        title: req.__("Preview"),
-        contents: div({ id: "viewcfg-preview", "data-preview-url": previewURL },
-          script(domReady(`updateViewPreview()`))),
-      }] : []
+      ...(previewURL
+        ? [
+            {
+              type: "card",
+              title: req.__("Preview"),
+              contents: div(
+                { id: "viewcfg-preview", "data-preview-url": previewURL },
+                script(domReady(`updateViewPreview()`))
+              ),
+            },
+          ]
+        : []),
     ],
   });
   if (wfres.flash) req.flash(wfres.flash[0], wfres.flash[1]);
@@ -485,7 +470,11 @@ const respondWorkflow = (view, wf, wfres, req, res) => {
           },
         ],
       },
-      wrap(renderForm(wfres.renderForm, req.csrfToken()), false, wfres.previewURL)
+      wrap(
+        renderForm(wfres.renderForm, req.csrfToken()),
+        false,
+        wfres.previewURL
+      )
     );
   else if (wfres.renderBuilder) {
     wfres.renderBuilder.options.view_id = view.id;

package/tests/admin.test.js

@@ -1,13 +1,13 @@
 const request = require("supertest");
 const getApp = require("../app");
 const {
-  getStaffLoginCookie,
+  //getStaffLoginCookie,
   getAdminLoginCookie,
   toRedirect,
   itShouldRedirectUnauthToLogin,
   toInclude,
   toSucceed,
-  toNotInclude,
+  //toNotInclude,
   resetToFixtures,
   respondJsonWith,
 } = require("../auth/testhelp");
@@ -79,6 +79,8 @@ describe("admin page", () => {
     ["/roleadmin", "Theme"],
     ["/useradmin/settings", "Authentication settings"],
     ["/useradmin/ssl", "HTTPS encryption"],
+    ["/useradmin/http", "HTTP settings"],
+    ["/useradmin/permissions", "Permissions settings"],
   ]);
   adminPageContains([
     ["/menu", "jquery-menu-editor"],

package/tests/fields.test.js

@@ -141,6 +141,7 @@ describe("Field Endpoints", () => {
       .send("stepName=Summary")
       .send("contextEnc=" + ctx)
       .send("summary_field=pages")
+      .send("on_delete=Fail")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/table/2"));
   });

package/tests/tenant.test.js

@@ -1,3 +1,4 @@
+// File: tenant.test.js
 const db = require("@saltcorn/data/db");
 const request = require("supertest");
 
@@ -40,6 +41,7 @@ describe("tenant routes", () => {
         .send("subdomain=test2")
         .expect(toInclude("Success"));
     });
+
     it("creates tenant with capital letter", async () => {
       db.enable_multi_tenant();
       await getState().setConfig("role_to_create_tenant", "10");
@@ -51,6 +53,7 @@ describe("tenant routes", () => {
         .expect(toInclude("Success"));
       db.set_sql_logging(false);
     });
+
     it("rejects existing tenant", async () => {
       db.enable_multi_tenant();
       await getState().setConfig("role_to_create_tenant", "10");
@@ -71,6 +74,7 @@ describe("tenant routes", () => {
         .set("Cookie", loginCookie)
         .expect(toInclude("peashoot"));
     });
+
     it("show tenant info", async () => {
       const loginCookie = await getAdminLoginCookie();
 
@@ -80,6 +84,7 @@ describe("tenant routes", () => {
         .set("Cookie", loginCookie)
         .expect(toInclude("E-mail"));
     });
+
     it("delete tenant", async () => {
       const loginCookie = await getAdminLoginCookie();
 
@@ -89,9 +94,12 @@ describe("tenant routes", () => {
         .set("Cookie", loginCookie)
         .expect(toRedirect("/tenant/list"));
     });
+
   } else {
+
     it("does not support tenants on SQLite", async () => {
       expect(db.isSQLite).toBe(true);
     });
+
   }
 });

package/tests/viewedit.test.js

@@ -43,6 +43,20 @@ describe("viewedit edit endpoint", () => {
       .set("Cookie", loginCookie)
       .expect(toInclude("author"));
   });
+  it("direct edit to config", async () => {
+    const loginCookie = await getAdminLoginCookie();
+    const app = await getApp({ disableCsrf: true });
+    const v = await View.findOne({ name: "authorlist" });
+    await request(app)
+      .post("/viewedit/save")
+      .send("viewtemplate=List")
+      .send("table_name=books")
+      .send("id=" + v.id)
+      .send("name=authorlist")
+      .send("min_role=10")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/viewedit/config/authorlist"));
+  });
   it("show list editor", async () => {
     const loginCookie = await getAdminLoginCookie();
     const app = await getApp({ disableCsrf: true });
@@ -478,6 +492,6 @@ describe("Library", () => {
       .get("/library/list")
       .set("Cookie", loginCookie)
       .expect(toInclude("Library"))
-      .expect(toNotInclude("ShinyCard"))
+      .expect(toNotInclude("ShinyCard"));
   });
 });