@saltcorn/server 0.6.2-beta.5 → 0.6.3-beta.2

package/locales/en.json

@@ -843,5 +843,9 @@
 	"Optional. String type with options, each of which will become a menu section": "Optional. String type with options, each of which will become a menu section",
 	"Role to generate API keys": "Role to generate API keys",
 	"User should have this role or higher to generate API keys in their user settings": "User should have this role or higher to generate API keys in their user settings",
-	"API token removed": "API token removed"
+	"API token removed": "API token removed",
+	"Row inclusion formula": "Row inclusion formula",
+	"Only include rows where this formula is true": "Only include rows where this formula is true",
+	"Slug": "Slug",
+	"Field that can be used for a prettier URL structure": "Field that can be used for a prettier URL structure"
 }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.2-beta.5",
+  "version": "0.6.3-beta.2",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.6.2-beta.5",
-    "@saltcorn/builder": "0.6.2-beta.5",
-    "@saltcorn/data": "0.6.2-beta.5",
+    "@saltcorn/base-plugin": "0.6.3-beta.2",
+    "@saltcorn/builder": "0.6.3-beta.2",
+    "@saltcorn/data": "0.6.3-beta.2",
     "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.6.2-beta.5",
-    "@saltcorn/sbadmin2": "0.6.2-beta.5",
+    "@saltcorn/markup": "0.6.3-beta.2",
+    "@saltcorn/sbadmin2": "0.6.3-beta.2",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",
@@ -75,6 +75,7 @@
       "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1",
       "@saltcorn/db-common/(.*)": "@saltcorn/db-common/dist/$1",
       "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1",
+      "@saltcorn/types/(.*)": "@saltcorn/types/dist/$1",
       "@saltcorn/markup$": "@saltcorn/markup/dist",
       "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1"
     }

package/public/saltcorn.js

@@ -32,7 +32,9 @@ function apply_showif() {
     var e = $(element);
     var to_show = new Function("e", "return " + e.attr("data-show-if"));
     if (to_show(e))
-      e.show().find("input, textarea, button, select").prop("disabled", false);
+      e.show()
+        .find("input, textarea, button, select")
+        .prop("disabled", e.attr("data-disabled") || false);
     else
       e.hide().find("input, textarea, button, select").prop("disabled", true);
   });
@@ -585,11 +587,11 @@ function test_formula(tablename, stored) {
 function align_dropdown(id) {
   setTimeout(() => {
     if ($("#dm" + id).hasClass("show")) {
-      var inputWidth = $(".input-group.search-bar").outerWidth();
-      $(".dropdown-menu.search-bar").css("width", inputWidth);
-      var d0pos = $(".input-group.search-bar").offset();
+      var inputWidth = $("#search-input-group-" + id).outerWidth();
+      $("#dm" + id).css("width", inputWidth);
+      var d0pos = $("#search-input-group-" + id).offset();
       $("#dm" + id).offset({ left: d0pos.left });
-      $(document).on("click", ".dropdown-menu.search-bar", function (e) {
+      $(document).on("click", "#dm" + id, function (e) {
         e.stopPropagation();
       });
     }

package/restart_watcher.js

@@ -120,10 +120,6 @@ const listenForChanges = (projectDirs, pluginDirs) => {
         (event, file) => {
           console.log("'%s' changed \n re-starting now", file);
           closeWatchers();
-          spawnSync("npm", ["run", "tsc"], {
-            stdio: "inherit",
-            cwd: projectRoot,
-          });
           process.exit();
         }
       )

package/routes/homepage.js

@@ -455,25 +455,26 @@ const get_config_response = async (role_id, res, req) => {
   }
 };
 
-/**
- * Function assigned to 'module.exports'.
- * @param {object} req
- * @param {object} res
- * @returns {Promise<void>}
- */
-module.exports = async (req, res) => {
-  const isAuth = req.isAuthenticated();
-  const role_id = req.user ? req.user.role_id : 10;
-  const cfgResp = await get_config_response(role_id, res, req);
-  if (cfgResp) return;
+module.exports =
+  /**
+   * Function assigned to 'module.exports'.
+   * @param {object} req
+   * @param {object} res
+   * @returns {Promise<void>}
+   */
+  async (req, res) => {
+    const isAuth = req.isAuthenticated();
+    const role_id = req.user ? req.user.role_id : 10;
+    const cfgResp = await get_config_response(role_id, res, req);
+    if (cfgResp) return;
 
-  if (!isAuth) {
-    const hasUsers = await User.nonEmpty();
-    if (!hasUsers) {
-      res.redirect("/auth/create_first_user");
-      return;
-    } else res.redirect("/auth/login");
-  } else {
-    await no_views_logged_in(req, res);
-  }
-};
+    if (!isAuth) {
+      const hasUsers = await User.nonEmpty();
+      if (!hasUsers) {
+        res.redirect("/auth/create_first_user");
+        return;
+      } else res.redirect("/auth/login");
+    } else {
+      await no_views_logged_in(req, res);
+    }
+  };

package/routes/index.js

@@ -36,7 +36,7 @@
  * @property {module:routes/utils} utils
  * @property {module:routes/view} view
  * @property {module:routes/viewedit} viewedit
- * 
+ *
  * @category server
  * @subcategory routes
  */
@@ -71,38 +71,39 @@ const useradmin = require("../auth/admin");
 const roleadmin = require("../auth/roleadmin");
 const scapi = require("./scapi");
 
-/**
- * Function assigned to 'module.exports'
- * @returns {void}
- */
-module.exports = (app) => {
-  app.use("/table", table);
-  app.use("/field", field);
-  app.use("/files", files);
-  app.use("/list", list);
-  app.use("/edit", edit);
-  app.use("/config", config);
-  app.use("/plugins", plugins);
-  app.use("/packs", packs);
-  app.use("/menu", menu);
-  app.use("/view", view);
-  app.use("/crashlog", crashlog);
-  app.use("/events", events);
-  app.use("/page", page);
-  app.use("/settings", settings);
-  app.use("/pageedit", pageedit);
-  app.use("/actions", actions);
-  app.use("/eventlog", eventlog);
-  app.use("/library", library);
-  app.use("/site-structure", infoarch);
-  app.use("/search", search);
-  app.use("/admin", admin);
-  app.use("/tenant", tenant);
-  app.use("/api", api);
-  app.use("/viewedit", viewedit);
-  app.use("/delete", del);
-  app.use("/auth", auth);
-  app.use("/useradmin", useradmin);
-  app.use("/roleadmin", roleadmin);
-  app.use("/scapi", scapi);
-};
+module.exports =
+  /**
+   * Function assigned to 'module.exports'
+   * @returns {void}
+   */
+  (app) => {
+    app.use("/table", table);
+    app.use("/field", field);
+    app.use("/files", files);
+    app.use("/list", list);
+    app.use("/edit", edit);
+    app.use("/config", config);
+    app.use("/plugins", plugins);
+    app.use("/packs", packs);
+    app.use("/menu", menu);
+    app.use("/view", view);
+    app.use("/crashlog", crashlog);
+    app.use("/events", events);
+    app.use("/page", page);
+    app.use("/settings", settings);
+    app.use("/pageedit", pageedit);
+    app.use("/actions", actions);
+    app.use("/eventlog", eventlog);
+    app.use("/library", library);
+    app.use("/site-structure", infoarch);
+    app.use("/search", search);
+    app.use("/admin", admin);
+    app.use("/tenant", tenant);
+    app.use("/api", api);
+    app.use("/viewedit", viewedit);
+    app.use("/delete", del);
+    app.use("/auth", auth);
+    app.use("/useradmin", useradmin);
+    app.use("/roleadmin", roleadmin);
+    app.use("/scapi", scapi);
+  };

package/routes/plugins.js

@@ -511,7 +511,7 @@ const plugin_store_html = (items, req) => {
       },
       {
         besides: items.map(store_item_html(req)),
-        widths: items.map((item) => 4), // todo warning that item uis unused
+        widths: items.map(() => 4),
       },
     ],
   };

package/routes/view.js

@@ -37,10 +37,10 @@ module.exports = router;
  * @function
  */
 router.get(
-  "/:viewname",
+  ["/:viewname", "/:viewname/*"],
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
-
+    const query = { ...req.query };
     const view = await View.findOne({ name: viewname });
     const role = req.isAuthenticated() ? req.user.role_id : 10;
 
@@ -49,15 +49,17 @@ router.get(
       res.redirect("/");
       return;
     }
+
+    view.rewrite_query_from_slug(query, req.params);
     if (
       role > view.min_role &&
-      !(await view.authorise_get({ query: req.query, req, ...view }))
+      !(await view.authorise_get({ query, req, ...view }))
     ) {
       req.flash("danger", req.__("Not authorized"));
       res.redirect("/");
       return;
     }
-    const contents = await view.run_possibly_on_page(req.query, req, res);
+    const contents = await view.run_possibly_on_page(query, req, res);
     const title = scan_for_page_title(contents, view.name);
     res.sendWrap(
       title,
@@ -142,16 +144,21 @@ router.post(
  * @function
  */
 router.post(
-  "/:viewname",
+  ["/:viewname", "/:viewname/*"],
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
     const role = req.isAuthenticated() ? req.user.role_id : 10;
+    const query = { ...req.query };
 
     const view = await View.findOne({ name: viewname });
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));
       res.redirect("/");
-    } else if (
+      return;
+    }
+    view.rewrite_query_from_slug(query, req.params);
+
+    if (
       role > view.min_role &&
       !(await view.authorise_post({ body: req.body, req, ...view }))
     ) {
@@ -164,7 +171,7 @@ router.post(
         } does not supply a POST handler`
       );
     } else {
-      await view.runPost(req.query, req.body, { res, req });
+      await view.runPost(query, req.body, { res, req });
     }
   })
 );

package/routes/viewedit.js

@@ -232,12 +232,13 @@ const mapObjectValues = (o, f) =>
  * @param {object} values
  * @returns {Form}
  */
-const viewForm = (req, tableOptions, roles, pages, values) => {
+const viewForm = async (req, tableOptions, roles, pages, values) => {
   const isEdit =
     values && values.id && !getState().getConfig("development_mode", false);
   const hasTable = Object.entries(getState().viewtemplates)
     .filter(([k, v]) => !v.tableless)
     .map(([k, v]) => k);
+  const slugOptions = await Table.allSlugOptions();
   return new Form({
     action: "/viewedit/save",
     submitLabel: req.__("Configure") + " »",
@@ -302,6 +303,19 @@ const viewForm = (req, tableOptions, roles, pages, values) => {
           ...pages.map((p) => ({ value: p.name, label: p.name })),
         ],
       }),
+      new Field({
+        name: "slug",
+        label: req.__("Slug"),
+        sublabel: req.__("Field that can be used for a prettier URL structure"),
+        type: "String",
+        attributes: {
+          calcOptions: [
+            "table_name",
+            mapObjectValues(slugOptions, (lvs) => lvs.map((lv) => lv.label)),
+          ],
+        },
+        showIf: { viewtemplate: hasTable },
+      }),
       ...(isEdit
         ? [
             new Field({
@@ -342,10 +356,15 @@ router.get(
       (t) => t.id === viewrow.table_id || t.name === viewrow.exttable_name
     );
     viewrow.table_name = currentTable && currentTable.name;
+    if (viewrow.slug && currentTable) {
+      const slugOptions = await currentTable.slug_options();
+      const slug = slugOptions.find((so) => so.label === viewrow.slug.label);
+      if (slug) viewrow.slug = slug.label;
+    }
     const tableOptions = tables.map((t) => t.name);
     const roles = await User.get_roles();
     const pages = await Page.find();
-    const form = viewForm(req, tableOptions, roles, pages, viewrow);
+    const form = await viewForm(req, tableOptions, roles, pages, viewrow);
     form.hidden("id");
     res.sendWrap(req.__(`Edit view`), {
       above: [
@@ -380,7 +399,7 @@ router.get(
     const tableOptions = tables.map((t) => t.name);
     const roles = await User.get_roles();
     const pages = await Page.find();
-    const form = viewForm(req, tableOptions, roles, pages);
+    const form = await viewForm(req, tableOptions, roles, pages);
     if (req.query && req.query.table) {
       form.values.table_name = req.query.table;
     }
@@ -417,7 +436,7 @@ router.post(
     const tableOptions = tables.map((t) => t.name);
     const roles = await User.get_roles();
     const pages = await Page.find();
-    const form = viewForm(req, tableOptions, roles, pages);
+    const form = await viewForm(req, tableOptions, roles, pages);
     const result = form.validate(req.body);
 
     const sendForm = (form) => {
@@ -458,11 +477,18 @@ router.post(
         const v = result.success;
         if (v.table_name) {
           const table = await Table.findOne({ name: v.table_name });
-          if (table && table.id) v.table_id = table.id;
-          else if (table && table.external) v.exttable_name = v.table_name;
+          if (table && table.id) {
+            v.table_id = table.id;
+          } else if (table && table.external) v.exttable_name = v.table_name;
         }
+        if (v.table_id) {
+          const table = await Table.findOne({ id: v.table_id });
+          const slugOptions = await table.slug_options();
+          const slug = slugOptions.find((so) => so.label === v.slug);
+          v.slug = slug || null;
+        }
+        const table = await Table.findOne({ name: v.table_name });
         delete v.table_name;
-
         if (req.body.id) {
           await View.update(v, +req.body.id);
         } else {

package/serve.js

@@ -38,6 +38,7 @@ const {
   getRelevantPackages,
   getPluginDirectories,
 } = require("./restart_watcher");
+const { spawnSync } = require("child_process");
 
 // helpful https://gist.github.com/jpoehls/2232358
 /**
@@ -162,6 +163,9 @@ module.exports =
     ...appargs
   } = {}) => {
     if (dev && cluster.isMaster) {
+      spawnSync("npm", ["run", "tsc"], {
+        stdio: "inherit",
+      });
       listenForChanges(getRelevantPackages(), await getPluginDirectories());
     }
     const useNCpus = process.env.SALTCORN_NWORKERS

package/tests/view.test.js

@@ -137,3 +137,41 @@ describe("render view on page", () => {
       .expect(toNotInclude("Herman Melville"));
   });
 });
+
+describe("render view with slug", () => {
+  it("should show with id slug in list", async () => {
+    const view = await View.findOne({ name: "authorshow" });
+    const table = await Table.findOne({ name: "books" });
+    const slugOpts = await table.slug_options();
+    const slugOpt = slugOpts.find((so) => so.label === "/:id");
+    expect(!!slugOpt).toBe(true);
+    View.update({ default_render_page: null, slug: slugOpt }, view.id);
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/view/authorlist")
+      .expect(toInclude(`/view/authorshow/1`));
+    await request(app)
+      .get("/view/authorshow/1")
+      .expect(toInclude(`Herman Melville`));
+  });
+  it("should show with name slug in list", async () => {
+    const view = await View.findOne({ name: "authorshow" });
+    const table0 = await Table.findOne({ name: "books" });
+    const fields = await table0.getFields();
+    const field = fields.find((f) => f.name === "author");
+    await field.update({ is_unique: true });
+    const table = await Table.findOne({ name: "books" });
+
+    const slugOpts = await table.slug_options();
+    const slugOpt = slugOpts.find((so) => so.label === "/slugify-author");
+    expect(!!slugOpt).toBe(true);
+    View.update({ default_render_page: null, slug: slugOpt }, view.id);
+    const app = await getApp({ disableCsrf: true });
+    await request(app)
+      .get("/view/authorlist")
+      .expect(toInclude(`/view/authorshow/herman-melville`));
+    await request(app)
+      .get("/view/authorshow/herman-melville")
+      .expect(toInclude(`Herman Melville`));
+  });
+});

package/wrapper.js

@@ -239,6 +239,7 @@ module.exports = (version_tag) =>
             brand: get_brand(state),
             menu: get_menu(req),
             currentUrl,
+            originalUrl: req.originalUrl,
             alerts: getFlashes(req),
             body,
             headers: get_headers(req, version_tag),
@@ -283,6 +284,8 @@ module.exports = (version_tag) =>
           brand: get_brand(state),
           menu: get_menu(req),
           currentUrl,
+          originalUrl: req.originalUrl,
+
           alerts,
           body: html.length === 1 ? html[0] : html.join(""),
           headers: get_headers(req, version_tag, opts.description, pageHeaders),