@saltcorn/server 0.7.4 → 0.8.0-beta.1

package/routes/common_lists.js

@@ -8,7 +8,9 @@ const {
   settingsDropdown,
   post_dropdown_item,
 } = require("@saltcorn/markup");
-
+const {
+  get_base_url,
+} = require("./utils.js");
 const { h4, p, div, a, input, text } = require("@saltcorn/markup/tags");
 
 /**
@@ -46,52 +48,52 @@ const tablesList = async (tables, req, { tagId, domId, showList } = {}) => {
   const getRole = (rid) => roles.find((r) => r.id === rid).role;
   return tables.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)}`,
-          },
-          !tagId
-            ? {
-                label: req.__("Delete"),
-                key: (r) =>
-                  r.name === "users" || r.external
-                    ? ""
-                    : post_delete_btn(`/table/delete/${r.id}`, req, r.name),
-              }
-            : {
-                label: req.__("Remove From Tag"),
-                key: (r) =>
-                  post_delete_btn(
-                    `/tag-entries/remove/tables/${r.id}/${tagId}`,
-                    req,
-                    `${r.name} from this tag`
-                  ),
-              },
-        ],
-        tables,
+      [
         {
-          hover: true,
-          tableClass: listClass(tagId, showList),
-          tableId: domId,
-        }
-      )
+          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)}`,
+        },
+        !tagId
+          ? {
+            label: req.__("Delete"),
+            key: (r) =>
+              r.name === "users" || r.external
+                ? ""
+                : post_delete_btn(`/table/delete/${r.id}`, req, r.name),
+          }
+          : {
+            label: req.__("Remove From Tag"),
+            key: (r) =>
+              post_delete_btn(
+                `/tag-entries/remove/tables/${r.id}/${tagId}`,
+                req,
+                `${r.name} from this tag`
+              ),
+          },
+      ],
+      tables,
+      {
+        hover: true,
+        tableClass: listClass(tagId, showList),
+        tableId: domId,
+      }
+    )
     : div(
-        { class: listClass(tagId, showList), id: domId },
-        h4(req.__("No tables defined")),
-        p(req.__("Tables hold collections of similar data"))
-      );
+      { class: listClass(tagId, showList), id: domId },
+      h4(req.__("No tables defined")),
+      p(req.__("Tables hold collections of similar data"))
+    );
 };
 
 /**
@@ -173,78 +175,78 @@ const viewsList = async (views, req, { tagId, domId, showList } = {}) => {
 
   return views.length > 0
     ? mkTable(
-        [
-          {
-            label: req.__("Name"),
-            key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
-            sortlink: !tagId
-              ? `javascript:set_state_field('_sortby', 'name')`
-              : undefined,
-          },
-          // description - currently I dont want to show description in view list
-          // because description can be long
-          /*
-         {
-             label: req.__("Description"),
-             key: "description",
-             // this is sorting by column
-             sortlink: `javascript:set_state_field('_sortby', 'description')`,
-         },
-         */
-          // template
-          {
-            label: req.__("Pattern"),
-            key: "viewtemplate",
-            sortlink: !tagId
-              ? `javascript:set_state_field('_sortby', 'viewtemplate')`
-              : undefined,
-          },
-          {
-            label: req.__("Table"),
-            key: (r) => link(`/table/${r.table}`, r.table),
-            sortlink: !tagId
-              ? `javascript:set_state_field('_sortby', 'table')`
-              : undefined,
-          },
-          {
-            label: req.__("Role to access"),
-            key: (row) => editViewRoleForm(row, roles, req),
-          },
-          {
+      [
+        {
+          label: req.__("Name"),
+          key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
+          sortlink: !tagId
+            ? `javascript:set_state_field('_sortby', 'name')`
+            : undefined,
+        },
+        // description - currently I dont want to show description in view list
+        // because description can be long
+        /*
+       {
+           label: req.__("Description"),
+           key: "description",
+           // this is sorting by column
+           sortlink: `javascript:set_state_field('_sortby', 'description')`,
+       },
+       */
+        // template
+        {
+          label: req.__("Pattern"),
+          key: "viewtemplate",
+          sortlink: !tagId
+            ? `javascript:set_state_field('_sortby', 'viewtemplate')`
+            : undefined,
+        },
+        {
+          label: req.__("Table"),
+          key: (r) => link(`/table/${r.table}`, r.table),
+          sortlink: !tagId
+            ? `javascript:set_state_field('_sortby', 'table')`
+            : undefined,
+        },
+        {
+          label: req.__("Role to access"),
+          key: (row) => editViewRoleForm(row, roles, req),
+        },
+        {
+          label: "",
+          key: (r) =>
+            link(
+              `/viewedit/config/${encodeURIComponent(r.name)}`,
+              req.__("Configure")
+            ),
+        },
+        !tagId
+          ? {
             label: "",
+            key: (r) => view_dropdown(r, req),
+          }
+          : {
+            label: req.__("Remove From Tag"),
             key: (r) =>
-              link(
-                `/viewedit/config/${encodeURIComponent(r.name)}`,
-                req.__("Configure")
+              post_delete_btn(
+                `/tag-entries/remove/views/${r.id}/${tagId}`,
+                req,
+                `${r.name} from this tag`
               ),
           },
-          !tagId
-            ? {
-                label: "",
-                key: (r) => view_dropdown(r, req),
-              }
-            : {
-                label: req.__("Remove From Tag"),
-                key: (r) =>
-                  post_delete_btn(
-                    `/tag-entries/remove/views/${r.id}/${tagId}`,
-                    req,
-                    `${r.name} from this tag`
-                  ),
-              },
-        ],
-        views,
-        {
-          hover: true,
-          tableClass: listClass(tagId, showList),
-          tableId: domId,
-        }
-      )
+      ],
+      views,
+      {
+        hover: true,
+        tableClass: listClass(tagId, showList),
+        tableId: domId,
+      }
+    )
     : div(
-        { class: listClass(tagId, showList), id: domId },
-        h4(req.__("No views defined")),
-        p(req.__("Views define how table rows are displayed to the user"))
-      );
+      { class: listClass(tagId, showList), id: domId },
+      h4(req.__("No views defined")),
+      p(req.__("Views define how table rows are displayed to the user"))
+    );
 };
 
 /**
@@ -332,18 +334,18 @@ const getPageList = (rows, roles, req, { tagId, domId, showList } = {}) => {
       },
       !tagId
         ? {
-            label: "",
-            key: (r) => page_dropdown(r, req),
-          }
+          label: "",
+          key: (r) => page_dropdown(r, req),
+        }
         : {
-            label: req.__("Remove From Tag"),
-            key: (r) =>
-              post_delete_btn(
-                `/tag-entries/remove/pages/${r.id}/${tagId}`,
-                req,
-                `${r.name} from this tag`
-              ),
-          },
+          label: req.__("Remove From Tag"),
+          key: (r) =>
+            post_delete_btn(
+              `/tag-entries/remove/pages/${r.id}/${tagId}`,
+              req,
+              `${r.name} from this tag`
+            ),
+        },
       ,
     ],
     rows,
@@ -356,6 +358,7 @@ const getPageList = (rows, roles, req, { tagId, domId, showList } = {}) => {
 };
 
 const getTriggerList = (triggers, req, { tagId, domId, showList } = {}) => {
+  const base_url = get_base_url(req);
   return mkTable(
     [
       { label: req.__("Name"), key: "name" },
@@ -388,18 +391,18 @@ const getTriggerList = (triggers, req, { tagId, domId, showList } = {}) => {
       },
       !tagId
         ? {
-            label: req.__("Delete"),
-            key: (r) => post_delete_btn(`/actions/delete/${r.id}`, req),
-          }
+          label: req.__("Delete"),
+          key: (r) => post_delete_btn(`/actions/delete/${r.id}`, req),
+        }
         : {
-            label: req.__("Remove From Tag"),
-            key: (r) =>
-              post_delete_btn(
-                `/tag-entries/remove/trigger/${r.id}/${tagId}`,
-                req,
-                `${r.name} from this tag`
-              ),
-          },
+          label: req.__("Remove From Tag"),
+          key: (r) =>
+            post_delete_btn(
+              `/tag-entries/remove/trigger/${r.id}/${tagId}`,
+              req,
+              `${r.name} from this tag`
+            ),
+        },
     ],
     triggers,
     {

package/routes/delete.js

@@ -6,7 +6,7 @@
 
 const Router = require("express-promise-router");
 
-const { loggedIn, error_catcher } = require("./utils.js");
+const { error_catcher } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
 
 /**
@@ -28,17 +28,18 @@ module.exports = router;
  * @function
  */
 router.post(
-  "/:name/:id",
+  "/:tableName/:id",
   error_catcher(async (req, res) => {
-    const { name, id } = req.params;
+    const { tableName, id } = req.params;
     const { redirect } = req.query;
-    const table = await Table.findOne({ name });
+    // todo check that works after where change
+    const table = await Table.findOne({ name : tableName });
     const role = req.user && req.user.id ? req.user.role_id : 10;
     try {
       if (role <= table.min_role_write) await table.deleteRows({ id });
       else if (table.ownership_field_id && req.user) {
         const row = await table.getRow({ id });
-        if (row && (await table.is_owner(req.user, row)))
+        if (row && (table.is_owner(req.user, row)))
           await table.deleteRows({ id });
         else req.flash("error", req.__("Not authorized"));
       } else

package/routes/diagram.js

@@ -21,107 +21,27 @@ 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 User = require("@saltcorn/data/models/user");
 
 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 buildGlobalVars = (tags, roles) => {
+  return `
+    const allTags = ${JSON.stringify(tags)};
+    const roles = ${JSON.stringify(roles)};
+  `;
 };
 
 const findEntryPages = async () => {
   const modernCfg = getState().getConfig("home_page_by_role");
-  let pages = null;
+  let pages;
   if (modernCfg) {
     pages = Object.values(modernCfg)
       .filter((val) => val)
       .map((val) => Page.findOne({ name: val }));
   } else {
-    pages = new Array();
+    pages = [];
     for (const legacyRole of ["public", "user", "staff", "admin"]) {
       const page = await Page.findOne({ name: `${legacyRole}_home` });
       if (page) pages.push(page);
@@ -169,6 +89,7 @@ router.get(
     };
     const initialCyCode = generateCyCode(await buildObjectTrees(extractOpts));
     const tags = await Tag.find();
+    const roles = await User.get_roles();
     send_infoarch_page({
       res,
       req,
@@ -197,11 +118,6 @@ router.get(
                   {
                     class: "dropdown-menu",
                   },
-                  input({
-                    type: "hidden",
-                    name: "_csrf",
-                    value: req.csrfToken(),
-                  }),
                   // New View
                   div(
                     { class: "m-3" },
@@ -252,23 +168,18 @@ router.get(
                     "data-bs-toggle": "dropdown",
                     "aria-expanded": false,
                   },
-                  "All entities"
+                  req.__("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"
+                      req.__("Views")
                     ),
                     input({
                       type: "checkbox",
@@ -286,7 +197,7 @@ router.get(
                     { class: "m-3 form-check" },
                     label(
                       { class: "form-check-label", for: "showPagesId" },
-                      "Pages"
+                      req.__("Pages")
                     ),
                     input({
                       type: "checkbox",
@@ -304,7 +215,7 @@ router.get(
                     { class: "m-3 form-check" },
                     label(
                       { class: "form-check-label", for: "showTablesId" },
-                      "Tables"
+                      req.__("Tables")
                     ),
                     input({
                       type: "checkbox",
@@ -322,7 +233,7 @@ router.get(
                     { class: "m-3 form-check" },
                     label(
                       { class: "form-check-label", for: "showTriggerId" },
-                      "Trigger"
+                      req.__("Triggers")
                     ),
                     input({
                       type: "checkbox",
@@ -344,23 +255,18 @@ router.get(
                     "data-bs-toggle": "dropdown",
                     "aria-expanded": false,
                   },
-                  "Tags"
+                  req.__("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"
+                      req.__("no tags")
                     ),
                     input({
                       type: "checkbox",
@@ -408,25 +314,45 @@ router.get(
                       i({ class: "fas fa-plus ms-2" })
                     )
                   )
+                ),
+                // refresh button
+                button(
+                  {
+                    type: "button",
+                    class: "btn btn-primary m-2 rounded",
+                    onclick: "reloadCy(true);",
+                  },
+                  i({ class: "fas fa-sync-alt" })
                 )
               ),
               div({ id: "cy" }),
+              script(buildGlobalVars(tags, roles)),
+              script({ src: "/diagram_utils.js" }),
               script(domReady(initialCyCode)),
-              script(buildScript()),
             ],
           },
         ],
       },
       headers: [
+        {
+          style: `
+            #cy {
+              width: 100%;
+              height: 900px;
+              display: block;
+            }`,
+        },
+        {
+          script:
+            "https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.9.2/umd/popper.min.js",
+        },
         {
           script:
             "https://cdnjs.cloudflare.com/ajax/libs/cytoscape/3.22.1/cytoscape.min.js",
-          style: `
-                #cy {
-                  width: 100%;
-                  height: 900px;
-                  display: block;
-              }`,
+        },
+        {
+          script:
+            "https://cdnjs.cloudflare.com/ajax/libs/cytoscape-popper/2.0.0/cytoscape-popper.min.js",
         },
       ],
     });

package/routes/edit.js

@@ -6,14 +6,8 @@
 
 const Router = require("express-promise-router");
 
-const Field = require("@saltcorn/data/models/field");
-const File = require("@saltcorn/data/models/file");
-const Form = require("@saltcorn/data/models/form");
-const { loggedIn, error_catcher } = require("./utils.js");
+const { error_catcher } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
-const pluralize = require("pluralize");
-
-const { renderForm } = require("@saltcorn/markup");
 
 /**
  * @type {object}
@@ -32,11 +26,12 @@ module.exports = router;
  * @function
  */
 router.post(
-  "/toggle/:name/:id/:field_name",
+  "/toggle/:tableName/:id/:field_name",
   error_catcher(async (req, res) => {
-    const { name, id, field_name } = req.params;
+    const { tableName, id, field_name } = req.params;
     const { redirect } = req.query;
-    const table = await Table.findOne({ name });
+    // todo check that works after where change
+    const table = await Table.findOne({ name : tableName });
     const role = req.user && req.user.id ? req.user.role_id : 10;
     if (role <= table.min_role_write) await table.toggleBool(+id, field_name);
     else