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

package/routes/viewedit.js

@@ -145,57 +145,57 @@ router.get(
     const viewMarkup =
       views.length > 0
         ? mkTable(
-            [
-              {
-                label: req.__("Name"),
-                key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
-                sortlink: `javascript:set_state_field('_sortby', 'name')`,
-              },
-              // 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.__("Template"),
-                key: "viewtemplate",
-                sortlink: `javascript:set_state_field('_sortby', 'viewtemplate')`,
-              },
-              {
-                label: req.__("Table"),
-                key: (r) => link(`/table/${r.table}`, r.table),
-                sortlink: `javascript:set_state_field('_sortby', 'table')`,
-              },
-              {
-                label: req.__("Role to access"),
-                key: (row) => editViewRoleForm(row, roles, req),
-              },
-              {
-                label: "",
-                key: (r) =>
-                  link(
-                    `/viewedit/config/${encodeURIComponent(r.name)}`,
-                    req.__("Configure")
-                  ),
-              },
-              {
-                label: "",
-                key: (r) => view_dropdown(r, req),
-              },
-            ],
-            views,
-            { hover: true }
-          )
+          [
+            {
+              label: req.__("Name"),
+              key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
+              sortlink: `javascript:set_state_field('_sortby', 'name')`,
+            },
+            // 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: `javascript:set_state_field('_sortby', 'viewtemplate')`,
+            },
+            {
+              label: req.__("Table"),
+              key: (r) => link(`/table/${r.table}`, r.table),
+              sortlink: `javascript:set_state_field('_sortby', 'table')`,
+            },
+            {
+              label: req.__("Role to access"),
+              key: (row) => editViewRoleForm(row, roles, req),
+            },
+            {
+              label: "",
+              key: (r) =>
+                link(
+                  `/viewedit/config/${encodeURIComponent(r.name)}`,
+                  req.__("Configure")
+                ),
+            },
+            {
+              label: "",
+              key: (r) => view_dropdown(r, req),
+            },
+          ],
+          views,
+          { hover: true }
+        )
         : div(
-            h4(req.__("No views defined")),
-            p(req.__("Views define how table rows are displayed to the user"))
-          );
+          h4(req.__("No views defined")),
+          p(req.__("Views define how table rows are displayed to the user"))
+        );
     res.sendWrap(req.__(`Views`), {
       above: [
         {
@@ -210,14 +210,14 @@ router.get(
             viewMarkup,
             tables.length > 0
               ? a(
-                  { href: `/viewedit/new`, class: "btn btn-primary" },
-                  req.__("Create view")
-                )
+                { href: `/viewedit/new`, class: "btn btn-primary" },
+                req.__("Create view")
+              )
               : p(
-                  req.__(
-                    "You must create at least one table before you can create views."
-                  )
-                ),
+                req.__(
+                  "You must create at least one table before you can create views."
+                )
+              ),
           ],
         },
       ],
@@ -270,10 +270,10 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         ),
       }),
       new Field({
-        label: req.__("Template"),
+        label: req.__("View pattern"),
         name: "viewtemplate",
         input_type: "select",
-        sublabel: req.__("Views are based on a view template"),
+        sublabel: req.__("The view pattern sets the foundation of how the view relates to the table and the behaviour of the view"),
         options: Object.keys(getState().viewtemplates),
         attributes: {
           explainers: mapObjectValues(
@@ -327,15 +327,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,

package/tests/admin.test.js

@@ -57,7 +57,7 @@ describe("admin page", () => {
     await request(app)
       .get("/settings")
       .set("Cookie", loginCookie)
-      .expect(toInclude("Plugin and pack installation and control"));
+      .expect(toInclude("Module installation and control"));
   });
   it("show admin page", async () => {
     const app = await getApp({ disableCsrf: true });

package/tests/plugins.test.js

@@ -30,7 +30,7 @@ describe("Plugin Endpoints", () => {
     await request(app)
       .get("/plugins")
       .set("Cookie", loginCookie)
-      .expect(toInclude("Plugin and pack store"));
+      .expect(toInclude("Module store"));
   });
 
   it("should show new", async () => {

package/tests/viewedit.test.js

@@ -54,7 +54,7 @@ describe("viewedit new List", () => {
     await request(app)
       .get("/viewedit/new")
       .set("Cookie", loginCookie)
-      .expect(toInclude("Template"));
+      .expect(toInclude("View pattern"));
   });
   it("submit new view", async () => {
     const loginCookie = await getAdminLoginCookie();

package/wrapper.js

@@ -13,7 +13,7 @@ const renderLayout = require("@saltcorn/markup/layout");
  * @returns {T[]}
  */
 const getFlashes = (req) =>
-  ["error", "success", "danger", "warning","information"]
+  ["error", "success", "danger", "warning", "information"]
     .map((type) => {
       return { type, msg: req.flash(type) };
     })
@@ -44,11 +44,13 @@ const get_extra_menu = (role, state, req) => {
         link:
           item.type === "Link"
             ? item.url
-            : item.type === "View"
-            ? `/view/${encodeURIComponent(item.viewname)}`
-            : item.type === "Page"
-            ? `/page/${encodeURIComponent(item.pagename)}`
-            : undefined,
+            : item.type === "Action"
+              ? `javascript:ajax_post_json('/menu/runaction/${item.action_name}')`
+              : item.type === "View"
+                ? `/view/${encodeURIComponent(item.viewname)}`
+                : item.type === "Page"
+                  ? `/page/${encodeURIComponent(item.pagename)}`
+                  : undefined,
         ...(item.subitems ? { subitems: transform(item.subitems) } : {}),
       }));
   return transform(cfg);
@@ -68,41 +70,41 @@ const get_menu = (req) => {
   const extra_menu = get_extra_menu(role, state, req);
   const authItems = isAuth
     ? [
-        {
-          label: req.__("User"),
-          icon: "far fa-user",
-          isUser: true,
-          subitems: [
-            { label: small((req.user.email || "").split("@")[0]) },
-            {
-              label: req.__("User Settings"),
-              icon: "fas fa-user-cog",
+      {
+        label: req.__("User"),
+        icon: "far fa-user",
+        isUser: true,
+        subitems: [
+          { label: small((req.user.email || "").split("@")[0]) },
+          {
+            label: req.__("User Settings"),
+            icon: "fas fa-user-cog",
 
-              link: "/auth/settings",
-            },
-            {
-              link: "/auth/logout",
-              icon: "fas fa-sign-out-alt",
-              label: req.__("Logout"),
-            },
-          ],
-        },
-      ]
+            link: "/auth/settings",
+          },
+          {
+            link: "/auth/logout",
+            icon: "fas fa-sign-out-alt",
+            label: req.__("Logout"),
+          },
+        ],
+      },
+    ]
     : [
-        ...(allow_signup
-          ? [{ link: "/auth/signup", label: req.__("Sign up") }]
-          : []),
-        ...(login_menu
-          ? [{ link: "/auth/login", label: req.__("Login") }]
-          : []),
-      ];
+      ...(allow_signup
+        ? [{ link: "/auth/signup", label: req.__("Sign up") }]
+        : []),
+      ...(login_menu
+        ? [{ link: "/auth/login", label: req.__("Login") }]
+        : []),
+    ];
   // const schema = db.getTenantSchema();
   // Admin role id (todo move to common constants)
   const isAdmin = role === 1;
-    /*
-     * Admin Menu items
-     *
-     */
+  /*
+   * Admin Menu items
+   *
+   */
   const adminItems = [
     { link: "/table", icon: "fas fa-table", label: req.__("Tables") },
     { link: "/viewedit", icon: "far fa-eye", label: req.__("Views") },
@@ -116,7 +118,7 @@ const get_menu = (req) => {
           icon: "fas fa-tools",
           label: req.__("About application"),
         },
-        { link: "/plugins", icon: "fas fa-plug", label: req.__("Plugins") },
+        { link: "/plugins", icon: "fas fa-cubes", label: req.__("Modules") },
         {
           link: "/useradmin",
           icon: "fas fa-users-cog",
@@ -177,17 +179,17 @@ const get_headers = (req, version_tag, description, extras = []) => {
 
   const iconHeader = favicon
     ? [
-        {
-          headerTag: `<link rel="icon" type="image/png" href="/files/serve/${favicon}">`,
-        },
-      ]
+      {
+        headerTag: `<link rel="icon" type="image/png" href="/files/serve/${favicon}">`,
+      },
+    ]
     : [];
   const meta_description = description
     ? [
-        {
-          headerTag: `<meta name="description" content="${description}">`,
-        },
-      ]
+      {
+        headerTag: `<meta name="description" content="${description}">`,
+      },
+    ]
     : [];
   const stdHeaders = [
     {
@@ -228,12 +230,12 @@ const get_brand = (state) => {
   };
 };
 module.exports = (version_tag) =>
-    /**
-     *
-     * @param req
-     * @param res
-     * @param next
-     */
+  /**
+   *
+   * @param req
+   * @param res
+   * @param next
+   */
   function (req, res, next) {
     const role = (req.user || {}).role_id || 10;
 
@@ -349,7 +351,7 @@ const defaultRenderToHtml = (s, role) =>
   typeof s === "string"
     ? s
     : renderLayout({
-        blockDispatch: {},
-        role,
-        layout: s,
-      });
+      blockDispatch: {},
+      role,
+      layout: s,
+    });