@saltcorn/server 0.7.4-beta.1 → 0.7.4-beta.3

package/routes/pageedit.js

@@ -19,6 +19,7 @@ const Trigger = require("@saltcorn/data/models/trigger");
 const { getViews, traverseSync } = require("@saltcorn/data/models/layout");
 const { add_to_menu } = require("@saltcorn/admin-models/models/pack");
 const db = require("@saltcorn/data/db");
+const { getPageList } = require("./common_lists");
 
 const { isAdmin, error_catcher } = require("./utils.js");
 const {
@@ -32,7 +33,6 @@ const {
   settingsDropdown,
 } = require("@saltcorn/markup");
 const { getActionConfigFields } = require("@saltcorn/data/plugin-helper");
-const { editRoleForm, wizardCardTitle } = require("../markup/forms.js");
 const Library = require("@saltcorn/data/models/library");
 
 /**
@@ -45,68 +45,6 @@ const Library = require("@saltcorn/data/models/library");
 const router = new Router();
 module.exports = router;
 
-/**
- * @param {object} page
- * @param {*} roles
- * @param {object} req
- * @returns {Form}
- */
-const editPageRoleForm = (page, roles, req) =>
-  editRoleForm({
-    url: `/pageedit/setrole/${page.id}`,
-    current_role: page.min_role,
-    roles,
-    req,
-  });
-
-/**
- * @param {object} page
- * @param {object} req
- * @returns {string}
- */
-const page_dropdown = (page, req) =>
-  settingsDropdown(`dropdownMenuButton${page.id}`, [
-    a(
-      {
-        class: "dropdown-item",
-        href: `/page/${encodeURIComponent(page.name)}`,
-      },
-      '<i class="fas fa-running"></i>&nbsp;' + req.__("Run")
-    ),
-    a(
-      {
-        class: "dropdown-item",
-        href: `/pageedit/edit-properties/${encodeURIComponent(page.name)}`,
-      },
-      '<i class="fas fa-edit"></i>&nbsp;' + req.__("Edit properties")
-    ),
-    post_dropdown_item(
-      `/pageedit/add-to-menu/${page.id}`,
-      '<i class="fas fa-bars"></i>&nbsp;' + req.__("Add to menu"),
-      req
-    ),
-    post_dropdown_item(
-      `/pageedit/clone/${page.id}`,
-      '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
-      req
-    ),
-    a(
-      {
-        class: "dropdown-item",
-        href: `javascript:ajax_modal('/admin/snapshot-restore/page/${page.name}')`,
-      },
-      '<i class="fas fa-undo-alt"></i>&nbsp;' + req.__("Restore")
-    ),
-    div({ class: "dropdown-divider" }),
-    post_dropdown_item(
-      `/pageedit/delete/${page.id}`,
-      '<i class="far fa-trash-alt"></i>&nbsp;' + req.__("Delete"),
-      req,
-      true,
-      page.name
-    ),
-  ]);
-
 /**
  *
  * @param {object} req
@@ -188,7 +126,7 @@ const pageBuilderData = async (req, context) => {
   for (const view of views) {
     fixed_state_fields[view.name] = [];
     const table = Table.findOne(view.table_id || view.exttable_name);
-    
+
     const fs = await view.get_state_fields();
     for (const frec of fs) {
       const f = new Field(frec);
@@ -236,46 +174,6 @@ const pageBuilderData = async (req, context) => {
   };
 };
 
-/**
- * @param {*} rows
- * @param {*} roles
- * @param {object} req
- * @returns {div}
- */
-const getPageList = (rows, roles, req) => {
-  return div(
-    mkTable(
-      [
-        {
-          label: req.__("Name"),
-          key: (r) => link(`/page/${r.name}`, r.name),
-        },
-        {
-          label: req.__("Role to access"),
-          key: (row) => editPageRoleForm(row, roles, req),
-        },
-        {
-          label: req.__("Edit"),
-          key: (r) => link(`/pageedit/edit/${r.name}`, req.__("Edit")),
-        },
-        {
-          label: "",
-          key: (r) => page_dropdown(r, req),
-        },
-      ],
-      rows,
-      { hover: true }
-    ),
-    a(
-      {
-        href: `/pageedit/new`,
-        class: "btn btn-primary",
-      },
-      req.__("Create page")
-    )
-  );
-};
-
 /**
  * Root pages configuration Form
  * Allows to configure root page for each role
@@ -287,9 +185,8 @@ const getPageList = (rows, roles, req) => {
 const getRootPageForm = (pages, roles, req) => {
   const form = new Form({
     action: "/pageedit/set_root_page",
-    submitLabel: req.__("Save"),
-    submitButtonClass: "btn-outline-primary",
-    onChange: "remove_outline(this)",
+    noSubmitButton: true,
+    onChange: "saveAndContinue(this)",
     blurb: req.__(
       "The root page is the page that is served when the user visits the home location (/). This can be set for each user role."
     ),
@@ -335,7 +232,16 @@ router.get(
           type: "card",
           title: req.__("Your pages"),
           class: "mt-0",
-          contents: getPageList(pages, roles, req),
+          contents: div(
+            getPageList(pages, roles, req),
+            a(
+              {
+                href: `/pageedit/new`,
+                class: "btn btn-primary",
+              },
+              req.__("Create page")
+            )
+          ),
         },
         {
           type: "card",

package/routes/plugins.js

@@ -455,7 +455,7 @@ const store_actions_dropdown = (req) =>
         {
           class: "dropdown-item",
           href: `/plugins/upgrade`,
-          onClick: `notifyAlert('Upgrading modules...', true)`,
+          onClick: `notifyAlert('${req.__("Upgrading modules...")}', true)`,
         },
         '<i class="far fa-arrow-alt-circle-up"></i>&nbsp;' +
         req.__("Upgrade installed modules")
@@ -551,7 +551,7 @@ router.get(
     const { name } = req.params;
     const plugin = await Plugin.findOne({ name: decodeURIComponent(name) });
     if (!plugin) {
-      req.flash("warning", "Plugin not found");
+      req.flash("warning", req.__("Module not found"));
       res.redirect("/plugins");
       return;
     }
@@ -792,7 +792,7 @@ router.get(
       pkgjson = require(path.join(mod.location, "package.json"));
 
     if (!plugin_db) {
-      req.flash("warning", "Plugin not found");
+      req.flash("warning", "Module not found");
       res.redirect("/plugins");
       return;
     }
@@ -817,7 +817,7 @@ router.get(
         ),
         mod.plugin_module.dependencies
           ? tr(
-            th(req.__("Plugin dependencies")),
+            th(req.__("Module dependencies")),
             td(
               mod.plugin_module.dependencies.map((d) =>
                 span({ class: "badge bg-primary me-1" }, d)
@@ -933,7 +933,7 @@ router.get(
 
     const plugin = await Plugin.findOne({ name });
     await plugin.upgrade_version((p, f) => load_plugins.loadPlugin(p, f));
-    req.flash("success", req.__(`Plugin up-to-date`));
+    req.flash("success", req.__(`Module up-to-date`));
 
     res.redirect(`/plugins/info/${plugin.name}`);
   })
@@ -954,7 +954,7 @@ router.post(
     if (schema !== db.connectObj.default_schema) {
       req.flash(
         "error",
-        req.__(`Only store plugins can be installed on tenant instances`)
+        req.__(`Only store modules can be installed on tenant instances`)
       );
       res.redirect(`/plugins`);
     } else {
@@ -963,12 +963,12 @@ router.post(
           plugin,
           schema === db.connectObj.default_schema || plugin.source === "github"
         );
-        req.flash("success", req.__(`Plugin %s installed`, plugin.name));
+        req.flash("success", req.__(`Module %s installed`, plugin.name));
         res.redirect(`/plugins`);
       } catch (e) {
         req.flash("error", `${e.message}`);
         const form = pluginForm(req, plugin);
-        res.sendWrap(req.__(`Edit Plugin`), renderForm(form, req.csrfToken()));
+        res.sendWrap(req.__(`Edit Module`), renderForm(form, req.csrfToken()));
       }
     }
   })
@@ -988,7 +988,7 @@ router.post(
 
     const plugin = await Plugin.findOne({ name: decodeURIComponent(name) });
     if (!plugin) {
-      req.flash("warning", "Plugin not found");
+      req.flash("warning", "Module not found");
       res.redirect("/plugins");
       return;
     }
@@ -998,11 +998,11 @@ router.post(
       getState().getConfig("development_mode", false)
     ) {
       await plugin.delete();
-      req.flash("success", req.__(`Plugin %s removed.`, plugin.name));
+      req.flash("success", req.__(`Module %s removed.`, plugin.name));
     } else {
       req.flash(
         "error",
-        req.__(`Cannot remove plugin: views %s depend on it`, depviews.join())
+        req.__(`Cannot remove module: views %s depend on it`, depviews.join())
       );
     }
     res.redirect(`/plugins`);
@@ -1025,7 +1025,7 @@ router.post(
     if (!plugin) {
       req.flash(
         "error",
-        req.__(`Plugin %s not found`, text(decodeURIComponent(name)))
+        req.__(`Module %s not found`, text(decodeURIComponent(name)))
       );
       res.redirect(`/plugins`);
       return;
@@ -1034,7 +1034,7 @@ router.post(
     if (!isRoot && plugin.unsafe) {
       req.flash(
         "error",
-        req.__("Cannot install unsafe plugins on subdomain tenants")
+        req.__("Cannot install unsafe modules on subdomain tenants")
       );
       res.redirect(`/plugins`);
       return;
@@ -1047,14 +1047,14 @@ router.post(
       req.flash(
         "success",
         req.__(
-          `Plugin %s installed, please complete configuration.`,
+          `Module %s installed, please complete configuration.`,
           plugin_db.name
         )
       );
       await sleep(1000); // Allow other workers to load this plugin
       res.redirect(`/plugins/configure/${plugin_db.name}`);
     } else {
-      req.flash("success", req.__(`Plugin %s installed`, plugin.name));
+      req.flash("success", req.__(`Module %s installed`, plugin.name));
       res.redirect(`/plugins`);
     }
   })

package/routes/tables.js

@@ -56,6 +56,7 @@ const {
 } = require("@saltcorn/data/models/discovery");
 const { getState } = require("@saltcorn/data/db/state");
 const { cardHeaderTabs } = require("@saltcorn/markup/layout_utils");
+const { tablesList } = require("./common_lists");
 
 /**
  * @type {object}
@@ -129,7 +130,7 @@ const tableForm = async (table, req) => {
       {
         label: req.__("Minimum role to read"),
         sublabel: req.__(
-          "User must have this role or higher to read rows from the table"
+          "User must have this role or higher to read rows from the table, unless they are the owner"
         ),
         name: "min_role_read",
         input_type: "select",
@@ -143,7 +144,7 @@ const tableForm = async (table, req) => {
             name: "min_role_write",
             input_type: "select",
             sublabel: req.__(
-              "User must have this role or higher to edit or create new rows in the table"
+              "User must have this role or higher to edit or create new rows in the table, unless they are the owner"
             ),
             options: roleOptions,
           },
@@ -888,7 +889,6 @@ router.post(
       if (rest.ownership_field_id === "_formula") {
         rest.ownership_field_id = null;
         const fmlValidRes = expressionValidator(rest.ownership_formula);
-        console.log({ fmlValidRes });
         if (typeof fmlValidRes === "string") {
           req.flash(
             "error",
@@ -1011,44 +1011,8 @@ router.get(
     const rows = await Table.find_with_external({}, { orderBy: "name" });
     const roles = await User.get_roles();
     const getRole = (rid) => roles.find((r) => r.id === rid).role;
-    const mainCard =
-      rows.length > 0
-        ? mkTable(
-          [
-            {
-              label: req.__("Name"),
-              key: (r) => link(`/table/${r.id || r.name}`, text(r.name)),
-            },
-            {
-              label: "",
-              key: (r) => tableBadges(r, req),
-            },
-            {
-              label: req.__("Access Read/Write"),
-              key: (t) =>
-                t.external
-                  ? `${getRole(t.min_role_read)} (read only)`
-                  : `${getRole(t.min_role_read)}/${getRole(
-                    t.min_role_write
-                  )}`,
-            },
-            {
-              label: req.__("Delete"),
-              key: (r) =>
-                r.name === "users" || r.external
-                  ? ""
-                  : post_delete_btn(`/table/delete/${r.id}`, req, r.name),
-            },
-          ],
-          rows,
-          { hover: true }
-        )
-        : div(
-          h4(req.__("No tables defined")),
-          p(req.__("Tables hold collections of similar data"))
-        );
+    const mainCard = await tablesList(rows, req);
     const createCard = div(
-      h5(req.__("Create table")),
       a(
         { href: `/table/new`, class: "btn btn-primary mt-1 me-3" },
         i({ class: "fas fa-plus-square me-1" }),
@@ -1064,8 +1028,13 @@ router.get(
       ),
       !db.isSQLite &&
       a(
-        { href: `/table/discover`, class: "btn btn-secondary mt-1" },
+        {
+          href: `/table/discover`,
+          class: "btn btn-secondary mt-1",
+          title: req.__("Discover tables that are already in the Database, but not known to Saltcorn"),
+        },
         i({ class: "fas fa-map-signs me-1" }),
+
         req.__("Discover tables")
       )
     );

package/routes/tag_entries.js

@@ -0,0 +1,173 @@
+const {
+  a,
+  div,
+  text,
+  button,
+  i,
+  form,
+  select,
+  option,
+  label,
+} = require("@saltcorn/markup/tags");
+
+const Tag = require("@saltcorn/data/models/tag");
+const TagEntry = require("@saltcorn/data/models/tag_entry");
+const Router = require("express-promise-router");
+
+const { isAdmin, error_catcher, csrfField } = require("./utils");
+
+const Table = require("@saltcorn/data/models/table");
+const View = require("@saltcorn/data/models/view");
+const Page = require("@saltcorn/data/models/page");
+const Trigger = require("@saltcorn/data/models/trigger");
+
+const router = new Router();
+module.exports = router;
+
+const buildFields = (entryType, formOptions, req) => {
+  return Object.entries(formOptions).map(([type, list]) => {
+    return div(
+      { class: "form-group row" },
+      div({ class: "col-sm-2" }, label("type")),
+      div(
+        { class: "col-sm-10" },
+        select(
+          { name: "ids", class: "form-control form-select", multiple: true },
+          list.map((entry) => {
+            return option({ value: entry.id, label: entry.name });
+          })
+        )
+      ),
+      div(
+        { class: "col-sm-12" },
+        button({ type: "submit", class: "btn btn-primary" }, req.__("Save"))
+      )
+    );
+  });
+};
+
+const buildForm = (entryType, tag_id, formOptions, req) => {
+  return form(
+    { action: `/tag-entries/add/${entryType}/${tag_id}`, method: "post" },
+    csrfField(req),
+    buildFields(entryType, formOptions, req)
+  );
+};
+
+const formOptions = async (type, tag_id) => {
+  const tag = await Tag.findOne({ id: tag_id });
+  switch (type) {
+    case "tables": {
+      const ids = await tag.getTableIds();
+      return {
+        tables: (await Table.find()).filter(
+          (value) => ids.indexOf(value.id) === -1
+        ),
+      };
+    }
+    case "views": {
+      const ids = await tag.getViewIds();
+      return {
+        views: (await View.find()).filter(
+          (value) => ids.indexOf(value.id) === -1
+        ),
+      };
+    }
+    case "pages": {
+      const ids = await tag.getPageIds();
+      return {
+        pages: (await Page.find()).filter(
+          (value) => ids.indexOf(value.id) === -1
+        ),
+      };
+    }
+    case "trigger": {
+      const ids = await tag.getTriggerIds();
+      return {
+        trigger: (await Trigger.find()).filter(
+          (value) => ids.indexOf(value.id) === -1
+        ),
+      };
+    }
+  }
+};
+
+router.get(
+  "/add/:entry_type/:tag_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { entry_type, tag_id } = req.params;
+    res.sendWrap(req.__("Add %s to tag"), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [{ text: `Tag entry` }],
+        },
+        {
+          type: "card",
+          title: req.__(`Add entries to tag`),
+          contents: buildForm(
+            entry_type,
+            tag_id,
+            await formOptions(entry_type, tag_id),
+            req
+          ),
+        },
+      ],
+    });
+  })
+);
+
+const idField = (entryType) => {
+  switch (entryType) {
+    case "tables": {
+      return "table_id";
+    }
+    case "views": {
+      return "view_id";
+    }
+    case "pages": {
+      return "page_id";
+    }
+    case "trigger": {
+      return "trigger_id";
+    }
+  }
+  return null;
+};
+
+router.post(
+  "/add/:entry_type/:tag_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { entry_type, tag_id } = req.params;
+    const { ids } = req.body;
+    if (!ids) {
+      req.flash("error", req.__("Please select at least one item"));
+      return res.redirect(`/tag-entries/add/${entry_type}/${tag_id}`);
+    }
+    const fieldName = idField(entry_type);
+    const tag = await Tag.findOne({ id: tag_id });
+    for (const id of ids) {
+      await tag.addEntry({ [fieldName]: id });
+    }
+    res.redirect(`/tag/${tag_id}?show_list=${entry_type}`);
+  })
+);
+
+router.post(
+  "/remove/:entry_type/:entry_id/:tag_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { tag_id, entry_type, entry_id } = req.params;
+    const fieldName = idField(entry_type);
+    const entry = await TagEntry.findOne({ tag_id, [fieldName]: entry_id });
+    entry[fieldName] = undefined;
+    if (entry.isEmpty()) {
+      await entry.delete();
+    } else {
+      await TagEntry.update(entry.id, { [fieldName]: null });
+    }
+    res.redirect(`/tag/${tag_id}?show_list=${entry_type}`);
+  })
+);