@saltcorn/server 0.7.4-beta.2 → 0.7.4

package/routes/admin.js

@@ -390,7 +390,7 @@ router.get(
                 renderForm(backupForm, req.csrfToken()),
                 a(
                   { href: "/admin/auto-backup-list" },
-                  "Restore/download automated backups »"
+                  req.__("Restore/download automated backups »")
                 ),
                 script(
                   domReady(
@@ -406,13 +406,13 @@ router.get(
             contents: div(
               p(
                 i(
-                  "Snapshots store your application structure and definition, without the table data. Individual views and pages can be restored from snapshots from the <a href='/viewedit'>view</a> or <a href='/pageedit'>pages</a> overviews (\"Restore\" from individual page or view dropdowns)."
+                  req.__("Snapshots store your application structure and definition, without the table data. Individual views and pages can be restored from snapshots from the <a href='/viewedit'>view</a> or <a href='/pageedit'>pages</a> overviews (\"Restore\" from individual page or view dropdowns).")
                 )
               ),
               renderForm(aSnapshotForm, req.csrfToken()),
               a(
                 { href: "/admin/snapshot-list" },
-                "List/download snapshots &raquo;"
+                req.__("List/download snapshots &raquo;")
               )
             ),
           },
@@ -472,16 +472,16 @@ router.get(
             title: req.__("Restoring automated backup"),
             contents: div(
               ol(
-                li("Download one of the backups above"),
+                li(req.__("Download one of the backups above")),
                 li(
-                  a({ href: "/admin/clear-all" }, "Clear this application"),
+                  a({ href: "/admin/clear-all" }, req.__("Clear this application")),
                   " ",
-                  "(tick all boxes)"
+                  req.__("(tick all boxes)")
                 ),
                 li(
-                  "When prompted to create the first user, click the link to restore a backup"
+                  req.__("When prompted to create the first user, click the link to restore a backup")
                 ),
-                li("Select the downloaded backup file")
+                li(req.__("Select the downloaded backup file"))
               )
             ),
           },
@@ -551,7 +551,7 @@ router.get(
       mkTable(
         [
           {
-            label: "When",
+            label: req.__("When"),
             key: (r) =>
               `${localeDateTime(r.created)} (${moment(r.created).fromNow()})`,
           },
@@ -618,7 +618,7 @@ const autoBackupForm = (req) =>
     noSubmitButton: true,
     additionalButtons: [
       {
-        label: "Backup now",
+        label: req.__("Backup now"),
         id: "btnBackupNow",
         class: "btn btn-outline-secondary",
         onclick: "ajax_post('/admin/auto-backup-now')",
@@ -671,7 +671,7 @@ const snapshotForm = (req) =>
     noSubmitButton: true,
     additionalButtons: [
       {
-        label: "Snapshot now",
+        label: req.__("Snapshot now"),
         id: "btnSnapNow",
         class: "btn btn-outline-secondary",
         onclick: "ajax_post('/admin/snapshot-now')",
@@ -808,7 +808,6 @@ router.get(
                 " ",
                 req.__("Configuration check")
               ),
-
               hr(),
 
               a(
@@ -945,7 +944,7 @@ router.post(
       });
       child.on("exit", function (code, signal) {
         res.end(
-          `Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`
+          req.__(`Upgrade done (if it was available) with code ${code}.\n\nPress the BACK button in your browser, then RELOAD the page.`)
         );
         setTimeout(() => {
           if (process.send) process.send("RestartServer");
@@ -981,7 +980,7 @@ router.post(
     res.attachment(fileName);
     const file = fs.createReadStream(fileName);
     file.on("end", function () {
-      fs.unlink(fileName, function () { });
+      fs.unlink(fileName, function () {});
     });
     file.pipe(res);
   })
@@ -1004,7 +1003,7 @@ router.post(
     );
     if (err) req.flash("error", err);
     else req.flash("success", req.__("Successfully restored backup"));
-    fs.unlink(newPath, function () { });
+    fs.unlink(newPath, function () {});
     res.redirect(`/admin`);
   })
 );
@@ -1193,18 +1192,23 @@ router.get(
   })
 );
 /**
- * /confiuration-check
+ * /configuration-check
  */
 router.get(
   "/configuration-check",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { passes, errors, pass } = await runConfigurationCheck(req);
+    const { passes, errors, pass, warnings } = await runConfigurationCheck(req);
     const mkError = (err) =>
       div(
         { class: "alert alert-danger", role: "alert" },
         pre({ class: "mb-0" }, code(err))
       );
+    const mkWarning = (err) =>
+      div(
+        { class: "alert alert-warning", role: "alert" },
+        pre({ class: "mb-0" }, code(err))
+      );
     res.sendWrap(req.__(`Admin`), {
       above: [
         {
@@ -1228,7 +1232,8 @@ router.get(
                   req.__("No errors detected during configuration check")
                 )
               )
-              : errors.map(mkError)
+              : errors.map(mkError),
+            (warnings || []).map(mkWarning)
           ),
         },
         {
@@ -1270,11 +1275,10 @@ const buildDialogScript = () => {
   
   function handleMessages() {
     notifyAlert("This is still under development and might run longer.")
-    ${
-      getState().getConfig("apple_team_id") &&
+    ${getState().getConfig("apple_team_id") &&
       getState().getConfig("apple_team_id") !== "null"
-        ? ""
-        : `  
+      ? ""
+      : `  
     if ($("#iOSCheckboxId")[0].checked) {
       notifyAlert(
         "No 'Apple Team ID' is configured, I will try to build a project for the iOS simulator."
@@ -1548,6 +1552,12 @@ router.post(
     }
     if (appFile) spawnParams.push("-a", appFile);
     if (serverURL) spawnParams.push("-s", serverURL);
+    if (
+      db.is_it_multi_tenant() &&
+      db.getTenantSchema() !== db.connectObj.default_schema
+    ) {
+      spawnParams.push("--tenantAppName", db.getTenantSchema());
+    }
     const child = spawn("saltcorn", spawnParams, {
       stdio: ["ignore", "pipe", "pipe"],
       cwd: ".",
@@ -1576,7 +1586,7 @@ router.post(
             {
               type: "card",
               title: req.__("Build Result"),
-              contents: div("The build was successfully"),
+              contents: div(req.__("The build was successfully")),
             },
             files.length > 0 ? app_files_table(files, req) : "",
           ],
@@ -1588,7 +1598,7 @@ router.post(
               type: "card",
               title: req.__("Build Result"),
               contents: div(
-                "Unable to build the app:",
+                req.__("Unable to build the app:"),
                 pre(code(childOutputs.join("<br/>")))
               ),
             },
@@ -1604,7 +1614,7 @@ router.post(
             type: "card",
             title: req.__("Build Result"),
             contents: div(
-              p("Unable to build the app:"),
+              p(req.__("Unable to build the app:")),
               pre(code(message)),
               pre(code(stack))
             ),

package/routes/api.js

@@ -71,8 +71,8 @@ function accessAllowedRead(req, user, table) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 10;
+        ? user.role_id
+        : 10;
 
   return role <= table.min_role_read;
 }
@@ -89,8 +89,8 @@ function accessAllowedWrite(req, user, table) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 10;
+        ? user.role_id
+        : 10;
 
   return role <= table.min_role_write;
 }
@@ -106,8 +106,8 @@ function accessAllowed(req, user, trigger) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 10;
+        ? user.role_id
+        : 10;
 
   return role <= trigger.min_role;
 }
@@ -247,6 +247,7 @@ router.get(
               fields: tbl_fields,
               approximate: !!approximate,
               state: req_query,
+              table
             });
             rows = await table.getRows(qstate);
           } else {

package/routes/diagram.js

@@ -0,0 +1,460 @@
+const Page = require("@saltcorn/data/models/page");
+const {
+  buildObjectTrees,
+} = require("@saltcorn/data/diagram/node_extract_utils");
+const {
+  generateCyCode,
+  genereateCyCfg,
+} = require("@saltcorn/data/diagram/cy_generate_utils");
+const { getState } = require("@saltcorn/data/db/state");
+const {
+  a,
+  input,
+  label,
+  button,
+  div,
+  script,
+  i,
+  domReady,
+} = require("@saltcorn/markup/tags");
+const { send_infoarch_page } = require("../markup/admin");
+const { isAdmin, error_catcher } = require("./utils.js");
+const Tag = require("@saltcorn/data/models/tag");
+const Router = require("express-promise-router");
+
+const router = new Router();
+module.exports = router;
+
+function reloadCy() {
+  $.ajax("/diagram/data", {
+    dataType: "json",
+    type: "GET",
+    headers: { "CSRF-Token": _sc_globalCsrf },
+    data: !tagFilterEnabled ? entityFilter : { ...entityFilter, tagFilterIds },
+  }).done((res) => {
+    const cfg = {
+      container: document.getElementById("cy"),
+      ...res,
+    };
+    window.cy = cytoscape(cfg);
+  });
+}
+
+function toggleEntityFilter(type) {
+  switch (type) {
+    case "views": {
+      entityFilter.showViews = !entityFilter.showViews;
+      break;
+    }
+    case "pages": {
+      entityFilter.showPages = !entityFilter.showPages;
+      break;
+    }
+    case "tables": {
+      entityFilter.showTables = !entityFilter.showTables;
+      break;
+    }
+    case "trigger": {
+      entityFilter.showTrigger = !entityFilter.showTrigger;
+      break;
+    }
+  }
+}
+
+function toggleTagFilter(id) {
+  if (!tagFilterEnabled) enableTagFilter();
+  const index = tagFilterIds.indexOf(id);
+  if (index > -1) {
+    tagFilterIds.splice(index, 1);
+  } else {
+    tagFilterIds.push(id);
+  }
+}
+
+function enableTagFilter() {
+  tagFilterEnabled = true;
+  for (const node of document.querySelectorAll('[id^="tagFilter_box_"]')) {
+    node.style = "";
+  }
+  for (const node of document.querySelectorAll('[id^="tagFilter_label_"]')) {
+    node.style = "";
+  }
+  const box = document.getElementById("noTagsId");
+  box.checked = false;
+}
+
+function toggleTagFilterMode() {
+  if (tagFilterEnabled) {
+    tagFilterEnabled = false;
+    for (const node of document.querySelectorAll('[id^="tagFilter_box_"]')) {
+      node.style = "opacity: 0.5;";
+    }
+    for (const node of document.querySelectorAll('[id^="tagFilter_label_"]')) {
+      node.style = "opacity: 0.5;";
+    }
+  } else {
+    enableTagFilter();
+  }
+}
+
+const buildScript = () => {
+  return `const entityFilter = {
+    showViews: true,
+    showPages: true,
+    showTables: true,
+    showTrigger: true,
+  };  
+  const tagFilterIds = [];
+  let tagFilterEnabled = false;
+  ${reloadCy.toString()}
+  ${toggleTagFilterMode.toString()}
+  ${enableTagFilter.toString()}
+  ${toggleEntityFilter.toString()}
+  ${toggleTagFilter.toString()}`;
+};
+
+const findEntryPages = async () => {
+  const modernCfg = getState().getConfig("home_page_by_role");
+  let pages = null;
+  if (modernCfg) {
+    pages = Object.values(modernCfg)
+      .filter((val) => val)
+      .map((val) => Page.findOne({ name: val }));
+  } else {
+    pages = new Array();
+    for (const legacyRole of ["public", "user", "staff", "admin"]) {
+      const page = await Page.findOne({ name: `${legacyRole}_home` });
+      if (page) pages.push(page);
+    }
+  }
+  return pages;
+};
+
+const buildFilterIds = async (tags) => {
+  if (!tags || tags.length === 0) return null;
+  else {
+    const viewFilterIds = new Set();
+    const pageFilterIds = new Set();
+    const tableFilterIds = new Set();
+    const triggerFilterIds = new Set();
+    for (const tag of tags) {
+      for (const id of await tag.getViewIds()) viewFilterIds.add(id);
+      for (const id of await tag.getPageIds()) pageFilterIds.add(id);
+      for (const id of await tag.getTableIds()) tableFilterIds.add(id);
+      for (const id of await tag.getTriggerIds()) triggerFilterIds.add(id);
+    }
+    return {
+      viewFilterIds,
+      pageFilterIds,
+      tableFilterIds,
+      triggerFilterIds,
+    };
+  }
+};
+
+const parseBool = (str) => {
+  return str === "true";
+};
+
+router.get(
+  "/",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const extractOpts = {
+      entryPages: await findEntryPages(),
+      showViews: true,
+      showPages: true,
+      showTables: true,
+      showTrigger: true,
+    };
+    const initialCyCode = generateCyCode(await buildObjectTrees(extractOpts));
+    const tags = await Tag.find();
+    send_infoarch_page({
+      res,
+      req,
+      active_sub: "Diagram",
+      contents: {
+        above: [
+          {
+            type: "card",
+            title: req.__(`Application diagram`),
+            contents: [
+              div(
+                { class: "btn-group" },
+                // New dropdown
+                button(
+                  {
+                    type: "button",
+                    class: "btn btn-primary m-2 rounded",
+                    "data-bs-toggle": "dropdown",
+                    "aria-expanded": false,
+                  },
+                  "New",
+                  i({ class: "fas fa-plus-square ms-2" })
+                ),
+
+                div(
+                  {
+                    class: "dropdown-menu",
+                  },
+                  input({
+                    type: "hidden",
+                    name: "_csrf",
+                    value: req.csrfToken(),
+                  }),
+                  // New View
+                  div(
+                    { class: "m-3" },
+
+                    a(
+                      {
+                        href: "/viewedit/new?on_done_redirect=diagram",
+                      },
+                      req.__("View")
+                    )
+                  ),
+                  // New Page
+                  div(
+                    { class: "m-3" },
+                    a(
+                      {
+                        href: "/pageedit/new?on_done_redirect=diagram",
+                      },
+                      req.__("Page")
+                    )
+                  ),
+                  // New Table
+                  div(
+                    { class: "m-3" },
+                    a(
+                      {
+                        href: "/table/new",
+                      },
+                      req.__("Table")
+                    )
+                  ),
+                  // New Trigger
+                  div(
+                    { class: "m-3" },
+                    a(
+                      {
+                        href: "/actions/new?on_done_redirect=diagram",
+                      },
+                      req.__("Trigger")
+                    )
+                  )
+                ),
+                // Entity type filter dropdown
+                button(
+                  {
+                    type: "button",
+                    class: "btn btn-primary m-2 rounded",
+                    "data-bs-toggle": "dropdown",
+                    "aria-expanded": false,
+                  },
+                  "All entities"
+                ),
+                div(
+                  {
+                    class: "dropdown-menu",
+                  },
+                  input({
+                    type: "hidden",
+                    name: "_csrf",
+                    value: req.csrfToken(),
+                  }),
+                  // Views checkbox
+                  div(
+                    { class: "m-3 form-check" },
+                    label(
+                      { class: "form-check-label", for: "showViewsId" },
+                      "Views"
+                    ),
+                    input({
+                      type: "checkbox",
+                      class: "form-check-input",
+                      id: "showViewsId",
+                      checked: true,
+                      name: "show_views",
+                      value: "true",
+                      onclick: "toggleEntityFilter('views'); reloadCy();",
+                      autocomplete: "off",
+                    })
+                  ),
+                  // Pages checkbox
+                  div(
+                    { class: "m-3 form-check" },
+                    label(
+                      { class: "form-check-label", for: "showPagesId" },
+                      "Pages"
+                    ),
+                    input({
+                      type: "checkbox",
+                      class: "form-check-input",
+                      id: "showPagesId",
+                      name: "show_pages",
+                      value: "true",
+                      checked: true,
+                      onclick: "toggleEntityFilter('pages'); reloadCy();",
+                      autocomplete: "off",
+                    })
+                  ),
+                  // Tables checkbox
+                  div(
+                    { class: "m-3 form-check" },
+                    label(
+                      { class: "form-check-label", for: "showTablesId" },
+                      "Tables"
+                    ),
+                    input({
+                      type: "checkbox",
+                      class: "form-check-input",
+                      id: "showTablesId",
+                      name: "show_tables",
+                      value: "true",
+                      checked: true,
+                      onclick: "toggleEntityFilter('tables'); reloadCy();",
+                      autocomplete: "off",
+                    })
+                  ),
+                  // Trigger checkbox
+                  div(
+                    { class: "m-3 form-check" },
+                    label(
+                      { class: "form-check-label", for: "showTriggerId" },
+                      "Trigger"
+                    ),
+                    input({
+                      type: "checkbox",
+                      class: "form-check-input",
+                      id: "showTriggerId",
+                      name: "show_trigger",
+                      value: "true",
+                      checked: true,
+                      onclick: "toggleEntityFilter('trigger'); reloadCy();",
+                      autocomplete: "off",
+                    })
+                  )
+                ),
+                // Tags filter dropdown
+                button(
+                  {
+                    type: "button",
+                    class: "btn btn-primary m-2 rounded",
+                    "data-bs-toggle": "dropdown",
+                    "aria-expanded": false,
+                  },
+                  "Tags"
+                ),
+                div(
+                  {
+                    class: "dropdown-menu",
+                  },
+                  input({
+                    type: "hidden",
+                    name: "_csrf",
+                    value: req.csrfToken(),
+                  }),
+                  // no tags checkbox
+                  div(
+                    { class: "m-3 form-check" },
+                    label(
+                      { class: "form-check-label", for: "noTagsId" },
+                      "no tags"
+                    ),
+                    input({
+                      type: "checkbox",
+                      class: "form-check-input",
+                      id: "noTagsId",
+                      name: "no_tags",
+                      value: "true",
+                      checked: true,
+                      onclick: "toggleTagFilterMode(); reloadCy();",
+                      autocomplete: "off",
+                    })
+                  ),
+                  tags.map((tag) => {
+                    const inputId = `tagFilter_box_${tag.name}_id`;
+                    return div(
+                      { class: "m-3 form-check" },
+                      label(
+                        {
+                          class: "form-check-label",
+                          id: `tagFilter_label_${tag.name}`,
+                          style: "opacity: 0.5;",
+                          for: inputId,
+                        },
+                        tag.name
+                      ),
+                      input({
+                        type: "checkbox",
+                        class: "form-check-input",
+                        id: inputId,
+                        name: "choice",
+                        value: tag.id,
+                        checked: false,
+                        onclick: `toggleTagFilter(${tag.id});  reloadCy();`,
+                        autocomplete: "off",
+                      })
+                    );
+                  }),
+                  div(
+                    { class: "m-3" },
+                    a(
+                      {
+                        href: "/tag/new",
+                      },
+                      req.__("Add tag"),
+                      i({ class: "fas fa-plus ms-2" })
+                    )
+                  )
+                )
+              ),
+              div({ id: "cy" }),
+              script(domReady(initialCyCode)),
+              script(buildScript()),
+            ],
+          },
+        ],
+      },
+      headers: [
+        {
+          script:
+            "https://cdnjs.cloudflare.com/ajax/libs/cytoscape/3.22.1/cytoscape.min.js",
+          style: `
+                #cy {
+                  width: 100%;
+                  height: 900px;
+                  display: block;
+              }`,
+        },
+      ],
+    });
+  })
+);
+
+router.get(
+  "/data",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { showViews, showPages, showTables, showTrigger } = req.query;
+    const tagFilterIds = req.query.tagFilterIds
+      ? req.query.tagFilterIds.map((id) => parseInt(id))
+      : [];
+    const tags = (await Tag.find()).filter(
+      (tag) => tagFilterIds.indexOf(tag.id) > -1
+    );
+    let extractOpts = {
+      entryPages: await findEntryPages(),
+      showViews: parseBool(showViews),
+      showPages: parseBool(showPages),
+      showTables: parseBool(showTables),
+      showTrigger: parseBool(showTrigger),
+    };
+    const filterIds = await buildFilterIds(tags);
+    if (filterIds) {
+      extractOpts = { ...extractOpts, ...filterIds };
+    }
+    res.json(genereateCyCfg(await buildObjectTrees(extractOpts)));
+  })
+);