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

package/auth/routes.js

@@ -335,7 +335,7 @@ router.get(
     if (result.error) req.flash("danger", result.error);
     else if (result) {
       req.flash("success", req.__("Email verified"));
-      const u = await User.findOne({ email });
+      const u = await User.findForSession({ email });
       if (u) u.relogin(req);
     }
     res.redirect("/");
@@ -470,11 +470,11 @@ router.get(
         form,
         {},
         restore +
-          script(
-            domReady(
-              `$('form.create-first-user button[type=submit]').click(function(){press_store_button(this)})`
-            )
+        script(
+          domReady(
+            `$('form.create-first-user button[type=submit]').click(function(){press_store_button(this)})`
           )
+        )
       );
     } else {
       req.flash("danger", req.__("Users already present"));
@@ -503,7 +503,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(`/auth/login`);
     } else {
       req.flash("danger", req.__("Users already present"));
@@ -536,12 +536,7 @@ router.post(
         const { email, password } = form.values;
         const u = await User.create({ email, password, role_id: 1 });
         req.login(
-          {
-            email: u.email,
-            id: u.id,
-            role_id: u.role_id,
-            tenant: db.getTenantSchema(),
-          },
+          u.session_object,
           function (err) {
             if (!err) {
               Trigger.emitEvent("Login", null, u);
@@ -646,12 +641,7 @@ const getNewUserForm = async (new_user_view_name, req, askEmail) => {
  */
 const signup_login_with_user = (u, req, res) =>
   req.login(
-    {
-      email: u.email,
-      id: u.id,
-      role_id: u.role_id,
-      tenant: db.getTenantSchema(),
-    },
+    u.session_object,
     function (err) {
       if (!err) {
         Trigger.emitEvent("Login", null, u);
@@ -930,7 +920,7 @@ function handler(req, res) {
   req.flash(
     "error",
     "You've made too many failed attempts in a short period of time, please try again " +
-      moment(req.rateLimit.resetTime).fromNow()
+    moment(req.rateLimit.resetTime).fromNow()
   );
   res.redirect("/auth/login"); // brute force protection triggered, send them back to the login page
 }
@@ -1194,7 +1184,7 @@ const userSettings = async ({ req, res, pwform, user }) => {
         div(
           user.api_token
             ? span({ class: "me-1" }, req.__("API token for this user: ")) +
-                code(user.api_token)
+            code(user.api_token)
             : req.__("No API token issued")
         ),
         // button for reset or generate api token
@@ -1208,16 +1198,16 @@ const userSettings = async ({ req, res, pwform, user }) => {
         ),
         // button for remove api token
         user.api_token &&
-          div(
-            { class: "mt-4 ms-2 d-inline-block" },
-            post_btn(
-              `/auth/remove-api-token`,
-              // TBD localization
-              user.api_token ? req.__("Remove") : req.__("Generate"),
-              req.csrfToken(),
-              { req: req, confirm: true }
-            )
-          ),
+        div(
+          { class: "mt-4 ms-2 d-inline-block" },
+          post_btn(
+            `/auth/remove-api-token`,
+            // TBD localization
+            user.api_token ? req.__("Remove") : req.__("Generate"),
+            req.csrfToken(),
+            { req: req, confirm: true }
+          )
+        ),
       ],
     };
   return {
@@ -1228,13 +1218,13 @@ const userSettings = async ({ req, res, pwform, user }) => {
       },
       ...(usersets
         ? [
-            {
-              type: "card",
-              class: "mt-0",
-              title: userSetsName,
-              contents: usersets,
-            },
-          ]
+          {
+            type: "card",
+            class: "mt-0",
+            title: userSetsName,
+            contents: usersets,
+          },
+        ]
         : []),
       {
         type: "card",
@@ -1257,35 +1247,35 @@ const userSettings = async ({ req, res, pwform, user }) => {
       },
       ...(show2FAPolicy
         ? [
-            {
-              type: "card",
-              title: req.__("Two-factor authentication"),
-              contents: [
-                div(
-                  user._attributes.totp_enabled
-                    ? req.__("Two-factor authentication is enabled")
-                    : req.__("Two-factor authentication is disabled")
-                ),
-                div(
-                  user._attributes.totp_enabled
-                    ? a(
-                        {
-                          href: "/auth/twofa/disable/totp",
-                          class: "btn btn-danger mt-2",
-                        },
-                        req.__("Disable TWA")
-                      )
-                    : a(
-                        {
-                          href: "/auth/twofa/setup/totp",
-                          class: "btn btn-primary mt-2",
-                        },
-                        req.__("Enable TWA")
-                      )
-                ),
-              ],
-            },
-          ]
+          {
+            type: "card",
+            title: req.__("Two-factor authentication"),
+            contents: [
+              div(
+                user._attributes.totp_enabled
+                  ? req.__("Two-factor authentication is enabled")
+                  : req.__("Two-factor authentication is disabled")
+              ),
+              div(
+                user._attributes.totp_enabled
+                  ? a(
+                    {
+                      href: "/auth/twofa/disable/totp",
+                      class: "btn btn-danger mt-2",
+                    },
+                    req.__("Disable TWA")
+                  )
+                  : a(
+                    {
+                      href: "/auth/twofa/setup/totp",
+                      class: "btn btn-primary mt-2",
+                    },
+                    req.__("Enable TWA")
+                  )
+              ),
+            ],
+          },
+        ]
         : []),
       ...(apikeycard ? [apikeycard] : []),
     ],
@@ -1338,18 +1328,12 @@ router.post(
   "/setlanguage",
   loggedIn,
   error_catcher(async (req, res) => {
-    const u = await User.findOne({ id: req.user.id });
+    const u = await User.findForSession({ id: req.user.id });
     const newlang = available_languages[req.body.locale];
     if (newlang && u) {
       await u.set_language(req.body.locale);
       req.login(
-        {
-          email: u.email,
-          id: u.id,
-          role_id: u.role_id,
-          language: req.body.locale,
-          tenant: db.getTenantSchema(),
-        },
+        u.session_object,
         function (err) {
           if (!err) {
             req.flash("success", req.__("Language changed to %s", newlang));
@@ -1453,16 +1437,11 @@ router.post(
       return;
     }
 
-    const u = await User.findOne({ id: req.user.id });
+    const u = await User.findForSession({ id: req.user.id });
     await u.update({ email: form.values.email });
     u.email = form.values.email;
     req.login(
-      {
-        email: u.email,
-        id: u.id,
-        role_id: u.role_id,
-        tenant: db.getTenantSchema(),
-      },
+      u.session_object,
       function (err) {
         if (!err) {
           Trigger.emitEvent("Login", null, u);
@@ -1553,7 +1532,7 @@ router.all(
       return;
     }
     if (wfres.verified === true) {
-      const user = await User.findOne({ id: req.user.id });
+      const user = await User.findForSession({ id: req.user.id });
       await user.set_to_verified();
       req.flash("success", req.__("User verified"));
       user.relogin(req);
@@ -1590,9 +1569,8 @@ router.get(
     // generate QR code for scanning into Google Authenticator
     // reference: https://code.google.com/p/google-authenticator/wiki/KeyUriFormat
     const site_name = getState().getConfig("site_name");
-    const otpUrl = `otpauth://totp/${
-      user.email
-    }?secret=${encodedKey}&period=30&issuer=${encodeURIComponent(site_name)}`;
+    const otpUrl = `otpauth://totp/${user.email
+      }?secret=${encodedKey}&period=30&issuer=${encodeURIComponent(site_name)}`;
     const image = await qrcode.toDataURL(otpUrl);
     res.sendWrap(req.__("Setup two-factor authentication"), {
       type: "card",
@@ -1763,7 +1741,7 @@ router.post(
     failureFlash: true,
   }),
   error_catcher(async (req, res) => {
-    const user = await User.findOne({ id: req.user.pending_user.id });
+    const user = await User.findForSession({ id: req.user.pending_user.id });
     user.relogin(req);
     Trigger.emitEvent("Login", null, user);
     res.redirect("/");

package/locales/en.json

@@ -948,5 +948,23 @@
 	"Source of module for install. Few options:npm - download from npm repository,local - get from local file system,github - download from github,git - get from git": "Source of module for install. Few options:npm - download from npm repository,local - get from local file system,github - download from github,git - get from git",
 	"Version of module, latest is default value": "Version of module, latest is default value",
 	"For npm - name of npm package, e.g. @saltcorn/html or saltcorn-gantt, check at npmjs.com, for local - absolute path to module folder in file system, e.g. C:\\gitsrc\\any-bootstrap-theme\\, for github - name of github project.": "For npm - name of npm package, e.g. @saltcorn/html or saltcorn-gantt, check at npmjs.com, for local - absolute path to module folder in file system, e.g. C:\\gitsrc\\any-bootstrap-theme\\, for github - name of github project.",
-	"Modules up-to-date": "Modules up-to-date"
-}
+	"Modules up-to-date": "Modules up-to-date",
+	"User must have this role or higher to read rows from the table, unless they are the owner": "User must have this role or higher to read rows from the table, unless they are the owner",
+	"User must have this role or higher to edit or create new rows in the table, unless they are the owner": "User must have this role or higher to edit or create new rows in the table, unless they are the owner",
+	"Tag": "Tag",
+	"Tagname": "Tagname",
+	"Create tag": "Create tag",
+	"Tags": "Tags",
+	"New tag": "New tag",
+	"Tag name": "Tag name",
+	"%s Tag": "%s Tag",
+	"Remove From Tag": "Remove From Tag",
+	"Add tables": "Add tables",
+	"Add views": "Add views",
+	"Add tages": "Add tages",
+	"Trigger": "Trigger",
+	"Add %s to tag": "Add %s to tag",
+	"Tag %s deleted": "Tag %s deleted",
+	"Tag %s created": "Tag %s created"
+
+}

package/markup/admin.js

@@ -245,6 +245,13 @@ const send_files_page = (args) => {
   });
 };
 
+const send_tags_page = (args) => {
+  return send_settings_page({
+    main_section: "Tags",
+    ...args,
+  });
+};
+
 /**
  * Send Events Page
  * @param {object} args
@@ -281,6 +288,7 @@ const send_admin_page = (args) => {
       { text: "Backup", href: "/admin/backup" },
       { text: "Email", href: "/admin/email" },
       { text: "System", href: "/admin/system" },
+      ...(isRoot ? [{ text: "Tag", href: "/tag" }] : []),
       ...(isRoot
         ? [{ text: "Mobile app", href: "/admin/build-mobile-app" }]
         : []),
@@ -345,7 +353,12 @@ const flash_restart = (req) => {
  * @param {*} opts.formArgs
  * @returns {Promise<Form>}
  */
-const config_fields_form = async ({ field_names, req, action, ...formArgs }) => {
+const config_fields_form = async ({
+  field_names,
+  req,
+  action,
+  ...formArgs
+}) => {
   const values = {};
   const state = getState();
   const fields = [];
@@ -512,4 +525,5 @@ module.exports = {
   save_config_from_form,
   flash_restart_if_required,
   flash_restart,
+  send_tags_page,
 };

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.4-beta.1",
+  "version": "0.7.4-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.7.4-beta.1",
-    "@saltcorn/builder": "0.7.4-beta.1",
-    "@saltcorn/data": "0.7.4-beta.1",
-    "@saltcorn/admin-models": "0.7.4-beta.1",
-    "@saltcorn/markup": "0.7.4-beta.1",
-    "@saltcorn/sbadmin2": "0.7.4-beta.1",
+    "@saltcorn/base-plugin": "0.7.4-beta.2",
+    "@saltcorn/builder": "0.7.4-beta.2",
+    "@saltcorn/data": "0.7.4-beta.2",
+    "@saltcorn/admin-models": "0.7.4-beta.2",
+    "@saltcorn/markup": "0.7.4-beta.2",
+    "@saltcorn/sbadmin2": "0.7.4-beta.2",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",

package/public/saltcorn.css

@@ -323,4 +323,27 @@ table.table-inner-grid, table.table-inner-grid th, table.table-inner-grid td {
 
 .CodeMirror {
   resize: vertical;
-}
+}
+
+/* copied from bootstrap and adjusted to show the arrow on the left */
+.card .card-header-left-collapse[data-bs-toggle=collapse] {
+  text-decoration: none;
+  position: relative;
+  padding: 0.75rem 3.25rem 0.75rem 1.25rem;
+}
+.card .card-header-left-collapse[data-bs-toggle=collapse]::before {
+  position: absolute;
+  left: 0;
+  top: 0;
+  line-height: 51px;
+  font-weight: 900;
+  content: "\f107";
+  font-family: "Font Awesome 5 Free";
+  color: #d1d3e2;
+}
+.card .card-header-left-collapse[data-bs-toggle=collapse].collapsed {
+  border-radius: 0.35rem;
+}
+.card .card-header-left-collapse[data-bs-toggle=collapse].collapsed::before {
+  content: "\f105";
+}

package/public/saltcorn.js

@@ -143,6 +143,8 @@ function view_post(viewname, route, data, onDone) {
   }).done(function (res) {
     if (onDone) onDone(res);
     ajax_done(res);
+  }).fail(function (res) {
+    notifyAlert({ type: "danger", text: res.responseText });
   });
 }
 var logged_errors = [];
@@ -210,9 +212,9 @@ function ajax_modal(url, opts = {}) {
       $("#scmodal .modal-body").html(res);
       new bootstrap.Modal($("#scmodal")).show();
       initialize_page();
-      (opts.onOpen || function () {})(res);
+      (opts.onOpen || function () { })(res);
       $("#scmodal").on("hidden.bs.modal", function (e) {
-        (opts.onClose || function () {})(res);
+        (opts.onClose || function () { })(res);
         $("body").css("overflow", "");
       });
     },
@@ -264,7 +266,7 @@ function applyViewConfig(e, url, k) {
       "CSRF-Token": _sc_globalCsrf,
     },
     data: JSON.stringify(cfg),
-    error: function (request) {},
+    error: function (request) { },
     success: function (res) {
       k && k(res);
     },
@@ -444,16 +446,16 @@ Copyright (c) 2015 Jeff Green
             stateObject,
             document.title,
             window.location.pathname +
-              window.location.search +
-              $(this).attr("href")
+            window.location.search +
+            $(this).attr("href")
           );
         } else {
           window.history.replaceState(
             stateObject,
             document.title,
             window.location.pathname +
-              window.location.search +
-              $(this).attr("href")
+            window.location.search +
+            $(this).attr("href")
           );
         }
       });

package/routes/actions.js

@@ -8,6 +8,7 @@ const Router = require("express-promise-router");
 const { isAdmin, error_catcher, get_base_url } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
+const { getTriggerList } = require("./common_lists");
 
 /**
  * @type {object}
@@ -97,45 +98,7 @@ router.get(
             type: "card",
             title: req.__("Triggers"),
             contents: div(
-              mkTable(
-                [
-                  { label: req.__("Name"), key: "name" },
-                  { label: req.__("Action"), key: "action" },
-                  {
-                    label: req.__("Table or Channel"),
-                    key: (r) => r.table_name || r.channel,
-                  },
-                  {
-                    label: req.__("When"),
-                    key: (a) =>
-                      a.when_trigger === "API call"
-                        ? `API: ${base_url}api/action/${a.name}`
-                        : a.when_trigger,
-                  },
-                  {
-                    label: req.__("Test run"),
-                    key: (r) =>
-                      r.table_id
-                        ? ""
-                        : link(`/actions/testrun/${r.id}`, req.__("Test run")),
-                  },
-                  {
-                    label: req.__("Edit"),
-                    key: (r) => link(`/actions/edit/${r.id}`, req.__("Edit")),
-                  },
-                  {
-                    label: req.__("Configure"),
-                    key: (r) =>
-                      link(`/actions/configure/${r.id}`, req.__("Configure")),
-                  },
-                  {
-                    label: req.__("Delete"),
-                    key: (r) => post_delete_btn(`/actions/delete/${r.id}`, req),
-                  },
-                ],
-                triggers,
-                { hover: true }
-              ),
+              getTriggerList(triggers, req),
               link("/actions/new", req.__("Add trigger"))
             ),
           },